From 153683cfb007c6066c9dcf71d25afa4c66efa17f Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 20 Aug 2024 15:10:14 +0200
Subject: [PATCH 001/254] fix(core): look for `emcc` instead of `emcc.py` on
 Linux and Mac

`emcc.py` is not marked as executable in emcripten's git repo so the
build failed when trying to locate emscripten. However, it turns out
that `emcc` is marked as executable, so we use that instead.

On Windows however, we still need to use `emcc.py` because otherwise
Meson won't detect it as valid compiler.
---
 core/wasm.build.linux.in                   |  6 ++---
 core/wasm.build.mac.in                     |  6 ++---
 core/wasm.defs.build                       |  6 ++---
 developer/src/kmcmplib/wasm.build.linux.in |  6 ++---
 developer/src/kmcmplib/wasm.build.mac.in   |  6 ++---
 resources/locate_emscripten.inc.sh         | 30 +++++++++++++---------
 6 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/core/wasm.build.linux.in b/core/wasm.build.linux.in
index d449dcf94a0..27cb7ba68fe 100644
--- a/core/wasm.build.linux.in
+++ b/core/wasm.build.linux.in
@@ -1,4 +1,4 @@
 [binaries]
-c = ['$EMSCRIPTEN_BASE/emcc.py']
-cpp = ['$EMSCRIPTEN_BASE/em++.py']
-ar = ['$EMSCRIPTEN_BASE/emar.py']
\ No newline at end of file
+c = ['$EMSCRIPTEN_BASE/emcc']
+cpp = ['$EMSCRIPTEN_BASE/em++']
+ar = ['$EMSCRIPTEN_BASE/emar']
diff --git a/core/wasm.build.mac.in b/core/wasm.build.mac.in
index d449dcf94a0..27cb7ba68fe 100644
--- a/core/wasm.build.mac.in
+++ b/core/wasm.build.mac.in
@@ -1,4 +1,4 @@
 [binaries]
-c = ['$EMSCRIPTEN_BASE/emcc.py']
-cpp = ['$EMSCRIPTEN_BASE/em++.py']
-ar = ['$EMSCRIPTEN_BASE/emar.py']
\ No newline at end of file
+c = ['$EMSCRIPTEN_BASE/emcc']
+cpp = ['$EMSCRIPTEN_BASE/em++']
+ar = ['$EMSCRIPTEN_BASE/emar']
diff --git a/core/wasm.defs.build b/core/wasm.defs.build
index 4a598a1e1c1..f41af337a38 100644
--- a/core/wasm.defs.build
+++ b/core/wasm.defs.build
@@ -1,7 +1,7 @@
 [binaries]
-c = ['emcc.py']
-cpp = ['em++.py']
-ar = ['emar.py']
+c = ['emcc']
+cpp = ['em++']
+ar = ['emar']
 exe_wrapper = 'node'
 
 [properties]
diff --git a/developer/src/kmcmplib/wasm.build.linux.in b/developer/src/kmcmplib/wasm.build.linux.in
index c5e61a9bda9..27cb7ba68fe 100644
--- a/developer/src/kmcmplib/wasm.build.linux.in
+++ b/developer/src/kmcmplib/wasm.build.linux.in
@@ -1,4 +1,4 @@
 [binaries]
-c = ['$EMSCRIPTEN_BASE/emcc.py']
-cpp = ['$EMSCRIPTEN_BASE/em++.py']
-ar = ['$EMSCRIPTEN_BASE/emar.py']
+c = ['$EMSCRIPTEN_BASE/emcc']
+cpp = ['$EMSCRIPTEN_BASE/em++']
+ar = ['$EMSCRIPTEN_BASE/emar']
diff --git a/developer/src/kmcmplib/wasm.build.mac.in b/developer/src/kmcmplib/wasm.build.mac.in
index c5e61a9bda9..27cb7ba68fe 100644
--- a/developer/src/kmcmplib/wasm.build.mac.in
+++ b/developer/src/kmcmplib/wasm.build.mac.in
@@ -1,4 +1,4 @@
 [binaries]
-c = ['$EMSCRIPTEN_BASE/emcc.py']
-cpp = ['$EMSCRIPTEN_BASE/em++.py']
-ar = ['$EMSCRIPTEN_BASE/emar.py']
+c = ['$EMSCRIPTEN_BASE/emcc']
+cpp = ['$EMSCRIPTEN_BASE/em++']
+ar = ['$EMSCRIPTEN_BASE/emar']
diff --git a/resources/locate_emscripten.inc.sh b/resources/locate_emscripten.inc.sh
index be66adfa32f..20923770e2a 100644
--- a/resources/locate_emscripten.inc.sh
+++ b/resources/locate_emscripten.inc.sh
@@ -2,30 +2,36 @@
 # no hashbang for .inc.sh
 
 #
-# We don't want to rely on emcc.py being on the path, because Emscripten puts far
+# We don't want to rely on emcc being on the path, because Emscripten puts far
 # too many things onto the path (in particular for us, node).
 #
-# The following comment suggests that we don't need emcc.py on the path.
+# The following comment suggests that we don't need emcc on the path.
 # https://github.com/emscripten-core/emscripten/issues/4848#issuecomment-1097357775
 #
-# So we try and locate emcc.py in common locations ourselves. The search pattern
+# So we try and locate emcc in common locations ourselves. The search pattern
 # is:
 #
 # 1. Look for $EMSCRIPTEN_BASE (our primary emscripten variable), which should
-#    point to the folder that emcc.py is located in
-# 2. Look for $EMCC which should point to the emcc.py executable
-# 3. Look for emcc.py on the path
+#    point to the folder that emcc is located in
+# 2. Look for $EMCC which should point to the emcc executable
+# 3. Look for emcc on the path
 #
 locate_emscripten() {
+  local EMCC_EXECUTABLE
+  if [[ "${BUILDER_OS}" == "win" ]]; then
+    EMCC_EXECUTABLE="emcc.py"
+  else
+    EMCC_EXECUTABLE="emcc"
+  fi
   if [[ -z ${EMSCRIPTEN_BASE+x} ]]; then
     if [[ -z ${EMCC+x} ]]; then
-      local EMCC=`which emcc.py`
-      [[ -z $EMCC ]] && builder_die "locate_emscripten: Could not locate emscripten (emcc.py) on the path or with \$EMCC or \$EMSCRIPTEN_BASE"
+      local EMCC=$(which ${EMCC_EXECUTABLE})
+      [[ -z $EMCC ]] && builder_die "locate_emscripten: Could not locate emscripten (${EMCC_EXECUTABLE}) on the path or with \$EMCC or \$EMSCRIPTEN_BASE"
     fi
-    [[ -f $EMCC && ! -x $EMCC ]] && builder_die "locate_emscripten: Variable EMCC ($EMCC) points to emcc.py but it is not executable"
-    [[ -x $EMCC ]] || builder_die "locate_emscripten: Variable EMCC ($EMCC) does not point to a valid executable emcc.py"
+    [[ -f $EMCC && ! -x $EMCC ]] && builder_die "locate_emscripten: Variable EMCC ($EMCC) points to ${EMCC_EXECUTABLE} but it is not executable"
+    [[ -x $EMCC ]] || builder_die "locate_emscripten: Variable EMCC ($EMCC) does not point to a valid executable ${EMCC_EXECUTABLE}"
     EMSCRIPTEN_BASE="$(dirname "$EMCC")"
   fi
-  [[ -f ${EMSCRIPTEN_BASE}/emcc.py && ! -x ${EMSCRIPTEN_BASE}/emcc.py ]] && builder_die "locate_emscripten: Variable EMSCRIPTEN_BASE ($EMSCRIPTEN_BASE) contains emcc.py but it is not executable"
-  [[ -x ${EMSCRIPTEN_BASE}/emcc.py ]] || builder_die "locate_emscripten: Variable EMSCRIPTEN_BASE ($EMSCRIPTEN_BASE) does not point to emcc.py's folder"
+  [[ -f ${EMSCRIPTEN_BASE}/${EMCC_EXECUTABLE} && ! -x ${EMSCRIPTEN_BASE}/${EMCC_EXECUTABLE} ]] && builder_die "locate_emscripten: Variable EMSCRIPTEN_BASE ($EMSCRIPTEN_BASE) contains ${EMCC_EXECUTABLE} but it is not executable"
+  [[ -x ${EMSCRIPTEN_BASE}/${EMCC_EXECUTABLE} ]] || builder_die "locate_emscripten: Variable EMSCRIPTEN_BASE ($EMSCRIPTEN_BASE) does not point to ${EMCC_EXECUTABLE}'s folder"
 }

From 0abc250af38a64b2a3aaa7113a2ca99067fe0bd3 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 20 Aug 2024 12:45:16 +0200
Subject: [PATCH 002/254] feat(web): POC of Core WASM integration into Keyman
 Web

- add temporary function to Core for this POC
- add new CoreProcessor to access Keyman Core WASM
- add unit tests for new core processor
- add code to KeymanEngine and InputProcessor to load the new CoreProcessor
- add web server to manual tests and new action `start` to build script

This change requires the manual tests to be loaded from a web server
instead of loaded as file, because otherwise the wasm code won't be
loaded.

Currently we always load CoreProcessor. This should be improved in a future
change to only load when it is actually needed.

Part-of: #11293
---
 core/src/meson.build                          | 38 ++++++++
 core/src/wasm.cpp                             | 92 +++++++++++++++++++
 package-lock.json                             |  2 +
 resources/build/minimum-versions.inc.sh       |  2 +-
 web/README.md                                 |  5 +-
 web/build.sh                                  |  8 ++
 web/package.json                              | 14 ++-
 web/src/app/browser/build.sh                  |  4 +
 web/src/app/webview/build.sh                  | 11 +++
 web/src/engine/core-processor/.gitignore      |  1 +
 web/src/engine/core-processor/build.sh        | 64 +++++++++++++
 .../core-processor/src/core-processor.ts      | 30 ++++++
 web/src/engine/core-processor/src/index.ts    |  1 +
 web/src/engine/core-processor/tsconfig.json   | 13 +++
 .../interfaces/src/pathConfiguration.ts       |  4 +
 web/src/engine/main/build.sh                  |  1 +
 .../main/src/headless/inputProcessor.ts       |  9 +-
 web/src/engine/main/src/keymanEngine.ts       |  2 +
 .../dom/cases/core-processor/basic.spec.ts    | 21 +++++
 .../test/auto/dom/web-test-runner.config.mjs  | 13 ++-
 web/src/test/manual/build.sh                  |  2 +-
 web/src/tools/testing/test-server/index.cjs   | 12 +++
 22 files changed, 339 insertions(+), 10 deletions(-)
 create mode 100644 core/src/wasm.cpp
 create mode 100644 web/src/engine/core-processor/.gitignore
 create mode 100755 web/src/engine/core-processor/build.sh
 create mode 100644 web/src/engine/core-processor/src/core-processor.ts
 create mode 100644 web/src/engine/core-processor/src/index.ts
 create mode 100644 web/src/engine/core-processor/tsconfig.json
 create mode 100644 web/src/test/auto/dom/cases/core-processor/basic.spec.ts
 create mode 100644 web/src/tools/testing/test-server/index.cjs

diff --git a/core/src/meson.build b/core/src/meson.build
index 41c198543cb..564472b7980 100644
--- a/core/src/meson.build
+++ b/core/src/meson.build
@@ -118,6 +118,7 @@ api_files = files(
   'km_core_state_api.cpp',
   'km_core_debug_api.cpp',
   'km_core_processevent_api.cpp',
+  'wasm.cpp',
 )
 
 core_files = files(
@@ -133,6 +134,23 @@ mock_files = files(
   'mock/mock_processor.cpp',
 )
 
+if cpp_compiler.get_id() == 'emscripten'
+  host_links = ['--whole-archive', '-sALLOW_MEMORY_GROWTH=1', '-sMODULARIZE=1', '-sEXPORT_ES6', '-sENVIRONMENT=webview', '--embind-emit-tsd', 'core-interface.d.ts', '-sERROR_ON_UNDEFINED_SYMBOLS=0']
+
+  if cpp_compiler.version().version_compare('>=3.1.44')
+    # emscripten 3.1.44 removes .asm object and so we need to export `wasmExports`
+    # #9375; https://github.com/emscripten-core/emscripten/blob/main/ChangeLog.md#3144---072523
+    links += ['-sEXPORTED_RUNTIME_METHODS=[\'UTF8ToString\',\'stringToNewUTF8\',\'wasmExports\']']
+  else
+    # emscripten < 3.1.44 does not include `wasmExports`
+    links += ['-sEXPORTED_RUNTIME_METHODS=[\'UTF8ToString\',\'stringToNewUTF8\']']
+  endif
+
+  links += [
+      # Forcing inclusion of debug symbols
+      '-g', '-Wlimited-postlink-optimizations', '--bind']
+endif
+
 lib = library('keymancore',
   api_files,
   core_files,
@@ -160,3 +178,23 @@ pkg.generate(
     description: 'Keyman processor for KMN keyboards.',
     subdirs: headerdirs,
     libraries: lib)
+
+if cpp_compiler.get_id() == 'emscripten'
+  # Build an executable
+  host = executable('core',
+    cpp_args: defns,
+    include_directories: inc,
+    link_args: links + host_links,
+    objects: lib.extract_all_objects(recursive: false))
+
+  if get_option('buildtype') == 'release'
+    # Split debug symbols into separate wasm file for release builds only
+    # as the release symbols will be uploaded to sentry
+    # custom_target('kmcmplib.wasm',
+    #   depends: host,
+    #   input: host,
+    #   output: 'kmcmplib.wasm',
+    #   command: ['wasm-split', '@OUTDIR@/wasm-host.wasm', '-o', '@OUTPUT@', '--strip', '--debug-out=@OUTDIR@/kmcmplib.debug.wasm'],
+    #   build_by_default: true)
+  endif
+endif
diff --git a/core/src/wasm.cpp b/core/src/wasm.cpp
new file mode 100644
index 00000000000..d9c4277a96b
--- /dev/null
+++ b/core/src/wasm.cpp
@@ -0,0 +1,92 @@
+#ifdef __EMSCRIPTEN__
+#ifdef __EMSCRIPTEN__
+#include <emscripten/emscripten.h>
+#include <emscripten/bind.h>
+
+#else
+#define EMSCRIPTEN_KEEPALIVE
+#endif
+
+#ifdef __cplusplus
+#define EXTERN extern "C" EMSCRIPTEN_KEEPALIVE
+#else
+#define EXTERN EMSCRIPTEN_KEEPALIVE
+#endif
+
+#include <keyman_core.h>
+
+constexpr km_core_attr const engine_attrs = {
+  256,
+  KM_CORE_LIB_CURRENT,
+  KM_CORE_LIB_AGE,
+  KM_CORE_LIB_REVISION,
+  KM_CORE_TECH_KMX,
+  "SIL International"
+};
+
+EMSCRIPTEN_KEEPALIVE km_core_attr const & tmp_wasm_attributes() {
+  return engine_attrs;
+}
+
+EMSCRIPTEN_BINDINGS(compiler_interface) {
+
+  // emscripten::class_<WasmCallbackInterface>("WasmCallbackInterface")
+  //   .function("message", &WasmCallbackInterface::message, emscripten::pure_virtual())
+  //   .function("loadFile", &WasmCallbackInterface::loadFile, emscripten::pure_virtual())
+  //   .allow_subclass<WasmCallbackInterfaceWrapper>("WasmCallbackInterfaceWrapper")
+  //   ;
+
+  // emscripten::class_<KMCMP_COMPILER_OPTIONS>("CompilerOptions")
+  //   .constructor<>()
+  //   .property("saveDebug", &KMCMP_COMPILER_OPTIONS::saveDebug)
+  //   .property("compilerWarningsAsErrors", &KMCMP_COMPILER_OPTIONS::compilerWarningsAsErrors)
+  //   .property("warnDeprecatedCode", &KMCMP_COMPILER_OPTIONS::warnDeprecatedCode)
+  //   .property("shouldAddCompilerVersion", &KMCMP_COMPILER_OPTIONS::shouldAddCompilerVersion)
+  //   .property("target", &KMCMP_COMPILER_OPTIONS::target)
+  //   ;
+
+  // emscripten::class_<WASM_COMPILER_RESULT>("CompilerResult")
+  //   .constructor<>()
+  //   .property("result", &WASM_COMPILER_RESULT::result)
+  //   .property("kmx", &WASM_COMPILER_RESULT::kmx)
+  //   .property("kmxSize", &WASM_COMPILER_RESULT::kmxSize)
+  //   .property("extra", &WASM_COMPILER_RESULT::extra)
+  //   ;
+
+  // emscripten::class_<KMCMP_COMPILER_RESULT_MESSAGE>("CompilerResultMessage")
+  //   .constructor<>()
+  //   .property("errorCode", &KMCMP_COMPILER_RESULT_MESSAGE::errorCode)
+  //   .property("lineNumber", &KMCMP_COMPILER_RESULT_MESSAGE::lineNumber)
+  //   .property("columnNumber", &KMCMP_COMPILER_RESULT_MESSAGE::columnNumber)
+  //   .property("filename", &KMCMP_COMPILER_RESULT_MESSAGE::filename)
+  //   .property("parameters", &KMCMP_COMPILER_RESULT_MESSAGE::parameters)
+  //   ;
+
+  // emscripten::class_<KMCMP_COMPILER_RESULT_EXTRA>("CompilerResultExtra")
+  //   .constructor<>()
+  //   .property("targets", &KMCMP_COMPILER_RESULT_EXTRA::targets)
+  //   .property("kmnFilename", &KMCMP_COMPILER_RESULT_EXTRA::kmnFilename)
+  //   .property("kvksFilename", &KMCMP_COMPILER_RESULT_EXTRA::kvksFilename)
+  //   .property("displayMapFilename", &KMCMP_COMPILER_RESULT_EXTRA::displayMapFilename)
+  //   .property("stores", &KMCMP_COMPILER_RESULT_EXTRA::stores)
+  //   .property("groups", &KMCMP_COMPILER_RESULT_EXTRA::groups)
+  //   ;
+
+  // emscripten::value_object<KMCMP_COMPILER_RESULT_EXTRA_STORE>("CompilerResultExtraStore")
+  //   .field("storeType", &KMCMP_COMPILER_RESULT_EXTRA_STORE::storeType)
+  //   .field("name", &KMCMP_COMPILER_RESULT_EXTRA_STORE::name)
+  //   .field("line", &KMCMP_COMPILER_RESULT_EXTRA_STORE::line)
+  //   ;
+
+  emscripten::value_object<km_core_attr>("km_core_attr")
+    .field("max_context", &km_core_attr::max_context)
+    .field("current", &km_core_attr::current)
+    .field("revision", &km_core_attr::revision)
+    .field("age", &km_core_attr::age)
+    .field("technology", &km_core_attr::technology)
+    //.field("vendor", &km_core_attr::vendor, emscripten::allow_raw_pointers())
+    ;
+
+  emscripten::function("tmp_wasm_attributes", &tmp_wasm_attributes);
+}
+#endif
diff --git a/package-lock.json b/package-lock.json
index cee7d8528b7..c8451a75191 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8514,6 +8514,7 @@
       "version": "4.19.2",
       "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
       "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -14760,6 +14761,7 @@
         "@sentry/cli": "^2.31.0",
         "@zip.js/zip.js": "^2.7.32",
         "c8": "^7.12.0",
+        "express": "^4.19.2",
         "jsdom": "^23.0.1",
         "mocha": "^10.0.0"
       }
diff --git a/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh
index c060d31c58f..385f1647544 100644
--- a/resources/build/minimum-versions.inc.sh
+++ b/resources/build/minimum-versions.inc.sh
@@ -20,7 +20,7 @@ KEYMAN_MIN_TARGET_VERSION_CHROME=95.0         # Final version that runs on Andro
 # Dependency versions
 KEYMAN_MIN_VERSION_NODE_MAJOR=20              # node version source of truth is /package.json:/engines/node
 KEYMAN_MIN_VERSION_NPM=10.5.1                 # 10.5.0 has bug, discussed in #10350
-KEYMAN_MIN_VERSION_EMSCRIPTEN=3.1.44          # Warning: 3.1.45 is bad (#9529); newer versions work
+KEYMAN_MIN_VERSION_EMSCRIPTEN=3.1.58
 KEYMAN_MAX_VERSION_EMSCRIPTEN=3.1.58          # See #9529
 KEYMAN_MIN_VERSION_VISUAL_STUDIO=2019
 KEYMAN_MIN_VERSION_MESON=1.0.0
diff --git a/web/README.md b/web/README.md
index f09fe519bbb..ef7344adffb 100644
--- a/web/README.md
+++ b/web/README.md
@@ -29,8 +29,9 @@ src/test/auto              A Node-driven test suite for automated testing of Key
 
 ## Usage
 
-Open **index.html** or **samples/index.html** in your browser. Be sure to
-compile Keyman Engine for Web before viewing the pages.
+Start the test server by running `./build.sh start`, then open
+your browser to http://localhost:3000. Be sure to compile Keyman Engine
+for Web before viewing the pages.
 
 Refer to the samples for usage details.
 
diff --git a/web/build.sh b/web/build.sh
index 16d3d112356..27243535940 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -17,12 +17,14 @@ builder_describe "Builds engine modules for Keyman Engine for Web (KMW)." \
   "clean" \
   "configure" \
   "build" \
+  "start                     Starts the test server" \
   "test" \
   "coverage                  Create an HTML page with code coverage" \
   ":app/browser              The form of Keyman Engine for Web for use on websites" \
   ":app/webview              A puppetable version of KMW designed for use in a host app's WebView" \
   ":app/ui                   Builds KMW's desktop form-factor keyboard-selection UI modules" \
   ":engine/attachment        Subset used for detecting valid page contexts for use in text editing " \
+  ":engine/core-processor    Keyman Core WASM integration" \
   ":engine/device-detect     Subset used for device-detection " \
   ":engine/dom-utils         A common subset of function used for DOM calculations, layout, etc" \
   ":engine/events            Specialized classes utilized to support KMW API events" \
@@ -56,6 +58,7 @@ builder_describe_outputs \
   build:app/webview             "/web/build/app/webview/${config}/keymanweb-webview.js" \
   build:app/ui                  "/web/build/app/ui/${config}/kmwuitoggle.js" \
   build:engine/attachment       "/web/build/engine/attachment/lib/index.mjs" \
+  build:engine/core-processor   "/web/build/engine/core-processor/lib/index.mjs" \
   build:engine/device-detect    "/web/build/engine/device-detect/lib/index.mjs" \
   build:engine/dom-utils        "/web/build/engine/dom-utils/obj/index.js" \
   build:engine/events           "/web/build/engine/events/lib/index.mjs" \
@@ -159,6 +162,8 @@ builder_run_child_actions build:engine/attachment
 # Uses engine/interfaces (due to resource-path config interface)
 builder_run_child_actions build:engine/keyboard-storage
 
+builder_run_child_actions build:engine/core-processor
+
 # Uses engine/interfaces, engine/device-detect, engine/keyboard-storage, & engine/osk
 builder_run_child_actions build:engine/main
 
@@ -188,3 +193,6 @@ builder_run_action test test_action
 
 # Create coverage report
 builder_run_action coverage coverage_action
+
+# Start the test server
+builder_run_action start node src/tools/testing/test-server/index.cjs
diff --git a/web/package.json b/web/package.json
index 96a11c0cd3e..8a170dedaf4 100644
--- a/web/package.json
+++ b/web/package.json
@@ -12,10 +12,10 @@
       "types": "./build/engine/attachment/obj/index.d.ts",
       "import": "./build/engine/attachment/obj/index.js"
     },
-    "./engine/interfaces": {
-      "es6-bundling": "./src/engine/interfaces/src/index.ts",
-      "types": "./build/engine/interfaces/obj/index.d.ts",
-      "import": "./build/engine/interfaces/obj/index.js"
+    "./engine/core-processor": {
+      "es6-bundling": "./src/engine/core-processor/src/index.ts",
+      "types": "./build/engine/core-processor/obj/index.d.ts",
+      "import": "./build/engine/core-processor/obj/index.js"
     },
     "./engine/device-detect": {
       "es6-bundling": "./src/engine/device-detect/src/index.ts",
@@ -37,6 +37,11 @@
       "types": "./build/engine/events/obj/index.d.ts",
       "import": "./build/engine/events/obj/index.js"
     },
+    "./engine/interfaces": {
+      "es6-bundling": "./src/engine/interfaces/src/index.ts",
+      "types": "./build/engine/interfaces/obj/index.d.ts",
+      "import": "./build/engine/interfaces/obj/index.js"
+    },
     "./engine/js-processor": {
       "es6-bundling": "./src/engine/js-processor/src/index.ts",
       "types": "./build/engine/js-processor/obj/index.d.ts",
@@ -112,6 +117,7 @@
     "@sentry/cli": "^2.31.0",
     "@zip.js/zip.js": "^2.7.32",
     "c8": "^7.12.0",
+    "express": "^4.19.2",
     "jsdom": "^23.0.1",
     "mocha": "^10.0.0"
   },
diff --git a/web/src/app/browser/build.sh b/web/src/app/browser/build.sh
index 1d757e264a2..bf135637d1c 100755
--- a/web/src/app/browser/build.sh
+++ b/web/src/app/browser/build.sh
@@ -73,6 +73,10 @@ compile_and_copy() {
   mkdir -p "$KEYMAN_ROOT/web/build/app/resources/osk"
   cp -R "$KEYMAN_ROOT/web/src/resources/osk/." "$KEYMAN_ROOT/web/build/app/resources/osk/"
 
+  # Copy the WASM host
+  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/browser/debug/"
+  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/browser/release/"
+
   # Update the build/publish copy of our build artifacts
   prepare
 
diff --git a/web/src/app/webview/build.sh b/web/src/app/webview/build.sh
index e22e1b470ef..13e6fe2ddf1 100755
--- a/web/src/app/webview/build.sh
+++ b/web/src/app/webview/build.sh
@@ -58,8 +58,16 @@ compile_and_copy() {
   mkdir -p "$KEYMAN_ROOT/web/build/app/resources/osk"
   cp -R "$KEYMAN_ROOT/web/src/resources/osk/." "$KEYMAN_ROOT/web/build/app/resources/osk/"
 
+  # Copy the WASM host
+  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/webview/debug/"
+  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/webview/release/"
+
   # Clean the sourcemaps of .. and . components
   for script in "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME/debug/"*.js; do
+    if [[ "${script}" == *"/core.js" ]]; then
+      continue
+    fi
+
     sourcemap="$script.map"
     node "$KEYMAN_ROOT/web/build/tools/building/sourcemap-root/index.js" \
       "$script" "$sourcemap" --clean --inline
@@ -68,6 +76,9 @@ compile_and_copy() {
   # Do NOT inline sourcemaps for release builds - we don't want them to affect
   # load time.
   for script in "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME/release/"*.js; do
+    if [[ "${script}" == *"/core.js" ]]; then
+      continue
+    fi
     sourcemap="$script.map"
     node "$KEYMAN_ROOT/web/build/tools/building/sourcemap-root/index.js" \
       "$script" "$sourcemap" --clean
diff --git a/web/src/engine/core-processor/.gitignore b/web/src/engine/core-processor/.gitignore
new file mode 100644
index 00000000000..282f91762fb
--- /dev/null
+++ b/web/src/engine/core-processor/.gitignore
@@ -0,0 +1 @@
+src/import/
\ No newline at end of file
diff --git a/web/src/engine/core-processor/build.sh b/web/src/engine/core-processor/build.sh
new file mode 100755
index 00000000000..14379c87654
--- /dev/null
+++ b/web/src/engine/core-processor/build.sh
@@ -0,0 +1,64 @@
+#!/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/builder.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+SUBPROJECT_NAME=engine/core-processor
+
+. "${KEYMAN_ROOT}/web/common.inc.sh"
+. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+
+# ################################ Main script ################################
+
+builder_describe "Keyman Core WASM integration" \
+  "@/core:wasm" \
+  "clean" \
+  "configure" \
+  "build" \
+  "test" \
+  "--ci+                     Set to utilize CI-based test configurations & reporting."
+
+builder_describe_outputs \
+  configure    "/web/src/engine/core-processor/src/import/core/core-interface.d.ts" \
+  build        "/web/build/${SUBPROJECT_NAME}/lib/index.mjs"
+
+builder_parse "$@"
+
+#### Build action definitions ####
+
+do_clean() {
+  rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
+  rm -rf "src/import/"
+}
+
+do_configure() {
+  verify_npm_setup
+
+  mkdir -p "src/import/core/"
+  # we don't need this file here, but it's nice to have for reference and auto-completion
+  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/core-interface.d.ts" "src/import/core/"
+}
+
+copy_deps() {
+  mkdir -p "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/import/core/"
+  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/"core{.js,.wasm,-interface.d.ts} "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/import/core/"
+}
+
+do_build () {
+  copy_deps
+  compile "${SUBPROJECT_NAME}"
+
+  ${BUNDLE_CMD} "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/index.js" \
+    --out         "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/lib/index.mjs" \
+    --format esm
+}
+
+builder_run_action clean      do_clean
+builder_run_action configure  do_configure
+builder_run_action build      do_build
+
+# No headless tests for this child project.  Currently, DOM-based unit &
+# integrated tests are run solely by the top-level $KEYMAN_ROOT/web project.
diff --git a/web/src/engine/core-processor/src/core-processor.ts b/web/src/engine/core-processor/src/core-processor.ts
new file mode 100644
index 00000000000..3b53a0ec838
--- /dev/null
+++ b/web/src/engine/core-processor/src/core-processor.ts
@@ -0,0 +1,30 @@
+type km_core_attr = import('./import/core/core-interface.js').km_core_attr;
+
+export class CoreProcessor {
+  private instance: any;
+
+  /**
+     * Initialize Core Processor
+     * @param baseurl - The url where core.js is located
+     */
+  public async init(baseurl: string): Promise<boolean> {
+
+    if (!this.instance) {
+      try {
+        const module = await import(baseurl + '/core.js');
+        this.instance = await module.default({
+          locateFile: function (path: string, scriptDirectory: string) {
+            return baseurl + '/' + path;
+          }
+        });
+      } catch (e: any) {
+        return false;
+      }
+    }
+    return !!this.instance;
+  };
+
+  public tmp_wasm_attributes(): km_core_attr {
+    return this.instance.tmp_wasm_attributes();
+  }
+}
diff --git a/web/src/engine/core-processor/src/index.ts b/web/src/engine/core-processor/src/index.ts
new file mode 100644
index 00000000000..06f040ce538
--- /dev/null
+++ b/web/src/engine/core-processor/src/index.ts
@@ -0,0 +1 @@
+export * from './core-processor.js';
\ No newline at end of file
diff --git a/web/src/engine/core-processor/tsconfig.json b/web/src/engine/core-processor/tsconfig.json
new file mode 100644
index 00000000000..84996aaca16
--- /dev/null
+++ b/web/src/engine/core-processor/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  // While the actual references themselves are headless, it compiles against the DOM-reliant OSK module.
+  "extends": "../../tsconfig.dom.json",
+
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "../../../build/engine/core-processor/obj/",
+    "tsBuildInfoFile": "../../../build/engine/core-processor/obj/tsconfig.tsbuildinfo",
+    "rootDir": "./src"
+  },
+
+  "include": [ "**/*.ts", "src/import/core/core.js" ],
+}
diff --git a/web/src/engine/interfaces/src/pathConfiguration.ts b/web/src/engine/interfaces/src/pathConfiguration.ts
index 0eff8f65f78..18080374e48 100644
--- a/web/src/engine/interfaces/src/pathConfiguration.ts
+++ b/web/src/engine/interfaces/src/pathConfiguration.ts
@@ -106,6 +106,10 @@ export default class PathConfiguration implements OSKResourcePathConfiguration {
     return this._root;
   }
 
+  get basePath(): string {
+    return this.sourcePath;
+  }
+
   get resources(): string {
     return this._resources;
   }
diff --git a/web/src/engine/main/build.sh b/web/src/engine/main/build.sh
index 77673626e02..5abcb59008c 100755
--- a/web/src/engine/main/build.sh
+++ b/web/src/engine/main/build.sh
@@ -14,6 +14,7 @@ SUBPROJECT_NAME=engine/main
 
 builder_describe "Builds the Keyman Engine for Web's common top-level base classes." \
   "@/common/web/keyman-version" \
+  "@/web/src/engine/core-processor" \
   "@/web/src/engine/keyboard" \
   "@/web/src/engine/interfaces build" \
   "@/web/src/engine/device-detect build" \
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index 6d8904c563d..94c95f56012 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -4,9 +4,10 @@
 
 import ContextWindow from "./contextWindow.js";
 import { LanguageProcessor }  from "./languageProcessor.js";
-import type { ModelSpec }  from "keyman/engine/interfaces";
+import type { ModelSpec, PathConfiguration }  from "keyman/engine/interfaces";
 import { globalObject, DeviceSpec } from "@keymanapp/web-utils";
 
+import { CoreProcessor } from "keyman/engine/core-processor";
 import { Codes, type Keyboard, type KeyEvent } from "keyman/engine/keyboard";
 import {
   type Alternate,
@@ -35,6 +36,7 @@ export class InputProcessor {
   private contextDevice: DeviceSpec;
   private kbdProcessor: KeyboardProcessor;
   private lngProcessor: LanguageProcessor;
+  private coreProcessor: CoreProcessor;
 
   private readonly contextCache = new TranscriptionCache();
 
@@ -50,6 +52,11 @@ export class InputProcessor {
     this.contextDevice = device;
     this.kbdProcessor = new KeyboardProcessor(device, options);
     this.lngProcessor = new LanguageProcessor(predictiveTextWorker, this.contextCache);
+    this.coreProcessor = new CoreProcessor();
+  }
+
+  public async init(paths: PathConfiguration) {
+    this.coreProcessor.init(paths.basePath);
   }
 
   public get languageProcessor(): LanguageProcessor {
diff --git a/web/src/engine/main/src/keymanEngine.ts b/web/src/engine/main/src/keymanEngine.ts
index 851134f258f..5901bbded3e 100644
--- a/web/src/engine/main/src/keymanEngine.ts
+++ b/web/src/engine/main/src/keymanEngine.ts
@@ -234,6 +234,8 @@ export default class KeymanEngine<
     // Initialize supplementary plane string extensions
     String.kmwEnableSupplementaryPlane(true);
 
+    await this.core.init(config.paths);
+
     // Since we're not sandboxing keyboard loads yet, we just use `window` as the jsGlobal object.
     // All components initialized below require a properly-configured `config.paths` or similar.
     const keyboardLoader = new KeyboardLoader(this.interface, config.applyCacheBusting);
diff --git a/web/src/test/auto/dom/cases/core-processor/basic.spec.ts b/web/src/test/auto/dom/cases/core-processor/basic.spec.ts
new file mode 100644
index 00000000000..c24748e9c58
--- /dev/null
+++ b/web/src/test/auto/dom/cases/core-processor/basic.spec.ts
@@ -0,0 +1,21 @@
+import { assert } from 'chai';
+import { CoreProcessor } from 'keyman/engine/core-processor';
+
+const coreurl = '/web/build/engine/core-processor/obj/import/core/';
+
+// Test the CoreProcessor interface.
+describe('CoreProcessor', function () {
+  it('can initialize without errors', async function () {
+    const kp = new CoreProcessor();
+    assert.isTrue(await kp.init(coreurl));
+  });
+
+  it('can call temp function', async function () {
+    const kp = new CoreProcessor();
+    await kp.init(coreurl);
+    const a = kp.tmp_wasm_attributes();
+    assert.isNotNull(a);
+    assert.isNumber(a.max_context);
+    console.dir(a);
+  });
+});
diff --git a/web/src/test/auto/dom/web-test-runner.config.mjs b/web/src/test/auto/dom/web-test-runner.config.mjs
index 62edfc7dbf9..1d9534a77ba 100644
--- a/web/src/test/auto/dom/web-test-runner.config.mjs
+++ b/web/src/test/auto/dom/web-test-runner.config.mjs
@@ -40,6 +40,11 @@ export default {
       // Relative, from the containing package.json
       files: ['build/test/dom/cases/browser/**/*.spec.mjs']
     },
+    {
+      name: 'engine/core-processor',
+      // Relative, from the containing package.json
+      files: ['build/test/dom/cases/core-processor/**/*.spec.mjs']
+    },
     {
       name: 'engine/dom-utils',
       // Relative, from the containing package.json
@@ -59,7 +64,7 @@ export default {
       name: 'engine/keyboard-storage',
       // Relative, from the containing package.json
       files: ['build/test/dom/cases/keyboard-storage/**/*.spec.mjs']
-    }
+    },
   ],
   middleware: [
     // Rewrites short-hand paths for test resources, making them fully relative to the repo root.
@@ -68,6 +73,12 @@ export default {
         context.url = '/web/src/test/auto' + context.url;
       }
 
+      return next();
+    },
+    function rewriteWasmContentType(context, next) {
+      if (context.url.endsWith('.wasm')) {
+        context.headers['content-type'] = 'application/wasm';
+      }
       return next();
     }
   ],
diff --git a/web/src/test/manual/build.sh b/web/src/test/manual/build.sh
index 046cefe1520..6edae31b08f 100755
--- a/web/src/test/manual/build.sh
+++ b/web/src/test/manual/build.sh
@@ -57,4 +57,4 @@ function do_copy() {
 }
 
 builder_run_action clean rm -rf "$KEYMAN_ROOT/$DEST"
-builder_run_action build do_copy
\ No newline at end of file
+builder_run_action build do_copy
diff --git a/web/src/tools/testing/test-server/index.cjs b/web/src/tools/testing/test-server/index.cjs
new file mode 100644
index 00000000000..80237e9f756
--- /dev/null
+++ b/web/src/tools/testing/test-server/index.cjs
@@ -0,0 +1,12 @@
+const express = require('express')
+const path = require('path')
+const app = express()
+const port = 3000
+
+app.use(express.static(path.join(__dirname, '../../../../')))
+
+app.listen(port, () => {
+  console.log(`Keyman test app listening on port ${port}`)
+})
+
+

From f6c822906461db162da31840b8f5fba3f34708f1 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 21 Aug 2024 09:20:10 +0200
Subject: [PATCH 003/254] feat(web): don't use deprecated emcc parameter

---
 core/src/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/meson.build b/core/src/meson.build
index 564472b7980..25499ab600b 100644
--- a/core/src/meson.build
+++ b/core/src/meson.build
@@ -135,7 +135,7 @@ mock_files = files(
 )
 
 if cpp_compiler.get_id() == 'emscripten'
-  host_links = ['--whole-archive', '-sALLOW_MEMORY_GROWTH=1', '-sMODULARIZE=1', '-sEXPORT_ES6', '-sENVIRONMENT=webview', '--embind-emit-tsd', 'core-interface.d.ts', '-sERROR_ON_UNDEFINED_SYMBOLS=0']
+  host_links = ['--whole-archive', '-sALLOW_MEMORY_GROWTH=1', '-sMODULARIZE=1', '-sEXPORT_ES6', '-sENVIRONMENT=webview', '--emit-tsd', 'core-interface.d.ts', '-sERROR_ON_UNDEFINED_SYMBOLS=0']
 
   if cpp_compiler.version().version_compare('>=3.1.44')
     # emscripten 3.1.44 removes .asm object and so we need to export `wasmExports`

From 3912bf4c1390cc1dbee31c1a5edf0fd61c227362 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 21 Aug 2024 12:25:51 +0200
Subject: [PATCH 004/254] chore(developer): support for emscripten 3.1.64

---
 developer/src/kmcmplib/src/CompilerInterfacesWasm.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/developer/src/kmcmplib/src/CompilerInterfacesWasm.cpp b/developer/src/kmcmplib/src/CompilerInterfacesWasm.cpp
index a857b41dce4..3848d89c4d2 100644
--- a/developer/src/kmcmplib/src/CompilerInterfacesWasm.cpp
+++ b/developer/src/kmcmplib/src/CompilerInterfacesWasm.cpp
@@ -75,8 +75,8 @@ struct BindingType<std::vector<T, Allocator>> {
     using ValBinding = BindingType<val>;
     using WireType = ValBinding::WireType;
 
-    static WireType toWireType(const std::vector<T, Allocator> &vec) {
-        return ValBinding::toWireType(val::array(vec));
+    static WireType toWireType(const std::vector<T, Allocator> &vec, rvp::default_tag) {
+        return ValBinding::toWireType(val::array(vec), rvp::default_tag{});
     }
 
     static std::vector<T, Allocator> fromWireType(WireType value) {

From e015072213a01c58482a15bfd19ee2c8563f0425 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 22 Aug 2024 15:58:53 +0200
Subject: [PATCH 005/254] chore(web): add utils dependency to core-processor
 (es-bundling)

---
 web/src/engine/core-processor/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/src/engine/core-processor/build.sh b/web/src/engine/core-processor/build.sh
index 14379c87654..4d0818f578b 100755
--- a/web/src/engine/core-processor/build.sh
+++ b/web/src/engine/core-processor/build.sh
@@ -15,6 +15,7 @@ SUBPROJECT_NAME=engine/core-processor
 
 builder_describe "Keyman Core WASM integration" \
   "@/core:wasm" \
+  "@/common/web/utils" \
   "clean" \
   "configure" \
   "build" \

From c021999f9e7a9a11aa07bbd5247f1eba4f7c879d Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 23 Aug 2024 07:11:41 +0200
Subject: [PATCH 006/254] chore(common): use `npm install` and set min ver for
 emsdk

---
 docs/minimum-versions.md                | 3 +--
 resources/build/minimum-versions.inc.sh | 2 +-
 resources/locate_emscripten.inc.sh      | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/minimum-versions.md b/docs/minimum-versions.md
index a9a2ead26b9..4b308450690 100644
--- a/docs/minimum-versions.md
+++ b/docs/minimum-versions.md
@@ -49,7 +49,6 @@ https://help.keyman.com/developer/engine/android/latest-version/
 |          KEYMAN Variable          |     Value    |
 |-----------------------------------|--------------|
 | KEYMAN_DEFAULT_VERSION_UBUNTU_CONTAINER | noble |
-| KEYMAN_MAX_VERSION_EMSCRIPTEN | 3.1.58 |
 | KEYMAN_MIN_TARGET_VERSION_ANDROID | 5 |
 | KEYMAN_MIN_TARGET_VERSION_CHROME | 95.0 |
 | KEYMAN_MIN_TARGET_VERSION_IOS | 12.2 |
@@ -58,7 +57,7 @@ https://help.keyman.com/developer/engine/android/latest-version/
 | KEYMAN_MIN_TARGET_VERSION_WINDOWS | 10 |
 | KEYMAN_MIN_VERSION_ANDROID_SDK | 21 |
 | KEYMAN_MIN_VERSION_CPP | 17 |
-| KEYMAN_MIN_VERSION_EMSCRIPTEN | 3.1.44 |
+| KEYMAN_MIN_VERSION_EMSCRIPTEN | 3.1.64 |
 | KEYMAN_MIN_VERSION_MESON | 1.0.0 |
 | KEYMAN_MIN_VERSION_NODE_MAJOR | 20 |
 | KEYMAN_MIN_VERSION_NPM | 10.5.1 |
diff --git a/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh
index 97f25094067..4dcf5e64f1e 100644
--- a/resources/build/minimum-versions.inc.sh
+++ b/resources/build/minimum-versions.inc.sh
@@ -20,7 +20,7 @@ KEYMAN_MIN_TARGET_VERSION_CHROME=95.0         # Final version that runs on Andro
 # Dependency versions
 KEYMAN_MIN_VERSION_NODE_MAJOR=20              # node version source of truth is /package.json:/engines/node
 KEYMAN_MIN_VERSION_NPM=10.5.1                 # 10.5.0 has bug, discussed in #10350
-KEYMAN_MIN_VERSION_EMSCRIPTEN=3.1.58          # Use KEYMAN_USE_EMSDK to automatically update to this version
+KEYMAN_MIN_VERSION_EMSCRIPTEN=3.1.64          # Use KEYMAN_USE_EMSDK to automatically update to this version
 KEYMAN_MIN_VERSION_VISUAL_STUDIO=2019
 KEYMAN_MIN_VERSION_MESON=1.0.0
 
diff --git a/resources/locate_emscripten.inc.sh b/resources/locate_emscripten.inc.sh
index f678e8449e6..3d470f75772 100644
--- a/resources/locate_emscripten.inc.sh
+++ b/resources/locate_emscripten.inc.sh
@@ -69,5 +69,7 @@ _select_emscripten_version_with_emsdk() {
   git pull
   ./emsdk install "$KEYMAN_MIN_VERSION_EMSCRIPTEN"
   ./emsdk activate "$KEYMAN_MIN_VERSION_EMSCRIPTEN"
+  cd upstream/emscripten
+  npm install
   popd > /dev/null
 }

From 13f052f766931db3c3f3225a76c41d5c22b7fcb1 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
Date: Mon, 26 Aug 2024 14:49:54 +0700
Subject: [PATCH 007/254] Apply suggestions from code review

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 web/src/app/browser/build.sh           | 2 +-
 web/src/app/webview/build.sh           | 2 +-
 web/src/engine/core-processor/build.sh | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/web/src/app/browser/build.sh b/web/src/app/browser/build.sh
index bf135637d1c..b5402d29218 100755
--- a/web/src/app/browser/build.sh
+++ b/web/src/app/browser/build.sh
@@ -73,7 +73,7 @@ compile_and_copy() {
   mkdir -p "$KEYMAN_ROOT/web/build/app/resources/osk"
   cp -R "$KEYMAN_ROOT/web/src/resources/osk/." "$KEYMAN_ROOT/web/build/app/resources/osk/"
 
-  # Copy the WASM host
+  # Copy Keyman Core build artifacts for local reference
   cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/browser/debug/"
   cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/browser/release/"
 
diff --git a/web/src/app/webview/build.sh b/web/src/app/webview/build.sh
index 13e6fe2ddf1..4a2bc2fb544 100755
--- a/web/src/app/webview/build.sh
+++ b/web/src/app/webview/build.sh
@@ -58,7 +58,7 @@ compile_and_copy() {
   mkdir -p "$KEYMAN_ROOT/web/build/app/resources/osk"
   cp -R "$KEYMAN_ROOT/web/src/resources/osk/." "$KEYMAN_ROOT/web/build/app/resources/osk/"
 
-  # Copy the WASM host
+  # Copy Keyman Core build artifacts for local reference
   cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/webview/debug/"
   cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/webview/release/"
 
diff --git a/web/src/engine/core-processor/build.sh b/web/src/engine/core-processor/build.sh
index 4d0818f578b..cee72fea011 100755
--- a/web/src/engine/core-processor/build.sh
+++ b/web/src/engine/core-processor/build.sh
@@ -39,7 +39,8 @@ do_configure() {
   verify_npm_setup
 
   mkdir -p "src/import/core/"
-  # we don't need this file here, but it's nice to have for reference and auto-completion
+  # we don't need this file for release builds, but it's nice to have 
+  # for reference and auto-completion
   cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/core-interface.d.ts" "src/import/core/"
 }
 
@@ -60,6 +61,3 @@ do_build () {
 builder_run_action clean      do_clean
 builder_run_action configure  do_configure
 builder_run_action build      do_build
-
-# No headless tests for this child project.  Currently, DOM-based unit &
-# integrated tests are run solely by the top-level $KEYMAN_ROOT/web project.

From eb33c53b9cb5dc3b7ea1828e75004a0f1bb55ec7 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 26 Aug 2024 15:10:43 +0700
Subject: [PATCH 008/254] chore(core): address code review comments

---
 core/src/meson.build | 22 +++++++------------
 core/src/wasm.cpp    | 50 +-------------------------------------------
 package-lock.json    |  8 +++----
 3 files changed, 13 insertions(+), 67 deletions(-)

diff --git a/core/src/meson.build b/core/src/meson.build
index 25499ab600b..74acf6e54b9 100644
--- a/core/src/meson.build
+++ b/core/src/meson.build
@@ -135,18 +135,11 @@ mock_files = files(
 )
 
 if cpp_compiler.get_id() == 'emscripten'
-  host_links = ['--whole-archive', '-sALLOW_MEMORY_GROWTH=1', '-sMODULARIZE=1', '-sEXPORT_ES6', '-sENVIRONMENT=webview', '--emit-tsd', 'core-interface.d.ts', '-sERROR_ON_UNDEFINED_SYMBOLS=0']
-
-  if cpp_compiler.version().version_compare('>=3.1.44')
-    # emscripten 3.1.44 removes .asm object and so we need to export `wasmExports`
-    # #9375; https://github.com/emscripten-core/emscripten/blob/main/ChangeLog.md#3144---072523
-    links += ['-sEXPORTED_RUNTIME_METHODS=[\'UTF8ToString\',\'stringToNewUTF8\',\'wasmExports\']']
-  else
-    # emscripten < 3.1.44 does not include `wasmExports`
-    links += ['-sEXPORTED_RUNTIME_METHODS=[\'UTF8ToString\',\'stringToNewUTF8\']']
-  endif
+  host_links = ['--whole-archive', '-sALLOW_MEMORY_GROWTH=1', '-sMODULARIZE=1',
+    '-sEXPORT_ES6', '-sENVIRONMENT=webview',
+    '--emit-tsd', 'core-interface.d.ts', '-sERROR_ON_UNDEFINED_SYMBOLS=0']
 
-  links += [
+  links += ['-sEXPORTED_RUNTIME_METHODS=[\'UTF8ToString\',\'stringToNewUTF8\',\'wasmExports\']',
       # Forcing inclusion of debug symbols
       '-g', '-Wlimited-postlink-optimizations', '--bind']
 endif
@@ -188,13 +181,14 @@ if cpp_compiler.get_id() == 'emscripten'
     objects: lib.extract_all_objects(recursive: false))
 
   if get_option('buildtype') == 'release'
+    # TODO: #12888
     # Split debug symbols into separate wasm file for release builds only
     # as the release symbols will be uploaded to sentry
-    # custom_target('kmcmplib.wasm',
+    # custom_target('core.wasm',
     #   depends: host,
     #   input: host,
-    #   output: 'kmcmplib.wasm',
-    #   command: ['wasm-split', '@OUTDIR@/wasm-host.wasm', '-o', '@OUTPUT@', '--strip', '--debug-out=@OUTDIR@/kmcmplib.debug.wasm'],
+    #   output: 'core.wasm',
+    #   command: ['wasm-split', '@OUTDIR@/core.wasm', '-o', '@OUTPUT@', '--strip', '--debug-out=@OUTDIR@/core.debug.wasm'],
     #   build_by_default: true)
   endif
 endif
diff --git a/core/src/wasm.cpp b/core/src/wasm.cpp
index d9c4277a96b..90fc85cda88 100644
--- a/core/src/wasm.cpp
+++ b/core/src/wasm.cpp
@@ -28,55 +28,7 @@ EMSCRIPTEN_KEEPALIVE km_core_attr const & tmp_wasm_attributes() {
   return engine_attrs;
 }
 
-EMSCRIPTEN_BINDINGS(compiler_interface) {
-
-  // emscripten::class_<WasmCallbackInterface>("WasmCallbackInterface")
-  //   .function("message", &WasmCallbackInterface::message, emscripten::pure_virtual())
-  //   .function("loadFile", &WasmCallbackInterface::loadFile, emscripten::pure_virtual())
-  //   .allow_subclass<WasmCallbackInterfaceWrapper>("WasmCallbackInterfaceWrapper")
-  //   ;
-
-  // emscripten::class_<KMCMP_COMPILER_OPTIONS>("CompilerOptions")
-  //   .constructor<>()
-  //   .property("saveDebug", &KMCMP_COMPILER_OPTIONS::saveDebug)
-  //   .property("compilerWarningsAsErrors", &KMCMP_COMPILER_OPTIONS::compilerWarningsAsErrors)
-  //   .property("warnDeprecatedCode", &KMCMP_COMPILER_OPTIONS::warnDeprecatedCode)
-  //   .property("shouldAddCompilerVersion", &KMCMP_COMPILER_OPTIONS::shouldAddCompilerVersion)
-  //   .property("target", &KMCMP_COMPILER_OPTIONS::target)
-  //   ;
-
-  // emscripten::class_<WASM_COMPILER_RESULT>("CompilerResult")
-  //   .constructor<>()
-  //   .property("result", &WASM_COMPILER_RESULT::result)
-  //   .property("kmx", &WASM_COMPILER_RESULT::kmx)
-  //   .property("kmxSize", &WASM_COMPILER_RESULT::kmxSize)
-  //   .property("extra", &WASM_COMPILER_RESULT::extra)
-  //   ;
-
-  // emscripten::class_<KMCMP_COMPILER_RESULT_MESSAGE>("CompilerResultMessage")
-  //   .constructor<>()
-  //   .property("errorCode", &KMCMP_COMPILER_RESULT_MESSAGE::errorCode)
-  //   .property("lineNumber", &KMCMP_COMPILER_RESULT_MESSAGE::lineNumber)
-  //   .property("columnNumber", &KMCMP_COMPILER_RESULT_MESSAGE::columnNumber)
-  //   .property("filename", &KMCMP_COMPILER_RESULT_MESSAGE::filename)
-  //   .property("parameters", &KMCMP_COMPILER_RESULT_MESSAGE::parameters)
-  //   ;
-
-  // emscripten::class_<KMCMP_COMPILER_RESULT_EXTRA>("CompilerResultExtra")
-  //   .constructor<>()
-  //   .property("targets", &KMCMP_COMPILER_RESULT_EXTRA::targets)
-  //   .property("kmnFilename", &KMCMP_COMPILER_RESULT_EXTRA::kmnFilename)
-  //   .property("kvksFilename", &KMCMP_COMPILER_RESULT_EXTRA::kvksFilename)
-  //   .property("displayMapFilename", &KMCMP_COMPILER_RESULT_EXTRA::displayMapFilename)
-  //   .property("stores", &KMCMP_COMPILER_RESULT_EXTRA::stores)
-  //   .property("groups", &KMCMP_COMPILER_RESULT_EXTRA::groups)
-  //   ;
-
-  // emscripten::value_object<KMCMP_COMPILER_RESULT_EXTRA_STORE>("CompilerResultExtraStore")
-  //   .field("storeType", &KMCMP_COMPILER_RESULT_EXTRA_STORE::storeType)
-  //   .field("name", &KMCMP_COMPILER_RESULT_EXTRA_STORE::name)
-  //   .field("line", &KMCMP_COMPILER_RESULT_EXTRA_STORE::line)
-  //   ;
+EMSCRIPTEN_BINDINGS(core_interface) {
 
   emscripten::value_object<km_core_attr>("km_core_attr")
     .field("max_context", &km_core_attr::max_context)
diff --git a/package-lock.json b/package-lock.json
index c8451a75191..eaaffeea7e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -404,7 +404,7 @@
         "eventemitter3": "^5.0.0",
         "restructure": "^3.0.1",
         "sax": ">=0.6.0",
-        "semver": "^7.5.2",
+        "semver": "^7.5.4",
         "xmlbuilder": "~11.0.0"
       },
       "devDependencies": {
@@ -1153,7 +1153,7 @@
         "@keymanapp/keyman-version": "*",
         "@keymanapp/kmc-kmn": "*",
         "@keymanapp/ldml-keyboard-constants": "*",
-        "semver": "^7.5.2"
+        "semver": "^7.5.4"
       },
       "devDependencies": {
         "@keymanapp/developer-test-helpers": "*",
@@ -1942,7 +1942,7 @@
         "open": "^8.4.0",
         "restructure": "^3.0.1",
         "sax": ">=0.6.0",
-        "semver": "^7.5.2",
+        "semver": "^7.5.4",
         "ws": "^8.17.1",
         "xmlbuilder": "~11.0.0"
       },
@@ -14631,7 +14631,7 @@
       "devDependencies": {
         "@types/semver": "^7.1.0",
         "@types/yargs": "^17.0.26",
-        "semver": "^7.5.2"
+        "semver": "^7.5.4"
       }
     },
     "resources/build/version/node_modules/ansi-regex": {

From 1deaa323ada28a6212da06d76ef886abc9c1335c Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 30 Aug 2024 14:44:40 +0700
Subject: [PATCH 009/254] feat(core): spec out API extensions

- loading a keyboard from a BLOB
- getting the on-screen keyboard layout from Core. This is an internal-
  only API because of it's use of C++.

Part-of: #11293
Part-of: #8093
---
 core/include/keyman/keyman_core_api.h |  45 +++++++
 core/src/layout.hpp                   | 185 ++++++++++++++++++++++++++
 core/src/mock/mock_processor.cpp      |   2 +-
 3 files changed, 231 insertions(+), 1 deletion(-)
 create mode 100644 core/src/layout.hpp

diff --git a/core/include/keyman/keyman_core_api.h b/core/include/keyman/keyman_core_api.h
index 328965e8761..341b5fa1fad 100644
--- a/core/include/keyman/keyman_core_api.h
+++ b/core/include/keyman/keyman_core_api.h
@@ -1140,6 +1140,51 @@ km_core_keyboard_load(km_core_path_name kb_path,
 
 -------------------------------------------------------------------------------
 
+# km_core_keyboard_load_from_blob()
+
+## Description
+
+Parse and load keyboard from the supplied blob and a pointer to the loaded keyboard
+into the out paramter.
+
+## Specification
+
+```c */
+KMN_API
+km_core_status km_core_keyboard_load_from_blob(void* blob, km_core_keyboard** keyboard);
+
+/*
+```
+
+## Parameters
+
+`blob`
+: a byte array containing the content of a KMX/KMX+ file
+
+`keyboard`
+: A pointer to result variable: A pointer to the opaque keyboard
+  object returned by the Processor. This memory must be freed with a
+  call to [km_core_keyboard_dispose].
+
+## Returns
+
+`KM_CORE_STATUS_OK`
+: On success.
+
+`KM_CORE_STATUS_NO_MEM`
+: In the event an internal memory allocation fails.
+
+`KM_CORE_STATUS_IO_ERROR`
+: In the event the keyboard file is unparseable for any reason
+
+`KM_CORE_STATUS_INVALID_ARGUMENT`
+: In the event `keyboard` is null.
+
+`KM_CORE_STATUS_OS_ERROR`
+: Bit 31 (high bit) set, bits 0-30 are an OS-specific error code.
+
+-------------------------------------------------------------------------------
+
 # km_core_keyboard_dispose()
 
 ## Description
diff --git a/core/src/layout.hpp b/core/src/layout.hpp
new file mode 100644
index 00000000000..54577919be3
--- /dev/null
+++ b/core/src/layout.hpp
@@ -0,0 +1,185 @@
+/*
+ * Keyman is copyright (C) SIL International. MIT License.
+ *
+ * Keyman Keyboard Processor API - On-Screen Keyboard Layout Interfaces
+ */
+
+#pragma once
+
+#include <string>
+#include <map>
+#include <vector>
+
+#include "keyman_core_api.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/**
+ * Possible directions of a flick
+ */
+enum keyboard_layout_flick_direction {
+  /** flick up (north) */
+  n = 0,
+  /** flick down (south) */
+  s = 1,
+  /** flick right (east) */
+  e = 2,
+  /** flick left (west) */
+  w = 3,
+  /** flick up-right (north-east) */
+  ne = 4,
+  /** flick up-left (north-west) */
+  nw = 5,
+  /** flick down-right (south-east) */
+  se = 6,
+  /** flick down-left (south-west) */
+  sw = 7
+};
+
+/**
+ * key type like regular key, framekeys, deadkeys, blank, etc.
+ */
+enum keyboard_layout_key_type {
+  /** regular key */
+  normal = 0,
+  /** A 'frame' key, such as Shift or Enter */
+  special = 1,
+  /** A 'frame' key, such as Shift or Enter, which is is active, such as
+   * the shift key on a shift layer */
+  specialActive = 2,
+  /** **KeymanWeb runtime private use:** a variant of `special` with the
+   *  keyboard font rather than 'KeymanwebOsk' font */
+  customSpecial = 3,
+  /** **KeymanWeb runtime private use:** a  variant of `specialActive` with the
+   *  keyboard font rather than 'KeymanwebOsk' font. */
+  customSpecialActive = 4,
+  /** A deadkey */
+  deadkey = 8,
+  /** A key which is rendered as a blank keycap, should block any interaction */
+  blank = 9,
+  /** Renders the key only as a gap or spacer, should block any interaction */
+  spacer = 10
+};
+
+/**
+ * A key on a touch layout/on-screen keyboard
+ */
+struct keyboard_layout_key {
+  /** key id */
+  std::u16string id;  // ??? perhaps necessary for special keys, Enter, etc? or can we get that from virtualKey?
+  /** the virtual key code */
+  int virtualKey; // ??? do we need this? both id and virtualKey? Or just one of them?
+  /** text to display on key cap */
+  std::u16string display;
+  /** hint e.g. for longpress */
+  std::u16string hint;
+  /** the type of key */
+  keyboard_layout_key_type type;
+
+  /**
+   * the modifier combination (not layer) that should be used in key events,
+   * for this key, overriding the layer that the key is a part of.
+   */
+  int modifiersOverride;
+  /** the next layer to switch to after this key is pressed */
+  std::u16string nextLayerId;
+
+  // touch layouts only
+
+  /** padding - space to the left of key (in what units?) */
+  int gap;
+  /** width of the key (in what units?) */
+  int width;
+
+  /** longpress keys, also known as subkeys */
+  std::vector<keyboard_layout_key> longpresses;
+  /** multitaps */
+  std::vector<keyboard_layout_key> multiTaps;
+  /** flicks */
+  std::map<keyboard_layout_flick_direction, keyboard_layout_key> flicks;
+};
+
+/**
+ * a row of keys on a touch layout/on-screen keyboard
+ */
+struct keyboard_layout_row {
+  /** row id */
+  int id; // ??? do we need this? Web has it (`TouchLayoutRow`)
+  /** keys in this row */
+  std::vector<keyboard_layout_key> keys;
+};
+
+/**
+ * a layer with rows of keys on a touch layout/on-screen keyboard
+ */
+struct keyboard_layout_layer {
+  /** layer id */
+  std::u16string id;
+  /** layer modifiers */
+  // ??? we added this during our discussion, but Web doesn't have it.
+  // Should be an enum if it's needed.
+  int modifiers;  //? 0 = default, n = shift, etc. -1 = unspecified?
+  /** rows in this layer */
+  std::vector<keyboard_layout_row> rows;
+};
+
+/**
+ * layout specification for a specific platform like desktop, phone or tablet
+ */
+struct keyboard_layout_platform {
+  /** platform form factor, e.g. 'iso', 'touch', 'ansi', ... (see ldml spec) */
+  std::u16string form;
+  /** width of screen for touch layout */
+  int minWidthMm;       // we don't have mobile vs tablet, instead use this
+  /** layers for this platform */
+  std::vector<keyboard_layout_layer> layers;
+
+  // ??? Do we need these:
+  // Web additionally has:
+  // - font (should be in CSS; we have it in `keyboard_layout`)
+  // - fontsize (should be in CSS; we have it in `keyboard_layout`)
+  // - displayUnderlying
+  // - defaultHint ("none"|"dot"|"longpress"|"multitap"|"flick"|"flick-n"|"flick-ne"|
+  //               "flick-e"|"flick-se"|"flick-s"|"flick-sw"|"flick-w"|"flick-nw")
+};
+
+/**
+ * On screen keyboard description consisting of specific layouts for different
+ * form factors.
+ */
+struct keyboard_layout {
+  /** layouts for different form factors */
+  std::vector<keyboard_layout_platform> platforms;
+  /** font face name to use for key caps*/
+  std::string fontFacename;
+  /** font size to use for key caps */
+  int fontSizeEm;  // ??? em? px? something else?
+};
+
+
+/**
+ * Get the on-screen keyboard layout for the specified keyboard.
+ *
+ * @param keyboard         [in]  The keyboard to get the layout for.
+ * @param layout           [out] The on-screen keyboard layout.
+ * @return km_core_status  `KM_CORE_STATUS_OK`: On success.
+ *                         `KM_CORE_STATUS_INVALID_ARGUMENT`: If `keyboard` is not a valid keyboard or `layout` is null.
+ */
+km_core_status
+keyboard_get_layout(
+  km_core_keyboard const* keyboard,
+  keyboard_layout**       layout
+);
+
+
+/**
+ * Dispose the on-screen keyboard layout.
+ */
+void
+keyboard_layout_dispose(keyboard_layout* layout);
+
+#if defined(__cplusplus)
+}
+#endif
diff --git a/core/src/mock/mock_processor.cpp b/core/src/mock/mock_processor.cpp
index d78ab5ef0e0..e70d5ba4353 100644
--- a/core/src/mock/mock_processor.cpp
+++ b/core/src/mock/mock_processor.cpp
@@ -3,7 +3,7 @@
   Description:  This is a test implementation of the keyboard processor API to
                 enable testing API clients against a basic keyboard and give
                 them something to link against and load.
-                TODO: Add a mecahnism to trigger output of PERSIST_OPT &
+                TODO: Add a mechanism to trigger output of PERSIST_OPT &
                 RESET_OPT actions items, options support and context matching.
   Create Date:  17 Oct 2018
   Authors:      Tim Eves (TSE)

From f7f26e87f892887f7331b8fcf22e7c9ffa237c8f Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Sat, 31 Aug 2024 21:37:16 +0700
Subject: [PATCH 010/254] feat(web): refactor loading of .js keyboards

- split keyboard loading into loading into blob and then loading the script
- look at first four bytes to see if it's a .js or a .kmx keyboard
- for domKeyboardLoader, use fetch to get the blob, then use indirect
  eval to load the script, instead of injecting a script element.

This does not yet implement the loading of .kmx keyboards.
---
 web/src/engine/keyboard/src/index.ts          |  8 +-
 .../src/keyboards/keyboardLoadError.ts        | 63 +++++++++++++
 .../src/keyboards/keyboardLoaderBase.ts       | 92 ++++---------------
 .../keyboards/loaders/domKeyboardLoader.ts    | 72 ++++++---------
 .../keyboards/loaders/nodeKeyboardLoader.ts   | 18 +++-
 5 files changed, 124 insertions(+), 129 deletions(-)
 create mode 100644 web/src/engine/keyboard/src/keyboards/keyboardLoadError.ts

diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index 28b6331c219..cc0e86db532 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -3,12 +3,8 @@ export * from "./keyboards/defaultLayouts.js";
 export { default as Keyboard } from "./keyboards/keyboard.js";
 export * from "./keyboards/keyboard.js";
 export { KeyboardHarness, KeyboardKeymanGlobal, MinimalCodesInterface, MinimalKeymanGlobal } from "./keyboards/keyboardHarness.js";
-export {
-  default as KeyboardLoaderBase,
-  KeyboardLoadErrorBuilder,
-  KeyboardMissingError,
-  KeyboardScriptError
-} from "./keyboards/keyboardLoaderBase.js";
+export { default as KeyboardLoaderBase, } from "./keyboards/keyboardLoaderBase.js";
+export { KeyboardLoadErrorBuilder, KeyboardMissingError, KeyboardScriptError } from './keyboards/keyboardLoadError.js'
 export {
   CloudKeyboardFont,
   internalizeFont,
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoadError.ts b/web/src/engine/keyboard/src/keyboards/keyboardLoadError.ts
new file mode 100644
index 00000000000..9a95c24ef23
--- /dev/null
+++ b/web/src/engine/keyboard/src/keyboards/keyboardLoadError.ts
@@ -0,0 +1,63 @@
+import { type KeyboardStub } from './keyboardLoaderBase.js';
+
+export interface KeyboardLoadErrorBuilder {
+    scriptError(err?: Error): void;
+    missingError(err: Error): void;
+}
+
+export class KeyboardScriptError extends Error {
+    public readonly cause;
+
+    constructor(msg: string, cause?: Error) {
+        super(msg);
+        this.cause = cause;
+    }
+}
+
+export class KeyboardMissingError extends Error {
+    public readonly cause;
+
+    constructor(msg: string, cause?: Error) {
+        super(msg);
+        this.cause = cause;
+    }
+}
+
+export class UriBasedErrorBuilder implements KeyboardLoadErrorBuilder {
+    readonly uri: string;
+
+    constructor(uri: string) {
+        this.uri = uri;
+    }
+
+    missingError(err: Error) {
+        const msg = `Cannot find the keyboard at ${this.uri}.`;
+        return new KeyboardMissingError(msg, err);
+    }
+
+    scriptError(err: Error) {
+        const msg = `Error registering the keyboard script at ${this.uri}; it may contain an error.`;
+        return new KeyboardScriptError(msg, err);
+    }
+}
+
+export class StubBasedErrorBuilder implements KeyboardLoadErrorBuilder {
+    readonly stub: KeyboardStub;
+
+    constructor(stub: KeyboardStub) {
+        this.stub = stub;
+    }
+
+    missingError(err: Error) {
+        const stub = this.stub;
+        const msg = `Cannot find the ${stub.name} keyboard for ${stub.langName} at ${stub.filename}.`;
+        return new KeyboardMissingError(msg, err);
+    }
+
+    scriptError(err: Error) {
+        const stub = this.stub;
+        const msg = `Error registering the ${stub.name} keyboard for ${stub.langName}; keyboard script at ${stub.filename} may contain an error.`;
+        return new KeyboardScriptError(msg, err);
+    }
+}
+
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
index d894eeb20c7..8024609c883 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
@@ -1,69 +1,9 @@
 import Keyboard from "./keyboard.js";
 import { KeyboardHarness } from "./keyboardHarness.js";
 import KeyboardProperties from "./keyboardProperties.js";
+import { KeyboardLoadErrorBuilder, StubBasedErrorBuilder, UriBasedErrorBuilder } from './keyboardLoadError.js';
 
-type KeyboardStub = KeyboardProperties & { filename: string };
-
-export interface KeyboardLoadErrorBuilder {
-  scriptError(err?: Error): void;
-  missingError(err: Error): void;
-}
-
-export class KeyboardScriptError extends Error {
-  public readonly cause;
-
-  constructor(msg: string, cause?: Error) {
-    super(msg);
-    this.cause = cause;
-  }
-}
-
-export class KeyboardMissingError extends Error {
-  public readonly cause;
-
-  constructor(msg: string, cause?: Error) {
-    super(msg);
-    this.cause = cause;
-  }
-}
-
-class UriBasedErrorBuilder implements KeyboardLoadErrorBuilder {
-  readonly uri: string;
-
-  constructor(uri: string) {
-    this.uri = uri;
-  }
-
-  missingError(err: Error) {
-    const msg = `Cannot find the keyboard at ${this.uri}.`;
-    return new KeyboardMissingError(msg, err);
-  }
-
-  scriptError(err: Error) {
-    const msg = `Error registering the keyboard script at ${this.uri}; it may contain an error.`;
-    return new KeyboardScriptError(msg, err);
-  }
-}
-
-class StubBasedErrorBuilder implements KeyboardLoadErrorBuilder {
-  readonly stub: KeyboardStub;
-
-  constructor(stub: KeyboardStub) {
-    this.stub = stub;
-  }
-
-  missingError(err: Error) {
-    const stub = this.stub;
-    const msg = `Cannot find the ${stub.name} keyboard for ${stub.langName} at ${stub.filename}.`;
-    return new KeyboardMissingError(msg, err);
-  }
-
-  scriptError(err: Error) {
-    const stub = this.stub;
-    const msg = `Error registering the ${stub.name} keyboard for ${stub.langName}; keyboard script at ${stub.filename} may contain an error.`;
-    return new KeyboardScriptError(msg, err);
-  }
-}
+export type KeyboardStub = KeyboardProperties & { filename: string };
 
 export default abstract class KeyboardLoaderBase {
   private _harness: KeyboardHarness;
@@ -78,21 +18,29 @@ export default abstract class KeyboardLoaderBase {
 
   public loadKeyboardFromPath(uri: string): Promise<Keyboard> {
     this.harness.install();
-    const promise = this.loadKeyboardInternal(uri, new UriBasedErrorBuilder(uri));
-
-    return promise;
+    return this.loadKeyboardInternal(uri, new UriBasedErrorBuilder(uri));
   }
 
   public loadKeyboardFromStub(stub: KeyboardStub) {
     this.harness.install();
-    let promise = this.loadKeyboardInternal(stub.filename, new StubBasedErrorBuilder(stub), stub.id);
+    return this.loadKeyboardInternal(stub.filename, new StubBasedErrorBuilder(stub));
+  }
 
-    return promise;
+  private async loadKeyboardInternal(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
+    const blob = await this.loadKeyboardBlob(uri);
+
+    const script = await blob.text();
+    if (script.startsWith('KXTS', 0)) {
+      // KMX or LDML (KMX+) keyboard
+      console.error("KMX keyboard loading is not yet implemented!");
+      return null;
+    }
+
+    // .js keyboard
+    return await this.loadKeyboardFromScript(script, errorBuilder);
   }
 
-  protected abstract loadKeyboardInternal(
-    uri: string,
-    errorBuilder: KeyboardLoadErrorBuilder,
-    id?: string
-  ): Promise<Keyboard>;
+  protected abstract loadKeyboardBlob(uri: string): Promise<Blob>;
+
+  protected abstract loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard>;
 }
\ No newline at end of file
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
index fcb2c764cd6..abfea28a91c 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
+++ b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
@@ -2,9 +2,10 @@
 
 ///<reference lib="dom" />
 
-import { Keyboard, KeyboardHarness, KeyboardLoaderBase, KeyboardLoadErrorBuilder, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-
-import { ManagedPromise } from '@keymanapp/web-utils';
+import { default as Keyboard } from '../keyboard.js';
+import { KeyboardHarness, MinimalKeymanGlobal } from '../keyboardHarness.js';
+import { default as KeyboardLoaderBase } from '../keyboardLoaderBase.js';
+import { KeyboardLoadErrorBuilder, KeyboardMissingError } from '../keyboardLoadError.js';
 
 export class DOMKeyboardLoader extends KeyboardLoaderBase {
   public readonly element: HTMLIFrameElement;
@@ -28,54 +29,23 @@ export class DOMKeyboardLoader extends KeyboardLoaderBase {
     this.performCacheBusting = cacheBust || false;
   }
 
-  protected loadKeyboardInternal(
-    uri: string,
-    errorBuilder: KeyboardLoadErrorBuilder,
-    id?: string
-  ): Promise<Keyboard> {
-    const promise = new ManagedPromise<Keyboard>();
-
-    if(this.performCacheBusting) {
+  protected async loadKeyboardBlob(uri: string): Promise<Blob> {
+    if (this.performCacheBusting) {
       uri = this.cacheBust(uri);
     }
 
-    try {
-      const document = this.harness._jsGlobal.document;
-      const script = document.createElement('script');
-      if(id) {
-        script.id = id;
-      }
-      document.head.appendChild(script);
-      script.onerror = (err: any) => {
-        promise.reject(errorBuilder.missingError(err));
-      }
-      script.onload = () => {
-        if(this.harness.loadedKeyboard) {
-          const keyboard = this.harness.loadedKeyboard;
-          this.harness.loadedKeyboard = null;
-          promise.resolve(keyboard);
-        } else {
-          promise.reject(errorBuilder.scriptError());
-        }
-      }
-
-      // On the oldest mobile devices we support, Promise.finally may not actually exist.
-      // Fortunately... it's not that hard of an issue to work around.
-      // Note:  es6-shim doesn't polyfill Promise.finally!
-      promise.then(() => {
-        // It is safe to remove the script once it has been run (https://stackoverflow.com/a/37393041)
-        script.remove();
-      }).catch(() => {
-        script.remove();
-      });
-
-      // Now that EVERYTHING ELSE is ready, establish the link to the keyboard's script.
-      script.src = uri;
-    } catch (err) {
-      return Promise.reject(err);
+    const response = await fetch(uri);
+    if (!response.ok) {
+      throw new KeyboardMissingError(`Cannot find the keyboard at ${uri}.`, new Error(`HTTP ${response.status} ${response.statusText}`));
     }
+    return response.blob();
+  }
 
-    return promise.corePromise;
+  protected async loadKeyboardFromScript(script: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
+    this.evalScriptInContext(script, this.harness._jsGlobal);
+    const keyboard = this.harness.loadedKeyboard;
+    this.harness.loadedKeyboard = null;
+    return keyboard;
   }
 
   private cacheBust(uri: string) {
@@ -84,4 +54,14 @@ export class DOMKeyboardLoader extends KeyboardLoaderBase {
     // being ignored.
     return uri + "?v=" + (new Date()).getTime(); /*cache buster*/
   }
+
+  private evalScriptInContext(script: string, context: any) {
+    const f = function (s: string) {
+      // use indirect eval (eval?.() notation doesn't work because of esbuild bundling)
+      const evalFunc = eval;
+      return evalFunc(s);
+    }
+    f.call(context, script);
+  }
+
 }
\ No newline at end of file
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
index b9f6a7cdfef..ca0874dfd8f 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
+++ b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
@@ -1,7 +1,10 @@
-import { Keyboard, KeyboardHarness, KeyboardLoaderBase, KeyboardLoadErrorBuilder, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
+import { default as Keyboard } from '../keyboard.js';
+import { KeyboardHarness, MinimalKeymanGlobal } from '../keyboardHarness.js';
+import { default as KeyboardLoaderBase } from '../keyboardLoaderBase.js';
+import { KeyboardLoadErrorBuilder } from '../keyboardLoadError.js';
 
 import vm from 'vm';
-import fs from 'fs';
+import { readFile } from 'fs/promises';
 import { globalObject } from '@keymanapp/web-utils';
 
 export class NodeKeyboardLoader extends KeyboardLoaderBase {
@@ -22,15 +25,20 @@ export class NodeKeyboardLoader extends KeyboardLoaderBase {
     }
   }
 
-  protected loadKeyboardInternal(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
+  protected async loadKeyboardBlob(uri: string): Promise<Blob> {
     // `fs` does not like 'file:///'; it IS "File System" oriented, after all, and wants a path, not a URI.
-    if(uri.indexOf('file:///') == 0) {
+    if (uri.indexOf('file:///') == 0) {
       uri = uri.substring('file:///'.length);
     }
 
+    const buffer = await readFile(uri);
+    return new Blob([buffer]);
+  }
+
+  protected async loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
     let script;
     try {
-      script = new vm.Script(fs.readFileSync(uri).toString());
+      script = new vm.Script(scriptSrc);
     } catch (err) {
       return Promise.reject(errorBuilder.missingError(err));
     }

From 59019cc8b79242de3c1e2a1703083f1b89d792d7 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 5 Sep 2024 18:11:32 +0200
Subject: [PATCH 011/254] feat(linux): add blob size parameter

Addresses code review comments.
---
 core/include/keyman/keyman_core_api.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/include/keyman/keyman_core_api.h b/core/include/keyman/keyman_core_api.h
index 341b5fa1fad..6769e22306d 100644
--- a/core/include/keyman/keyman_core_api.h
+++ b/core/include/keyman/keyman_core_api.h
@@ -1151,7 +1151,8 @@ into the out paramter.
 
 ```c */
 KMN_API
-km_core_status km_core_keyboard_load_from_blob(void* blob, km_core_keyboard** keyboard);
+km_core_status km_core_keyboard_load_from_blob(void* blob, size_t blob_size,
+                                               km_core_keyboard** keyboard);
 
 /*
 ```
@@ -1161,6 +1162,9 @@ km_core_status km_core_keyboard_load_from_blob(void* blob, km_core_keyboard** ke
 `blob`
 : a byte array containing the content of a KMX/KMX+ file
 
+`blob_size`
+: A pointer to a size_t variable with the size of the blob in bytes.
+
 `keyboard`
 : A pointer to result variable: A pointer to the opaque keyboard
   object returned by the Processor. This memory must be freed with a

From bc4645836838e37e696f49fa6f342e548635a91a Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 6 Sep 2024 12:44:36 +0200
Subject: [PATCH 012/254] feat(web): address code review comments

---
 core/include/keyman/keyman_core_api.h |  7 ++-----
 core/src/layout.hpp                   | 12 ++++++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/core/include/keyman/keyman_core_api.h b/core/include/keyman/keyman_core_api.h
index 6769e22306d..11affd9296b 100644
--- a/core/include/keyman/keyman_core_api.h
+++ b/core/include/keyman/keyman_core_api.h
@@ -1179,13 +1179,10 @@ km_core_status km_core_keyboard_load_from_blob(void* blob, size_t blob_size,
 : In the event an internal memory allocation fails.
 
 `KM_CORE_STATUS_IO_ERROR`
-: In the event the keyboard file is unparseable for any reason
+: In the event the keyboard blob is unparseable for any reason
 
 `KM_CORE_STATUS_INVALID_ARGUMENT`
-: In the event `keyboard` is null.
-
-`KM_CORE_STATUS_OS_ERROR`
-: Bit 31 (high bit) set, bits 0-30 are an OS-specific error code.
+: In the event one of the required parameters is null.
 
 -------------------------------------------------------------------------------
 
diff --git a/core/src/layout.hpp b/core/src/layout.hpp
index 54577919be3..2e3d2833b4a 100644
--- a/core/src/layout.hpp
+++ b/core/src/layout.hpp
@@ -68,9 +68,9 @@ enum keyboard_layout_key_type {
  */
 struct keyboard_layout_key {
   /** key id */
-  std::u16string id;  // ??? perhaps necessary for special keys, Enter, etc? or can we get that from virtualKey?
+  std::u16string id;  // TODO-WEB-CORE: perhaps necessary for special keys, Enter, etc? or can we get that from virtualKey?
   /** the virtual key code */
-  int virtualKey; // ??? do we need this? both id and virtualKey? Or just one of them?
+  int virtualKey; // TODO-WEB-CORE: do we need this? both id and virtualKey? Or just one of them?
   /** text to display on key cap */
   std::u16string display;
   /** hint e.g. for longpress */
@@ -106,7 +106,7 @@ struct keyboard_layout_key {
  */
 struct keyboard_layout_row {
   /** row id */
-  int id; // ??? do we need this? Web has it (`TouchLayoutRow`)
+  int id; // TODO-WEB-CORE: do we need this? Web has it (`TouchLayoutRow`)
   /** keys in this row */
   std::vector<keyboard_layout_key> keys;
 };
@@ -118,7 +118,7 @@ struct keyboard_layout_layer {
   /** layer id */
   std::u16string id;
   /** layer modifiers */
-  // ??? we added this during our discussion, but Web doesn't have it.
+  // TODO-WEB-CORE: we added this during our discussion, but Web doesn't have it.
   // Should be an enum if it's needed.
   int modifiers;  //? 0 = default, n = shift, etc. -1 = unspecified?
   /** rows in this layer */
@@ -136,7 +136,7 @@ struct keyboard_layout_platform {
   /** layers for this platform */
   std::vector<keyboard_layout_layer> layers;
 
-  // ??? Do we need these:
+  // TODO-WEB-CORE: Do we need these:
   // Web additionally has:
   // - font (should be in CSS; we have it in `keyboard_layout`)
   // - fontsize (should be in CSS; we have it in `keyboard_layout`)
@@ -155,7 +155,7 @@ struct keyboard_layout {
   /** font face name to use for key caps*/
   std::string fontFacename;
   /** font size to use for key caps */
-  int fontSizeEm;  // ??? em? px? something else?
+  int fontSizeEm;  // TODO-WEB-CORE: em? px? something else?
 };
 
 

From cbbe971cb3ccb238c08b7af0b0f1d8290e03648d Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 11 Sep 2024 19:27:54 +0200
Subject: [PATCH 013/254] chore(web): allow to run unit tests in vscode test
 explorer

#11746 removed the `ts-node` dependency. Unfortunately that broke running
TypeScript test files with Mocha in VSCode Test Explorer because it no
longer knows what to do with .ts files. This change adds the more modern
`tsx` package as developer dependency, which allows to use Test Explorer
again.

See https://stackoverflow.com/a/77609121.
---
 package-lock.json | 493 +++++++++++++++++++++++++++++++++++++++++++++-
 web/.mocharc.json |   4 +
 web/package.json  |   3 +-
 3 files changed, 495 insertions(+), 5 deletions(-)
 create mode 100644 web/.mocharc.json

diff --git a/package-lock.json b/package-lock.json
index e0864087710..c317ee79d48 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2174,6 +2174,23 @@
         "node": ">=12"
       }
     },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.1.tgz",
+      "integrity": "sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/android-arm64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
@@ -2318,6 +2335,23 @@
         "node": ">=12"
       }
     },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz",
+      "integrity": "sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/linux-mips64el": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
@@ -2414,6 +2448,23 @@
         "node": ">=12"
       }
     },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz",
+      "integrity": "sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/openbsd-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
@@ -8981,10 +9032,11 @@
       }
     },
     "node_modules/get-tsconfig": {
-      "version": "4.7.4",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.4.tgz",
-      "integrity": "sha512-ofbkKj+0pjXjhejr007J/fLf+sW+8H7K5GCm+msC8q3IpvgjobpyPqSRFemNyIMxklC0zeJpi7VDFna19FacvQ==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.8.0.tgz",
+      "integrity": "sha512-Pgba6TExTZ0FJAn1qkJAjIeKoDJ3CsI2ChuLohJnZl/tTU8MVrq3b+2t5UOPfRa4RMsorClBjJALkJUMjG1PAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "resolve-pkg-maps": "^1.0.0"
       },
@@ -13790,6 +13842,438 @@
         "node": ">=0.6.x"
       }
     },
+    "node_modules/tsx": {
+      "version": "4.19.0",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.0.tgz",
+      "integrity": "sha512-bV30kM7bsLZKZIOCHeMNVMJ32/LuJzLVajkQI/qf92J2Qr08ueLQvW00PUZGiuLPP760UINwupgUj8qrSCPUKg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "~0.23.0",
+        "get-tsconfig": "^4.7.5"
+      },
+      "bin": {
+        "tsx": "dist/cli.mjs"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz",
+      "integrity": "sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz",
+      "integrity": "sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.1.tgz",
+      "integrity": "sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz",
+      "integrity": "sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/darwin-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz",
+      "integrity": "sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz",
+      "integrity": "sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz",
+      "integrity": "sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-arm": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz",
+      "integrity": "sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz",
+      "integrity": "sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-ia32": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz",
+      "integrity": "sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz",
+      "integrity": "sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz",
+      "integrity": "sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz",
+      "integrity": "sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-s390x": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz",
+      "integrity": "sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz",
+      "integrity": "sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz",
+      "integrity": "sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz",
+      "integrity": "sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/sunos-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz",
+      "integrity": "sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz",
+      "integrity": "sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-ia32": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz",
+      "integrity": "sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz",
+      "integrity": "sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/esbuild": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.1.tgz",
+      "integrity": "sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.23.1",
+        "@esbuild/android-arm": "0.23.1",
+        "@esbuild/android-arm64": "0.23.1",
+        "@esbuild/android-x64": "0.23.1",
+        "@esbuild/darwin-arm64": "0.23.1",
+        "@esbuild/darwin-x64": "0.23.1",
+        "@esbuild/freebsd-arm64": "0.23.1",
+        "@esbuild/freebsd-x64": "0.23.1",
+        "@esbuild/linux-arm": "0.23.1",
+        "@esbuild/linux-arm64": "0.23.1",
+        "@esbuild/linux-ia32": "0.23.1",
+        "@esbuild/linux-loong64": "0.23.1",
+        "@esbuild/linux-mips64el": "0.23.1",
+        "@esbuild/linux-ppc64": "0.23.1",
+        "@esbuild/linux-riscv64": "0.23.1",
+        "@esbuild/linux-s390x": "0.23.1",
+        "@esbuild/linux-x64": "0.23.1",
+        "@esbuild/netbsd-x64": "0.23.1",
+        "@esbuild/openbsd-arm64": "0.23.1",
+        "@esbuild/openbsd-x64": "0.23.1",
+        "@esbuild/sunos-x64": "0.23.1",
+        "@esbuild/win32-arm64": "0.23.1",
+        "@esbuild/win32-ia32": "0.23.1",
+        "@esbuild/win32-x64": "0.23.1"
+      }
+    },
+    "node_modules/tsx/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/tunnel": {
       "version": "0.0.6",
       "license": "MIT",
@@ -14753,7 +15237,8 @@
         "c8": "^7.12.0",
         "express": "^4.19.2",
         "jsdom": "^23.0.1",
-        "mocha": "^10.0.0"
+        "mocha": "^10.0.0",
+        "tsx": "^4.19.0"
       }
     },
     "web/src/engine/osk/gesture-processor": {
diff --git a/web/.mocharc.json b/web/.mocharc.json
new file mode 100644
index 00000000000..e8ecf2c60fd
--- /dev/null
+++ b/web/.mocharc.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://json.schemastore.org/mocharc.json",
+  "require": "tsx"
+}
diff --git a/web/package.json b/web/package.json
index 67ebb687438..f503e912f96 100644
--- a/web/package.json
+++ b/web/package.json
@@ -120,7 +120,8 @@
     "c8": "^7.12.0",
     "express": "^4.19.2",
     "jsdom": "^23.0.1",
-    "mocha": "^10.0.0"
+    "mocha": "^10.0.0",
+    "tsx": "^4.19.0"
   },
   "scripts": {
     "test": "gosh ./test.sh"

From 1dd6989747723967faddf868cf4e0614ae7372ce Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 11 Sep 2024 18:26:13 +0200
Subject: [PATCH 014/254] feat(web): add error handling and tests

Addresses code review comments.
---
 web/src/engine/keyboard/src/index.ts          |   4 +-
 .../src/keyboards/keyboardLoadError.ts        |  27 ++++
 .../src/keyboards/keyboardLoaderBase.ts       |  26 +++-
 .../keyboards/loaders/domKeyboardLoader.ts    |  29 +++-
 .../keyboards/loaders/nodeKeyboardLoader.ts   |  24 ++--
 .../engine/keyboard/keyboard-loading.js       |  94 -------------
 .../engine/keyboard/keyboard-loading.tests.ts | 132 ++++++++++++++++++
 7 files changed, 220 insertions(+), 116 deletions(-)
 delete mode 100644 web/src/test/auto/headless/engine/keyboard/keyboard-loading.js
 create mode 100644 web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.ts

diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index cc0e86db532..e430556ed62 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -3,8 +3,8 @@ export * from "./keyboards/defaultLayouts.js";
 export { default as Keyboard } from "./keyboards/keyboard.js";
 export * from "./keyboards/keyboard.js";
 export { KeyboardHarness, KeyboardKeymanGlobal, MinimalCodesInterface, MinimalKeymanGlobal } from "./keyboards/keyboardHarness.js";
-export { default as KeyboardLoaderBase, } from "./keyboards/keyboardLoaderBase.js";
-export { KeyboardLoadErrorBuilder, KeyboardMissingError, KeyboardScriptError } from './keyboards/keyboardLoadError.js'
+export { KeyboardLoaderBase } from "./keyboards/keyboardLoaderBase.js";
+export { KeyboardLoadErrorBuilder, KeyboardMissingError, KeyboardScriptError, KeyboardDownloadError } from './keyboards/keyboardLoadError.js'
 export {
   CloudKeyboardFont,
   internalizeFont,
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoadError.ts b/web/src/engine/keyboard/src/keyboards/keyboardLoadError.ts
index 9a95c24ef23..d394be15bf0 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardLoadError.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardLoadError.ts
@@ -3,6 +3,8 @@ import { type KeyboardStub } from './keyboardLoaderBase.js';
 export interface KeyboardLoadErrorBuilder {
     scriptError(err?: Error): void;
     missingError(err: Error): void;
+    missingKeyboardError(msg: string, err: Error): void;
+    keyboardDownloadError(msg: string, err: Error): void;
 }
 
 export class KeyboardScriptError extends Error {
@@ -23,6 +25,15 @@ export class KeyboardMissingError extends Error {
     }
 }
 
+export class KeyboardDownloadError extends Error {
+    public readonly cause;
+
+    constructor(message: string, cause?: Error) {
+        super(message);
+        this.cause = cause;
+    }
+}
+
 export class UriBasedErrorBuilder implements KeyboardLoadErrorBuilder {
     readonly uri: string;
 
@@ -35,10 +46,18 @@ export class UriBasedErrorBuilder implements KeyboardLoadErrorBuilder {
         return new KeyboardMissingError(msg, err);
     }
 
+    missingKeyboardError(msg: string, err: Error) {
+        return new KeyboardMissingError(msg, err);
+    }
+
     scriptError(err: Error) {
         const msg = `Error registering the keyboard script at ${this.uri}; it may contain an error.`;
         return new KeyboardScriptError(msg, err);
     }
+
+    keyboardDownloadError(msg: string, err: Error) {
+        return new KeyboardDownloadError(msg, err);
+    }
 }
 
 export class StubBasedErrorBuilder implements KeyboardLoadErrorBuilder {
@@ -54,10 +73,18 @@ export class StubBasedErrorBuilder implements KeyboardLoadErrorBuilder {
         return new KeyboardMissingError(msg, err);
     }
 
+    missingKeyboardError(msg: string, err: Error) {
+        return new KeyboardMissingError(msg, err);
+    }
+
     scriptError(err: Error) {
         const stub = this.stub;
         const msg = `Error registering the ${stub.name} keyboard for ${stub.langName}; keyboard script at ${stub.filename} may contain an error.`;
         return new KeyboardScriptError(msg, err);
     }
+
+    keyboardDownloadError(msg: string, err: Error) {
+        return new KeyboardDownloadError(msg, err);
+    }
 }
 
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
index 8024609c883..4c718d3e888 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
@@ -5,7 +5,7 @@ import { KeyboardLoadErrorBuilder, StubBasedErrorBuilder, UriBasedErrorBuilder }
 
 export type KeyboardStub = KeyboardProperties & { filename: string };
 
-export default abstract class KeyboardLoaderBase {
+export abstract class KeyboardLoaderBase {
   private _harness: KeyboardHarness;
 
   public get harness(): KeyboardHarness {
@@ -16,20 +16,38 @@ export default abstract class KeyboardLoaderBase {
     this._harness = harness;
   }
 
+  /**
+   * Load a keyboard from a remote or local URI.
+   *
+   * @param uri  The URI of the keyboard to load.
+   * @returns    A Promise that resolves to the loaded keyboard.
+   */
   public loadKeyboardFromPath(uri: string): Promise<Keyboard> {
     this.harness.install();
     return this.loadKeyboardInternal(uri, new UriBasedErrorBuilder(uri));
   }
 
+  /**
+   * Load a keyboard from keyboard stub.
+   *
+   * @param stub  The stub of the keyboard to load.
+   * @returns     A Promise that resolves to the loaded keyboard.
+   */
   public loadKeyboardFromStub(stub: KeyboardStub) {
     this.harness.install();
     return this.loadKeyboardInternal(stub.filename, new StubBasedErrorBuilder(stub));
   }
 
   private async loadKeyboardInternal(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
-    const blob = await this.loadKeyboardBlob(uri);
+    const blob = await this.loadKeyboardBlob(uri, errorBuilder);
+
+    let script: string;
+    try {
+      script = await blob.text();
+    } catch (e) {
+      throw errorBuilder.missingKeyboardError('The keyboard has an invalid encoding.', e);
+    }
 
-    const script = await blob.text();
     if (script.startsWith('KXTS', 0)) {
       // KMX or LDML (KMX+) keyboard
       console.error("KMX keyboard loading is not yet implemented!");
@@ -40,7 +58,7 @@ export default abstract class KeyboardLoaderBase {
     return await this.loadKeyboardFromScript(script, errorBuilder);
   }
 
-  protected abstract loadKeyboardBlob(uri: string): Promise<Blob>;
+  protected abstract loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Blob>;
 
   protected abstract loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard>;
 }
\ No newline at end of file
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
index abfea28a91c..2fba52a80e0 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
+++ b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
@@ -4,8 +4,8 @@
 
 import { default as Keyboard } from '../keyboard.js';
 import { KeyboardHarness, MinimalKeymanGlobal } from '../keyboardHarness.js';
-import { default as KeyboardLoaderBase } from '../keyboardLoaderBase.js';
-import { KeyboardLoadErrorBuilder, KeyboardMissingError } from '../keyboardLoadError.js';
+import { KeyboardLoaderBase } from '../keyboardLoaderBase.js';
+import { KeyboardLoadErrorBuilder } from '../keyboardLoadError.js';
 
 export class DOMKeyboardLoader extends KeyboardLoaderBase {
   public readonly element: HTMLIFrameElement;
@@ -29,20 +29,35 @@ export class DOMKeyboardLoader extends KeyboardLoaderBase {
     this.performCacheBusting = cacheBust || false;
   }
 
-  protected async loadKeyboardBlob(uri: string): Promise<Blob> {
+  protected async loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Blob> {
     if (this.performCacheBusting) {
       uri = this.cacheBust(uri);
     }
 
-    const response = await fetch(uri);
+    let response: Response;
+    try {
+      response = await fetch(uri);
+    } catch (e) {
+      throw errorBuilder.keyboardDownloadError(`Unable to fetch fetch keyboard at ${uri}`, e);
+    }
+
     if (!response.ok) {
-      throw new KeyboardMissingError(`Cannot find the keyboard at ${uri}.`, new Error(`HTTP ${response.status} ${response.statusText}`));
+      throw errorBuilder.missingError(new Error(`HTTP ${response.status} ${response.statusText}`));
+    }
+
+    try {
+      return await response.blob();
+    } catch (e) {
+      throw errorBuilder.keyboardDownloadError(`Unable to retrieve blob from keyboard at ${uri}`, e);
     }
-    return response.blob();
   }
 
   protected async loadKeyboardFromScript(script: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
-    this.evalScriptInContext(script, this.harness._jsGlobal);
+    try {
+      this.evalScriptInContext(script, this.harness._jsGlobal);
+    } catch (e) {
+      throw errorBuilder.scriptError(e);
+    }
     const keyboard = this.harness.loadedKeyboard;
     this.harness.loadedKeyboard = null;
     return keyboard;
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
index ca0874dfd8f..a63181fe8bc 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
+++ b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
@@ -1,12 +1,13 @@
+import vm from 'node:vm';
+import { readFile } from 'node:fs/promises';
+
+import { globalObject } from '@keymanapp/web-utils';
+
 import { default as Keyboard } from '../keyboard.js';
 import { KeyboardHarness, MinimalKeymanGlobal } from '../keyboardHarness.js';
-import { default as KeyboardLoaderBase } from '../keyboardLoaderBase.js';
+import { KeyboardLoaderBase } from '../keyboardLoaderBase.js';
 import { KeyboardLoadErrorBuilder } from '../keyboardLoadError.js';
 
-import vm from 'vm';
-import { readFile } from 'fs/promises';
-import { globalObject } from '@keymanapp/web-utils';
-
 export class NodeKeyboardLoader extends KeyboardLoaderBase {
   constructor()
   constructor(harness: KeyboardHarness);
@@ -25,13 +26,18 @@ export class NodeKeyboardLoader extends KeyboardLoaderBase {
     }
   }
 
-  protected async loadKeyboardBlob(uri: string): Promise<Blob> {
+  protected async loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Blob> {
     // `fs` does not like 'file:///'; it IS "File System" oriented, after all, and wants a path, not a URI.
     if (uri.indexOf('file:///') == 0) {
       uri = uri.substring('file:///'.length);
     }
 
-    const buffer = await readFile(uri);
+    let buffer: Buffer;
+    try {
+      buffer = await readFile(uri);
+    } catch (err) {
+      throw errorBuilder.keyboardDownloadError(`Unable to read keyboard file at ${uri}`, err);
+    }
     return new Blob([buffer]);
   }
 
@@ -40,12 +46,12 @@ export class NodeKeyboardLoader extends KeyboardLoaderBase {
     try {
       script = new vm.Script(scriptSrc);
     } catch (err) {
-      return Promise.reject(errorBuilder.missingError(err));
+      throw errorBuilder.missingError(err);
     }
     try {
       script.runInContext(this.harness._jsGlobal);
     } catch (err) {
-      return Promise.reject(errorBuilder.scriptError(err));
+      throw errorBuilder.scriptError(err);
     }
 
     const keyboard = this.harness.loadedKeyboard;
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.js b/web/src/test/auto/headless/engine/keyboard/keyboard-loading.js
deleted file mode 100644
index 0dd89a36148..00000000000
--- a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.js
+++ /dev/null
@@ -1,94 +0,0 @@
-import { assert } from 'chai';
-
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
-
-import { KeyboardHarness, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { KeyboardInterface, Mock } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
-
-describe('Headless keyboard loading', function() {
-  const laoPath = require.resolve('@keymanapp/common-test-resources/keyboards/lao_2008_basic.js');
-  const khmerPath = require.resolve('@keymanapp/common-test-resources/keyboards/khmer_angkor.js');
-  const nonKeyboardPath = require.resolve('@keymanapp/common-test-resources/index.mjs');
-  const ipaPath = require.resolve('@keymanapp/common-test-resources/keyboards/sil_ipa.js');
-  // Common test suite setup.
-
-  let device = {
-    formFactor: 'desktop',
-    OS: 'windows',
-    browser: 'native'
-  }
-
-  describe('Minimal harness loading', () => {
-    it('successfully loads', async function() {
-      // -- START: Standard Recorder-based unit test loading boilerplate --
-      let harness = new KeyboardHarness({}, MinimalKeymanGlobal);
-      let keyboardLoader = new NodeKeyboardLoader(harness);
-      let keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
-      // --  END:  Standard Recorder-based unit test loading boilerplate --
-
-      // Asserts that the harness's loading field is cleared once the load is complete.
-      assert.isNotOk(harness.loadedKeyboard);
-
-      // Asserts that the `activeKeyboard` field was not set by the operation.
-      assert.isNotOk(harness.activeKeyboard);
-
-      // This part provides assurance that the keyboard properly loaded.
-      assert.equal(keyboard.id, "Keyboard_lao_2008_basic");
-    });
-
-    it('successfully loads (has variable stores)', async () => {
-      // -- START: Standard Recorder-based unit test loading boilerplate --
-      let harness = new KeyboardHarness({}, MinimalKeymanGlobal);
-      let keyboardLoader = new NodeKeyboardLoader(harness);
-      let keyboard = await keyboardLoader.loadKeyboardFromPath(ipaPath);
-      // --  END:  Standard Recorder-based unit test loading boilerplate --
-
-      // This part provides extra assurance that the keyboard properly loaded.
-      assert.equal(keyboard.id, "Keyboard_sil_ipa");
-    });
-
-    it('cannot evaluate rules', async function() {
-      // -- START: Standard Recorder-based unit test loading boilerplate --
-      let harness = new KeyboardHarness({}, MinimalKeymanGlobal);
-      let keyboardLoader = new NodeKeyboardLoader(harness);
-      let keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
-      // --  END:  Standard Recorder-based unit test loading boilerplate --
-
-      // Runs a blank KeyEvent through the keyboard's rule processing...
-      // but via separate harness configured with a different captured global.
-      let ruleHarness = new KeyboardInterface({}, MinimalKeymanGlobal);
-      ruleHarness.activeKeyboard = keyboard;
-      try {
-        ruleHarness.processKeystroke(new Mock(), keyboard.constructNullKeyEvent(device));
-        assert.fail();
-      } catch (err) {
-        // Drives home an important detail: the 'global' object is effectively
-        // closure-captured.  (Similar constraints may occur when experimenting with
-        // 'sandboxed' keyboard loading in the DOM!)
-        assert.equal(err.message, 'k.KKM is not a function');
-      }
-    });
-
-    it('accurately determines supported gesture types', async () => {
-      // -- START: Standard Recorder-based unit test loading boilerplate --
-      let harness = new KeyboardHarness({}, MinimalKeymanGlobal);
-      let keyboardLoader = new NodeKeyboardLoader(harness);
-      let km_keyboard = await keyboardLoader.loadKeyboardFromPath(khmerPath);
-      // --  END:  Standard Recorder-based unit test loading boilerplate --
-
-      // `khmer_angkor` - supports longpresses, but not flicks or multitaps.
-
-      const desktopLayout = km_keyboard.layout('desktop');
-      assert.isFalse(desktopLayout.hasFlicks);
-      assert.isFalse(desktopLayout.hasLongpresses);
-      assert.isFalse(desktopLayout.hasMultitaps);
-
-      const mobileLayout = km_keyboard.layout('phone');
-      assert.isFalse(mobileLayout.hasFlicks);
-      assert.isTrue(mobileLayout.hasLongpresses);
-      assert.isFalse(mobileLayout.hasMultitaps);
-    });
-  });
-});
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.ts
new file mode 100644
index 00000000000..a01d469e470
--- /dev/null
+++ b/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.ts
@@ -0,0 +1,132 @@
+import { assert } from 'chai';
+
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+import { KeyboardHarness, MinimalKeymanGlobal, KeyboardDownloadError, DeviceSpec, KeyboardMissingError } from 'keyman/engine/keyboard';
+import { KeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+
+// async function assertThrowsAsync(fn: () => Promise<any>, message?: string): Promise<void>;
+async function assertThrowsAsync(fn: () => Promise<any>, type?: any, message?: string): Promise<void> {
+  if (typeof (type) === 'string') {
+    message = type;
+    type = undefined;
+  }
+  try {
+    await fn();
+    assert.fail('Expected function to throw an error, but it did not.');
+  } catch (err) {
+    if (type) {
+      assert.isTrue(err instanceof type, `Expected error to be of type ${type.name}, but got ${err.constructor.name}`);
+    }
+    if (message) {
+      assert.equal((err as Error).message, message);
+    }
+  }
+}
+
+function assertThrows(fn: () => any, message?: string): void;
+function assertThrows(fn: () => any, type?: any, message?: string): void {
+  if (typeof (type) === 'string') {
+    message = type;
+    type = undefined;
+  }
+  assert.throws(fn, type, message);
+}
+
+describe('Headless keyboard loading', function() {
+  const laoPath = require.resolve('@keymanapp/common-test-resources/keyboards/lao_2008_basic.js');
+  const khmerPath = require.resolve('@keymanapp/common-test-resources/keyboards/khmer_angkor.js');
+  const nonKeyboardPath = require.resolve('@keymanapp/common-test-resources/index.mjs');
+  const ipaPath = require.resolve('@keymanapp/common-test-resources/keyboards/sil_ipa.js');
+  const nonExisting = '/does/not/exist.js';
+  // Common test suite setup.
+
+  const device = {
+    formFactor: DeviceSpec.FormFactor.Desktop,
+    OS: DeviceSpec.OperatingSystem.Windows,
+    browser: DeviceSpec.Browser.Native,
+    touchable: false
+  }
+
+  describe('Minimal harness loading', () => {
+    it('successfully loads', async function() {
+      // -- START: Standard Recorder-based unit test loading boilerplate --
+      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const keyboardLoader = new NodeKeyboardLoader(harness);
+      const keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
+      // --  END:  Standard Recorder-based unit test loading boilerplate --
+
+      // Asserts that the harness's loading field is cleared once the load is complete.
+      assert.isNotOk(harness.loadedKeyboard);
+
+      // Asserts that the `activeKeyboard` field was not set by the operation.
+      assert.isNotOk(harness.activeKeyboard);
+
+      // This part provides assurance that the keyboard properly loaded.
+      assert.equal(keyboard.id, "Keyboard_lao_2008_basic");
+    });
+
+    it('throws error when keyboard does not exist', async function () {
+      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const keyboardLoader = new NodeKeyboardLoader(harness);
+
+      await assertThrowsAsync(() => keyboardLoader.loadKeyboardFromPath(nonExisting),
+        KeyboardDownloadError, `Unable to read keyboard file at ${nonExisting}`);
+    });
+
+    it('throws error when keyboard is invalid', async function () {
+      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const keyboardLoader = new NodeKeyboardLoader(harness);
+
+      await assertThrowsAsync(() => keyboardLoader.loadKeyboardFromPath(nonKeyboardPath),
+        KeyboardMissingError, `Cannot find the keyboard at ${nonKeyboardPath}.`);
+    });
+
+    it('successfully loads (has variable stores)', async () => {
+      // -- START: Standard Recorder-based unit test loading boilerplate --
+      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const keyboardLoader = new NodeKeyboardLoader(harness);
+      const keyboard = await keyboardLoader.loadKeyboardFromPath(ipaPath);
+      // --  END:  Standard Recorder-based unit test loading boilerplate --
+
+      // This part provides extra assurance that the keyboard properly loaded.
+      assert.equal(keyboard.id, "Keyboard_sil_ipa");
+    });
+
+    it('cannot evaluate rules', async function() {
+      // -- START: Standard Recorder-based unit test loading boilerplate --
+      const harness = new KeyboardHarness({}, MinimalKeymanGlobal);
+      const keyboardLoader = new NodeKeyboardLoader(harness);
+      const keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
+      // --  END:  Standard Recorder-based unit test loading boilerplate --
+
+      // Runs a blank KeyEvent through the keyboard's rule processing...
+      // but via separate harness configured with a different captured global.
+      const ruleHarness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      ruleHarness.activeKeyboard = keyboard;
+      assertThrows(() => ruleHarness.processKeystroke(new Mock(), keyboard.constructNullKeyEvent(device)), 'k.KKM is not a function');
+    });
+
+    it('accurately determines supported gesture types', async () => {
+      // -- START: Standard Recorder-based unit test loading boilerplate --
+      const harness = new KeyboardHarness({}, MinimalKeymanGlobal);
+      const keyboardLoader = new NodeKeyboardLoader(harness);
+      const km_keyboard = await keyboardLoader.loadKeyboardFromPath(khmerPath);
+      // --  END:  Standard Recorder-based unit test loading boilerplate --
+
+      // `khmer_angkor` - supports longpresses, but not flicks or multitaps.
+
+      const desktopLayout = km_keyboard.layout(DeviceSpec.FormFactor.Desktop);
+      assert.isFalse(desktopLayout.hasFlicks);
+      assert.isFalse(desktopLayout.hasLongpresses);
+      assert.isFalse(desktopLayout.hasMultitaps);
+
+      const mobileLayout = km_keyboard.layout(DeviceSpec.FormFactor.Phone);
+      assert.isFalse(mobileLayout.hasFlicks);
+      assert.isTrue(mobileLayout.hasLongpresses);
+      assert.isFalse(mobileLayout.hasMultitaps);
+    });
+  });
+});

From 5d92ff6635a6d01ff9730ab7ea861bad228daa76 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 13 Sep 2024 17:23:50 +0200
Subject: [PATCH 015/254] chore(web): move kbdInterface tests to typescript

---
 web/src/engine/js-processor/build.sh          |  7 +++-
 ...terface.tests.js => kbdInterface.tests.ts} | 33 ++++++++++---------
 2 files changed, 23 insertions(+), 17 deletions(-)
 rename web/src/test/auto/headless/engine/js-processor/{kbdInterface.tests.js => kbdInterface.tests.ts} (72%)

diff --git a/web/src/engine/js-processor/build.sh b/web/src/engine/js-processor/build.sh
index db00593166a..34546a913bd 100755
--- a/web/src/engine/js-processor/build.sh
+++ b/web/src/engine/js-processor/build.sh
@@ -36,7 +36,12 @@ do_build () {
     --format esm
 }
 
+do_test() {
+  test-headless "${SUBPROJECT_NAME}" ""
+  test-headless-typescript "${SUBPROJECT_NAME}"
+}
+
 builder_run_action configure  verify_npm_setup
 builder_run_action clean      rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
 builder_run_action build      do_build
-builder_run_action test       test-headless "${SUBPROJECT_NAME}" ""
+builder_run_action test       do_test
diff --git a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.js b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
similarity index 72%
rename from web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.js
rename to web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
index 0d084964425..c58a7d91910 100644
--- a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
@@ -3,7 +3,7 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
+import { DeviceSpec, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { KeyboardInterface, Mock } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
@@ -11,21 +11,22 @@ describe('Headless keyboard loading', function () {
   const laoPath = require.resolve('@keymanapp/common-test-resources/keyboards/lao_2008_basic.js');
   const khmerPath = require.resolve('@keymanapp/common-test-resources/keyboards/khmer_angkor.js');
   const nonKeyboardPath = require.resolve('@keymanapp/common-test-resources/index.mjs');
-  const ipaPath = require.resolve('@keymanapp/common-test-resources/keyboards/sil_ipa.js');
+  // const ipaPath = require.resolve('@keymanapp/common-test-resources/keyboards/sil_ipa.js');
   // Common test suite setup.
 
-  let device = {
-    formFactor: 'desktop',
-    OS: 'windows',
-    browser: 'native'
+  const device = {
+    formFactor: DeviceSpec.FormFactor.Desktop,
+    OS: DeviceSpec.OperatingSystem.Windows,
+    browser: DeviceSpec.Browser.Native,
+    touchable: false
   }
 
   describe('Full harness loading', () => {
     it('successfully loads', async function () {
       // -- START: Standard Recorder-based unit test loading boilerplate --
-      let harness = new KeyboardInterface({}, MinimalKeymanGlobal);
-      let keyboardLoader = new NodeKeyboardLoader(harness);
-      let keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
+      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const keyboardLoader = new NodeKeyboardLoader(harness);
+      const keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
       harness.activeKeyboard = keyboard;
       // --  END:  Standard Recorder-based unit test loading boilerplate --
 
@@ -35,9 +36,9 @@ describe('Headless keyboard loading', function () {
 
     it('can evaluate rules', async function () {
       // -- START: Standard Recorder-based unit test loading boilerplate --
-      let harness = new KeyboardInterface({}, MinimalKeymanGlobal);
-      let keyboardLoader = new NodeKeyboardLoader(harness);
-      let keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
+      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const keyboardLoader = new NodeKeyboardLoader(harness);
+      const keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
       harness.activeKeyboard = keyboard;
       // --  END:  Standard Recorder-based unit test loading boilerplate --
 
@@ -46,8 +47,8 @@ describe('Headless keyboard loading', function () {
     });
 
     it('does not change the active kehboard', async function () {
-      let harness = new KeyboardInterface({}, MinimalKeymanGlobal);
-      let keyboardLoader = new NodeKeyboardLoader(harness);
+      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const keyboardLoader = new NodeKeyboardLoader(harness);
       const lao_keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
       assert.isNotOk(harness.activeKeyboard);
       assert.isOk(lao_keyboard);
@@ -66,8 +67,8 @@ describe('Headless keyboard loading', function () {
     it('throws distinct errors', async function () {
       const invalidPath = 'totally_invalid_path.js';
 
-      let harness = new KeyboardInterface({}, MinimalKeymanGlobal);
-      let keyboardLoader = new NodeKeyboardLoader(harness);
+      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const keyboardLoader = new NodeKeyboardLoader(harness);
       let missingError;
       try {
         await keyboardLoader.loadKeyboardFromPath(invalidPath);

From 7c75211f303df0000707ff0c92ea2b8e233df601 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Mon, 16 Sep 2024 05:51:38 +0700
Subject: [PATCH 016/254] chore: update dependencies

---
 web/src/engine/core-processor/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/engine/core-processor/build.sh b/web/src/engine/core-processor/build.sh
index cee72fea011..16cb5947d8e 100755
--- a/web/src/engine/core-processor/build.sh
+++ b/web/src/engine/core-processor/build.sh
@@ -15,7 +15,7 @@ SUBPROJECT_NAME=engine/core-processor
 
 builder_describe "Keyman Core WASM integration" \
   "@/core:wasm" \
-  "@/common/web/utils" \
+  "@/web/src/engine/common/web-utils" \
   "clean" \
   "configure" \
   "build" \
@@ -39,7 +39,7 @@ do_configure() {
   verify_npm_setup
 
   mkdir -p "src/import/core/"
-  # we don't need this file for release builds, but it's nice to have 
+  # we don't need this file for release builds, but it's nice to have
   # for reference and auto-completion
   cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/core-interface.d.ts" "src/import/core/"
 }

From 94b06b7ed760c906028cb2bde0aa43d77cdf27ea Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 13 Sep 2024 17:17:42 +0200
Subject: [PATCH 017/254] feat(web): improve errors and tests

Addresses code review comments.
---
 web/package.json                              |   4 +
 web/src/engine/keyboard/build.sh              |   9 +-
 web/src/engine/keyboard/src/index.ts          |   2 +-
 .../src/keyboards/keyboardLoadError.ts        | 146 ++++++++++--------
 .../src/keyboards/keyboardLoaderBase.ts       |   6 +-
 .../keyboards/loaders/domKeyboardLoader.ts    |   6 +-
 .../keyboards/loaders/nodeKeyboardLoader.ts   |   4 +-
 .../cases/keyboard/domKeyboardLoader.spec.ts  |  21 ++-
 .../engine/keyboard/keyboard.tests.ts         |  34 ++++
 ...g.tests.ts => keyboardLoaderBase.tests.ts} |  69 ++-------
 web/src/tools/build.sh                        |   3 +-
 web/src/tools/testing/test-utils/build.sh     |  34 ++++
 web/src/tools/testing/test-utils/index.ts     |  31 ++++
 .../tools/testing/test-utils/tsconfig.json    |  11 ++
 14 files changed, 244 insertions(+), 136 deletions(-)
 create mode 100644 web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
 rename web/src/test/auto/headless/engine/keyboard/{keyboard-loading.tests.ts => keyboardLoaderBase.tests.ts} (57%)
 create mode 100755 web/src/tools/testing/test-utils/build.sh
 create mode 100644 web/src/tools/testing/test-utils/index.ts
 create mode 100644 web/src/tools/testing/test-utils/tsconfig.json

diff --git a/web/package.json b/web/package.json
index f503e912f96..5dee2b63221 100644
--- a/web/package.json
+++ b/web/package.json
@@ -91,6 +91,10 @@
     "./engine/osk/internals": {
       "types": "./build/engine/osk/obj/test-index.d.ts",
       "import": "./build/engine/osk/obj/test-index.js"
+    },
+    "./tools/testing/test-utils": {
+      "types": "./build/tools/testing/test-utils/obj/index.d.ts",
+      "import": "./build/tools/testing/test-utils/obj/index.js"
     }
   },
   "imports": {
diff --git a/web/src/engine/keyboard/build.sh b/web/src/engine/keyboard/build.sh
index 7b04e478a09..7222ba7680b 100755
--- a/web/src/engine/keyboard/build.sh
+++ b/web/src/engine/keyboard/build.sh
@@ -44,7 +44,7 @@ function do_configure() {
 
 BUILD_DIR="${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
 
-function do_build() {
+do_build() {
   tsc --build "${THIS_SCRIPT_PATH}/tsconfig.all.json"
 
   # Base product - the main keyboard processor
@@ -73,7 +73,12 @@ function do_build() {
   tsc --emitDeclarationOnly --outFile "${BUILD_DIR}/lib/node-keyboard-loader.d.ts" -p src/keyboards/loaders/tsconfig.node.json
 }
 
+do_test() {
+  test-headless "${SUBPROJECT_NAME}" ""
+  test-headless-typescript "${SUBPROJECT_NAME}"
+}
+
 builder_run_action configure  do_configure
 builder_run_action clean      rm -rf "${BUILD_DIR}"
 builder_run_action build      do_build
-builder_run_action test       test-headless "${SUBPROJECT_NAME}" ""
+builder_run_action test       do_test
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index e430556ed62..6047426af9f 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -4,7 +4,7 @@ export { default as Keyboard } from "./keyboards/keyboard.js";
 export * from "./keyboards/keyboard.js";
 export { KeyboardHarness, KeyboardKeymanGlobal, MinimalCodesInterface, MinimalKeymanGlobal } from "./keyboards/keyboardHarness.js";
 export { KeyboardLoaderBase } from "./keyboards/keyboardLoaderBase.js";
-export { KeyboardLoadErrorBuilder, KeyboardMissingError, KeyboardScriptError, KeyboardDownloadError } from './keyboards/keyboardLoadError.js'
+export { KeyboardLoadErrorBuilder, KeyboardMissingError, KeyboardScriptError, KeyboardDownloadError, InvalidKeyboardError } from './keyboards/keyboardLoadError.js'
 export {
   CloudKeyboardFont,
   internalizeFont,
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoadError.ts b/web/src/engine/keyboard/src/keyboards/keyboardLoadError.ts
index d394be15bf0..b68f03d3a9c 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardLoadError.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardLoadError.ts
@@ -1,90 +1,104 @@
 import { type KeyboardStub } from './keyboardLoaderBase.js';
 
 export interface KeyboardLoadErrorBuilder {
-    scriptError(err?: Error): void;
-    missingError(err: Error): void;
-    missingKeyboardError(msg: string, err: Error): void;
-    keyboardDownloadError(msg: string, err: Error): void;
+  scriptError(err?: Error): void;
+  missingError(err: Error): void;
+  keyboardDownloadError(err: Error): void;
+
+  invalidKeyboard(err: Error): void;
 }
 
 export class KeyboardScriptError extends Error {
-    public readonly cause;
+  public readonly cause;
 
-    constructor(msg: string, cause?: Error) {
-        super(msg);
-        this.cause = cause;
-    }
+  constructor(msg: string, cause?: Error) {
+    super(msg);
+    this.cause = cause;
+  }
 }
 
 export class KeyboardMissingError extends Error {
-    public readonly cause;
+  public readonly cause;
 
-    constructor(msg: string, cause?: Error) {
-        super(msg);
-        this.cause = cause;
-    }
+  constructor(msg: string, cause?: Error) {
+    super(msg);
+    this.cause = cause;
+  }
 }
 
 export class KeyboardDownloadError extends Error {
-    public readonly cause;
+  public readonly cause;
 
-    constructor(message: string, cause?: Error) {
-        super(message);
-        this.cause = cause;
-    }
+  constructor(message: string, cause?: Error) {
+    super(message);
+    this.cause = cause;
+  }
 }
 
-export class UriBasedErrorBuilder implements KeyboardLoadErrorBuilder {
-    readonly uri: string;
-
-    constructor(uri: string) {
-        this.uri = uri;
-    }
-
-    missingError(err: Error) {
-        const msg = `Cannot find the keyboard at ${this.uri}.`;
-        return new KeyboardMissingError(msg, err);
-    }
+export class InvalidKeyboardError extends Error {
+  public readonly cause;
 
-    missingKeyboardError(msg: string, err: Error) {
-        return new KeyboardMissingError(msg, err);
-    }
-
-    scriptError(err: Error) {
-        const msg = `Error registering the keyboard script at ${this.uri}; it may contain an error.`;
-        return new KeyboardScriptError(msg, err);
-    }
+  constructor(message: string, cause?: Error) {
+    super(message);
+    this.cause = cause;
+  }
+}
 
-    keyboardDownloadError(msg: string, err: Error) {
-        return new KeyboardDownloadError(msg, err);
-    }
+export class UriBasedErrorBuilder implements KeyboardLoadErrorBuilder {
+  readonly uri: string;
+
+  constructor(uri: string) {
+    this.uri = uri;
+  }
+
+  missingError(err: Error) {
+    const msg = `Cannot find the keyboard at ${this.uri}.`;
+    return new KeyboardMissingError(msg, err);
+  }
+
+  scriptError(err: Error) {
+    const msg = `Error registering the keyboard script at ${this.uri}; it may contain an error.`;
+    return new KeyboardScriptError(msg, err);
+  }
+
+  keyboardDownloadError(err: Error) {
+    const msg = `Unable to download keyboard at ${this.uri}`;
+    return new KeyboardDownloadError(msg, err);
+  }
+
+  invalidKeyboard(err: Error) {
+    const msg = `${this.uri} is not a valid keyboard file`;
+    return new InvalidKeyboardError(msg, err);
+  }
 }
 
 export class StubBasedErrorBuilder implements KeyboardLoadErrorBuilder {
-    readonly stub: KeyboardStub;
-
-    constructor(stub: KeyboardStub) {
-        this.stub = stub;
-    }
-
-    missingError(err: Error) {
-        const stub = this.stub;
-        const msg = `Cannot find the ${stub.name} keyboard for ${stub.langName} at ${stub.filename}.`;
-        return new KeyboardMissingError(msg, err);
-    }
-
-    missingKeyboardError(msg: string, err: Error) {
-        return new KeyboardMissingError(msg, err);
-    }
-
-    scriptError(err: Error) {
-        const stub = this.stub;
-        const msg = `Error registering the ${stub.name} keyboard for ${stub.langName}; keyboard script at ${stub.filename} may contain an error.`;
-        return new KeyboardScriptError(msg, err);
-    }
-
-    keyboardDownloadError(msg: string, err: Error) {
-        return new KeyboardDownloadError(msg, err);
-    }
+  readonly stub: KeyboardStub;
+
+  constructor(stub: KeyboardStub) {
+    this.stub = stub;
+  }
+
+  missingError(err: Error) {
+    const stub = this.stub;
+    const msg = `Cannot find the ${stub.name} keyboard for ${stub.langName} at ${stub.filename}.`;
+    return new KeyboardMissingError(msg, err);
+  }
+
+  scriptError(err: Error) {
+    const stub = this.stub;
+    const msg = `Error registering the ${stub.name} keyboard for ${stub.langName}; keyboard script at ${stub.filename} may contain an error.`;
+    return new KeyboardScriptError(msg, err);
+  }
+
+  keyboardDownloadError(err: Error) {
+    const msg = `Unable to download ${this.stub.name} keyboard for ${this.stub.langName}`;
+    return new KeyboardDownloadError(msg, err);
+  }
+
+  invalidKeyboard(err: Error) {
+    const msg = `${this.stub.name} is not a valid keyboard`;
+    return new InvalidKeyboardError(msg, err);
+  }
 }
 
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
index 4c718d3e888..eb12472dd8a 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
@@ -22,7 +22,7 @@ export abstract class KeyboardLoaderBase {
    * @param uri  The URI of the keyboard to load.
    * @returns    A Promise that resolves to the loaded keyboard.
    */
-  public loadKeyboardFromPath(uri: string): Promise<Keyboard> {
+  public async loadKeyboardFromPath(uri: string): Promise<Keyboard> {
     this.harness.install();
     return this.loadKeyboardInternal(uri, new UriBasedErrorBuilder(uri));
   }
@@ -33,7 +33,7 @@ export abstract class KeyboardLoaderBase {
    * @param stub  The stub of the keyboard to load.
    * @returns     A Promise that resolves to the loaded keyboard.
    */
-  public loadKeyboardFromStub(stub: KeyboardStub) {
+  public async loadKeyboardFromStub(stub: KeyboardStub): Promise<Keyboard> {
     this.harness.install();
     return this.loadKeyboardInternal(stub.filename, new StubBasedErrorBuilder(stub));
   }
@@ -45,7 +45,7 @@ export abstract class KeyboardLoaderBase {
     try {
       script = await blob.text();
     } catch (e) {
-      throw errorBuilder.missingKeyboardError('The keyboard has an invalid encoding.', e);
+      throw errorBuilder.invalidKeyboard(e);
     }
 
     if (script.startsWith('KXTS', 0)) {
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
index 2fba52a80e0..96d00bf4fda 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
+++ b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
@@ -38,17 +38,17 @@ export class DOMKeyboardLoader extends KeyboardLoaderBase {
     try {
       response = await fetch(uri);
     } catch (e) {
-      throw errorBuilder.keyboardDownloadError(`Unable to fetch fetch keyboard at ${uri}`, e);
+      throw errorBuilder.keyboardDownloadError(e);
     }
 
     if (!response.ok) {
-      throw errorBuilder.missingError(new Error(`HTTP ${response.status} ${response.statusText}`));
+      throw errorBuilder.keyboardDownloadError(new Error(`HTTP ${response.status} ${response.statusText}`));
     }
 
     try {
       return await response.blob();
     } catch (e) {
-      throw errorBuilder.keyboardDownloadError(`Unable to retrieve blob from keyboard at ${uri}`, e);
+      throw errorBuilder.invalidKeyboard(e);
     }
   }
 
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
index a63181fe8bc..8f568840ffd 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
+++ b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
@@ -36,7 +36,7 @@ export class NodeKeyboardLoader extends KeyboardLoaderBase {
     try {
       buffer = await readFile(uri);
     } catch (err) {
-      throw errorBuilder.keyboardDownloadError(`Unable to read keyboard file at ${uri}`, err);
+      throw errorBuilder.keyboardDownloadError(err);
     }
     return new Blob([buffer]);
   }
@@ -46,7 +46,7 @@ export class NodeKeyboardLoader extends KeyboardLoaderBase {
     try {
       script = new vm.Script(scriptSrc);
     } catch (err) {
-      throw errorBuilder.missingError(err);
+      throw errorBuilder.invalidKeyboard(err);
     }
     try {
       script.runInContext(this.harness._jsGlobal);
diff --git a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.spec.ts b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.spec.ts
index 95db91b0f8f..7f2f48e2c12 100644
--- a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.spec.ts
+++ b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.spec.ts
@@ -1,8 +1,9 @@
 import { assert } from 'chai';
 
 import { DOMKeyboardLoader } from 'keyman/engine/keyboard/dom-keyboard-loader';
-import { extendString, KeyboardHarness, Keyboard, MinimalKeymanGlobal, DeviceSpec, KeyboardKeymanGlobal } from 'keyman/engine/keyboard';
+import { extendString, KeyboardHarness, Keyboard, MinimalKeymanGlobal, DeviceSpec, KeyboardKeymanGlobal, KeyboardDownloadError, KeyboardScriptError } from 'keyman/engine/keyboard';
 import { KeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { assertThrowsAsync } from 'keyman/tools/testing/test-utils';
 
 declare let window: typeof globalThis;
 // KeymanEngine from the web/ folder... when available.
@@ -27,6 +28,24 @@ describe('Keyboard loading in DOM', function() {
     }
   })
 
+  it('throws error when keyboard does not exist', async () => {
+    const harness = new KeyboardInterface(window, MinimalKeymanGlobal);
+    const keyboardLoader = new DOMKeyboardLoader(harness);
+    const nonExisting = '/does/not/exist.js';
+
+    await assertThrowsAsync(async () => await keyboardLoader.loadKeyboardFromPath(nonExisting),
+      KeyboardDownloadError, `Unable to download keyboard at ${nonExisting}`);
+  });
+
+  it('throws error when keyboard is invalid', async () => {
+    const harness = new KeyboardInterface(window, MinimalKeymanGlobal);
+    const keyboardLoader = new DOMKeyboardLoader(harness);
+    const nonKeyboardPath = '/common/test/resources/index.mjs';
+
+    await assertThrowsAsync(async () => await keyboardLoader.loadKeyboardFromPath(nonKeyboardPath),
+      KeyboardScriptError, `Error registering the keyboard script at ${nonKeyboardPath}; it may contain an error.`);
+  });
+
   it('`window`, disabled rule processing', async () => {
     const harness = new KeyboardHarness(window, MinimalKeymanGlobal);
     let keyboardLoader = new DOMKeyboardLoader(harness);
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
new file mode 100644
index 00000000000..e089b64fe7b
--- /dev/null
+++ b/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
@@ -0,0 +1,34 @@
+import { assert } from 'chai';
+
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+import { KeyboardHarness, MinimalKeymanGlobal, DeviceSpec } from 'keyman/engine/keyboard';
+import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+
+
+describe('Keyboard tests', function () {
+  const khmerPath = require.resolve('@keymanapp/common-test-resources/keyboards/khmer_angkor.js');
+
+  it('accurately determines layout properties', async () => {
+    // -- START: Standard Recorder-based unit test loading boilerplate --
+    const harness = new KeyboardHarness({}, MinimalKeymanGlobal);
+    const keyboardLoader = new NodeKeyboardLoader(harness);
+    const km_keyboard = await keyboardLoader.loadKeyboardFromPath(khmerPath);
+    // --  END:  Standard Recorder-based unit test loading boilerplate --
+
+    // `khmer_angkor` - supports longpresses, but not flicks or multitaps.
+
+    // Phone supports longpress if the keyboard supports it.
+    const mobileLayout = km_keyboard.layout(DeviceSpec.FormFactor.Phone);
+    assert.isTrue(mobileLayout.hasLongpresses);
+    assert.isFalse(mobileLayout.hasFlicks);
+    assert.isFalse(mobileLayout.hasMultitaps);
+
+    // Desktop doesn't support longpress even if the keyboard supports it.
+    const desktopLayout = km_keyboard.layout(DeviceSpec.FormFactor.Desktop);
+    assert.isFalse(desktopLayout.hasLongpresses);
+    assert.isFalse(desktopLayout.hasFlicks);
+    assert.isFalse(desktopLayout.hasMultitaps);
+  });
+});
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
similarity index 57%
rename from web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.ts
rename to web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
index a01d469e470..80fd0a21c2f 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
@@ -3,41 +3,13 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { KeyboardHarness, MinimalKeymanGlobal, KeyboardDownloadError, DeviceSpec, KeyboardMissingError } from 'keyman/engine/keyboard';
+import { KeyboardHarness, MinimalKeymanGlobal, KeyboardDownloadError, DeviceSpec, InvalidKeyboardError } from 'keyman/engine/keyboard';
 import { KeyboardInterface, Mock } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
-
-// async function assertThrowsAsync(fn: () => Promise<any>, message?: string): Promise<void>;
-async function assertThrowsAsync(fn: () => Promise<any>, type?: any, message?: string): Promise<void> {
-  if (typeof (type) === 'string') {
-    message = type;
-    type = undefined;
-  }
-  try {
-    await fn();
-    assert.fail('Expected function to throw an error, but it did not.');
-  } catch (err) {
-    if (type) {
-      assert.isTrue(err instanceof type, `Expected error to be of type ${type.name}, but got ${err.constructor.name}`);
-    }
-    if (message) {
-      assert.equal((err as Error).message, message);
-    }
-  }
-}
-
-function assertThrows(fn: () => any, message?: string): void;
-function assertThrows(fn: () => any, type?: any, message?: string): void {
-  if (typeof (type) === 'string') {
-    message = type;
-    type = undefined;
-  }
-  assert.throws(fn, type, message);
-}
+import { assertThrowsAsync, assertThrows } from 'keyman/tools/testing/test-utils';
 
 describe('Headless keyboard loading', function() {
   const laoPath = require.resolve('@keymanapp/common-test-resources/keyboards/lao_2008_basic.js');
-  const khmerPath = require.resolve('@keymanapp/common-test-resources/keyboards/khmer_angkor.js');
   const nonKeyboardPath = require.resolve('@keymanapp/common-test-resources/index.mjs');
   const ipaPath = require.resolve('@keymanapp/common-test-resources/keyboards/sil_ipa.js');
   const nonExisting = '/does/not/exist.js';
@@ -51,7 +23,7 @@ describe('Headless keyboard loading', function() {
   }
 
   describe('Minimal harness loading', () => {
-    it('successfully loads', async function() {
+    it('successfully loads a single keyboard from filesystem', async ()  => {
       // -- START: Standard Recorder-based unit test loading boilerplate --
       const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
       const keyboardLoader = new NodeKeyboardLoader(harness);
@@ -68,20 +40,20 @@ describe('Headless keyboard loading', function() {
       assert.equal(keyboard.id, "Keyboard_lao_2008_basic");
     });
 
-    it('throws error when keyboard does not exist', async function () {
+    it('throws error when keyboard does not exist', async () => {
       const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
       const keyboardLoader = new NodeKeyboardLoader(harness);
 
-      await assertThrowsAsync(() => keyboardLoader.loadKeyboardFromPath(nonExisting),
-        KeyboardDownloadError, `Unable to read keyboard file at ${nonExisting}`);
+      await assertThrowsAsync(async () => await keyboardLoader.loadKeyboardFromPath(nonExisting),
+        KeyboardDownloadError, `Unable to download keyboard at ${nonExisting}`);
     });
 
-    it('throws error when keyboard is invalid', async function () {
+    it('throws error when keyboard is invalid', async () => {
       const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
       const keyboardLoader = new NodeKeyboardLoader(harness);
 
-      await assertThrowsAsync(() => keyboardLoader.loadKeyboardFromPath(nonKeyboardPath),
-        KeyboardMissingError, `Cannot find the keyboard at ${nonKeyboardPath}.`);
+      await assertThrowsAsync(async () => await keyboardLoader.loadKeyboardFromPath(nonKeyboardPath),
+        InvalidKeyboardError, `${nonKeyboardPath} is not a valid keyboard file`);
     });
 
     it('successfully loads (has variable stores)', async () => {
@@ -104,29 +76,12 @@ describe('Headless keyboard loading', function() {
 
       // Runs a blank KeyEvent through the keyboard's rule processing...
       // but via separate harness configured with a different captured global.
+      // This shows an important detail: the 'global' object is effectively
+      // closure-captured. (Similar constraints may occur when experimenting with
+      // 'sandboxed' keyboard loading in the DOM!)
       const ruleHarness = new KeyboardInterface({}, MinimalKeymanGlobal);
       ruleHarness.activeKeyboard = keyboard;
       assertThrows(() => ruleHarness.processKeystroke(new Mock(), keyboard.constructNullKeyEvent(device)), 'k.KKM is not a function');
     });
-
-    it('accurately determines supported gesture types', async () => {
-      // -- START: Standard Recorder-based unit test loading boilerplate --
-      const harness = new KeyboardHarness({}, MinimalKeymanGlobal);
-      const keyboardLoader = new NodeKeyboardLoader(harness);
-      const km_keyboard = await keyboardLoader.loadKeyboardFromPath(khmerPath);
-      // --  END:  Standard Recorder-based unit test loading boilerplate --
-
-      // `khmer_angkor` - supports longpresses, but not flicks or multitaps.
-
-      const desktopLayout = km_keyboard.layout(DeviceSpec.FormFactor.Desktop);
-      assert.isFalse(desktopLayout.hasFlicks);
-      assert.isFalse(desktopLayout.hasLongpresses);
-      assert.isFalse(desktopLayout.hasMultitaps);
-
-      const mobileLayout = km_keyboard.layout(DeviceSpec.FormFactor.Phone);
-      assert.isFalse(mobileLayout.hasFlicks);
-      assert.isTrue(mobileLayout.hasLongpresses);
-      assert.isFalse(mobileLayout.hasMultitaps);
-    });
   });
 });
diff --git a/web/src/tools/build.sh b/web/src/tools/build.sh
index b7670418ab3..a2a95c8e512 100755
--- a/web/src/tools/build.sh
+++ b/web/src/tools/build.sh
@@ -22,7 +22,8 @@ builder_describe "Builds the Keyman Engine for Web's development & unit-testing
   "--ci         Does nothing for this script" \
   ":bulk_rendering=testing/bulk_rendering   Builds the bulk-rendering tool used to validate changes to OSK display code" \
   ":recorder=testing/recorder               Builds the KMW recorder tool used for development of unit-test resources" \
-  ":sourcemap-root=building/sourcemap-root  Builds the sourcemap-cleaning tool used during minification of app/ builds"
+  ":sourcemap-root=building/sourcemap-root  Builds the sourcemap-cleaning tool used during minification of app/ builds" \
+  ":test-utils=testing/test-utils           Builds the test-utils module"
 
 builder_parse "$@"
 
diff --git a/web/src/tools/testing/test-utils/build.sh b/web/src/tools/testing/test-utils/build.sh
new file mode 100755
index 00000000000..0ab8dc5a6e6
--- /dev/null
+++ b/web/src/tools/testing/test-utils/build.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+#
+# Compile KeymanWeb's test-utils module
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+SUBPROJECT_NAME=tools/testing/test-utils
+. "$KEYMAN_ROOT/web/common.inc.sh"
+. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+
+################################ Main script ################################
+
+builder_describe "Builds the Keyman Engine for Web's test-utils module" \
+  "clean" \
+  "configure" \
+  "build"
+
+builder_describe_outputs \
+  configure  /node_modules \
+  build      "/web/build/${SUBPROJECT_NAME}/obj/index.js"
+
+builder_parse "$@"
+
+do_build ( ) {
+  compile "${SUBPROJECT_NAME}"
+}
+
+builder_run_action configure  verify_npm_setup
+builder_run_action clean      rm -rf "../../../../build/${SUBPROJECT_NAME}/"
+builder_run_action build      do_build
\ No newline at end of file
diff --git a/web/src/tools/testing/test-utils/index.ts b/web/src/tools/testing/test-utils/index.ts
new file mode 100644
index 00000000000..79f98d1a3be
--- /dev/null
+++ b/web/src/tools/testing/test-utils/index.ts
@@ -0,0 +1,31 @@
+import { assert } from 'chai';
+
+// export async function assertThrowsAsync(fn: () => Promise<any>, message?: string): Promise<void>;
+export async function assertThrowsAsync(fn: () => Promise<any>, type?: any, message?: string): Promise<void> {
+  assert(!!type || !!message, 'at least one of type or message must be specified');
+  if (typeof(type) === 'string') {
+    message = type;
+    type = undefined;
+  }
+  try {
+    await fn();
+    assert.fail('Expected function to throw an error, but it did not.');
+  } catch (err) {
+    if (type) {
+      assert.isTrue(err instanceof type, `Expected error to be of type ${type.name}, but got ${err.constructor.name}`);
+    }
+    if (message) {
+      assert.equal((err as Error).message, message);
+    }
+  }
+}
+
+export function assertThrows(fn: () => any, message?: string): void;
+export function assertThrows(fn: () => any, type?: any, message?: string): void {
+  assert(!!type || !!message, 'at least one of type or message must be specified');
+  if (typeof(type) === 'string') {
+    message = type;
+    type = undefined;
+  }
+  assert.throws(fn, type, message);
+}
diff --git a/web/src/tools/testing/test-utils/tsconfig.json b/web/src/tools/testing/test-utils/tsconfig.json
new file mode 100644
index 00000000000..65dfe3a9bfd
--- /dev/null
+++ b/web/src/tools/testing/test-utils/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "../../../tsconfig.dom.json",
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "../../../../build/tools/testing/test-utils/obj/",
+    "rootDir": ".",
+    "tsBuildInfoFile": "../../../../build/tools/testing/test-utils/obj/tsconfig.tsbuildinfo"
+  },
+
+  "include": [ "*.ts" ],
+}

From d06aa29956227dd3277dee32fe36a94e0828f102 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 3 Sep 2024 15:53:23 +0200
Subject: [PATCH 018/254] feat(core): implement loading KMX from blob

- split keyboard loading into loading KMX file into blob and then
  loading the keyboard processor from the blob.
- deprecate `km_core_keyboard_load`
- move file access next to deprecated method. This is now the only place
  that loads a file in Core; unit tests have some more places that
  load files.
- introduce GTest and add unit tests for loading from blob

Part-of: #11293
---
 core/include/keyman/keyman_core_api.h         |  66 +++++++++-
 core/include/keyman/keyman_core_api_bits.h    |   5 +-
 core/src/keyboard.cpp                         |   7 +-
 core/src/keyboard.hpp                         |   5 +-
 core/src/km_core_keyboard_api.cpp             | 117 +++++++++++++++---
 core/src/kmx/kmx_file.cpp                     |  90 +++++---------
 core/src/kmx/kmx_processevent.h               |   4 +-
 core/src/kmx/kmx_processor.cpp                |   9 +-
 core/src/kmx/kmx_processor.hpp                |   2 +-
 core/src/ldml/ldml_processor.cpp              |  41 ++----
 core/src/ldml/ldml_processor.hpp              |   5 +-
 core/src/mock/mock_processor.cpp              |   2 +-
 core/src/mock/mock_processor.hpp              |   2 +-
 core/src/util_normalize_table_generator.cpp   |   1 -
 core/subprojects/.gitignore                   |   1 +
 core/subprojects/gtest.wrap                   |  16 +++
 .../tests/unit/km_core_keyboard_api.tests.cpp |  71 +++++++++++
 core/tests/unit/kmnkbd/action_set_api.cpp     |   5 +-
 core/tests/unit/kmnkbd/debug_api.cpp          |   5 +-
 core/tests/unit/kmnkbd/keyboard_api.cpp       |   8 +-
 core/tests/unit/kmnkbd/state_api.cpp          |   5 +-
 core/tests/unit/kmnkbd/state_context_api.cpp  |  11 +-
 .../unit/kmnkbd/test_actions_get_api.cpp      |   4 +-
 .../unit/kmnkbd/test_actions_normalize.cpp    |   4 +-
 core/tests/unit/kmx/kmx.cpp                   |   4 +-
 core/tests/unit/kmx/kmx_external_event.cpp    |   4 +-
 core/tests/unit/kmx/kmx_imx.cpp               |   7 +-
 core/tests/unit/kmx/kmx_key_list.cpp          |   4 +-
 core/tests/unit/ldml/core_ldml_min.cpp        |   4 +-
 core/tests/unit/ldml/ldml.cpp                 |   4 +-
 core/tests/unit/ldml/ldml_test_source.cpp     |   6 +-
 core/tests/unit/ldml/meson.build              |   5 +-
 .../unit/ldml/test_context_normalization.cpp  |   4 +-
 core/tests/unit/load_kmx_file.cpp             |  34 +++++
 core/tests/unit/load_kmx_file.hpp             |  14 +++
 core/tests/unit/meson.build                   |  30 ++++-
 linux/debian/libkeymancore2.symbols           |   2 +
 37 files changed, 440 insertions(+), 168 deletions(-)
 create mode 100644 core/subprojects/gtest.wrap
 create mode 100644 core/tests/unit/km_core_keyboard_api.tests.cpp
 create mode 100644 core/tests/unit/load_kmx_file.cpp
 create mode 100644 core/tests/unit/load_kmx_file.hpp

diff --git a/core/include/keyman/keyman_core_api.h b/core/include/keyman/keyman_core_api.h
index 328965e8761..588b98085fe 100644
--- a/core/include/keyman/keyman_core_api.h
+++ b/core/include/keyman/keyman_core_api.h
@@ -1007,7 +1007,11 @@ Provides read-only information about a keyboard.
 typedef struct {
   km_core_cu const * version_string;
   km_core_cu const * id;
+
+  // TODO-web-core: Deprecate this field
+  // KMN_DEPRECATED
   km_core_path_name  folder_path;
+
   km_core_option_item const * default_options;
 } km_core_keyboard_attrs;
 
@@ -1022,7 +1026,7 @@ typedef struct {
 : Keyman keyboard ID string.
 
 `folder_path`
-: Path to the unpacked folder containing the keyboard and associated resources.
+: Path to the unpacked folder containing the keyboard and associated resources (deprecated).
 
 `default_options`
 : Set of default values for any options included in the keyboard.
@@ -1096,12 +1100,16 @@ typedef struct {
 
 ## Description
 
+DEPRECATED: use [km_core_keyboard_load_from_blob] instead.
+
 Parse and load keyboard from the supplied path and a pointer to the loaded keyboard
-into the out paramter.
+into the out parameter.
 
 ## Specification
 
 ```c */
+// TODO-web-core: Deprecate this function
+// KMN_DEPRECATED_API
 KMN_API
 km_core_status
 km_core_keyboard_load(km_core_path_name kb_path,
@@ -1140,6 +1148,60 @@ km_core_keyboard_load(km_core_path_name kb_path,
 
 -------------------------------------------------------------------------------
 
+# km_core_keyboard_load_from_blob()
+
+## Description
+
+Parse and load keyboard from the supplied blob and a pointer to the loaded keyboard
+into the out paramter.
+
+## Specification
+
+```c */
+KMN_API
+km_core_status km_core_keyboard_load_from_blob(km_core_path_name kb_name,
+                                               void* blob,
+                                               size_t blob_size,
+                                               km_core_keyboard** keyboard);
+
+/*
+```
+
+## Parameters
+
+`kb_name`
+: a string with the name of the keyboard.
+
+`blob`
+: a byte array containing the content of a KMX/KMX+ file.
+
+`blob_size`
+: A pointer to a size_t variable with the size of the blob in bytes.
+
+`keyboard`
+: A pointer to result variable: A pointer to the opaque keyboard
+  object returned by the Processor. This memory must be freed with a
+  call to [km_core_keyboard_dispose].
+
+## Returns
+
+`KM_CORE_STATUS_OK`
+: On success.
+
+`KM_CORE_STATUS_NO_MEM`
+: In the event an internal memory allocation fails.
+
+`KM_CORE_STATUS_IO_ERROR`
+: In the event the keyboard file is unparseable for any reason
+
+`KM_CORE_STATUS_INVALID_ARGUMENT`
+: In the event `keyboard` is null.
+
+`KM_CORE_STATUS_OS_ERROR`
+: Bit 31 (high bit) set, bits 0-30 are an OS-specific error code.
+
+-------------------------------------------------------------------------------
+
 # km_core_keyboard_dispose()
 
 ## Description
diff --git a/core/include/keyman/keyman_core_api_bits.h b/core/include/keyman/keyman_core_api_bits.h
index e00f4698a8c..bd1f519bffe 100644
--- a/core/include/keyman/keyman_core_api_bits.h
+++ b/core/include/keyman/keyman_core_api_bits.h
@@ -23,7 +23,6 @@
   #define _kmn_unused(x)        UNUSED_ ## x __attribute__((__unused__))
 #else
   #define _kmn_unused(x)        UNUSED_ ## x
-
 #endif
 
 #if defined _WIN32 || defined __CYGWIN__
@@ -36,7 +35,7 @@
     #undef _kmn_static_flag
   #else  // How MSVC sepcifies function level attributes adn deprecation
     #define _kmn_and
-    #define _kmn_tag_fn(a)       __declspec(a)
+    #define _kmn_tag_fn(a)     __declspec(a)
     #define _kmn_deprecated_flag deprecated
   #endif
   #define _kmn_export_flag     dllexport
@@ -48,6 +47,8 @@
   #define _KM_CORE_EXT_SEPARATOR ('.')
 #endif
 
+#define KMN_DEPRECATED        _kmn_tag_fn(_kmn_deprecated_flag)
+
 #if defined KM_CORE_LIBRARY_STATIC
   #define KMN_API             _kmn_tag_fn(_kmn_static_flag)
   #define KMN_DEPRECATED_API  _kmn_tag_fn(_kmn_deprecated_flag _kmn_and _kmn_static_flag)
diff --git a/core/src/keyboard.cpp b/core/src/keyboard.cpp
index 2c3a0c11b2c..0f104f9422a 100644
--- a/core/src/keyboard.cpp
+++ b/core/src/keyboard.cpp
@@ -17,18 +17,16 @@ void keyboard_attributes::render()
   // Make attributes point to the stored values above.
   id              = _keyboard_id.c_str();
   version_string  = _version_string.c_str();
-  folder_path     = _folder_path.c_str();
   default_options = _default_opts.data();
 }
 
 
 keyboard_attributes::keyboard_attributes(std::u16string const & kbid,
     std::u16string const & version,
-    path_type const & path,
     options_store const &opts)
 : _keyboard_id(kbid),
   _version_string(version),
-  _folder_path(path),
+  _folder_path(""),
   _default_opts(opts)
 {
   // Ensure that the default_options array will be properly terminated.
@@ -40,7 +38,7 @@ keyboard_attributes::keyboard_attributes(std::u16string const & kbid,
 keyboard_attributes::keyboard_attributes(keyboard_attributes &&rhs)
 : _keyboard_id(std::move(rhs._keyboard_id)),
   _version_string(std::move(rhs._version_string)),
-  _folder_path(std::move(rhs._folder_path)),
+  _folder_path(""),
   _default_opts(std::move(rhs._default_opts))
 {
     rhs.id = rhs.version_string = nullptr;
@@ -58,7 +56,6 @@ json & km::core::operator << (json & j, km::core::keyboard_attributes const & kb
 {
   j << json::object
       << "id" << kb.id
-      << "folder" << kb._folder_path
       << "version" << kb.version_string
       << "rules" << json::array << json::close;
 
diff --git a/core/src/keyboard.hpp b/core/src/keyboard.hpp
index 142bf40e860..2ca7118d870 100644
--- a/core/src/keyboard.hpp
+++ b/core/src/keyboard.hpp
@@ -26,6 +26,7 @@ namespace core
   {
     std::u16string      _keyboard_id;
     std::u16string      _version_string;
+    // unused and deprecated
     core::path           _folder_path;
     std::vector<option> _default_opts;
 
@@ -33,7 +34,6 @@ namespace core
 
   public:
     using options_store = decltype(_default_opts);
-    using path_type = decltype(_folder_path);
 
     keyboard_attributes()
     : km_core_keyboard_attrs {nullptr, nullptr, nullptr, nullptr} {}
@@ -42,7 +42,6 @@ namespace core
 
     keyboard_attributes(std::u16string const & id,
              std::u16string const & version,
-             path_type const & path,
              options_store const &opts);
 
     keyboard_attributes & operator = (keyboard_attributes const &) = delete;
@@ -52,8 +51,6 @@ namespace core
 
     options_store const &   default_opts_store() const noexcept { return _default_opts; }
     options_store &         default_opts_store() noexcept { return _default_opts; }
-
-    path_type const     &   path() const noexcept { return _folder_path; }
   };
 
   json & operator << (json &, km::core::keyboard_attributes const &);
diff --git a/core/src/km_core_keyboard_api.cpp b/core/src/km_core_keyboard_api.cpp
index 964f73ca072..79e8bbc3c67 100644
--- a/core/src/km_core_keyboard_api.cpp
+++ b/core/src/km_core_keyboard_api.cpp
@@ -14,47 +14,123 @@
 #include "keyman_core.h"
 
 #include "keyboard.hpp"
-#include "processor.hpp"
 #include "kmx/kmx_processor.hpp"
 #include "ldml/ldml_processor.hpp"
 #include "mock/mock_processor.hpp"
+#include "processor.hpp"
+#include "utfcodec.hpp"
 
 using namespace km::core;
 
 namespace
 {
-  abstract_processor * processor_factory(path const & kb_path) {
-    // Some legacy packages may include upper-case file extensions
-    // TODO-LDML: move file io out of core and into engine
-    if (kb_path.suffix() == ".kmx" || kb_path.suffix() == ".KMX") {
-      std::vector<uint8_t> buf;
-      if(ldml_processor::is_kmxplus_file(kb_path, buf)) {
-        abstract_processor * result = new ldml_processor(kb_path, buf);
-        return result;
-      }
-      return new kmx_processor(kb_path);
-    }
-    else if (kb_path.suffix() == ".mock") {
-      return new mock_processor(kb_path);
+  abstract_processor* processor_factory(path const & kb_name, std::vector<uint8_t> buf) {
+    if (ldml_processor::is_kmxplus_file(buf)) {
+      abstract_processor* result = new ldml_processor(kb_name, buf);
+      return result;
     }
-    else {
-      return new null_processor();
+    return new kmx_processor(kb_name, buf);
+  }
+
+}  // namespace
+
+km_core_status
+km_core_keyboard_load_from_blob_internal(
+  km_core_path_name kb_name,
+  std::vector<uint8_t> buf,
+  km_core_keyboard** keyboard
+) {
+  assert(keyboard);
+  if (!keyboard)
+    return KM_CORE_STATUS_INVALID_ARGUMENT;
+
+  if (buf.size() < 64) { // a KMX file is at least 64 bytes (KMX header)
+    return KM_CORE_STATUS_IO_ERROR;
+  }
+
+  if (*PKMX_DWORD((KMX_BYTE*)buf.data()) != KMX_DWORD(FILEID_COMPILED)) {
+    return KM_CORE_STATUS_IO_ERROR;
+  }
+  try {
+    abstract_processor* kp = processor_factory(kb_name, buf);
+    km_core_status status  = kp->validate();
+    if (status != KM_CORE_STATUS_OK) {
+      delete kp;
+      return status;
     }
+    *keyboard = static_cast<km_core_keyboard*>(kp);
+  } catch (std::bad_alloc&) {
+    return KM_CORE_STATUS_NO_MEM;
   }
+  return KM_CORE_STATUS_OK;
+}
 
+km_core_status
+km_core_keyboard_load_from_blob(
+  km_core_path_name kb_name,
+  void* blob,
+  size_t blob_size,
+  km_core_keyboard** keyboard
+) {
+  assert(keyboard);
+  if (!keyboard || !blob)
+    return KM_CORE_STATUS_INVALID_ARGUMENT;
 
+  std::vector<uint8_t> buf((uint8_t*)blob, (uint8_t*)blob + blob_size);
+  return km_core_keyboard_load_from_blob_internal(kb_name, buf, keyboard);
 }
+
+// TODO-web-core: Remove this code when we remove the deprecated km_core_keyboard_load method
+// BEGIN DEPRECATED
+#include <fstream>
+std::vector<uint8_t> load_kmx_file(path const& kb_path) {
+  std::vector<uint8_t> data;
+  std::ifstream file(static_cast<std::string>(kb_path), std::ios::binary | std::ios::ate);
+  if (!file.good()) {
+    return std::vector<uint8_t>();
+  }
+  const std::streamsize size = file.tellg();
+  if (size >= KMX_MAX_ALLOWED_FILE_SIZE) {
+    return std::vector<uint8_t>();
+  }
+
+  file.seekg(0, std::ios::beg);
+
+  data.resize((size_t)size);
+  if (!file.read((char*)data.data(), size)) {
+    return std::vector<uint8_t>();
+  }
+
+  file.close();
+  return data;
+}
+
+KMN_DEPRECATED_API
 km_core_status
-km_core_keyboard_load(km_core_path_name kb_path, km_core_keyboard **keyboard)
+km_core_keyboard_load(km_core_path_name kb, km_core_keyboard **keyboard)
 {
   assert(keyboard);
-  if (!keyboard)
+  if (!keyboard || !kb)
     return KM_CORE_STATUS_INVALID_ARGUMENT;
 
+  path const kb_path(kb);
   try
   {
-    abstract_processor *kp = processor_factory(kb_path);
-    km_core_status status = kp->validate();
+    abstract_processor* kp = nullptr;
+    km_core_status status = KM_CORE_STATUS_OK;
+    // Some legacy packages may include upper-case file extensions
+    if (kb_path.suffix() == ".kmx" || kb_path.suffix() == ".KMX") {
+      std::vector<uint8_t> buf = load_kmx_file(kb_path);
+      status = km_core_keyboard_load_from_blob_internal(kb_path.stem().c_str(), buf, (km_core_keyboard**)&kp);
+      if (status != KM_CORE_STATUS_OK) {
+        return status;
+      }
+    } else if (kb_path.suffix() == ".mock") {
+      kp = new mock_processor(kb_path);
+    } else {
+      kp = new null_processor();
+    }
+    status = kp->validate();
     if (status != KM_CORE_STATUS_OK) {
       delete kp;
       return status;
@@ -67,6 +143,7 @@ km_core_keyboard_load(km_core_path_name kb_path, km_core_keyboard **keyboard)
   }
   return KM_CORE_STATUS_OK;
 }
+// END DEPRECATED
 
 void
 km_core_keyboard_dispose(km_core_keyboard *keyboard)
diff --git a/core/src/kmx/kmx_file.cpp b/core/src/kmx/kmx_file.cpp
index 8258c93b8a0..2eea0185813 100644
--- a/core/src/kmx/kmx_file.cpp
+++ b/core/src/kmx/kmx_file.cpp
@@ -13,9 +13,9 @@ using namespace kmx;
 #include <share.h>
 #endif
 
-KMX_BOOL KMX_ProcessEvent::Load(km_core_path_name KeyboardName)
-{
-  if(!LoadKeyboard(KeyboardName, &m_keyboard.Keyboard)) return FALSE;   // I5136
+KMX_BOOL KMX_ProcessEvent::Load(PKMX_BYTE buf, size_t sz) {
+  if(!LoadKeyboardFromBlob(buf, sz, &m_keyboard.Keyboard))
+    return FALSE;   // I5136
 
   return TRUE;
 }
@@ -51,50 +51,22 @@ const int km::core::kmx::CODE__SIZE[] = {
 // Ensure that all CODE_### sizes are defined
 static_assert(sizeof(CODE__SIZE) / sizeof(CODE__SIZE[0]) == (CODE_LASTCODE + 1), "Size of array CODE__SIZE not correct");
 
-
-
-KMX_BOOL KMX_ProcessEvent::LoadKeyboard(km_core_path_name fileName, LPKEYBOARD *lpKeyboard)
-{
-  PKMX_BYTE buf;
-  FILE *fp;
+KMX_BOOL KMX_ProcessEvent::LoadKeyboardFromBlob(
+  PKMX_BYTE original_buf,
+  size_t sz,
+  LPKEYBOARD* lpKeyboard
+) {
   LPKEYBOARD kbp;
+  PKMX_BYTE buf;
   PKMX_BYTE filebase;
 
-  DebugLog("Loading file '%s'", fileName);
-  if(!fileName || !lpKeyboard)
-  {
-    DebugLog("Bad Filename");
-    return FALSE;
-  }
-
-#if defined(_WIN32) || defined(_WIN64)
-  fp = _wfsopen(fileName, L"rb", _SH_DENYWR);
-#else
-  fp = fopen(fileName, "rb");
-#endif
-  if(fp == NULL)
-  {
-    DebugLog("Could not open file");
-    return FALSE;
-  }
-
-  if (fseek(fp, 0, SEEK_END) != 0) {
-    fclose(fp);
-    DebugLog("Could not fseek file");
-    return FALSE;
-  }
 
-  auto sz = ftell(fp);
-  if (sz < 0) {
-    fclose(fp);
+  if (!lpKeyboard || !original_buf) {
+    DebugLog("Invalid parameter");
     return FALSE;
   }
 
-  if (fseek(fp, 0, SEEK_SET) != 0) {
-    fclose(fp);
-    DebugLog("Could not fseek(set) file");
-    return FALSE;
-  }
+  *lpKeyboard = NULL;
 
 #ifdef KMX_64BIT
   // allocate enough memory for expanded data structure + original data.
@@ -108,57 +80,55 @@ KMX_BOOL KMX_ProcessEvent::LoadKeyboard(km_core_path_name fileName, LPKEYBOARD *
   buf = new KMX_BYTE[sz];
 #endif
 
-  if(!buf)
-  {
-    fclose(fp);
+  if (!buf) {
     DebugLog("Not allocmem");
     return FALSE;
   }
 #ifdef KMX_64BIT
-  filebase = buf + sz*2;
+  filebase = buf + sz * 2;
 #else
   filebase = buf;
 #endif
+  memcpy(filebase, original_buf, sz);
 
-  if (fread(filebase, 1, sz, fp) < (size_t) sz) {
-    fclose(fp);
-    DebugLog("Could not read file");
+  if (*PKMX_DWORD(filebase) != KMX_DWORD(FILEID_COMPILED)) {
+    DebugLog("Invalid keyboard - signature is invalid");
+    delete[] buf;
     return FALSE;
   }
 
-  fclose(fp);
-
-  if(*PKMX_DWORD(filebase) != KMX_DWORD(FILEID_COMPILED))
-  {
-    delete [] buf;
-    DebugLog("Invalid file - signature is invalid");
+  if (!VerifyKeyboard(filebase, sz)) {
+    DebugLog("Verify keyboard failed");
+    delete[] buf;
     return FALSE;
   }
 
-  if(!VerifyKeyboard(filebase, sz)) return FALSE;
-
 #ifdef KMX_64BIT
   kbp = CopyKeyboard(buf, filebase);
 #else
   kbp = FixupKeyboard(buf, filebase);
 #endif
 
-  if(!kbp) return FALSE;
+  if (!kbp) {
+    DebugLog("Can't copy/fixup keyboard");
+    delete[] buf;
+    return FALSE;
+  }
 
-  if(kbp->dwIdentifier != FILEID_COMPILED) {
-    delete [] buf;
+  if (kbp->dwIdentifier != FILEID_COMPILED) {
     DebugLog("errNotFileID");
+    delete[] buf;
     return FALSE;
   }
 
   *lpKeyboard = kbp;
-
   return TRUE;
 }
 
 PKMX_WCHAR KMX_ProcessEvent::StringOffset(PKMX_BYTE base, KMX_DWORD offset)
 {
-  if(offset == 0) return NULL;
+  if(offset == 0)
+    return NULL;
   return (PKMX_WCHAR)(base + offset);
 }
 
diff --git a/core/src/kmx/kmx_processevent.h b/core/src/kmx/kmx_processevent.h
index 50e84c996d8..090488dccb4 100644
--- a/core/src/kmx/kmx_processevent.h
+++ b/core/src/kmx/kmx_processevent.h
@@ -54,7 +54,7 @@ class KMX_ProcessEvent {
   KMX_DWORD m_modifiers = 0;
 
   /* File loading */
-  KMX_BOOL LoadKeyboard(km_core_path_name fileName, LPKEYBOARD *lpKeyboard);
+  KMX_BOOL LoadKeyboardFromBlob(PKMX_BYTE buf, size_t sz, LPKEYBOARD* lpKeyboard);
   KMX_BOOL VerifyKeyboard(PKMX_BYTE filebase, size_t sz);
   KMX_BOOL VerifyChecksum(PKMX_BYTE buf,  size_t sz);
 #ifdef KMX_64BIT
@@ -96,7 +96,7 @@ class KMX_ProcessEvent {
   KMX_ProcessEvent();
   ~KMX_ProcessEvent();
 
-  KMX_BOOL Load(km_core_path_name keyboardName);
+  KMX_BOOL Load(PKMX_BYTE buf, size_t sz);
   KMX_BOOL ProcessEvent(km_core_state *state, KMX_UINT vkey, KMX_DWORD modifiers, KMX_BOOL isKeyDown);  // returns FALSE on error or key not matched
 
   KMX_Actions *GetActions();
diff --git a/core/src/kmx/kmx_processor.cpp b/core/src/kmx/kmx_processor.cpp
index 95a9a094564..5bb0f801691 100644
--- a/core/src/kmx/kmx_processor.cpp
+++ b/core/src/kmx/kmx_processor.cpp
@@ -38,9 +38,8 @@ km_core_status kmx_processor::validate() const {
   return _valid ? KM_CORE_STATUS_OK : KM_CORE_STATUS_INVALID_KEYBOARD;
 }
 
-kmx_processor::kmx_processor(core::path p) {
-  p.replace_extension(".kmx");
-  _valid = bool(_kmx.Load(p.c_str()));
+kmx_processor::kmx_processor(std::u16string const& kb_name, const std::vector<uint8_t>& data) {
+  _valid = bool(_kmx.Load((PKMX_BYTE)data.data(), data.size()));
 
   if (!_valid)
     return;
@@ -57,8 +56,7 @@ kmx_processor::kmx_processor(core::path p) {
   auto v = _kmx.GetKeyboard()->Keyboard->version;
   auto vs = std::to_string(v >> 16) + "." + std::to_string(v & 0xffff);
 
-  _attributes = keyboard_attributes(static_cast<std::u16string>(p.stem()),
-                  std::u16string(vs.begin(), vs.end()), p.parent(), defaults);
+  _attributes = keyboard_attributes(kb_name, std::u16string(vs.begin(), vs.end()), defaults);
 }
 
 char16_t const *
@@ -413,4 +411,3 @@ km_core_keyboard_imx * kmx_processor::get_imx_list() const  {
   imx_list[fn_idx] =  KM_CORE_KEYBOARD_IMX_END;
   return imx_list;
 }
-
diff --git a/core/src/kmx/kmx_processor.hpp b/core/src/kmx/kmx_processor.hpp
index 08b2c1d242f..26b8b2b456b 100644
--- a/core/src/kmx/kmx_processor.hpp
+++ b/core/src/kmx/kmx_processor.hpp
@@ -29,7 +29,7 @@ namespace core
       );
 
   public:
-    kmx_processor(path);
+    kmx_processor(std::u16string const& kb_name, const std::vector<uint8_t>& data);
 
     km_core_status
     process_event(
diff --git a/core/src/ldml/ldml_processor.cpp b/core/src/ldml/ldml_processor.cpp
index fcadda629cb..730ea977200 100644
--- a/core/src/ldml/ldml_processor.cpp
+++ b/core/src/ldml/ldml_processor.cpp
@@ -5,7 +5,6 @@
   Authors:      Marc Durdin (MD)
 */
 
-#include <fstream>
 #include <algorithm>
 #include "ldml/ldml_processor.hpp"
 #include "ldml/ldml_transforms.hpp"
@@ -36,19 +35,15 @@ namespace {
 namespace km {
 namespace core {
 
-
-ldml_processor::ldml_processor(path const & kb_path, const std::vector<uint8_t> &data)
-: abstract_processor(
-    keyboard_attributes(kb_path.stem(), KM_CORE_LMDL_PROCESSOR_VERSION, kb_path.parent(), {})
-  ), _valid(false), transforms(), bksp_transforms(), keys(), normalization_disabled(false)
-{
-
+ldml_processor::ldml_processor(std::u16string const& kb_name, const std::vector<uint8_t>& data)
+    : abstract_processor(keyboard_attributes(kb_name, KM_CORE_LMDL_PROCESSOR_VERSION, {})),
+      _valid(false), transforms(), bksp_transforms(), keys(), normalization_disabled(false) {
   if(data.size() <= sizeof(kmx::COMP_KEYBOARD_EX)) {
     DebugLog("data.size %zu too small", data.size());
     return;
   }
 
-//   // Locate the structs here, but still retain ptrs to the raw structs.
+  // Locate the structs here, but still retain ptrs to the raw structs.
   kmx::KMX_FileValidator* comp_keyboard = (kmx::KMX_FileValidator*)data.data();
 
   // Perform the standard validation
@@ -116,40 +111,22 @@ ldml_processor::ldml_processor(path const & kb_path, const std::vector<uint8_t>
   _valid = true;
 }
 
-bool ldml_processor::is_kmxplus_file(path const & kb_path, std::vector<uint8_t>& data) {
-// TODO-LDML: we should refactor all the core components to delegate file loading
-//            to the Engine, which requires an API change, but this makes delivery
-//            of keyboard files more flexible under more WASM.
-
-  std::ifstream file(static_cast<std::string>(kb_path), std::ios::binary | std::ios::ate);
-  if(!file.good()) {
-    return false;
-  }
-  const std::streamsize size = file.tellg();
-  if(size >= KMX_MAX_ALLOWED_FILE_SIZE) {
+bool ldml_processor::is_kmxplus_file(const std::vector<uint8_t> & data) {
+  if (data.empty()) {
     return false;
   }
 
-  file.seekg(0, std::ios::beg);
-
-  data.resize((size_t)size);
-  if(!file.read((char *) data.data(), size)) {
-    return false;
-  }
-
-  file.close();
-
   const kmx::PCOMP_KEYBOARD comp_keyboard = (kmx::PCOMP_KEYBOARD)data.data();
 
-  if(comp_keyboard->dwIdentifier != KMX_DWORD(FILEID_COMPILED)) {
+  if (comp_keyboard->dwIdentifier != KMX_DWORD(FILEID_COMPILED)) {
     return false;
   }
 
-  if(comp_keyboard->dwFileVersion < VERSION_160 || (comp_keyboard->dwFlags & KF_KMXPLUS) == 0) {
+  if (comp_keyboard->dwFileVersion < VERSION_160 || (comp_keyboard->dwFlags & KF_KMXPLUS) == 0) {
     return false;
   }
 
-  // A KMXPlus file is in the buffer (although more validation is required and will
+  // The buffer contains KMXPlus data (although more validation is required and will
   // be done in the constructor)
   return true;
 }
diff --git a/core/src/ldml/ldml_processor.hpp b/core/src/ldml/ldml_processor.hpp
index fa5fada27ed..b3413a417be 100644
--- a/core/src/ldml/ldml_processor.hpp
+++ b/core/src/ldml/ldml_processor.hpp
@@ -30,13 +30,12 @@ class ldml_event_state;
 class ldml_processor : public abstract_processor {
   public:
     ldml_processor(
-      path const & kb_path,
+      std::u16string const& kb_name,
       const std::vector<uint8_t> & data
     );
 
     static bool is_kmxplus_file(
-      path const & kb_path,
-      std::vector<uint8_t>& data
+      const std::vector<uint8_t> & data
     );
 
     km_core_status
diff --git a/core/src/mock/mock_processor.cpp b/core/src/mock/mock_processor.cpp
index d78ab5ef0e0..3f50b35d12d 100644
--- a/core/src/mock/mock_processor.cpp
+++ b/core/src/mock/mock_processor.cpp
@@ -74,7 +74,7 @@ namespace km {
   {
     mock_processor::mock_processor(core::path const & path)
     : abstract_processor(
-        keyboard_attributes(path.stem(), u"3.145", path.parent(), {
+        keyboard_attributes(path.stem(), u"3.145", {
           option{KM_CORE_OPT_KEYBOARD, u"__test_point", u"not tiggered"},
         })),
       _options({
diff --git a/core/src/mock/mock_processor.hpp b/core/src/mock/mock_processor.hpp
index 97a7b82ab44..2401423f512 100644
--- a/core/src/mock/mock_processor.hpp
+++ b/core/src/mock/mock_processor.hpp
@@ -75,7 +75,7 @@ namespace core
   public:
     null_processor(): mock_processor(path())
     {
-      _attributes = keyboard_attributes(u"null", u"0.0", path(), {});
+      _attributes = keyboard_attributes(u"null", u"0.0", {});
     }
 
     km_core_status validate() const override;
diff --git a/core/src/util_normalize_table_generator.cpp b/core/src/util_normalize_table_generator.cpp
index 994f16d8b37..28edf68188a 100644
--- a/core/src/util_normalize_table_generator.cpp
+++ b/core/src/util_normalize_table_generator.cpp
@@ -17,7 +17,6 @@
 
 #include "core_icu.h"
 
-#include <fstream>
 #include <iostream>
 #include <string>
 #include <vector>
diff --git a/core/subprojects/.gitignore b/core/subprojects/.gitignore
index 99479aa952c..0161ac6349f 100644
--- a/core/subprojects/.gitignore
+++ b/core/subprojects/.gitignore
@@ -2,3 +2,4 @@
 /*.zip
 /*.tgz
 /packagecache
+/googletest*/
diff --git a/core/subprojects/gtest.wrap b/core/subprojects/gtest.wrap
new file mode 100644
index 00000000000..a77eb315bfa
--- /dev/null
+++ b/core/subprojects/gtest.wrap
@@ -0,0 +1,16 @@
+[wrap-file]
+directory = googletest-1.14.0
+source_url = https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz
+source_filename = gtest-1.14.0.tar.gz
+source_hash = 8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7
+patch_filename = gtest_1.14.0-2_patch.zip
+patch_url = https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.14.0-2/gtest_1.14.0-2_patch.zip
+patch_hash = 4ec7f767364386a99f7b2d61678287a73ad6ba0f9998be43b51794c464a63732
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.14.0-2/gtest-1.14.0.tar.gz
+wrapdb_version = 1.14.0-2
+
+[provide]
+gtest = gtest_dep
+gtest_main = gtest_main_dep
+gmock = gmock_dep
+gmock_main = gmock_main_dep
diff --git a/core/tests/unit/km_core_keyboard_api.tests.cpp b/core/tests/unit/km_core_keyboard_api.tests.cpp
new file mode 100644
index 00000000000..caaa0ec720a
--- /dev/null
+++ b/core/tests/unit/km_core_keyboard_api.tests.cpp
@@ -0,0 +1,71 @@
+// Copyright (c) 2024 SIL International
+// This software is licensed under the MIT license (http://opensource.org/licenses/MIT)
+
+#include <fstream>
+#include <gtest/gtest.h>
+
+#include <keyman/keyman_core_api.h>
+#include "emscripten_filesystem.h"
+#include "load_kmx_file.hpp"
+
+km::core::path test_dir;
+
+// TODO-web-core: Remove this code when we remove the deprecated km_core_keyboard_load method
+// BEGIN DEPRECATED
+#if defined(__GNUC__) || defined(__clang__)
+#define PRAGMA(X) _Pragma(#X)
+#define DISABLE_WARNING_PUSH PRAGMA(GCC diagnostic push)
+#define DISABLE_WARNING_POP PRAGMA(GCC diagnostic pop)
+#define DISABLE_WARNING(W) PRAGMA(GCC diagnostic ignored #W)
+#define DISABLE_WARNING_DEPRECATED_DECLARATIONS DISABLE_WARNING(-Wdeprecated-declarations)
+#else
+#define DISABLE_WARNING_PUSH
+#define DISABLE_WARNING_POP
+#define DISABLE_WARNING_DEPRECATED_DECLARATIONS
+#endif
+
+TEST(km_core_keyboard_api, load_from_file) {
+  // Setup
+  km_core_keyboard* keyboard = nullptr;
+  km::core::path kmxfile = km::core::path(test_dir / "kmx/k_020___deadkeys_and_backspace.kmx");
+
+  // Execute
+  DISABLE_WARNING_PUSH
+  DISABLE_WARNING_DEPRECATED_DECLARATIONS
+  auto status = km_core_keyboard_load(kmxfile.c_str(), &keyboard);
+  DISABLE_WARNING_POP
+
+  // Verify
+  EXPECT_EQ(status, KM_CORE_STATUS_OK);
+  EXPECT_TRUE(keyboard != nullptr);
+}
+// END DEPRECATED
+
+TEST(km_core_keyboard_api, load_from_blob) {
+  // Setup
+  km_core_keyboard* keyboard = nullptr;
+
+  km::core::path kmxfile = km::core::path(test_dir / "kmx/k_020___deadkeys_and_backspace.kmx");
+
+  std::vector<uint8_t> data = km::tests::load_kmx_file(kmxfile.native());
+  ASSERT_TRUE(data.size() > 0);
+
+  // Execute
+  auto status = km_core_keyboard_load_from_blob(kmxfile.stem().c_str(), data.data(), data.size(), &keyboard);
+
+  // Verify
+  EXPECT_EQ(status, KM_CORE_STATUS_OK);
+  EXPECT_TRUE(keyboard != nullptr);
+}
+
+// provide our own `main` so that we can get the path of the exe so that
+// we have a well-defined location to find our test keyboards
+int main(int argc, char **argv) {
+#ifdef __EMSCRIPTEN__
+  test_dir = get_wasm_file_path(km::core::path(argv[0]).parent());
+#else
+  test_dir = km::core::path(argv[0]).parent();
+#endif
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/core/tests/unit/kmnkbd/action_set_api.cpp b/core/tests/unit/kmnkbd/action_set_api.cpp
index 544d64a7571..4806eb4ac94 100644
--- a/core/tests/unit/kmnkbd/action_set_api.cpp
+++ b/core/tests/unit/kmnkbd/action_set_api.cpp
@@ -14,6 +14,7 @@
 
 #include <test_assert.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 const km_core_action_item alert_action_item();
 const km_core_action_item bksp_action_item(uint8_t type, uintptr_t value);
@@ -57,7 +58,9 @@ void setup(const char *keyboard, const km_core_cu* context) {
   teardown();
 
   km::core::path path = km::core::path::join(arg_path, keyboard);
-  try_status(km_core_keyboard_load(path.native().c_str(), &test_kb));
+
+  auto blob = km::tests::load_kmx_file(path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(path.stem().c_str(), blob.data(), blob.size(), &test_kb));
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
   try_status(context_items_from_utf16(context, &citems));
   try_status(km_core_context_set(km_core_state_context(test_state), citems));
diff --git a/core/tests/unit/kmnkbd/debug_api.cpp b/core/tests/unit/kmnkbd/debug_api.cpp
index 6542f3c378f..9a0d771e041 100644
--- a/core/tests/unit/kmnkbd/debug_api.cpp
+++ b/core/tests/unit/kmnkbd/debug_api.cpp
@@ -22,6 +22,7 @@
 
 #include <test_assert.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 using namespace km::core::kmx;
 
@@ -54,8 +55,8 @@ void setup(const char *keyboard) {
   teardown();
 
   km::core::path path = km::core::path::join(arg_path, keyboard);
-
-  try_status(km_core_keyboard_load(path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(path.stem().c_str(), blob.data(), blob.size(), &test_kb));
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
   try_status(context_items_from_utf16(u"Hello 😁", &citems));
 
diff --git a/core/tests/unit/kmnkbd/keyboard_api.cpp b/core/tests/unit/kmnkbd/keyboard_api.cpp
index bf232d69afb..07dfb3e4cfc 100644
--- a/core/tests/unit/kmnkbd/keyboard_api.cpp
+++ b/core/tests/unit/kmnkbd/keyboard_api.cpp
@@ -8,8 +8,7 @@
 
 #include "keyman_core.h"
 #include "path.hpp"
-
-//#include "keyboard.hpp"
+#include "mock/mock_processor.hpp"
 
 namespace
 {
@@ -26,14 +25,11 @@ int main(int, char *[])
   km_core_keyboard_key * kb_key_list = nullptr;
   km_core_keyboard_imx * kb_imx_list = nullptr;
 
-  try_status(km_core_keyboard_load(test_kb_path.c_str(), &test_kb));
+  test_kb = (km_core_keyboard *)new km::core::mock_processor(test_kb_path);
   try_status(km_core_keyboard_get_attrs(test_kb, &kb_attrs));
   try_status(km_core_keyboard_get_key_list(test_kb,&kb_key_list));
   try_status(km_core_keyboard_get_imx_list(test_kb,&kb_imx_list));
 
-  if (kb_attrs->folder_path != test_kb_path.parent())
-    return __LINE__;
-
   km_core_keyboard_dispose(test_kb);
   km_core_keyboard_key_list_dispose(kb_key_list);
   km_core_keyboard_imx_list_dispose(kb_imx_list);
diff --git a/core/tests/unit/kmnkbd/state_api.cpp b/core/tests/unit/kmnkbd/state_api.cpp
index 1da70c33faf..6e67ffb9324 100644
--- a/core/tests/unit/kmnkbd/state_api.cpp
+++ b/core/tests/unit/kmnkbd/state_api.cpp
@@ -14,6 +14,7 @@
 #include "path.hpp"
 #include "state.hpp"
 #include "action_items.hpp"
+#include "mock/mock_processor.hpp"
 
 #include <test_assert.h>
 
@@ -52,7 +53,6 @@ constexpr char const *doc1_expected = u8"\
     \"$schema\" : \"keyman/core/doc/introspection.schema\",\n\
     \"keyboard\" : {\n\
         \"id\" : \"dummy\",\n\
-        \"folder\" : \"\",\n\
         \"version\" : \"3.145\",\n\
         \"rules\" : []\n\
     },\n\
@@ -78,7 +78,6 @@ constexpr char const *doc2_expected = u8"\
     \"$schema\" : \"keyman/core/doc/introspection.schema\",\n\
     \"keyboard\" : {\n\
         \"id\" : \"dummy\",\n\
-        \"folder\" : \"\",\n\
         \"version\" : \"3.145\",\n\
         \"rules\" : []\n\
     },\n\
@@ -112,7 +111,7 @@ int main(int argc, char * argv[])
   km_core_keyboard * test_kb = nullptr;
   km_core_state * test_state = nullptr,
                * test_clone = nullptr;
-  try_status(km_core_keyboard_load(km::core::path("dummy.mock").c_str(), &test_kb));
+  test_kb = (km_core_keyboard *)new km::core::mock_processor(km::core::path("dummy.mock"));
 
   // Simple sanity tests.
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
diff --git a/core/tests/unit/kmnkbd/state_context_api.cpp b/core/tests/unit/kmnkbd/state_context_api.cpp
index f4df98c5391..b7f4efbcc2a 100644
--- a/core/tests/unit/kmnkbd/state_context_api.cpp
+++ b/core/tests/unit/kmnkbd/state_context_api.cpp
@@ -5,8 +5,10 @@
 
 #include "context.hpp"
 #include "path.hpp"
+#include "mock/mock_processor.hpp"
 
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 #include <test_assert.h>
 
 //-------------------------------------------------------------------------------------
@@ -41,7 +43,14 @@ setup(const char *keyboard, const km_core_cu *context, bool setup_app_context =
   teardown();
 
   km::core::path path = km::core::path::join(arg_path, keyboard);
-  try_status(km_core_keyboard_load(path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(path.native().c_str());
+  const auto mock_extension = ".mock";
+  if (strlen(keyboard) > strlen(mock_extension) && strcmp(keyboard + strlen(keyboard) - strlen(mock_extension), mock_extension) == 0) {
+    km::core::abstract_processor* kp = new km::core::mock_processor(keyboard);
+    test_kb = static_cast<km_core_keyboard*>(kp);
+  } else {
+    try_status(km_core_keyboard_load_from_blob(path.stem().c_str(), blob.data(), blob.size(), &test_kb));
+  }
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
   try_status(context_items_from_utf16(context, &citems));
   try_status(km_core_context_set(km_core_state_context(test_state), citems));
diff --git a/core/tests/unit/kmnkbd/test_actions_get_api.cpp b/core/tests/unit/kmnkbd/test_actions_get_api.cpp
index ead21762957..579f02e5ced 100644
--- a/core/tests/unit/kmnkbd/test_actions_get_api.cpp
+++ b/core/tests/unit/kmnkbd/test_actions_get_api.cpp
@@ -15,6 +15,7 @@
 
 #include <test_assert.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 km_core_option_item test_env_opts[] =
 {
@@ -48,7 +49,8 @@ void setup(const km_core_cu *app_context, const km_core_cu *cached_context, int
   teardown();
 
   km::core::path path = km::core::path::join(arg_path, "..", "ldml", "keyboards", "k_001_tiny.kmx");
-  try_status(km_core_keyboard_load(path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(path.stem().c_str(), blob.data(), blob.size(), &test_kb));
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
 
   try_status(set_context_from_string(km_core_state_context(test_state), cached_context));
diff --git a/core/tests/unit/kmnkbd/test_actions_normalize.cpp b/core/tests/unit/kmnkbd/test_actions_normalize.cpp
index f9044c5f322..aa4150ef9ad 100644
--- a/core/tests/unit/kmnkbd/test_actions_normalize.cpp
+++ b/core/tests/unit/kmnkbd/test_actions_normalize.cpp
@@ -15,6 +15,7 @@
 
 #include <test_assert.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 void compare_context(km_core_context *app_context, const km_core_cu* expected_final_app_context);
 
@@ -46,7 +47,8 @@ void setup(const km_core_cu *app_context, const km_core_cu *cached_context_strin
   teardown();
 
   km::core::path path = km::core::path::join(arg_path, "..", "ldml", "keyboards", "k_001_tiny.kmx");
-  try_status(km_core_keyboard_load(path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(path.stem().c_str(), blob.data(), blob.size(), &test_kb));
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
 
   if(cached_context_string) {
diff --git a/core/tests/unit/kmx/kmx.cpp b/core/tests/unit/kmx/kmx.cpp
index 2a83a11cd57..6dc3d69d68d 100644
--- a/core/tests/unit/kmx/kmx.cpp
+++ b/core/tests/unit/kmx/kmx.cpp
@@ -29,6 +29,7 @@
 #include <test_assert.h>
 #include <test_color.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 #include "kmx_test_source.hpp"
 
@@ -191,7 +192,8 @@ run_test(const km::core::path &source, const km::core::path &compiled) {
   km_core_keyboard * test_kb = nullptr;
   km_core_state * test_state = nullptr;
 
-  try_status(km_core_keyboard_load(compiled.c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(compiled.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(compiled.stem().c_str(), blob.data(), blob.size(), &test_kb));
 
   // Setup state, environment
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
diff --git a/core/tests/unit/kmx/kmx_external_event.cpp b/core/tests/unit/kmx/kmx_external_event.cpp
index d5d48c8ad67..a7ad4d750ab 100644
--- a/core/tests/unit/kmx/kmx_external_event.cpp
+++ b/core/tests/unit/kmx/kmx_external_event.cpp
@@ -14,6 +14,7 @@
 #include <test_assert.h>
 #include <test_color.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 #include <map>
 #include <iostream>
@@ -43,7 +44,8 @@ void test_external_event(const km::core::path &source_file){
 
   km::core::path full_path = source_file;
 
-  try_status(km_core_keyboard_load(full_path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(full_path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(full_path.stem().c_str(), blob.data(), blob.size(), &test_kb));
 
   // Setup state, environment
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
diff --git a/core/tests/unit/kmx/kmx_imx.cpp b/core/tests/unit/kmx/kmx_imx.cpp
index 12b3bc9455d..698bbb8fe55 100644
--- a/core/tests/unit/kmx/kmx_imx.cpp
+++ b/core/tests/unit/kmx/kmx_imx.cpp
@@ -14,6 +14,7 @@
 #include <test_assert.h>
 #include <test_color.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 #include "utfcodec.hpp"
 
 #include <map>
@@ -164,7 +165,8 @@ void test_imx_list(const km::core::path &source_file){
 
   km::core::path full_path = source_file;
 
-  try_status(km_core_keyboard_load(full_path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(full_path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(full_path.stem().c_str(), blob.data(), blob.size(), &test_kb));
 
   // Setup state, environment
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
@@ -211,7 +213,8 @@ void test_queue_actions (const km::core::path &source_keyboard) {
 
   km::core::path full_path = source_keyboard;
 
-  try_status(km_core_keyboard_load(full_path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(full_path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(full_path.stem().c_str(), blob.data(), blob.size(), &test_kb));
 
   // Setup state, environment
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
diff --git a/core/tests/unit/kmx/kmx_key_list.cpp b/core/tests/unit/kmx/kmx_key_list.cpp
index 25f3e836a2b..d4aa9b4e93f 100644
--- a/core/tests/unit/kmx/kmx_key_list.cpp
+++ b/core/tests/unit/kmx/kmx_key_list.cpp
@@ -15,6 +15,7 @@
 #include <test_assert.h>
 #include <test_color.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 using namespace km::core::kmx;
 
@@ -56,7 +57,8 @@ void test_key_list(const km::core::path &source_file){
 
   km::core::path full_path = source_file;
 
-  try_status(km_core_keyboard_load(full_path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(full_path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(full_path.stem().c_str(), blob.data(), blob.size(), &test_kb));
 
   // Setup state, environment
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
diff --git a/core/tests/unit/ldml/core_ldml_min.cpp b/core/tests/unit/ldml/core_ldml_min.cpp
index ed7ea1b3fd5..72090263a61 100644
--- a/core/tests/unit/ldml/core_ldml_min.cpp
+++ b/core/tests/unit/ldml/core_ldml_min.cpp
@@ -14,6 +14,7 @@
 #include <assert.h>
 
 #include "keyman_core.h"
+#include "../load_kmx_file.hpp"
 
 int main(int argc, const char *argv[]) {
 
@@ -22,7 +23,8 @@ int main(int argc, const char *argv[]) {
 
     km_core_status status;
     km_core_path_name nowhere = {0}; // this is a narrow or wide char string
-    status = km_core_keyboard_load(nowhere, &test_kb);
+    auto blob = km::tests::load_kmx_file(nowhere);
+    status = km_core_keyboard_load_from_blob(nowhere, blob.data(), blob.size(), &test_kb);
 
     std::cerr << "null km_core_keyboard_load = " << status << std::endl;
     assert(status == KM_CORE_STATUS_INVALID_ARGUMENT);
diff --git a/core/tests/unit/ldml/ldml.cpp b/core/tests/unit/ldml/ldml.cpp
index 12e0c94399a..339b1f0dc19 100644
--- a/core/tests/unit/ldml/ldml.cpp
+++ b/core/tests/unit/ldml/ldml.cpp
@@ -35,6 +35,7 @@
 #include "ldml/ldml_markers.hpp"
 
 #include "processor.hpp"
+#include "../load_kmx_file.hpp"
 
 namespace {
 
@@ -273,7 +274,8 @@ run_test(const km::core::path &source, const km::core::path &compiled, km::tests
   km_core_state * test_state = nullptr;
 
   const km_core_status expect_load_status = test_source.get_expected_load_status();
-  assert_equal(km_core_keyboard_load(compiled.c_str(), &test_kb), expect_load_status);
+  auto blob = km::tests::load_kmx_file(compiled.native().c_str());
+  assert_equal(km_core_keyboard_load_from_blob(compiled.stem().c_str(), blob.data(), blob.size(), &test_kb), expect_load_status);
 
   if (expect_load_status != KM_CORE_STATUS_OK) {
     std::cout << "Keyboard was expected to be invalid, so exiting " << std::endl;
diff --git a/core/tests/unit/ldml/ldml_test_source.cpp b/core/tests/unit/ldml/ldml_test_source.cpp
index f2cca9ee5fc..850b95c6146 100644
--- a/core/tests/unit/ldml/ldml_test_source.cpp
+++ b/core/tests/unit/ldml/ldml_test_source.cpp
@@ -40,6 +40,7 @@
 #include "unicode/uniset.h"
 #include "unicode/usetiter.h"
 
+#include "../load_kmx_file.hpp"
 #include <test_color.h>
 
 #define assert_or_return(expr) if(!(expr)) { \
@@ -56,8 +57,6 @@ namespace km {
 namespace tests {
 
 
-
-
 /** string munging */
 static void append_to_str(std::u16string &str, const char *buf) {
   const PKMX_WCHAR p = km::core::kmx::strtowstr((char *)buf); /** cast away const, unused*/
@@ -757,7 +756,8 @@ int LdmlJsonTestSourceFactory::load(const km::core::path &compiled, const km::co
   }
 
   // check and load the KMX (yes, once again)
-  if(!km::core::ldml_processor::is_kmxplus_file(compiled, rawdata)) {
+  rawdata = km::tests::load_kmx_file(compiled);
+  if (!km::core::ldml_processor::is_kmxplus_file(rawdata)) {
     std::cerr << "Reading KMX for test purposes failed: " << compiled << std::endl;
     return __LINE__;
   }
diff --git a/core/tests/unit/ldml/meson.build b/core/tests/unit/ldml/meson.build
index 20ad621b506..71fcf2fe1df 100644
--- a/core/tests/unit/ldml/meson.build
+++ b/core/tests/unit/ldml/meson.build
@@ -83,7 +83,10 @@ ldml = executable('ldml',
     )
 
 core_ldml_min = executable('core_ldml_min',
-    ['core_ldml_min.cpp'],
+    [
+      'core_ldml_min.cpp',
+      meson.current_source_dir() / '../load_kmx_file.cpp',
+    ],
     cpp_args: defns + warns,
     include_directories: [inc, libsrc],
     link_args: links,
diff --git a/core/tests/unit/ldml/test_context_normalization.cpp b/core/tests/unit/ldml/test_context_normalization.cpp
index df11ef76532..cda91cbf4df 100644
--- a/core/tests/unit/ldml/test_context_normalization.cpp
+++ b/core/tests/unit/ldml/test_context_normalization.cpp
@@ -13,6 +13,7 @@
 
 #include <test_assert.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 //-------------------------------------------------------------------------------------
 // Context normalization tests
@@ -42,7 +43,8 @@ void setup(const char *keyboard) {
   teardown();
 
   km::core::path path = km::core::path::join(arg_path, "keyboards", keyboard);
-  try_status(km_core_keyboard_load(path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(path.stem().c_str(), blob.data(), blob.size(), &test_kb));
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
 }
 
diff --git a/core/tests/unit/load_kmx_file.cpp b/core/tests/unit/load_kmx_file.cpp
new file mode 100644
index 00000000000..41ccea0cacc
--- /dev/null
+++ b/core/tests/unit/load_kmx_file.cpp
@@ -0,0 +1,34 @@
+#include <fstream>
+#include <iostream>
+#include <list>
+#include <string>
+
+#include "kmx_file.h"
+#include "path.hpp"
+#include "utfcodec.hpp"
+
+namespace km::tests {
+
+std::vector<uint8_t> load_kmx_file(km::core::path const& kb_path) {
+  std::vector<uint8_t> data;
+  std::ifstream file(static_cast<std::string>(kb_path), std::ios::binary | std::ios::ate);
+  if (file.fail()) {
+    return std::vector<uint8_t>();
+  }
+  const std::streamsize size = file.tellg();
+  if (size >= KMX_MAX_ALLOWED_FILE_SIZE) {
+    return std::vector<uint8_t>();
+  }
+
+  file.seekg(0, std::ios::beg);
+
+  data.resize((size_t)size);
+  if (!file.read((char*)data.data(), size)) {
+    return std::vector<uint8_t>();
+  }
+
+  file.close();
+  return data;
+}
+
+}
diff --git a/core/tests/unit/load_kmx_file.hpp b/core/tests/unit/load_kmx_file.hpp
new file mode 100644
index 00000000000..1a94b249c24
--- /dev/null
+++ b/core/tests/unit/load_kmx_file.hpp
@@ -0,0 +1,14 @@
+#ifndef __LOAD_KMX_FILE_HPP__
+#define __LOAD_KMX_FILE_HPP__
+
+#include "path.hpp"
+
+namespace km {
+namespace tests {
+
+std::vector<uint8_t> load_kmx_file(km::core::path const& kb_path);
+
+}
+}
+
+#endif  // __LOAD_KMX_FILE_HPP__
diff --git a/core/tests/unit/meson.build b/core/tests/unit/meson.build
index ee141cc12d3..ea8b74ea97a 100644
--- a/core/tests/unit/meson.build
+++ b/core/tests/unit/meson.build
@@ -1,13 +1,41 @@
 node = find_program('node', required: true)
 
-common_test_files = [
+gtest = subproject('gtest')
+gtest_dep = gtest.get_variable('gtest_dep')
+gmock_dep = gtest.get_variable('gmock_dep')
+
+test_util_files = [
   meson.current_source_dir() / 'emscripten_filesystem.cpp',
+  meson.current_source_dir() / 'load_kmx_file.cpp',
+]
+
+common_test_files = [
+  test_util_files,
   meson.global_source_root() / '../common/include/test_color.cpp'
 ]
 
 hextobin_root = meson.global_source_root() / '../common/tools/hextobin/build/hextobin.js'
 hextobin_cmd = [node, hextobin_root]
 
+if cpp_compiler.get_id() == 'emscripten'
+  extra_link_args = [ '-lnodefs.js' ]
+else
+  extra_link_args = []
+endif
+
+kmcorekeyboardapitests = executable('km_core_keyboard_api.tests',
+  [
+    'km_core_keyboard_api.tests.cpp',
+    test_util_files,
+  ],
+  include_directories: [inc, libsrc],
+  link_args: [ links, extra_link_args ],
+  dependencies: [icu_uc, icu_i18n, gtest_dep, gmock_dep],
+  objects: lib.extract_all_objects(recursive: false),
+)
+
+test('km-core-keyboard-api-tests', kmcorekeyboardapitests)
+
 subdir('json')
 subdir('utftest')
 subdir('kmnkbd')
diff --git a/linux/debian/libkeymancore2.symbols b/linux/debian/libkeymancore2.symbols
index 593e7aa7fc3..5a9db70ef0b 100644
--- a/linux/debian/libkeymancore2.symbols
+++ b/linux/debian/libkeymancore2.symbols
@@ -2,6 +2,7 @@ libkeymancore.so.2 libkeymancore2 #MINVER#
 * Build-Depends-Package: libkeymancore-dev
 
  (c++|optional)"typeinfo name for std::codecvt_utf8_utf16<char16_t, 1114111ul, (std::codecvt_mode)0>@Base" 17.0.244
+ (c++|optional)std::piecewise_construct@Base 18.0.101
  km_core_context_clear@Base 17.0.195
  km_core_context_get@Base 17.0.195
  km_core_context_item_list_size@Base 17.0.195
@@ -18,6 +19,7 @@ libkeymancore.so.2 libkeymancore2 #MINVER#
  km_core_keyboard_imx_list_dispose@Base 17.0.195
  km_core_keyboard_key_list_dispose@Base 17.0.195
  km_core_keyboard_load@Base 17.0.195
+ km_core_keyboard_load_from_blob@Base 18.0.101
  km_core_options_list_size@Base 17.0.195
  km_core_process_event@Base 17.0.195
  km_core_process_queued_actions@Base 17.0.195

From 840a773bdd6083374bb61e2571c344fa34446c59 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 26 Sep 2024 17:32:33 +0200
Subject: [PATCH 019/254] feat(web): throw scripError if script doesn't load
 keyboard

---
 .../keyboard/src/keyboards/loaders/domKeyboardLoader.ts       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
index 96d00bf4fda..0cbd5dfe0e0 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
+++ b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
@@ -59,6 +59,10 @@ export class DOMKeyboardLoader extends KeyboardLoaderBase {
       throw errorBuilder.scriptError(e);
     }
     const keyboard = this.harness.loadedKeyboard;
+    if (!keyboard) {
+      throw errorBuilder.scriptError();
+    }
+
     this.harness.loadedKeyboard = null;
     return keyboard;
   }

From de717cce58cbda1e44830d37e6e20764b74b964e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 26 Sep 2024 19:08:18 +0200
Subject: [PATCH 020/254] feat(web): address code review comments

---
 .../src/keyboards/keyboardLoaderBase.ts        | 18 +++++++++---------
 .../src/keyboards/loaders/domKeyboardLoader.ts |  6 ++++--
 .../keyboards/loaders/nodeKeyboardLoader.ts    |  4 ++--
 ...ader.spec.ts => domKeyboardLoader.tests.ts} |  0
 .../test/auto/dom/web-test-runner.config.mjs   |  2 +-
 .../keyboard/keyboardLoaderBase.tests.ts       |  2 ++
 web/src/tools/testing/test-utils/build.sh      |  8 ++++----
 7 files changed, 22 insertions(+), 18 deletions(-)
 rename web/src/test/auto/dom/cases/keyboard/{domKeyboardLoader.spec.ts => domKeyboardLoader.tests.ts} (100%)

diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
index eb12472dd8a..8ac7803a8b8 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
@@ -39,26 +39,26 @@ export abstract class KeyboardLoaderBase {
   }
 
   private async loadKeyboardInternal(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
-    const blob = await this.loadKeyboardBlob(uri, errorBuilder);
+    const byteArray = await this.loadKeyboardBlob(uri, errorBuilder);
+
+    if (byteArray.slice(0, 4) == Uint8Array.from([0x4b, 0x58, 0x54, 0x53])) { // 'KXTS'
+      // KMX or LDML (KMX+) keyboard
+      console.error("KMX keyboard loading is not yet implemented!");
+      return null;
+    }
 
     let script: string;
     try {
-      script = await blob.text();
+      script = new TextDecoder('utf-8', { fatal: true }).decode(byteArray);
     } catch (e) {
       throw errorBuilder.invalidKeyboard(e);
     }
 
-    if (script.startsWith('KXTS', 0)) {
-      // KMX or LDML (KMX+) keyboard
-      console.error("KMX keyboard loading is not yet implemented!");
-      return null;
-    }
-
     // .js keyboard
     return await this.loadKeyboardFromScript(script, errorBuilder);
   }
 
-  protected abstract loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Blob>;
+  protected abstract loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Uint8Array>;
 
   protected abstract loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard>;
 }
\ No newline at end of file
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
index 0cbd5dfe0e0..a6df76aff1b 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
+++ b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
@@ -29,7 +29,7 @@ export class DOMKeyboardLoader extends KeyboardLoaderBase {
     this.performCacheBusting = cacheBust || false;
   }
 
-  protected async loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Blob> {
+  protected async loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Uint8Array> {
     if (this.performCacheBusting) {
       uri = this.cacheBust(uri);
     }
@@ -45,11 +45,13 @@ export class DOMKeyboardLoader extends KeyboardLoaderBase {
       throw errorBuilder.keyboardDownloadError(new Error(`HTTP ${response.status} ${response.statusText}`));
     }
 
+    let buffer: ArrayBuffer;
     try {
-      return await response.blob();
+      buffer = await response.arrayBuffer();
     } catch (e) {
       throw errorBuilder.invalidKeyboard(e);
     }
+    return new Uint8Array(buffer);
   }
 
   protected async loadKeyboardFromScript(script: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
index 8f568840ffd..6ec27364fce 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
+++ b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
@@ -26,7 +26,7 @@ export class NodeKeyboardLoader extends KeyboardLoaderBase {
     }
   }
 
-  protected async loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Blob> {
+  protected async loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Uint8Array> {
     // `fs` does not like 'file:///'; it IS "File System" oriented, after all, and wants a path, not a URI.
     if (uri.indexOf('file:///') == 0) {
       uri = uri.substring('file:///'.length);
@@ -38,7 +38,7 @@ export class NodeKeyboardLoader extends KeyboardLoaderBase {
     } catch (err) {
       throw errorBuilder.keyboardDownloadError(err);
     }
-    return new Blob([buffer]);
+    return Uint8Array.from(buffer);
   }
 
   protected async loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
diff --git a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.spec.ts b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
similarity index 100%
rename from web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.spec.ts
rename to web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
diff --git a/web/src/test/auto/dom/web-test-runner.config.mjs b/web/src/test/auto/dom/web-test-runner.config.mjs
index d7df41baccb..5871f4e61e3 100644
--- a/web/src/test/auto/dom/web-test-runner.config.mjs
+++ b/web/src/test/auto/dom/web-test-runner.config.mjs
@@ -74,7 +74,7 @@ export default {
     {
       name: 'engine/keyboard',
       // Relative, from the containing package.json
-      files: ['build/test/dom/cases/keyboard/**/*.spec.mjs']
+      files: ['build/test/dom/cases/keyboard/**/*.tests.mjs']
     },
     {
       name: 'engine/keyboard-storage',
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
index 80fd0a21c2f..96699df9767 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
@@ -67,6 +67,8 @@ describe('Headless keyboard loading', function() {
       assert.equal(keyboard.id, "Keyboard_sil_ipa");
     });
 
+    // TODO-WEB-CORE: figure out what the purpose of this test is
+    // TODO-WEB-CORE: move to kbdInterface.tests.ts
     it('cannot evaluate rules', async function() {
       // -- START: Standard Recorder-based unit test loading boilerplate --
       const harness = new KeyboardHarness({}, MinimalKeymanGlobal);
diff --git a/web/src/tools/testing/test-utils/build.sh b/web/src/tools/testing/test-utils/build.sh
index 0ab8dc5a6e6..72248fa3048 100755
--- a/web/src/tools/testing/test-utils/build.sh
+++ b/web/src/tools/testing/test-utils/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Compile KeymanWeb's test-utils module
+# Compile KeymanWeb's automated js/ts test utilities
 
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
@@ -9,12 +9,12 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=tools/testing/test-utils
-. "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/web/common.inc.sh"
+. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
 
 ################################ Main script ################################
 
-builder_describe "Builds the Keyman Engine for Web's test-utils module" \
+builder_describe "Automated js/ts test utilities for KeymanWeb" \
   "clean" \
   "configure" \
   "build"

From c05cf0eff943cb055ddfb149970a786885809552 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 1 Oct 2024 15:33:55 +0200
Subject: [PATCH 021/254] feat(web): re-implement timeout error test

The previous approach with overriding `onload` no longer works if we use
indirect eval. However, since we now need to use a server anyways instead
of directly loading a file (because of Core), we can add a timeout to
the test server and implement this test in a cleaner way.
---
 web/src/test/manual/README.md                 | 10 +++++++
 .../manual/web/keyboard-errors/errorhdr.js    | 26 +++++++++----------
 .../manual/web/keyboard-errors/index.html     | 23 ++++++++++++++++
 .../manual/web/keyboard-errors/timeout.js     | 21 ---------------
 web/src/tools/testing/test-server/index.cjs   | 17 ++++++++++--
 5 files changed, 61 insertions(+), 36 deletions(-)
 create mode 100644 web/src/test/manual/README.md
 delete mode 100644 web/src/test/manual/web/keyboard-errors/timeout.js

diff --git a/web/src/test/manual/README.md b/web/src/test/manual/README.md
new file mode 100644
index 00000000000..5bd18f0d995
--- /dev/null
+++ b/web/src/test/manual/README.md
@@ -0,0 +1,10 @@
+# Manual tests
+
+To run the the manual tests, start the test web server with:
+
+```bash
+cd $KEYMAN_ROOT
+web/build.sh start
+```
+
+Then open <http://localhost:3000> in your browser.
diff --git a/web/src/test/manual/web/keyboard-errors/errorhdr.js b/web/src/test/manual/web/keyboard-errors/errorhdr.js
index b784f6a476c..9a0ad75939d 100644
--- a/web/src/test/manual/web/keyboard-errors/errorhdr.js
+++ b/web/src/test/manual/web/keyboard-errors/errorhdr.js
@@ -1,17 +1,15 @@
-// JavaScript Document samplehdr.js: Keyboard management for KeymanWeb demonstration pages
-
-/* 
+/*
     This script is designed to test KeymanWeb error message handling.
 */
 
-  function loadKeyboards() 
-  { 
+  function loadKeyboards()
+  {
     var kmw=keyman;
-    
+
     // We start by adding a keyboard correctly.  It's best to include a 'control' in our experiment.
     kmw.addKeyboards({id:'us',name:'English',languages:{id:'en',name:'English'},
       filename:'../us-1.0.js'});
-      
+
     // Insert a keyboard that cannot be found.
     kmw.addKeyboards({id:'lao_2008_basic',name:'wrong-filename',
       languages:{
@@ -19,9 +17,9 @@
         font:{family:'LaoWeb',source:['../font/saysettha_web.ttf','../font/saysettha_web.woff','../font/saysettha_web.eot']}
         },
       filename:'./missing_file.js' // Intentional error - the file doesn't exist, so the <script> tag will raise an error event.
-      });   
-	  
-	// Insert a keyboard that will generate a timing error.  
+    });
+
+    // Insert a keyboard that will generate a timing error.
     kmw.addKeyboards({id:'unparsable',name:'non-parsable',
       languages:{
         id:'lo',name:'debugging',region:'Asia',
@@ -29,14 +27,16 @@
         },
       filename:'./unparsable.js' // Intentional error - the file has no parsable keyboard, so while the <script> tag will load,
         // registration will fail.
-      });
+    });
 
-	// Insert a keyboard that will generate a timing error.  
+    // Insert a keyboard that will generate a timing error. `timeout.js` doesn't
+    // exist, but the test server (web/src/tools/testing/test-server/index.cjs)
+    // has special handling for that URL and times out after 10 seconds.
     kmw.addKeyboards({id:'timeout',name:'timeout',
       languages:{
         id:'lo',name:'debugging',region:'Asia',
         font:{family:'LaoWeb',source:['../font/saysettha_web.ttf','../font/saysettha_web.woff','../font/saysettha_web.eot']}
         },
       filename:'./timeout.js' // Intentional (simulated) error - the file never loads, simulating a server timeout.
-      }); 
+    });
   }
diff --git a/web/src/test/manual/web/keyboard-errors/index.html b/web/src/test/manual/web/keyboard-errors/index.html
index 011c9964724..7114d776364 100644
--- a/web/src/test/manual/web/keyboard-errors/index.html
+++ b/web/src/test/manual/web/keyboard-errors/index.html
@@ -65,9 +65,32 @@ <h3>Type in your language in this text area:</h3>
     <h3>or in this input field:</h3>
     <input class='test' value='' placeholder='or here'/>
 
+    <h2>Expected error messages:</h2>
+    <ul>
+      <li><i>wrong-filename</i> keyboard: "Unable to download wrong-filename keyboard for debugging"</li>
+      <li><i>non-parsable</i> keyboard: "Error registering the non-parsable keyboard for debugging; keyboard script at ./unparsable.js may contain an error."</li>
+      <li><i>timeout</i> keyboard: "Sorry, the timeout keyboard for debugging is not currently available."</li>
+    </ul>
+
     <h3><a href="../index.html">Return to testing home page</a></h3>
   </div>
 
+    <script>
+      if (!window.location.href.startsWith('http://localhost:3000')) {
+        const body = document.getElementsByTagName('body')[0];
+        body.innerHTML = `<h1>KeymanWeb Sample Page - Error Testing page</h1>
+        <h2>Unable to load this test page!</h2>
+        <p>This page has to be loaded through the local test server.</p>
+        <p>Do the following:</p>
+        <ol>
+          <li>Open a terminal and navigate to the Keyman source root directory</li>
+          <li>Start the test server with <code>web/build.sh start</code></li>
+          <li>Open <a href="http://localhost:3000/src/test/manual/web/keyboard-errors/index.html">http://localhost:3000/src/test/manual/web/keyboard-errors/index.html</a> in a browser</li>
+        </ol>
+        `;
+      }
+    </script>
+
   </body>
 
   <!--
diff --git a/web/src/test/manual/web/keyboard-errors/timeout.js b/web/src/test/manual/web/keyboard-errors/timeout.js
deleted file mode 100644
index d4e21179dfc..00000000000
--- a/web/src/test/manual/web/keyboard-errors/timeout.js
+++ /dev/null
@@ -1,21 +0,0 @@
-(function() {
-  var me = document.currentScript;
-  console.log(me);
-
-  var onload = me.onload;
-  if(onload) {
-    me.onload = null;
-  }
-
-  document.body.addEventListener('load', function(e) {
-    // Prevent the element's onload event from firing
-    if(e.srcElement == me || e.target == me) {
-      e.cancelBubble = true;
-    }
-  }, {capture: true});
-
-  window.setTimeout(function () {
-    // Restores the function after a slight delay.
-    me.onload = onload;
-  }, 1);
-})();
\ No newline at end of file
diff --git a/web/src/tools/testing/test-server/index.cjs b/web/src/tools/testing/test-server/index.cjs
index 80237e9f756..810b6632dc9 100644
--- a/web/src/tools/testing/test-server/index.cjs
+++ b/web/src/tools/testing/test-server/index.cjs
@@ -5,8 +5,21 @@ const port = 3000
 
 app.use(express.static(path.join(__dirname, '../../../../')))
 
+// for testing timeout error in web/src/test/manual/web/keyboard-errors
+const router = express.Router()
+router.get('/src/test/manual/web/keyboard-errors/timeout.js', async (req, res, next) => {
+  console.log('timeout.js requested')
+  return new Promise(() => {
+    setTimeout(() => {
+      res.set('Content-Type', 'application/json');
+      res.status(200);
+
+      next();
+    }, 10500); // > ContextManagerBase.TIMEOUT_THRESHOLD (10 seconds)
+  });
+})
+app.use(router)
+
 app.listen(port, () => {
   console.log(`Keyman test app listening on port ${port}`)
 })
-
-

From 1c88166f6eea3ebb27bb5bdd05c4704ea6afb4b3 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 2 Oct 2024 17:15:48 +0200
Subject: [PATCH 022/254] feat(core): instantiate different processor types in
 processor_factory

This moves instantiating the different processor types back to the
`processor_factory` by adding a new `is_handled` static method on the
different processors. Also addresses other code review comments.

Also add some more unit tests.
---
 core/include/keyman/keyman_core_api.h         | 12 +--
 core/src/km_core_keyboard_api.cpp             | 40 +++++-----
 core/src/kmx/kmx_processor.cpp                | 22 ++++++
 core/src/kmx/kmx_processor.hpp                |  2 +
 core/src/ldml/ldml_processor.cpp              | 17 ++--
 core/src/ldml/ldml_processor.hpp              |  4 +-
 core/src/mock/mock_processor.cpp              | 20 ++++-
 core/src/mock/mock_processor.hpp              |  8 ++
 .../tests/unit/km_core_keyboard_api.tests.cpp | 77 ++++++++++++++++---
 core/tests/unit/ldml/ldml_test_source.cpp     |  2 +-
 10 files changed, 159 insertions(+), 45 deletions(-)

diff --git a/core/include/keyman/keyman_core_api.h b/core/include/keyman/keyman_core_api.h
index 588b98085fe..3c41182bab2 100644
--- a/core/include/keyman/keyman_core_api.h
+++ b/core/include/keyman/keyman_core_api.h
@@ -1008,7 +1008,7 @@ typedef struct {
   km_core_cu const * version_string;
   km_core_cu const * id;
 
-  // TODO-web-core: Deprecate this field
+  // TODO-web-core: Deprecate this field (#12497)
   // KMN_DEPRECATED
   km_core_path_name  folder_path;
 
@@ -1108,7 +1108,7 @@ into the out parameter.
 ## Specification
 
 ```c */
-// TODO-web-core: Deprecate this function
+// TODO-web-core: Deprecate this function (#12497)
 // KMN_DEPRECATED_API
 KMN_API
 km_core_status
@@ -1159,9 +1159,9 @@ into the out paramter.
 
 ```c */
 KMN_API
-km_core_status km_core_keyboard_load_from_blob(km_core_path_name kb_name,
-                                               void* blob,
-                                               size_t blob_size,
+km_core_status km_core_keyboard_load_from_blob(const km_core_path_name kb_name,
+                                               const void* blob,
+                                               const size_t blob_size,
                                                km_core_keyboard** keyboard);
 
 /*
@@ -1176,7 +1176,7 @@ km_core_status km_core_keyboard_load_from_blob(km_core_path_name kb_name,
 : a byte array containing the content of a KMX/KMX+ file.
 
 `blob_size`
-: A pointer to a size_t variable with the size of the blob in bytes.
+: a size_t variable with the size of the blob in bytes.
 
 `keyboard`
 : A pointer to result variable: A pointer to the opaque keyboard
diff --git a/core/src/km_core_keyboard_api.cpp b/core/src/km_core_keyboard_api.cpp
index 79e8bbc3c67..f2f01df84cc 100644
--- a/core/src/km_core_keyboard_api.cpp
+++ b/core/src/km_core_keyboard_api.cpp
@@ -24,33 +24,33 @@ using namespace km::core;
 
 namespace
 {
-  abstract_processor* processor_factory(path const & kb_name, std::vector<uint8_t> buf) {
-    if (ldml_processor::is_kmxplus_file(buf)) {
-      abstract_processor* result = new ldml_processor(kb_name, buf);
-      return result;
+  abstract_processor* processor_factory(path const & kb_name, const std::vector<uint8_t> & buf) {
+    if (ldml_processor::is_handled(buf)) {
+      return new ldml_processor(kb_name, buf);
     }
-    return new kmx_processor(kb_name, buf);
+    if (kmx_processor::is_handled(buf)) {
+      return new kmx_processor(kb_name, buf);
+    }
+    if (mock_processor::is_handled(buf)) {
+      return new mock_processor(kb_name);
+    }
+    return new null_processor();
   }
 
 }  // namespace
 
 km_core_status
 km_core_keyboard_load_from_blob_internal(
-  km_core_path_name kb_name,
-  std::vector<uint8_t> buf,
+  const km_core_path_name kb_name,
+  const std::vector<uint8_t> & buf,
   km_core_keyboard** keyboard
 ) {
   assert(keyboard);
-  if (!keyboard)
+  if (!keyboard) {
     return KM_CORE_STATUS_INVALID_ARGUMENT;
-
-  if (buf.size() < 64) { // a KMX file is at least 64 bytes (KMX header)
-    return KM_CORE_STATUS_IO_ERROR;
   }
 
-  if (*PKMX_DWORD((KMX_BYTE*)buf.data()) != KMX_DWORD(FILEID_COMPILED)) {
-    return KM_CORE_STATUS_IO_ERROR;
-  }
+  *keyboard = nullptr;
   try {
     abstract_processor* kp = processor_factory(kb_name, buf);
     km_core_status status  = kp->validate();
@@ -67,14 +67,15 @@ km_core_keyboard_load_from_blob_internal(
 
 km_core_status
 km_core_keyboard_load_from_blob(
-  km_core_path_name kb_name,
-  void* blob,
-  size_t blob_size,
+  const km_core_path_name kb_name,
+  const void* blob,
+  const size_t blob_size,
   km_core_keyboard** keyboard
 ) {
   assert(keyboard);
-  if (!keyboard || !blob)
+  if (!keyboard || !blob) {
     return KM_CORE_STATUS_INVALID_ARGUMENT;
+  }
 
   std::vector<uint8_t> buf((uint8_t*)blob, (uint8_t*)blob + blob_size);
   return km_core_keyboard_load_from_blob_internal(kb_name, buf, keyboard);
@@ -110,8 +111,9 @@ km_core_status
 km_core_keyboard_load(km_core_path_name kb, km_core_keyboard **keyboard)
 {
   assert(keyboard);
-  if (!keyboard || !kb)
+  if (!keyboard || !kb) {
     return KM_CORE_STATUS_INVALID_ARGUMENT;
+  }
 
   path const kb_path(kb);
   try
diff --git a/core/src/kmx/kmx_processor.cpp b/core/src/kmx/kmx_processor.cpp
index 5bb0f801691..e3ecff6fde2 100644
--- a/core/src/kmx/kmx_processor.cpp
+++ b/core/src/kmx/kmx_processor.cpp
@@ -411,3 +411,25 @@ km_core_keyboard_imx * kmx_processor::get_imx_list() const  {
   imx_list[fn_idx] =  KM_CORE_KEYBOARD_IMX_END;
   return imx_list;
 }
+
+/**
+ * Returns true the data is a KMX file, i.e. starts with 'KXTS'.
+ *
+ * @param data  the keyboard blob
+ * @return true if the processor can handle the keyboard, otherwise false.
+ */
+bool kmx_processor::is_handled(const std::vector<uint8_t>& data) {
+  if (data.empty()) {
+    return false;
+  }
+
+  if (data.size() < 64) {  // a KMX file is at least 64 bytes (KMX header)
+    return false;
+  }
+
+  if (data.size() >= KMX_MAX_ALLOWED_FILE_SIZE) {
+    return false;
+  }
+
+  return ((kmx::PCOMP_KEYBOARD)data.data())->dwIdentifier == KMX_DWORD(FILEID_COMPILED);  // 'KXTS'
+}
diff --git a/core/src/kmx/kmx_processor.hpp b/core/src/kmx/kmx_processor.hpp
index 26b8b2b456b..6e3c4dd963a 100644
--- a/core/src/kmx/kmx_processor.hpp
+++ b/core/src/kmx/kmx_processor.hpp
@@ -84,6 +84,8 @@ namespace core
     supports_normalization() const override {
       return false;
     }
+
+    static bool is_handled(const std::vector<uint8_t>& buf);
   };
 
 } // namespace core
diff --git a/core/src/ldml/ldml_processor.cpp b/core/src/ldml/ldml_processor.cpp
index 730ea977200..826c0e7f51c 100644
--- a/core/src/ldml/ldml_processor.cpp
+++ b/core/src/ldml/ldml_processor.cpp
@@ -14,6 +14,7 @@
 #include "kmx/kmx_plus.h"
 #include "kmx/kmx_xstring.h"
 #include "kmx/kmx_processevent.h"
+#include "kmx/kmx_processor.hpp"
 #include "ldml/keyman_core_ldml.h"
 #include "kmx/kmx_file_validator.hpp"
 #include "debuglog.h"
@@ -111,17 +112,19 @@ ldml_processor::ldml_processor(std::u16string const& kb_name, const std::vector<
   _valid = true;
 }
 
-bool ldml_processor::is_kmxplus_file(const std::vector<uint8_t> & data) {
-  if (data.empty()) {
+/**
+ * Returns true if the data is a KMX+ file.
+ *
+ * @param data  the keyboard blob
+ * @return true if the processor can handle the keyboard, otherwise false.
+ */
+bool ldml_processor::is_handled(const std::vector<uint8_t>& data) {
+  // Check if it's a blob from a KMX file
+  if (!kmx_processor::is_handled(data)) {
     return false;
   }
 
   const kmx::PCOMP_KEYBOARD comp_keyboard = (kmx::PCOMP_KEYBOARD)data.data();
-
-  if (comp_keyboard->dwIdentifier != KMX_DWORD(FILEID_COMPILED)) {
-    return false;
-  }
-
   if (comp_keyboard->dwFileVersion < VERSION_160 || (comp_keyboard->dwFlags & KF_KMXPLUS) == 0) {
     return false;
   }
diff --git a/core/src/ldml/ldml_processor.hpp b/core/src/ldml/ldml_processor.hpp
index b3413a417be..82f59292c32 100644
--- a/core/src/ldml/ldml_processor.hpp
+++ b/core/src/ldml/ldml_processor.hpp
@@ -85,9 +85,11 @@ class ldml_processor : public abstract_processor {
       return !normalization_disabled;
     }
 
+    static bool is_handled(const std::vector<uint8_t> & buf);
+
   private:
     /** process a key-up */
-    void process_key_up(ldml_event_state &ldml_state) const;
+    void process_key_up(ldml_event_state& ldml_state) const;
 
     /** process a key-down (if it wasn't handled exceptionally) */
     void process_key_down(ldml_event_state &ldml_state) const;
diff --git a/core/src/mock/mock_processor.cpp b/core/src/mock/mock_processor.cpp
index 3f50b35d12d..564465f5c4c 100644
--- a/core/src/mock/mock_processor.cpp
+++ b/core/src/mock/mock_processor.cpp
@@ -228,5 +228,23 @@ namespace km {
     km_core_status mock_processor::validate() const { return KM_CORE_STATUS_OK; }
 
     km_core_status null_processor::validate() const { return KM_CORE_STATUS_INVALID_ARGUMENT; }
-  } // namespace core
+
+    /**
+     * Returns true if the data starts with 'MOCK'.
+     *
+     * @param data  the keyboard blob
+     * @return true if the processor can handle the keyboard, otherwise false.
+     */
+    bool mock_processor::is_handled(const std::vector<uint8_t>& data) {
+      if (data.empty()) {
+        return false;
+      }
+
+      if (data.size() < 4) {  // a MOCK file is at least 4 bytes (MOCK)
+        return false;
+      }
+
+      return ((char*)data.data())[0] == 'M' && ((char*)data.data())[1] == 'O' && ((char*)data.data())[2] == 'C' && ((char*)data.data())[3] == 'K';
+    }
+  }  // namespace core
 } // namespace km
diff --git a/core/src/mock/mock_processor.hpp b/core/src/mock/mock_processor.hpp
index 2401423f512..06fc29ad580 100644
--- a/core/src/mock/mock_processor.hpp
+++ b/core/src/mock/mock_processor.hpp
@@ -69,6 +69,14 @@ namespace core
     supports_normalization() const override {
       return true;
     }
+
+    /**
+     * Returns true if the data starts with 'MOCK'
+     *
+     * @param buf   the keyboard blob
+     * @return true if the processor can handle the keyboard, otherwise false.
+     */
+    static bool is_handled(const std::vector<uint8_t>& data);
   };
 
   class null_processor : public mock_processor {
diff --git a/core/tests/unit/km_core_keyboard_api.tests.cpp b/core/tests/unit/km_core_keyboard_api.tests.cpp
index caaa0ec720a..a682d53d0fb 100644
--- a/core/tests/unit/km_core_keyboard_api.tests.cpp
+++ b/core/tests/unit/km_core_keyboard_api.tests.cpp
@@ -24,38 +24,95 @@ km::core::path test_dir;
 #define DISABLE_WARNING_DEPRECATED_DECLARATIONS
 #endif
 
-TEST(km_core_keyboard_api, load_from_file) {
-  // Setup
+class KmCoreKeyboardApiTests : public testing::Test {
+protected:
   km_core_keyboard* keyboard = nullptr;
+  void TearDown() override {
+    if (this->keyboard) {
+      km_core_keyboard_dispose(this->keyboard);
+      this->keyboard = nullptr;
+    }
+    }
+};
+
+TEST_F(KmCoreKeyboardApiTests, LoadFromFile) {
+  // Setup
   km::core::path kmxfile = km::core::path(test_dir / "kmx/k_020___deadkeys_and_backspace.kmx");
 
   // Execute
   DISABLE_WARNING_PUSH
   DISABLE_WARNING_DEPRECATED_DECLARATIONS
-  auto status = km_core_keyboard_load(kmxfile.c_str(), &keyboard);
+  auto status = km_core_keyboard_load(kmxfile.c_str(), &this->keyboard);
   DISABLE_WARNING_POP
 
   // Verify
   EXPECT_EQ(status, KM_CORE_STATUS_OK);
-  EXPECT_TRUE(keyboard != nullptr);
+  EXPECT_TRUE(this->keyboard != nullptr);
 }
 // END DEPRECATED
 
-TEST(km_core_keyboard_api, load_from_blob) {
+TEST_F(KmCoreKeyboardApiTests, LoadFromBlob) {
   // Setup
-  km_core_keyboard* keyboard = nullptr;
-
   km::core::path kmxfile = km::core::path(test_dir / "kmx/k_020___deadkeys_and_backspace.kmx");
 
   std::vector<uint8_t> data = km::tests::load_kmx_file(kmxfile.native());
-  ASSERT_TRUE(data.size() > 0);
+  ASSERT_GT(data.size(), 0);
 
   // Execute
-  auto status = km_core_keyboard_load_from_blob(kmxfile.stem().c_str(), data.data(), data.size(), &keyboard);
+  auto status = km_core_keyboard_load_from_blob(kmxfile.stem().c_str(), data.data(), data.size(), &this->keyboard);
 
   // Verify
   EXPECT_EQ(status, KM_CORE_STATUS_OK);
-  EXPECT_TRUE(keyboard != nullptr);
+  EXPECT_TRUE(this->keyboard != nullptr);
+}
+
+TEST_F(KmCoreKeyboardApiTests, LoadFromBlobMock) {
+  // Setup
+  km::core::path kmxfile = "mock_keyboard.mock";
+  std::string blob_string = "MOCK";
+
+  std::vector<uint8_t> data = std::vector<uint8_t>(blob_string.begin(), blob_string.end());
+  ASSERT_GT(data.size(), 0);
+
+  // Execute
+  auto status = km_core_keyboard_load_from_blob(kmxfile.stem().c_str(), data.data(), data.size(), &this->keyboard);
+
+  // Verify
+  EXPECT_EQ(status, KM_CORE_STATUS_OK);
+  EXPECT_TRUE(this->keyboard != nullptr);
+}
+
+TEST_F(KmCoreKeyboardApiTests, LoadFromBlobNull) {
+  // Setup
+  km::core::path kmxfile  = "";
+
+  uint8_t data[] = {};
+
+  // Execute
+  auto status = km_core_keyboard_load_from_blob(kmxfile.stem().c_str(), data, 0, &this->keyboard);
+
+  // Verify
+  EXPECT_EQ(status, KM_CORE_STATUS_INVALID_ARGUMENT);
+  EXPECT_TRUE(this->keyboard == nullptr);
+}
+
+TEST_F(KmCoreKeyboardApiTests, LoadFromBlobInvalidKeyboard) {
+  // Setup
+  km::core::path kmxfile  = "invalid_keyboard.kmx";
+  std::string blob_string = "KXTS";
+
+  std::vector<uint8_t> data = std::vector<uint8_t>(blob_string.begin(), blob_string.end());
+  for (auto i = data.size(); i < 64; i++) {
+    data.push_back(0);
+  }
+  ASSERT_GT(data.size(), 0);
+
+  // Execute
+  auto status = km_core_keyboard_load_from_blob(kmxfile.stem().c_str(), data.data(), data.size(), &this->keyboard);
+
+  // Verify
+  EXPECT_EQ(status, KM_CORE_STATUS_INVALID_KEYBOARD);
+  EXPECT_TRUE(this->keyboard == nullptr);
 }
 
 // provide our own `main` so that we can get the path of the exe so that
diff --git a/core/tests/unit/ldml/ldml_test_source.cpp b/core/tests/unit/ldml/ldml_test_source.cpp
index 850b95c6146..beabee6a6f2 100644
--- a/core/tests/unit/ldml/ldml_test_source.cpp
+++ b/core/tests/unit/ldml/ldml_test_source.cpp
@@ -757,7 +757,7 @@ int LdmlJsonTestSourceFactory::load(const km::core::path &compiled, const km::co
 
   // check and load the KMX (yes, once again)
   rawdata = km::tests::load_kmx_file(compiled);
-  if (!km::core::ldml_processor::is_kmxplus_file(rawdata)) {
+  if (!km::core::ldml_processor::is_handled(rawdata)) {
     std::cerr << "Reading KMX for test purposes failed: " << compiled << std::endl;
     return __LINE__;
   }

From 3a74f85bc382637c7df3be56a906c90a9a86d73e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
Date: Mon, 7 Oct 2024 17:05:28 +0200
Subject: [PATCH 023/254] Apply suggestions from code review

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts | 2 +-
 web/src/test/manual/README.md                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
index 8ac7803a8b8..5ca3d4c8ced 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
@@ -22,7 +22,7 @@ export abstract class KeyboardLoaderBase {
    * @param uri  The URI of the keyboard to load.
    * @returns    A Promise that resolves to the loaded keyboard.
    */
-  public async loadKeyboardFromPath(uri: string): Promise<Keyboard> {
+  public loadKeyboardFromPath(uri: string): Promise<Keyboard> {
     this.harness.install();
     return this.loadKeyboardInternal(uri, new UriBasedErrorBuilder(uri));
   }
diff --git a/web/src/test/manual/README.md b/web/src/test/manual/README.md
index 5bd18f0d995..b875c617102 100644
--- a/web/src/test/manual/README.md
+++ b/web/src/test/manual/README.md
@@ -3,7 +3,7 @@
 To run the the manual tests, start the test web server with:
 
 ```bash
-cd $KEYMAN_ROOT
+cd "$KEYMAN_ROOT"
 web/build.sh start
 ```
 

From 069cd21ecde94730ba16cfef91a8f37a225bdcd7 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 7 Oct 2024 18:04:41 +0200
Subject: [PATCH 024/254] feat(core): address code review comments

- rename `km_core_keyboard_load_from_blob_internal` to
  `keyboard_load_from_blob_internal` since it's not part of the API
- use size of struct instead of hard-coding minimum KMX file size
---
 core/src/km_core_keyboard_api.cpp | 6 +++---
 core/src/kmx/kmx_processor.cpp    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/km_core_keyboard_api.cpp b/core/src/km_core_keyboard_api.cpp
index f2f01df84cc..abaf3bfaa08 100644
--- a/core/src/km_core_keyboard_api.cpp
+++ b/core/src/km_core_keyboard_api.cpp
@@ -40,7 +40,7 @@ namespace
 }  // namespace
 
 km_core_status
-km_core_keyboard_load_from_blob_internal(
+keyboard_load_from_blob_internal(
   const km_core_path_name kb_name,
   const std::vector<uint8_t> & buf,
   km_core_keyboard** keyboard
@@ -78,7 +78,7 @@ km_core_keyboard_load_from_blob(
   }
 
   std::vector<uint8_t> buf((uint8_t*)blob, (uint8_t*)blob + blob_size);
-  return km_core_keyboard_load_from_blob_internal(kb_name, buf, keyboard);
+  return keyboard_load_from_blob_internal(kb_name, buf, keyboard);
 }
 
 // TODO-web-core: Remove this code when we remove the deprecated km_core_keyboard_load method
@@ -123,7 +123,7 @@ km_core_keyboard_load(km_core_path_name kb, km_core_keyboard **keyboard)
     // Some legacy packages may include upper-case file extensions
     if (kb_path.suffix() == ".kmx" || kb_path.suffix() == ".KMX") {
       std::vector<uint8_t> buf = load_kmx_file(kb_path);
-      status = km_core_keyboard_load_from_blob_internal(kb_path.stem().c_str(), buf, (km_core_keyboard**)&kp);
+      status = keyboard_load_from_blob_internal(kb_path.stem().c_str(), buf, (km_core_keyboard**)&kp);
       if (status != KM_CORE_STATUS_OK) {
         return status;
       }
diff --git a/core/src/kmx/kmx_processor.cpp b/core/src/kmx/kmx_processor.cpp
index e3ecff6fde2..7ce8fad6bab 100644
--- a/core/src/kmx/kmx_processor.cpp
+++ b/core/src/kmx/kmx_processor.cpp
@@ -423,7 +423,7 @@ bool kmx_processor::is_handled(const std::vector<uint8_t>& data) {
     return false;
   }
 
-  if (data.size() < 64) {  // a KMX file is at least 64 bytes (KMX header)
+  if (data.size() < sizeof(COMP_KEYBOARD)) {  // a KMX file is at least 64 bytes (KMX header)
     return false;
   }
 

From 052ae2ec35e1756eebc15c691c3d690685272638 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 7 Oct 2024 18:05:00 +0200
Subject: [PATCH 025/254] feat(core): fix build failure on Windows

---
 core/tests/unit/km_core_keyboard_api.tests.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/tests/unit/km_core_keyboard_api.tests.cpp b/core/tests/unit/km_core_keyboard_api.tests.cpp
index a682d53d0fb..29d1a9468b8 100644
--- a/core/tests/unit/km_core_keyboard_api.tests.cpp
+++ b/core/tests/unit/km_core_keyboard_api.tests.cpp
@@ -86,10 +86,10 @@ TEST_F(KmCoreKeyboardApiTests, LoadFromBlobNull) {
   // Setup
   km::core::path kmxfile  = "";
 
-  uint8_t data[] = {};
+  std::unique_ptr<uint8_t> data(new uint8_t[0]);
 
   // Execute
-  auto status = km_core_keyboard_load_from_blob(kmxfile.stem().c_str(), data, 0, &this->keyboard);
+  auto status = km_core_keyboard_load_from_blob(kmxfile.stem().c_str(), data.get(), 0, &this->keyboard);
 
   // Verify
   EXPECT_EQ(status, KM_CORE_STATUS_INVALID_ARGUMENT);

From 11a2a3ba3a3e1bd58583438ca054f290836fcae2 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 8 Oct 2024 17:39:06 +0200
Subject: [PATCH 026/254] feat(core): fix compilation error on Windows

---
 core/tests/unit/km_core_keyboard_api.tests.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/tests/unit/km_core_keyboard_api.tests.cpp b/core/tests/unit/km_core_keyboard_api.tests.cpp
index 29d1a9468b8..184ec130c42 100644
--- a/core/tests/unit/km_core_keyboard_api.tests.cpp
+++ b/core/tests/unit/km_core_keyboard_api.tests.cpp
@@ -56,7 +56,7 @@ TEST_F(KmCoreKeyboardApiTests, LoadFromBlob) {
   km::core::path kmxfile = km::core::path(test_dir / "kmx/k_020___deadkeys_and_backspace.kmx");
 
   std::vector<uint8_t> data = km::tests::load_kmx_file(kmxfile.native());
-  ASSERT_GT(data.size(), 0);
+  ASSERT_GT(data.size(), (size_t)0);
 
   // Execute
   auto status = km_core_keyboard_load_from_blob(kmxfile.stem().c_str(), data.data(), data.size(), &this->keyboard);
@@ -72,7 +72,7 @@ TEST_F(KmCoreKeyboardApiTests, LoadFromBlobMock) {
   std::string blob_string = "MOCK";
 
   std::vector<uint8_t> data = std::vector<uint8_t>(blob_string.begin(), blob_string.end());
-  ASSERT_GT(data.size(), 0);
+  ASSERT_GT(data.size(), (size_t)0);
 
   // Execute
   auto status = km_core_keyboard_load_from_blob(kmxfile.stem().c_str(), data.data(), data.size(), &this->keyboard);
@@ -105,7 +105,7 @@ TEST_F(KmCoreKeyboardApiTests, LoadFromBlobInvalidKeyboard) {
   for (auto i = data.size(); i < 64; i++) {
     data.push_back(0);
   }
-  ASSERT_GT(data.size(), 0);
+  ASSERT_GT(data.size(), (size_t)0);
 
   // Execute
   auto status = km_core_keyboard_load_from_blob(kmxfile.stem().c_str(), data.data(), data.size(), &this->keyboard);

From db64bad4b0bd0c875342264d4c48531fbcca93a7 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 8 Oct 2024 17:39:31 +0200
Subject: [PATCH 027/254] docs(web): add clarification

---
 web/src/engine/main/readme.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/src/engine/main/readme.md b/web/src/engine/main/readme.md
index 219e06ad9bd..0ddc392f350 100644
--- a/web/src/engine/main/readme.md
+++ b/web/src/engine/main/readme.md
@@ -1,3 +1,4 @@
-## engine/main
+# engine/main
 
-This subproject holds modularized code converted from the old, namespaced version of KMW.
\ No newline at end of file
+This subproject holds modularized code converted from the old, namespaced version of KMW.
+Previously it was called `input-processor`.

From 2f3edd33153b897e6ccf789db3349dacc61084a1 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 9 Oct 2024 10:52:13 +0200
Subject: [PATCH 028/254] feat(core): Update version in
 `libkeymancore2.symbols`

---
 linux/debian/libkeymancore2.symbols | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/debian/libkeymancore2.symbols b/linux/debian/libkeymancore2.symbols
index 93525d29a2d..a820e59c599 100644
--- a/linux/debian/libkeymancore2.symbols
+++ b/linux/debian/libkeymancore2.symbols
@@ -19,7 +19,7 @@ libkeymancore.so.2 libkeymancore2 #MINVER#
  km_core_keyboard_imx_list_dispose@Base 17.0.195
  km_core_keyboard_key_list_dispose@Base 17.0.195
  km_core_keyboard_load@Base 17.0.195
- km_core_keyboard_load_from_blob@Base 18.0.101
+ km_core_keyboard_load_from_blob@Base 18.0.123
  km_core_options_list_size@Base 17.0.195
  km_core_process_event@Base 17.0.195
  km_core_process_queued_actions@Base 17.0.195

From ba7589e6b6ead09f6b32a6003a99fcb96ad19523 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 16 Oct 2024 20:41:23 +0200
Subject: [PATCH 029/254] fix(core): cleanup include directories

This fixes a meson warning that `common/include` was specified
multiple times (in `core/include/meson.build` and
`core/tests/meson.build`).
---
 core/tests/meson.build              | 5 +----
 core/tests/unit/json/meson.build    | 2 +-
 core/tests/unit/utftest/meson.build | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/core/tests/meson.build b/core/tests/meson.build
index 90e0ab2a54b..5ad808e1b2c 100644
--- a/core/tests/meson.build
+++ b/core/tests/meson.build
@@ -10,10 +10,7 @@
 cmpfiles = ['-c', 'import sys; a = open(sys.argv[1], \'r\').read(); b = open(sys.argv[2], \'r\').read(); exit(not (a==b))']
 stnds = join_paths(meson.current_source_dir(), 'standards')
 
-libsrc = include_directories(
-  '../src',
-  '../../common/include'
-)
+libsrc = include_directories('../src')
 
 # kmx_test_source is required for linux builds, so always enable it even when we
 # disable all other tests
diff --git a/core/tests/unit/json/meson.build b/core/tests/unit/json/meson.build
index 6289d7db0cb..aaed69104e1 100644
--- a/core/tests/unit/json/meson.build
+++ b/core/tests/unit/json/meson.build
@@ -11,7 +11,7 @@ else
 endif
 
 e = executable('jsontest', 'jsontest.cpp',
-    include_directories: [libsrc],
+    include_directories: [inc, libsrc],
     link_args: links + tests_flags,
     objects: lib.extract_objects('jsonpp.cpp'))
 test('jsontest', e, args: 'jsontest.json')
diff --git a/core/tests/unit/utftest/meson.build b/core/tests/unit/utftest/meson.build
index 4ab6cb74ca0..35ad47fed05 100644
--- a/core/tests/unit/utftest/meson.build
+++ b/core/tests/unit/utftest/meson.build
@@ -6,5 +6,5 @@
 
 e = executable('utftest', 'utftest.cpp',
                objects: lib.extract_objects('../../common/cpp/utfcodec.cpp'),
-               include_directories: [libsrc])
+               include_directories: [inc, libsrc])
 test('utftest', e)

From 998ad76632ee835a9d6c460b745d61569dcfede9 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 16 Oct 2024 20:35:15 +0200
Subject: [PATCH 030/254] fix(core): fix generated `core.js` file for debug
 builds

Due to emscripten bug emscripten-core/emscripten#22754 specifying only
`webview` as environment resulted in a broken `core.js` file when doing
a debug build. In release builds things worked because of the
`-Wl,-O1 -O2` that meson added for the release build. This change works
around that bug by adding `web` as additional environment.
---
 core/src/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/meson.build b/core/src/meson.build
index 74acf6e54b9..aa651c514db 100644
--- a/core/src/meson.build
+++ b/core/src/meson.build
@@ -136,7 +136,7 @@ mock_files = files(
 
 if cpp_compiler.get_id() == 'emscripten'
   host_links = ['--whole-archive', '-sALLOW_MEMORY_GROWTH=1', '-sMODULARIZE=1',
-    '-sEXPORT_ES6', '-sENVIRONMENT=webview',
+    '-sEXPORT_ES6', '-sENVIRONMENT=web,webview',
     '--emit-tsd', 'core-interface.d.ts', '-sERROR_ON_UNDEFINED_SYMBOLS=0']
 
   links += ['-sEXPORTED_RUNTIME_METHODS=[\'UTF8ToString\',\'stringToNewUTF8\',\'wasmExports\']',

From fd629c574e6227706db1b172b892ba911d9e6bfe Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 16 Oct 2024 14:53:37 +0200
Subject: [PATCH 031/254] feat(core): rename `core.js` to `km-core.js`

---
 core/src/meson.build                                   |  4 ++--
 web/src/app/browser/build.sh                           |  4 ++--
 web/src/app/webview/build.sh                           |  8 ++++----
 web/src/engine/core-processor/build.sh                 |  7 ++++---
 web/src/engine/core-processor/src/core-processor.ts    | 10 +++++-----
 web/src/engine/core-processor/tsconfig.json            |  2 +-
 .../test/auto/dom/cases/core-processor/basic.spec.ts   |  2 +-
 7 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/core/src/meson.build b/core/src/meson.build
index aa651c514db..3d7086b01bb 100644
--- a/core/src/meson.build
+++ b/core/src/meson.build
@@ -137,7 +137,7 @@ mock_files = files(
 if cpp_compiler.get_id() == 'emscripten'
   host_links = ['--whole-archive', '-sALLOW_MEMORY_GROWTH=1', '-sMODULARIZE=1',
     '-sEXPORT_ES6', '-sENVIRONMENT=web,webview',
-    '--emit-tsd', 'core-interface.d.ts', '-sERROR_ON_UNDEFINED_SYMBOLS=0']
+    '--emit-tsd', 'km-core-interface.d.ts', '-sERROR_ON_UNDEFINED_SYMBOLS=0']
 
   links += ['-sEXPORTED_RUNTIME_METHODS=[\'UTF8ToString\',\'stringToNewUTF8\',\'wasmExports\']',
       # Forcing inclusion of debug symbols
@@ -174,7 +174,7 @@ pkg.generate(
 
 if cpp_compiler.get_id() == 'emscripten'
   # Build an executable
-  host = executable('core',
+  host = executable('km-core',
     cpp_args: defns,
     include_directories: inc,
     link_args: links + host_links,
diff --git a/web/src/app/browser/build.sh b/web/src/app/browser/build.sh
index fbceaad5a2c..538ba82333c 100755
--- a/web/src/app/browser/build.sh
+++ b/web/src/app/browser/build.sh
@@ -73,8 +73,8 @@ compile_and_copy() {
   cp -R "$KEYMAN_ROOT/web/src/resources/osk/." "$KEYMAN_ROOT/web/build/app/resources/osk/"
 
   # Copy Keyman Core build artifacts for local reference
-  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/browser/debug/"
-  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/browser/release/"
+  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/browser/debug/"
+  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/browser/release/"
 
   # Update the build/publish copy of our build artifacts
   prepare
diff --git a/web/src/app/webview/build.sh b/web/src/app/webview/build.sh
index 6ae2a69dd9d..85ae08204c0 100755
--- a/web/src/app/webview/build.sh
+++ b/web/src/app/webview/build.sh
@@ -61,12 +61,12 @@ compile_and_copy() {
   cp -R "$KEYMAN_ROOT/web/src/resources/osk/." "$KEYMAN_ROOT/web/build/app/resources/osk/"
 
   # Copy Keyman Core build artifacts for local reference
-  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/webview/debug/"
-  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/webview/release/"
+  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/webview/debug/"
+  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/webview/release/"
 
   # Clean the sourcemaps of .. and . components
   for script in "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME/debug/"*.js; do
-    if [[ "${script}" == *"/core.js" ]]; then
+    if [[ "${script}" == *"/km-core.js" ]]; then
       continue
     fi
 
@@ -78,7 +78,7 @@ compile_and_copy() {
   # Do NOT inline sourcemaps for release builds - we don't want them to affect
   # load time.
   for script in "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME/release/"*.js; do
-    if [[ "${script}" == *"/core.js" ]]; then
+    if [[ "${script}" == *"/km-core.js" ]]; then
       continue
     fi
     sourcemap="$script.map"
diff --git a/web/src/engine/core-processor/build.sh b/web/src/engine/core-processor/build.sh
index 16cb5947d8e..072e5a89f35 100755
--- a/web/src/engine/core-processor/build.sh
+++ b/web/src/engine/core-processor/build.sh
@@ -23,7 +23,7 @@ builder_describe "Keyman Core WASM integration" \
   "--ci+                     Set to utilize CI-based test configurations & reporting."
 
 builder_describe_outputs \
-  configure    "/web/src/engine/core-processor/src/import/core/core-interface.d.ts" \
+  configure    "/web/src/engine/core-processor/src/import/core/km-core-interface.d.ts" \
   build        "/web/build/${SUBPROJECT_NAME}/lib/index.mjs"
 
 builder_parse "$@"
@@ -41,12 +41,13 @@ do_configure() {
   mkdir -p "src/import/core/"
   # we don't need this file for release builds, but it's nice to have
   # for reference and auto-completion
-  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/core-interface.d.ts" "src/import/core/"
+  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/km-core-interface.d.ts" "src/import/core/"
 }
 
 copy_deps() {
   mkdir -p "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/import/core/"
-  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/"core{.js,.wasm,-interface.d.ts} "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/import/core/"
+  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/"km-core-interface.d.ts "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/import/core/"
+  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/"km-core{.js,.wasm} "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/import/core/"
 }
 
 do_build () {
diff --git a/web/src/engine/core-processor/src/core-processor.ts b/web/src/engine/core-processor/src/core-processor.ts
index 3b53a0ec838..e1584ad1ea8 100644
--- a/web/src/engine/core-processor/src/core-processor.ts
+++ b/web/src/engine/core-processor/src/core-processor.ts
@@ -1,17 +1,17 @@
-type km_core_attr = import('./import/core/core-interface.js').km_core_attr;
+type km_core_attr = import('./import/core/km-core-interface.js').km_core_attr;
 
 export class CoreProcessor {
   private instance: any;
 
   /**
-     * Initialize Core Processor
-     * @param baseurl - The url where core.js is located
-     */
+   * Initialize Core Processor
+   * @param baseurl - The url where km-core.js is located
+   */
   public async init(baseurl: string): Promise<boolean> {
 
     if (!this.instance) {
       try {
-        const module = await import(baseurl + '/core.js');
+        const module = await import(baseurl + '/km-core.js');
         this.instance = await module.default({
           locateFile: function (path: string, scriptDirectory: string) {
             return baseurl + '/' + path;
diff --git a/web/src/engine/core-processor/tsconfig.json b/web/src/engine/core-processor/tsconfig.json
index 84996aaca16..a7b626029f8 100644
--- a/web/src/engine/core-processor/tsconfig.json
+++ b/web/src/engine/core-processor/tsconfig.json
@@ -9,5 +9,5 @@
     "rootDir": "./src"
   },
 
-  "include": [ "**/*.ts", "src/import/core/core.js" ],
+  "include": [ "**/*.ts", "src/import/core/km-core.js" ],
 }
diff --git a/web/src/test/auto/dom/cases/core-processor/basic.spec.ts b/web/src/test/auto/dom/cases/core-processor/basic.spec.ts
index c24748e9c58..767d2e2fbb9 100644
--- a/web/src/test/auto/dom/cases/core-processor/basic.spec.ts
+++ b/web/src/test/auto/dom/cases/core-processor/basic.spec.ts
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 import { CoreProcessor } from 'keyman/engine/core-processor';
 
-const coreurl = '/web/build/engine/core-processor/obj/import/core/';
+const coreurl = '/web/build/engine/core-processor/obj/import/core';
 
 // Test the CoreProcessor interface.
 describe('CoreProcessor', function () {

From 0d86bbd42911b4e3ae284c61a028cf68bae7852a Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 17 Oct 2024 19:23:56 +0200
Subject: [PATCH 032/254] feat(core): run tests from `KEYMAN_ROOT` instead of
 `web`

This gives us access to the keyboards needed for the core-processor tests.
---
 .../test/auto/dom/web-test-runner.config.mjs  | 22 +++++++++----------
 .../integrated/web-test-runner.config.mjs     |  2 +-
 web/test.sh                                   |  6 +++--
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/web/src/test/auto/dom/web-test-runner.config.mjs b/web/src/test/auto/dom/web-test-runner.config.mjs
index 5871f4e61e3..5aa1d7c49e7 100644
--- a/web/src/test/auto/dom/web-test-runner.config.mjs
+++ b/web/src/test/auto/dom/web-test-runner.config.mjs
@@ -33,7 +33,7 @@ export default {
   nodeResolve: true,
   // Top-level, implicit 'default' group
   files: [
-    'src/test/auto/dom/test_init_check.spec.ts',
+    'web/src/test/auto/dom/test_init_check.spec.ts',
     // '**/*.spec.html'
   ],
   groups: [
@@ -41,50 +41,50 @@ export default {
       name: 'engine/attachment',
       // Relative, from the containing package.json
       files: [
-        'build/test/dom/cases/attachment/**/*.spec.html',
-        'build/test/dom/cases/attachment/**/*.spec.mjs'
+        'web/build/test/dom/cases/attachment/**/*.spec.html',
+        'web/build/test/dom/cases/attachment/**/*.spec.mjs'
       ]
     },
     {
       name: 'app/browser',
       // Relative, from the containing package.json
-      files: ['build/test/dom/cases/browser/**/*.spec.mjs']
+      files: ['web/build/test/dom/cases/browser/**/*.spec.mjs']
     },
     {
       name: 'engine/core-processor',
       // Relative, from the containing package.json
-      files: ['build/test/dom/cases/core-processor/**/*.spec.mjs']
+      files: ['web/src/test/auto/dom/cases/core-processor/*.spec.ts']
     },
     {
       name: 'engine/dom-utils',
       // Relative, from the containing package.json
-      files: ['build/test/dom/cases/dom-utils/**/*.spec.mjs']
+      files: ['web/build/test/dom/cases/dom-utils/**/*.spec.mjs']
     },
     {
       name: 'engine/element-wrappers',
       // Relative, from the containing package.json
-      files: ['build/test/dom/cases/element-wrappers/**/*.spec.mjs']
+      files: ['web/build/test/dom/cases/element-wrappers/**/*.spec.mjs']
     },
     {
       name: 'engine/gesture-processor',
       // Relative, from the containing package.json
       // Note: here we use the .spec.html file in the src directory!
-      files: ['src/test/auto/dom/cases/gesture-processor/**/*.spec.html']
+      files: ['web/src/test/auto/dom/cases/gesture-processor/**/*.spec.html']
     },
     {
       name: 'engine/keyboard',
       // Relative, from the containing package.json
-      files: ['build/test/dom/cases/keyboard/**/*.tests.mjs']
+      files: ['web/build/test/dom/cases/keyboard/**/*.tests.mjs']
     },
     {
       name: 'engine/keyboard-storage',
       // Relative, from the containing package.json
-      files: ['build/test/dom/cases/keyboard-storage/**/*.spec.mjs']
+      files: ['web/build/test/dom/cases/keyboard-storage/**/*.spec.mjs']
     },
     {
       name: 'engine/osk',
       // Relative, from the containing package.json
-      files: ['build/test/dom/cases/osk/**/*.spec.mjs']
+      files: ['web/build/test/dom/cases/osk/**/*.spec.mjs']
     }
   ],
   middleware: [
diff --git a/web/src/test/auto/integrated/web-test-runner.config.mjs b/web/src/test/auto/integrated/web-test-runner.config.mjs
index 1637ea82d60..97985bf8e2b 100644
--- a/web/src/test/auto/integrated/web-test-runner.config.mjs
+++ b/web/src/test/auto/integrated/web-test-runner.config.mjs
@@ -24,7 +24,7 @@ export default {
   concurrency: 10,
   nodeResolve: true,
   files: [
-    'build/test/integrated//**/*.spec.mjs',
+    'web/build/test/integrated//**/*.spec.mjs',
     // '**/*.spec.html'
   ],
   middleware: [
diff --git a/web/test.sh b/web/test.sh
index 12216512c93..8566f2217b2 100755
--- a/web/test.sh
+++ b/web/test.sh
@@ -41,6 +41,8 @@ fi
 
 # End common configs.
 
-builder_run_action test:dom web-test-runner --config "src/test/auto/dom/web-test-runner${WTR_CONFIG}.config.mjs" ${WTR_DEBUG}
+cd "${KEYMAN_ROOT}"
 
-builder_run_action test:integrated web-test-runner --config "src/test/auto/integrated/web-test-runner${WTR_CONFIG}.config.mjs" ${WTR_DEBUG}
+builder_run_action test:dom web-test-runner --config "web/src/test/auto/dom/web-test-runner${WTR_CONFIG}.config.mjs" ${WTR_DEBUG}
+
+builder_run_action test:integrated web-test-runner --config "web/src/test/auto/integrated/web-test-runner${WTR_CONFIG}.config.mjs" ${WTR_DEBUG}

From 456bf622d3bb913adb5f83877b11162c874fd150 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 22 Nov 2024 13:55:41 +0700
Subject: [PATCH 033/254] feat(linux): use new km_core_keyboard_load_from_blob
 API method

Fixes: #12498
---
 linux/ibus-keyman/src/engine.c | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/linux/ibus-keyman/src/engine.c b/linux/ibus-keyman/src/engine.c
index 4ec6cf002f9..d9413242b07 100644
--- a/linux/ibus-keyman/src/engine.c
+++ b/linux/ibus-keyman/src/engine.c
@@ -498,10 +498,10 @@ ibus_keyman_engine_constructor(
 
     g_strfreev(split_name);
 
-    g_autofree gchar *kmx_file = g_path_get_basename(abs_kmx_path);
-    p = rindex(kmx_file, '.'); // get id to use as dbus service name
+    g_autofree gchar *kmx_filename = g_path_get_basename(abs_kmx_path);
+    p = rindex(kmx_filename, '.'); // get id to use as dbus service name
     if (p) {
-        keyman->kb_name = g_strndup(kmx_file, p-kmx_file);
+        keyman->kb_name = g_strndup(kmx_filename, p-kmx_filename);
         p = rindex(abs_kmx_path, '.');
         if (p)
         {
@@ -516,7 +516,28 @@ ibus_keyman_engine_constructor(
 
     km_core_status status;
 
-    status = km_core_keyboard_load(abs_kmx_path, &(keyman->keyboard));
+    FILE* kmx_file = fopen(abs_kmx_path, "rb");
+    if (!kmx_file) {
+      g_warning("%s: problem loading kmx_file %s.", __FUNCTION__, abs_kmx_path);
+      return NULL;
+    }
+
+    fseek(kmx_file, 0, SEEK_END);
+    long length = ftell(kmx_file);
+    fseek(kmx_file, 0, SEEK_SET);
+    void* buffer = malloc(length);
+    if (buffer) {
+      if (fread(buffer, 1, length, kmx_file) != length) {
+        g_warning("%s: problem reading entire kmx_file %s.", __FUNCTION__, abs_kmx_path);
+        return NULL;
+      }
+    }
+    fclose(kmx_file);
+
+    status = km_core_keyboard_load_from_blob(abs_kmx_path, buffer, length,
+      &(keyman->keyboard));
+
+    free(buffer);
 
     if (status != KM_CORE_STATUS_OK) {
       g_warning("%s: problem loading km_core_keyboard %s. Status is %u.", __FUNCTION__, abs_kmx_path, status);

From 1a4a2534d4c9913bddd1380e515d7e5fc275241d Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 22 Nov 2024 14:41:27 +0700
Subject: [PATCH 034/254] feat(linux): improve reading file

---
 linux/ibus-keyman/src/engine.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/linux/ibus-keyman/src/engine.c b/linux/ibus-keyman/src/engine.c
index d9413242b07..7e6dced68f2 100644
--- a/linux/ibus-keyman/src/engine.c
+++ b/linux/ibus-keyman/src/engine.c
@@ -518,7 +518,7 @@ ibus_keyman_engine_constructor(
 
     FILE* kmx_file = fopen(abs_kmx_path, "rb");
     if (!kmx_file) {
-      g_warning("%s: problem loading kmx_file %s.", __FUNCTION__, abs_kmx_path);
+      g_warning("%s: problem opening kmx_file %s.", __FUNCTION__, abs_kmx_path);
       return NULL;
     }
 
@@ -526,11 +526,16 @@ ibus_keyman_engine_constructor(
     long length = ftell(kmx_file);
     fseek(kmx_file, 0, SEEK_SET);
     void* buffer = malloc(length);
-    if (buffer) {
-      if (fread(buffer, 1, length, kmx_file) != length) {
-        g_warning("%s: problem reading entire kmx_file %s.", __FUNCTION__, abs_kmx_path);
-        return NULL;
-      }
+    if (!buffer) {
+      g_warning("%s: problem allocating buffer for reading kmx_file %s.", __FUNCTION__, abs_kmx_path);
+      fclose(kmx_file);
+      return NULL;
+    }
+    if (fread(buffer, 1, length, kmx_file) != length) {
+      g_warning("%s: problem reading entire kmx_file %s.", __FUNCTION__, abs_kmx_path);
+      fclose(kmx_file);
+      free(buffer);
+      return NULL;
     }
     fclose(kmx_file);
 

From 97c99cc6b7cf15f94d81d7b6a3697c4f8fc8887e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 22 Nov 2024 21:35:46 +0700
Subject: [PATCH 035/254] feat(linux): Improve error handling

---
 linux/ibus-keyman/src/engine.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/linux/ibus-keyman/src/engine.c b/linux/ibus-keyman/src/engine.c
index 7e6dced68f2..1dffba9cf32 100644
--- a/linux/ibus-keyman/src/engine.c
+++ b/linux/ibus-keyman/src/engine.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <errno.h>
 #include <ibus.h>
 #include <string.h>
 #include <stdio.h>
@@ -518,21 +519,30 @@ ibus_keyman_engine_constructor(
 
     FILE* kmx_file = fopen(abs_kmx_path, "rb");
     if (!kmx_file) {
-      g_warning("%s: problem opening kmx_file %s.", __FUNCTION__, abs_kmx_path);
+      g_warning("%s: problem opening kmx_file %s. (error: %s).", __FUNCTION__, abs_kmx_path, strerror(errno));
       return NULL;
     }
 
-    fseek(kmx_file, 0, SEEK_END);
+    if (fseek(kmx_file, 0, SEEK_END) < 0) {
+      g_warning("%s: problem seeking to end of kmx_file %s (error: %s).", __FUNCTION__, abs_kmx_path, strerror(errno));
+      fclose(kmx_file);
+      return NULL;
+    }
     long length = ftell(kmx_file);
-    fseek(kmx_file, 0, SEEK_SET);
+    if (length < 0) {
+      g_warning("%s: problem determining length of kmx_file %s (error: %s).", __FUNCTION__, abs_kmx_path, strerror(errno));
+      fclose(kmx_file);
+      return NULL;
+    }
+    rewind(kmx_file);
     void* buffer = malloc(length);
     if (!buffer) {
-      g_warning("%s: problem allocating buffer for reading kmx_file %s.", __FUNCTION__, abs_kmx_path);
+      g_warning("%s: problem allocating buffer for reading kmx_file %s (error: %s).", __FUNCTION__, abs_kmx_path, strerror(errno));
       fclose(kmx_file);
       return NULL;
     }
     if (fread(buffer, 1, length, kmx_file) != length) {
-      g_warning("%s: problem reading entire kmx_file %s.", __FUNCTION__, abs_kmx_path);
+      g_warning("%s: problem reading entire kmx_file %s (error: %s).", __FUNCTION__, abs_kmx_path, strerror(errno));
       fclose(kmx_file);
       free(buffer);
       return NULL;

From 7b96e2958da4f5a4a1ed345b99f2e958bf49269a Mon Sep 17 00:00:00 2001
From: rc-swag <58423624+rc-swag@users.noreply.github.com>
Date: Sat, 23 Nov 2024 18:13:10 +1000
Subject: [PATCH 036/254] feat(windows): load keyboard file to memorary blob

---
 windows/src/engine/keyman32/K32_load.cpp | 37 +++++++++++++++++++++---
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/windows/src/engine/keyman32/K32_load.cpp b/windows/src/engine/keyman32/K32_load.cpp
index c6bd1d4dfe1..2801d449f01 100644
--- a/windows/src/engine/keyman32/K32_load.cpp
+++ b/windows/src/engine/keyman32/K32_load.cpp
@@ -29,6 +29,7 @@
 */
 
 #include "pch.h"
+#include <stdio.h>
 
 BOOL GetKeyboardFileName(LPSTR kbname, LPSTR buf, int nbuf)
 {
@@ -78,13 +79,41 @@ BOOL LoadlpKeyboard(int i)
     _td->lpKeyboards[i].lpCoreKeyboardState = NULL;
   }
 
-  char buf[256];
-  if (!GetKeyboardFileName(_td->lpKeyboards[i].Name, buf, 255)) {
+  char kmx_filename[256];
+  if (!GetKeyboardFileName(_td->lpKeyboards[i].Name, kmx_filename, 255)) {
     return_SendDebugExit(FALSE);
   }
 
-  PWCHAR keyboardPath = strtowstr(buf);
-  km_core_status err_status = km_core_keyboard_load(keyboardPath, &_td->lpKeyboards[i].lpCoreKeyboard);
+  FILE* kmx_file;
+  errno_t status = fopen_s(&kmx_file, kmx_filename, "rb");
+  if (!status) {
+    SendDebugMessageFormat("Problem reading opening kmx_file %s status [%d].", kmx_filename, status);
+    return_SendDebugExit(FALSE);
+  }
+
+  fseek(kmx_file, 0, SEEK_END);
+  size_t length = ftell(kmx_file);
+  fseek(kmx_file, 0, SEEK_SET);
+  void* buffer = malloc(length);
+
+  if (!buffer) {
+    fclose(kmx_file);
+    return_SendDebugExit(FALSE);
+  }
+
+  if (fread(buffer, 1, length, kmx_file) != length) {
+    SendDebugMessageFormat("Problem reading entire kmx_file %s.", kmx_filename);
+    fclose(kmx_file);
+    free(buffer);
+    return_SendDebugExit(FALSE);
+  }
+
+  fclose(kmx_file);
+  PWCHAR keyboardPath = strtowstr(kmx_filename);
+  km_core_status err_status = km_core_keyboard_load_from_blob(keyboardPath, buffer, length, &_td->lpKeyboards[i].lpCoreKeyboard);
+
+  free(buffer);
+
   if (err_status != KM_CORE_STATUS_OK) {
     SendDebugMessageFormat("km_core_keyboard_load failed for %ls with error status [%d]", keyboardPath, err_status);
     delete[] keyboardPath;

From f3e5c1bc77f09a552fc90e9ddc41cacdeb42a8f0 Mon Sep 17 00:00:00 2001
From: rc-swag <58423624+rc-swag@users.noreply.github.com>
Date: Tue, 26 Nov 2024 15:03:58 +1000
Subject: [PATCH 037/254] feat(windows): add exiterror goto plus extra checks

Adds ExitError goto as there where too many paths requiring similar
clean up. Checks around reading the file.
---
 windows/src/engine/keyman32/K32_load.cpp | 58 ++++++++++++++++--------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/windows/src/engine/keyman32/K32_load.cpp b/windows/src/engine/keyman32/K32_load.cpp
index 2801d449f01..f54cf60abe4 100644
--- a/windows/src/engine/keyman32/K32_load.cpp
+++ b/windows/src/engine/keyman32/K32_load.cpp
@@ -84,40 +84,52 @@ BOOL LoadlpKeyboard(int i)
     return_SendDebugExit(FALSE);
   }
 
-  FILE* kmx_file;
+  FILE* kmx_file = nullptr;
+  PWCHAR keyboardPath = nullptr;
+  void* buffer = nullptr;
   errno_t status = fopen_s(&kmx_file, kmx_filename, "rb");
+
   if (!status) {
     SendDebugMessageFormat("Problem reading opening kmx_file %s status [%d].", kmx_filename, status);
     return_SendDebugExit(FALSE);
   }
 
-  fseek(kmx_file, 0, SEEK_END);
+  if (fseek(kmx_file, 0, SEEK_END) < 0 ) {
+    SendDebugMessageFormat("Problem seeking to end of kmx_file %s.", kmx_filename);
+    goto ExitError;
+  }
+
   size_t length = ftell(kmx_file);
-  fseek(kmx_file, 0, SEEK_SET);
-  void* buffer = malloc(length);
+
+  if (length < 0)
+  {
+    SendDebugMessageFormat("Problem determining length of kmx_file %s.", kmx_filename);
+    goto ExitError;
+  }
+
+  rewind(kmx_file);
+
+  buffer = malloc(length);
 
   if (!buffer) {
-    fclose(kmx_file);
-    return_SendDebugExit(FALSE);
+    SendDebugMessageFormat("Problem allocating buffer for reading kmx_file %s.", kmx_filename);
+    goto ExitError;
   }
 
   if (fread(buffer, 1, length, kmx_file) != length) {
     SendDebugMessageFormat("Problem reading entire kmx_file %s.", kmx_filename);
-    fclose(kmx_file);
-    free(buffer);
-    return_SendDebugExit(FALSE);
+    goto ExitError;
   }
 
   fclose(kmx_file);
-  PWCHAR keyboardPath = strtowstr(kmx_filename);
+  keyboardPath = strtowstr(kmx_filename);
   km_core_status err_status = km_core_keyboard_load_from_blob(keyboardPath, buffer, length, &_td->lpKeyboards[i].lpCoreKeyboard);
 
   free(buffer);
 
   if (err_status != KM_CORE_STATUS_OK) {
     SendDebugMessageFormat("km_core_keyboard_load failed for %ls with error status [%d]", keyboardPath, err_status);
-    delete[] keyboardPath;
-    return_SendDebugExit(FALSE);
+    goto ExitError;
   }
   delete[] keyboardPath;
 
@@ -134,22 +146,30 @@ BOOL LoadlpKeyboard(int i)
 
   if (err_status != KM_CORE_STATUS_OK) {
     SendDebugMessageFormat("km_core_state_create failed with error status [%d]", err_status);
-    // Dispose of the keyboard to leave us in a consistent state
-    ReleaseKeyboardMemoryCore(&_td->lpKeyboards[i].lpCoreKeyboard);
-    return_SendDebugExit(FALSE);
+    goto ExitError;
   }
   // Register callback?
   err_status = km_core_keyboard_get_imx_list(_td->lpKeyboards[i].lpCoreKeyboard, &_td->lpKeyboards[i].lpIMXList);
   if (err_status != KM_CORE_STATUS_OK) {
     SendDebugMessageFormat("km_core_keyboard_get_imx_list failed with error status [%d]", err_status);
-    // Dispose of the keyboard to leave us in a consistent state
-    ReleaseKeyboardMemoryCore(&_td->lpKeyboards[i].lpCoreKeyboard);
-    return_SendDebugExit(FALSE);
+    goto ExitError;
   }
 
   LoadDLLs(&_td->lpKeyboards[i]);
-
   LoadKeyboardOptionsRegistrytoCore(&_td->lpKeyboards[i], _td->lpKeyboards[i].lpCoreKeyboardState);
 
   return_SendDebugExit(TRUE);
+ExitError:
+  if (kmx_file) {
+    fclose(kmx_file);
+  }
+  if (buffer) {
+    free(buffer);
+  }
+  if (keyboardPath != nullptr) {
+    delete[] keyboardPath;
+  }
+  // Dispose of the keyboard to leave us in a consistent state
+  ReleaseKeyboardMemoryCore(&_td->lpKeyboards[i].lpCoreKeyboard);
+  return_SendDebugExit(FALSE);
 }

From 5fd2b1aa5af62a01c157e292b5c5173a129bbaef Mon Sep 17 00:00:00 2001
From: rc-swag <58423624+rc-swag@users.noreply.github.com>
Date: Wed, 27 Nov 2024 01:43:55 +1000
Subject: [PATCH 038/254] feat(windows): fix reading error status

---
 windows/src/engine/keyman32/K32_load.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/windows/src/engine/keyman32/K32_load.cpp b/windows/src/engine/keyman32/K32_load.cpp
index f54cf60abe4..6e770cc73af 100644
--- a/windows/src/engine/keyman32/K32_load.cpp
+++ b/windows/src/engine/keyman32/K32_load.cpp
@@ -89,8 +89,8 @@ BOOL LoadlpKeyboard(int i)
   void* buffer = nullptr;
   errno_t status = fopen_s(&kmx_file, kmx_filename, "rb");
 
-  if (!status) {
-    SendDebugMessageFormat("Problem reading opening kmx_file %s status [%d].", kmx_filename, status);
+  if (status) {
+    SendDebugMessageFormat("Problem opening kmx_file %s status [%d].", kmx_filename, status);
     return_SendDebugExit(FALSE);
   }
 

From b5b1747b0d29978144673ef43333fdb1159625b8 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 27 Nov 2024 08:56:50 +0700
Subject: [PATCH 039/254] refactor(developer):
 `km_core_keyboard_load_from_blob` in debugger

Replaces `km_core_keyboard_load` with `km_core_keyboard_load_from_blob`.

Fixes: #12690
---
 .../debug/Keyman.System.Debug.DebugCore.pas   | 23 ++++++++++++++++++-
 .../tike/main/Keyman.System.KeymanCore.pas    |  6 +++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas b/developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas
index bcc522e28c6..8af691be941 100644
--- a/developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas
+++ b/developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas
@@ -37,6 +37,8 @@   TDebugCore = class
 implementation
 
 uses
+  System.Classes,
+
   KeymanPaths;
 
 { TDebugCore }
@@ -44,6 +46,9 @@ implementation
 constructor TDebugCore.Create(const Filename: string; EnableDebug: Boolean);
 var
   status: km_core_status;
+  fs: TFileStream;
+  Buffer: Pointer;
+  BufferSize: NativeInt;
 begin
   inherited Create;
 
@@ -52,7 +57,23 @@ constructor TDebugCore.Create(const Filename: string; EnableDebug: Boolean);
   FKeyboard := nil;
   FState := nil;
 
-  status := km_core_keyboard_load(PChar(FileName), FKeyboard);
+  buffer := nil;
+  try
+    fs := TFileStream.Create(Filename, fmOpenRead or fmShareDenyWrite);
+    try
+      BufferSize := fs.Size;
+      Buffer := AllocMem(BufferSize);
+      if fs.Read(Buffer^, BufferSize) <> BufferSize then
+        raise EDebugCore.Create('Unable to start debugger -- failed to read file from disk');
+    finally
+      fs.Free;
+    end;
+
+    status := km_core_keyboard_load_from_blob(PChar(FileName), Buffer, BufferSize, FKeyboard);
+  finally
+    FreeMem(Buffer);
+  end;
+
   if status <> KM_CORE_STATUS_OK then
     raise EDebugCore.CreateFmt('Unable to start debugger -- keyboard load failed with error %x', [Ord(status)]);
 
diff --git a/developer/src/tike/main/Keyman.System.KeymanCore.pas b/developer/src/tike/main/Keyman.System.KeymanCore.pas
index 96f9219b379..22c4ac49430 100644
--- a/developer/src/tike/main/Keyman.System.KeymanCore.pas
+++ b/developer/src/tike/main/Keyman.System.KeymanCore.pas
@@ -245,8 +245,10 @@   km_core_keyboard_attrs = record
 
   pkm_core_keyboard_attrs = ^km_core_keyboard_attrs;
 
-function km_core_keyboard_load(
-  kb_path: km_core_path_name;
+function km_core_keyboard_load_from_blob(
+  kb_name: km_core_path_name;
+  blob: Pointer;
+  blob_size: NativeUint;
   var keyboard: pkm_core_keyboard
 ): km_core_status; cdecl; external keymancore delayed;
 

From adf2313a8b298f0c73e7015c42c78cd61eb3918e Mon Sep 17 00:00:00 2001
From: rc-swag <58423624+rc-swag@users.noreply.github.com>
Date: Wed, 27 Nov 2024 12:25:41 +1000
Subject: [PATCH 040/254] feat(windows): self nit on whitespace

---
 windows/src/engine/keyman32/K32_load.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/windows/src/engine/keyman32/K32_load.cpp b/windows/src/engine/keyman32/K32_load.cpp
index 6e770cc73af..6ad3fc90b2a 100644
--- a/windows/src/engine/keyman32/K32_load.cpp
+++ b/windows/src/engine/keyman32/K32_load.cpp
@@ -108,7 +108,6 @@ BOOL LoadlpKeyboard(int i)
   }
 
   rewind(kmx_file);
-
   buffer = malloc(length);
 
   if (!buffer) {

From 73dc549023e795f297b4cca5cf3863ab3b907509 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 27 Nov 2024 03:58:19 +0100
Subject: [PATCH 041/254] chore: Update
 developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas

Co-authored-by: Darcy Wong <darcy_wong@sil.org>
---
 developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas b/developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas
index 8af691be941..884eea627b1 100644
--- a/developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas
+++ b/developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas
@@ -57,7 +57,7 @@ constructor TDebugCore.Create(const Filename: string; EnableDebug: Boolean);
   FKeyboard := nil;
   FState := nil;
 
-  buffer := nil;
+  Buffer := nil;
   try
     fs := TFileStream.Create(Filename, fmOpenRead or fmShareDenyWrite);
     try

From 9b091aa1ee66546c57e482923beac8742df665db Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 5 Dec 2024 16:37:35 +0100
Subject: [PATCH 042/254] chore(web): rename test file that got added in
 epic/web-core branchworkflow-notes

---
 .../dom/cases/core-processor/{basic.spec.ts => basic.tests.ts}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename web/src/test/auto/dom/cases/core-processor/{basic.spec.ts => basic.tests.ts} (100%)

diff --git a/web/src/test/auto/dom/cases/core-processor/basic.spec.ts b/web/src/test/auto/dom/cases/core-processor/basic.tests.ts
similarity index 100%
rename from web/src/test/auto/dom/cases/core-processor/basic.spec.ts
rename to web/src/test/auto/dom/cases/core-processor/basic.tests.ts

From 1bedc62b5722d0fbca27af306eb1286837116961 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 11 Oct 2024 18:25:46 +0200
Subject: [PATCH 043/254] feat(core): expose `km_core_keyboard_load_from_blob`
 to WASM

---
 core/include/keyman/keyman_core_api_bits.h |  2 +-
 core/src/km_core_keyboard_api.cpp          | 23 ++++--
 core/src/meson.build                       | 50 +++++++------
 core/src/wasm.cpp                          | 84 +++++++++++++++++++---
 4 files changed, 123 insertions(+), 36 deletions(-)

diff --git a/core/include/keyman/keyman_core_api_bits.h b/core/include/keyman/keyman_core_api_bits.h
index bd1f519bffe..2fcc832f01e 100644
--- a/core/include/keyman/keyman_core_api_bits.h
+++ b/core/include/keyman/keyman_core_api_bits.h
@@ -33,7 +33,7 @@
     #undef _kmn_export_flag
     #undef _kmn_import_flag
     #undef _kmn_static_flag
-  #else  // How MSVC sepcifies function level attributes adn deprecation
+  #else  // How MSVC sepcifies function level attributes and deprecation
     #define _kmn_and
     #define _kmn_tag_fn(a)     __declspec(a)
     #define _kmn_deprecated_flag deprecated
diff --git a/core/src/km_core_keyboard_api.cpp b/core/src/km_core_keyboard_api.cpp
index 70d37fa63b0..cef9f99162b 100644
--- a/core/src/km_core_keyboard_api.cpp
+++ b/core/src/km_core_keyboard_api.cpp
@@ -40,18 +40,16 @@ namespace
 }  // namespace
 
 km_core_status
-km_core_keyboard_load_from_blob(
+keyboard_load_from_blob_internal(
   const km_core_path_name kb_name,
-  const void* blob,
-  const size_t blob_size,
+  const std::vector<uint8_t>& buf,
   km_core_keyboard** keyboard
 ) {
   assert(keyboard);
-  if (!keyboard || !blob) {
+  if (!keyboard) {
     return KM_CORE_STATUS_INVALID_ARGUMENT;
   }
 
-  std::vector<uint8_t> buf((uint8_t*)blob, (uint8_t*)blob + blob_size);
   *keyboard = nullptr;
   try {
     abstract_processor* kp = processor_factory(kb_name, buf);
@@ -67,6 +65,21 @@ km_core_keyboard_load_from_blob(
   return KM_CORE_STATUS_OK;
 }
 
+km_core_status
+km_core_keyboard_load_from_blob(
+  const km_core_path_name kb_name,
+  const void* blob,
+  const size_t blob_size,
+  km_core_keyboard** keyboard
+) {
+  if (!blob) {
+    return KM_CORE_STATUS_INVALID_ARGUMENT;
+  }
+
+  std::vector<uint8_t> buf((uint8_t*)blob, (uint8_t*)blob + blob_size);
+  return keyboard_load_from_blob_internal(kb_name, buf, keyboard);
+}
+
 void
 km_core_keyboard_dispose(km_core_keyboard *keyboard)
 {
diff --git a/core/src/meson.build b/core/src/meson.build
index 030ab0a5144..d80aae84bdd 100644
--- a/core/src/meson.build
+++ b/core/src/meson.build
@@ -32,8 +32,6 @@ else
 endif
 
 if cpp_compiler.get_id() == 'emscripten'
-  # TODO: why do we need this defn here?
-  defns += ['-DKM_CORE_LIBRARY']
   icu_if_not_on_wasm = []
 else
   # only include this if NOT on wasm.
@@ -54,19 +52,21 @@ if cpp_compiler.get_id() == 'emscripten'
     '-g', '-Wlimited-postlink-optimizations',
     '-lembind'
   ]
+  util_normalize_table_generator = executable(
+    'util_normalize_table_generator',
+    ['util_normalize_table_generator.cpp'],
+    cpp_args: defns + warns,
+    include_directories: [inc],
+    link_args: links,
+    dependencies: [icu_uc, icu_i18n],
+  )
 
-  util_normalize_table_generator = executable('util_normalize_table_generator',
-      ['util_normalize_table_generator.cpp'],
-      cpp_args: defns + warns,
-      include_directories: [inc],
-      link_args: links,
-      dependencies: [icu_uc, icu_i18n],
-      )
-
-  util_normalize_table_h = custom_target('util_normalize_table.h',
-                      output: 'util_normalize_table.h',
-                      command: [util_normalize_table_generator],
-                      capture:true)
+  util_normalize_table_h = custom_target(
+    'util_normalize_table.h',
+    output: 'util_normalize_table.h',
+    command: [util_normalize_table_generator],
+    capture:true
+  )
 
   generated_headers += util_normalize_table_h
 endif
@@ -139,13 +139,21 @@ mock_files = files(
 )
 
 if cpp_compiler.get_id() == 'emscripten'
-  host_links = ['--whole-archive', '-sALLOW_MEMORY_GROWTH=1', '-sMODULARIZE=1',
-    '-sEXPORT_ES6', '-sENVIRONMENT=web,webview',
-    '--emit-tsd', 'km-core-interface.d.ts', '-sERROR_ON_UNDEFINED_SYMBOLS=0']
-
-  links += ['-sEXPORTED_RUNTIME_METHODS=[\'UTF8ToString\',\'stringToNewUTF8\',\'wasmExports\']',
-      # Forcing inclusion of debug symbols
-      '-g', '-Wlimited-postlink-optimizations', '--bind']
+  links += [
+    '-sEXPORTED_RUNTIME_METHODS=[\'UTF8ToString\',\'stringToNewUTF8\',\'wasmExports\']',
+    # Forcing inclusion of debug symbols
+    '-g', '-Wlimited-postlink-optimizations',
+    '-lembind'
+  ]
+  host_links = [
+    '--whole-archive',
+    '-sALLOW_MEMORY_GROWTH=1',
+    '-sMODULARIZE=1', '-sEXPORT_NAME=createCoreProcessor',
+    '-sEXPORT_ES6',
+    '-sENVIRONMENT=web,webview',
+    '--emit-tsd', 'km-core-interface.d.ts',
+    # '-sERROR_ON_UNDEFINED_SYMBOLS=0'
+  ]
 endif
 
 lib = library('keymancore',
diff --git a/core/src/wasm.cpp b/core/src/wasm.cpp
index 90fc85cda88..f11158470e2 100644
--- a/core/src/wasm.cpp
+++ b/core/src/wasm.cpp
@@ -1,11 +1,7 @@
 #ifdef __EMSCRIPTEN__
-#ifdef __EMSCRIPTEN__
 #include <emscripten/emscripten.h>
 #include <emscripten/bind.h>
-
-#else
-#define EMSCRIPTEN_KEEPALIVE
-#endif
+#include <vector>
 
 #ifdef __cplusplus
 #define EXTERN extern "C" EMSCRIPTEN_KEEPALIVE
@@ -13,8 +9,11 @@
 #define EXTERN EMSCRIPTEN_KEEPALIVE
 #endif
 
+#include "processor.hpp"
 #include <keyman_core.h>
 
+namespace em = emscripten;
+
 constexpr km_core_attr const engine_attrs = {
   256,
   KM_CORE_LIB_CURRENT,
@@ -24,21 +23,88 @@ constexpr km_core_attr const engine_attrs = {
   "SIL International"
 };
 
-EMSCRIPTEN_KEEPALIVE km_core_attr const & tmp_wasm_attributes() {
+EMSCRIPTEN_KEEPALIVE km_core_attr const& tmp_wasm_attributes() {
   return engine_attrs;
 }
 
+template <typename T> class CoreReturn {
+public:
+  CoreReturn(int status = 0, const T* obj = nullptr) : status(status), object(obj) {
+  }
+  void setStatus(int status) {
+    this->status = status;
+  }
+  int getStatus() const {
+    return status;
+  }
+  void setObject(const T* obj) {
+    object = obj;
+  }
+  const T* getObject() const {
+    return object;
+  }
+
+private:
+  int status;
+  const T* object;
+};
+
+km_core_status
+keyboard_load_from_blob_internal(const km_core_path_name kb_name, const std::vector<uint8_t>& buf, km_core_keyboard** keyboard);
+
+EMSCRIPTEN_KEEPALIVE const CoreReturn<km_core_keyboard>*
+km_core_keyboard_load_from_blob_wasm(
+  std::string kb_name,
+  const emscripten::val& blob_val
+) {
+  std::vector<uint8_t> blob;
+  km_core_keyboard* keyboard_ptr = nullptr;
+
+  const auto length = blob_val["length"].as<unsigned>();
+  blob.resize(length);
+
+  emscripten::val memoryView{emscripten::typed_memory_view(length, blob.data())};
+  memoryView.call<void>("set", blob_val);
+  km_core_status retVal = ::keyboard_load_from_blob_internal(kb_name.c_str(), blob, &keyboard_ptr);
+  return new CoreReturn<km_core_keyboard>(retVal, keyboard_ptr);
+}
+
 EMSCRIPTEN_BINDINGS(core_interface) {
 
-  emscripten::value_object<km_core_attr>("km_core_attr")
+  em::value_object<km_core_attr>("km_core_attr")
     .field("max_context", &km_core_attr::max_context)
     .field("current", &km_core_attr::current)
     .field("revision", &km_core_attr::revision)
     .field("age", &km_core_attr::age)
     .field("technology", &km_core_attr::technology)
-    //.field("vendor", &km_core_attr::vendor, emscripten::allow_raw_pointers())
+    //.field("vendor", &km_core_attr::vendor, em::allow_raw_pointers())
     ;
 
-  emscripten::function("tmp_wasm_attributes", &tmp_wasm_attributes);
+  em::function("tmp_wasm_attributes", &tmp_wasm_attributes);
+
+
+  // Unfortunately embind has an open issue with enums and typescript where it
+  // only generates a type for the enum, but not the values in a usable way.
+  // Therefore it's not much use to expose the enum here.
+  // See https://github.com/emscripten-core/emscripten/issues/18585
+
+  // em::enum_<km_core_status_codes>("km_core_status_codes")
+  //   .value("OK", KM_CORE_STATUS_OK)
+  //   .value("NO_MEM", KM_CORE_STATUS_NO_MEM)
+  //   .value("IO_ERROR", KM_CORE_STATUS_IO_ERROR)
+  //   .value("INVALID_ARGUMENT", KM_CORE_STATUS_INVALID_ARGUMENT)
+  //   .value("KEY_ERROR", KM_CORE_STATUS_KEY_ERROR)
+  //   .value("INSUFFICENT_BUFFER", KM_CORE_STATUS_INSUFFICENT_BUFFER)
+  //   .value("INVALID_UTF", KM_CORE_STATUS_INVALID_UTF)
+  //   .value("INVALID_KEYBOARD", KM_CORE_STATUS_INVALID_KEYBOARD)
+  //   .value("NOT_IMPLEMENTED", KM_CORE_STATUS_NOT_IMPLEMENTED)
+  //   .value("OS_ERROR", KM_CORE_STATUS_OS_ERROR);
+
+  em::class_<km_core_keyboard>("km_core_keyboard");
+  em::class_<CoreReturn<km_core_keyboard>>("CoreKeyboardReturn")
+      .property("status", &CoreReturn<km_core_keyboard>::getStatus)
+      .property("object", &CoreReturn<km_core_keyboard>::getObject, em::allow_raw_pointers());
+
+  em::function("keyboard_load_from_blob", &km_core_keyboard_load_from_blob_wasm, em::allow_raw_pointers());
 }
 #endif

From 067c8a0a5b47f47e6eaf1e035b5bdff956eb7346 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 11 Dec 2024 19:47:38 +0100
Subject: [PATCH 044/254] chore(core): cleanup `meson.build`

---
 core/meson.build     |  2 +-
 core/src/meson.build | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/meson.build b/core/meson.build
index 8c6cbfdc61d..6f0ad87db50 100644
--- a/core/meson.build
+++ b/core/meson.build
@@ -37,7 +37,7 @@ endif
 
 # shared with a number of subdirs
 if cpp_compiler.get_id() == 'emscripten'
-  wasm_exported_runtime_methods = '-sEXPORTED_RUNTIME_METHODS=[\'UTF8ToString\',\'stringToNewUTF8\']'
+  wasm_exported_runtime_methods = '-sEXPORTED_RUNTIME_METHODS=[\'UTF8ToString\',\'stringToNewUTF8\',\'wasmExports\']'
 endif
 
 subdir('docs/internal')
diff --git a/core/src/meson.build b/core/src/meson.build
index d80aae84bdd..a9771e4747e 100644
--- a/core/src/meson.build
+++ b/core/src/meson.build
@@ -138,11 +138,14 @@ mock_files = files(
   'mock/mock_processor.cpp',
 )
 
+extra_defns = []
+extra_links = []
 if cpp_compiler.get_id() == 'emscripten'
-  links += [
-    '-sEXPORTED_RUNTIME_METHODS=[\'UTF8ToString\',\'stringToNewUTF8\',\'wasmExports\']',
+  extra_defns += ['-g']
+  extra_links += ['-sSAFE_HEAP=1', wasm_exported_runtime_methods,
     # Forcing inclusion of debug symbols
     '-g', '-Wlimited-postlink-optimizations',
+    '--emit-tsd', 'keymancore.d.ts',
     '-lembind'
   ]
   host_links = [
@@ -163,8 +166,8 @@ lib = library('keymancore',
   mock_files,
   version_res,
   generated_headers,
-  cpp_args: defns + warns + flags,
-  link_args: links,
+  cpp_args: defns + extra_defns + warns + flags,
+  link_args: links + extra_links,
   version: lib_version,
   include_directories: inc,
   pic: true,
@@ -187,9 +190,9 @@ pkg.generate(
 if cpp_compiler.get_id() == 'emscripten'
   # Build an executable
   host = executable('km-core',
-    cpp_args: defns,
+    cpp_args: defns + extra_defns,
     include_directories: inc,
-    link_args: links + host_links,
+    link_args: links + host_links + extra_links,
     objects: lib.extract_all_objects(recursive: false))
 
   if get_option('buildtype') == 'release'

From 193dd77ffbe1a12fa961e9365c369f45cb3cd87a Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 16 Dec 2024 17:19:52 +0100
Subject: [PATCH 045/254] fix(core): fix build of unit tests

Without this change building unit tests fail with an error that
`--shared-memory` is disallowed.
---
 core/meson.build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/meson.build b/core/meson.build
index 6f0ad87db50..a481567b850 100644
--- a/core/meson.build
+++ b/core/meson.build
@@ -38,6 +38,9 @@ endif
 # shared with a number of subdirs
 if cpp_compiler.get_id() == 'emscripten'
   wasm_exported_runtime_methods = '-sEXPORTED_RUNTIME_METHODS=[\'UTF8ToString\',\'stringToNewUTF8\',\'wasmExports\']'
+
+  # For Google Test
+  add_global_arguments('-pthread', language: [ 'cpp', 'c' ] )
 endif
 
 subdir('docs/internal')

From 06a8c7a867aea88df187f2407d4828f6e0771509 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 16 Dec 2024 17:22:11 +0100
Subject: [PATCH 046/254] feat(core): properly implement converting blob

---
 core/src/wasm.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/core/src/wasm.cpp b/core/src/wasm.cpp
index f11158470e2..a0dc5c1f790 100644
--- a/core/src/wasm.cpp
+++ b/core/src/wasm.cpp
@@ -57,14 +57,9 @@ km_core_keyboard_load_from_blob_wasm(
   std::string kb_name,
   const emscripten::val& blob_val
 ) {
-  std::vector<uint8_t> blob;
+  std::vector<uint8_t> blob = emscripten::convertJSArrayToNumberVector<uint8_t>(blob_val);
   km_core_keyboard* keyboard_ptr = nullptr;
 
-  const auto length = blob_val["length"].as<unsigned>();
-  blob.resize(length);
-
-  emscripten::val memoryView{emscripten::typed_memory_view(length, blob.data())};
-  memoryView.call<void>("set", blob_val);
   km_core_status retVal = ::keyboard_load_from_blob_internal(kb_name.c_str(), blob, &keyboard_ptr);
   return new CoreReturn<km_core_keyboard>(retVal, keyboard_ptr);
 }

From d48acd320476ff31c7234e98b6cb6b1fc0d159af Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 16 Dec 2024 18:01:09 +0100
Subject: [PATCH 047/254] chore(web): rename type library to match target name

This change renames the type library from `km-core=-interface.d.ts`
to `keymancore.d.ts` to match the name of the target (`keymancore`)
to make it more obvious where this comes from and where/how it gets
build.
---
 core/src/meson.build                                | 1 -
 web/src/engine/core-processor/build.sh              | 6 +++---
 web/src/engine/core-processor/src/core-processor.ts | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/src/meson.build b/core/src/meson.build
index a9771e4747e..ec76b843d86 100644
--- a/core/src/meson.build
+++ b/core/src/meson.build
@@ -154,7 +154,6 @@ if cpp_compiler.get_id() == 'emscripten'
     '-sMODULARIZE=1', '-sEXPORT_NAME=createCoreProcessor',
     '-sEXPORT_ES6',
     '-sENVIRONMENT=web,webview',
-    '--emit-tsd', 'km-core-interface.d.ts',
     # '-sERROR_ON_UNDEFINED_SYMBOLS=0'
   ]
 endif
diff --git a/web/src/engine/core-processor/build.sh b/web/src/engine/core-processor/build.sh
index 072e5a89f35..09568da5c20 100755
--- a/web/src/engine/core-processor/build.sh
+++ b/web/src/engine/core-processor/build.sh
@@ -23,7 +23,7 @@ builder_describe "Keyman Core WASM integration" \
   "--ci+                     Set to utilize CI-based test configurations & reporting."
 
 builder_describe_outputs \
-  configure    "/web/src/engine/core-processor/src/import/core/km-core-interface.d.ts" \
+  configure    "/web/src/engine/core-processor/src/import/core/keymancore.d.ts" \
   build        "/web/build/${SUBPROJECT_NAME}/lib/index.mjs"
 
 builder_parse "$@"
@@ -41,12 +41,12 @@ do_configure() {
   mkdir -p "src/import/core/"
   # we don't need this file for release builds, but it's nice to have
   # for reference and auto-completion
-  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/km-core-interface.d.ts" "src/import/core/"
+  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/keymancore.d.ts" "src/import/core/"
 }
 
 copy_deps() {
   mkdir -p "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/import/core/"
-  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/"km-core-interface.d.ts "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/import/core/"
+  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/keymancore.d.ts" "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/import/core/"
   cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/"km-core{.js,.wasm} "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/import/core/"
 }
 
diff --git a/web/src/engine/core-processor/src/core-processor.ts b/web/src/engine/core-processor/src/core-processor.ts
index e1584ad1ea8..7e54fcc1aa6 100644
--- a/web/src/engine/core-processor/src/core-processor.ts
+++ b/web/src/engine/core-processor/src/core-processor.ts
@@ -1,4 +1,4 @@
-type km_core_attr = import('./import/core/km-core-interface.js').km_core_attr;
+type km_core_attr = import('./import/core/keymancore.js').km_core_attr;
 
 export class CoreProcessor {
   private instance: any;

From 6bef09f68b81290a69b7a6efb7252bde86669d9e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 20 Dec 2024 18:00:25 +0100
Subject: [PATCH 048/254] fix(core): work around alignment problem when using
 Emscripten

The data we read from the KMX file is not in places 32-bit aligned, e.g.
`dpGroupArray` will often start at a 16-bit boundary. Emscripten doesn't
like this and will abort the program if `SAFE_HEAP=1` is defined.

This change works around the problem by calling `CopyKeyboard` and thus
expanding the structure.

See #12844.
---
 core/src/kmx/kmx_file.cpp       | 18 ++++++++++--------
 core/src/kmx/kmx_processevent.h |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/src/kmx/kmx_file.cpp b/core/src/kmx/kmx_file.cpp
index 2eea0185813..9a4100c754d 100644
--- a/core/src/kmx/kmx_file.cpp
+++ b/core/src/kmx/kmx_file.cpp
@@ -68,11 +68,11 @@ KMX_BOOL KMX_ProcessEvent::LoadKeyboardFromBlob(
 
   *lpKeyboard = NULL;
 
-#ifdef KMX_64BIT
+#if defined(KMX_64BIT) || defined(__EMSCRIPTEN__)
   // allocate enough memory for expanded data structure + original data.
-  // Expanded data structure is double the size of data on disk (8-byte
-  // pointers) - on disk the "pointers" are relative to the beginning of
-  // the file.
+  // Expanded data structure is no more than double the size of data on
+  // disk (8-byte pointers) - on disk the "pointers" are relative to the
+  // beginning of the file.
   // We save the original data at the end of buf; we don't copy strings, so
   // those will remain in the location at the end of the buffer.
   buf = new KMX_BYTE[sz * 3];
@@ -84,7 +84,7 @@ KMX_BOOL KMX_ProcessEvent::LoadKeyboardFromBlob(
     DebugLog("Not allocmem");
     return FALSE;
   }
-#ifdef KMX_64BIT
+#if defined(KMX_64BIT) || defined(__EMSCRIPTEN__)
   filebase = buf + sz * 2;
 #else
   filebase = buf;
@@ -103,7 +103,7 @@ KMX_BOOL KMX_ProcessEvent::LoadKeyboardFromBlob(
     return FALSE;
   }
 
-#ifdef KMX_64BIT
+#if defined(KMX_64BIT) || defined(__EMSCRIPTEN__)
   kbp = CopyKeyboard(buf, filebase);
 #else
   kbp = FixupKeyboard(buf, filebase);
@@ -132,13 +132,15 @@ PKMX_WCHAR KMX_ProcessEvent::StringOffset(PKMX_BYTE base, KMX_DWORD offset)
   return (PKMX_WCHAR)(base + offset);
 }
 
-#ifdef KMX_64BIT
+#if defined(KMX_64BIT) || defined(__EMSCRIPTEN__)
 /**
   CopyKeyboard will copy the data read into bufp from x86-sized structures into
   x64-sized structures starting at `base`
   * After this function finishes, we still need to keep the original data because
     we don't copy the strings
-  This method is used on 64-bit architectures.
+  This method is used on 64-bit architectures as well as with Emscripten.
+  Emscripten requires 32-bit alignment for pointers which we don't always
+  have in the KMX data (see #12844).
 */
 LPKEYBOARD KMX_ProcessEvent::CopyKeyboard(PKMX_BYTE bufp, PKMX_BYTE base)
 {
diff --git a/core/src/kmx/kmx_processevent.h b/core/src/kmx/kmx_processevent.h
index 090488dccb4..202541e4550 100644
--- a/core/src/kmx/kmx_processevent.h
+++ b/core/src/kmx/kmx_processevent.h
@@ -57,7 +57,7 @@ class KMX_ProcessEvent {
   KMX_BOOL LoadKeyboardFromBlob(PKMX_BYTE buf, size_t sz, LPKEYBOARD* lpKeyboard);
   KMX_BOOL VerifyKeyboard(PKMX_BYTE filebase, size_t sz);
   KMX_BOOL VerifyChecksum(PKMX_BYTE buf,  size_t sz);
-#ifdef KMX_64BIT
+#if defined(KMX_64BIT) || defined(__EMSCRIPTEN__)
   LPKEYBOARD CopyKeyboard(PKMX_BYTE bufp, PKMX_BYTE base);
 #else
   LPKEYBOARD FixupKeyboard(PKMX_BYTE bufp, PKMX_BYTE base);

From a072171ec881e4bee4cb3e41a055838a93cf40b2 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Sun, 17 Nov 2024 22:09:57 +0700
Subject: [PATCH 049/254] feat(web): load .kmx keyboard from blob

This change adds the web side of loading a .kmx keyboard from a
blob. It also replaces the `CoreProcessor` class with `CoreFactory`
that allows to directly use the methods defined in WASM without
having to add another wrapper for each method.
---
 core/include/keyman/keyman_core_api.h         |  5 ++-
 web/build.sh                                  |  3 ++
 .../engine/core-processor/src/core-factory.ts | 38 +++++++++++++++++++
 .../core-processor/src/core-processor.ts      | 30 ---------------
 web/src/engine/core-processor/src/index.ts    |  4 +-
 .../main/src/headless/inputProcessor.ts       | 12 ++++--
 .../dom/cases/core-processor/basic.tests.ts   | 31 +++++++++++----
 .../test/auto/dom/web-test-runner.config.mjs  |  2 +
 8 files changed, 82 insertions(+), 43 deletions(-)
 create mode 100644 web/src/engine/core-processor/src/core-factory.ts
 delete mode 100644 web/src/engine/core-processor/src/core-processor.ts

diff --git a/core/include/keyman/keyman_core_api.h b/core/include/keyman/keyman_core_api.h
index 7863689296d..af77ddfb2ca 100644
--- a/core/include/keyman/keyman_core_api.h
+++ b/core/include/keyman/keyman_core_api.h
@@ -302,11 +302,14 @@ typedef uint8_t (*km_core_keyboard_imx_platform)(km_core_state*, uint32_t, void*
 
 ## Description
 
-An error code mechanism similar to COM’s `HRESULT` scheme (unlike COM, any
+An error code mechanism similar to COM's `HRESULT` scheme (unlike COM, any
 non-zero value is an error).
 
 ## Specification
 
+-->
+// keep in sync with web/src/engine/core-processor/src/core-factory.ts
+<!--
 ```c */
 enum km_core_status_codes {
   KM_CORE_STATUS_OK = 0,
diff --git a/web/build.sh b/web/build.sh
index 1fb06436e33..08b898e91e0 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -122,6 +122,9 @@ build_action() {
 
   tsc --project "${KEYMAN_ROOT}/web/src/test/auto/tsconfig.json"
 
+  mkdir -p "${KEYMAN_ROOT}/web/build/test/dom/cases/core-processor/import/core/"
+  cp "${KEYMAN_ROOT}/web/src/engine/core-processor/src/import/core/keymancore.d.ts" "${KEYMAN_ROOT}/web/build/test/dom/cases/core-processor/import/core/"
+
   for dir in \
     "${KEYMAN_ROOT}/web/build/test/dom/cases"/*/ \
     "${KEYMAN_ROOT}/web/build/test/integrated/" \
diff --git a/web/src/engine/core-processor/src/core-factory.ts b/web/src/engine/core-processor/src/core-factory.ts
new file mode 100644
index 00000000000..516e6f521df
--- /dev/null
+++ b/web/src/engine/core-processor/src/core-factory.ts
@@ -0,0 +1,38 @@
+// Keyman is copyright (C) SIL International. MIT License.
+
+import { type MainModule } from './import/core/keymancore.js';
+
+// Unfortunately embind has an open issue with enums and typescript where it
+// only generates a type for the enum, but not the values in a usable way.
+// So we have to re-define the enum here.
+// See https://github.com/emscripten-core/emscripten/issues/18585
+// NOTE: Keep in sync with core/include/keyman/keyman_core_api.h#L311
+export enum KM_CORE_STATUS {
+  OK = 0,
+  NO_MEM = 1,
+  IO_ERROR = 2,
+  INVALID_ARGUMENT = 3,
+  KEY_ERROR = 4,
+  INSUFFICENT_BUFFER = 5,
+  INVALID_UTF = 6,
+  INVALID_KEYBOARD = 7,
+  NOT_IMPLEMENTED = 8,
+  OS_ERROR = 0x80000000
+}
+
+export class CoreFactory {
+  public static async createCoreProcessor(baseurl: string): Promise<MainModule> {
+    try {
+      const module = await import(baseurl + '/km-core.js');
+      const createCoreProcessor = module.default;
+      return await createCoreProcessor({
+        locateFile: function (path: string, scriptDirectory: string) {
+          return baseurl + '/' + path;
+        }
+      });
+    } catch (e: any) {
+      console.log('got execption in CoreFactory.createCoreProcessor', e);
+      return null;
+    }
+  }
+}
\ No newline at end of file
diff --git a/web/src/engine/core-processor/src/core-processor.ts b/web/src/engine/core-processor/src/core-processor.ts
deleted file mode 100644
index 7e54fcc1aa6..00000000000
--- a/web/src/engine/core-processor/src/core-processor.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-type km_core_attr = import('./import/core/keymancore.js').km_core_attr;
-
-export class CoreProcessor {
-  private instance: any;
-
-  /**
-   * Initialize Core Processor
-   * @param baseurl - The url where km-core.js is located
-   */
-  public async init(baseurl: string): Promise<boolean> {
-
-    if (!this.instance) {
-      try {
-        const module = await import(baseurl + '/km-core.js');
-        this.instance = await module.default({
-          locateFile: function (path: string, scriptDirectory: string) {
-            return baseurl + '/' + path;
-          }
-        });
-      } catch (e: any) {
-        return false;
-      }
-    }
-    return !!this.instance;
-  };
-
-  public tmp_wasm_attributes(): km_core_attr {
-    return this.instance.tmp_wasm_attributes();
-  }
-}
diff --git a/web/src/engine/core-processor/src/index.ts b/web/src/engine/core-processor/src/index.ts
index 06f040ce538..ecd943b494c 100644
--- a/web/src/engine/core-processor/src/index.ts
+++ b/web/src/engine/core-processor/src/index.ts
@@ -1 +1,3 @@
-export * from './core-processor.js';
\ No newline at end of file
+export { CoreFactory, KM_CORE_STATUS } from './core-factory.js';
+import { type MainModule, type km_core_keyboard, type CoreKeyboardReturn } from './import/core/keymancore.js';
+export { MainModule, km_core_keyboard, CoreKeyboardReturn };
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index c367405af95..cf30f574cd1 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -5,7 +5,8 @@ import { LanguageProcessor }  from "./languageProcessor.js";
 import type { ModelSpec, PathConfiguration }  from "keyman/engine/interfaces";
 import { globalObject, DeviceSpec } from "@keymanapp/web-utils";
 
-import { CoreProcessor } from "keyman/engine/core-processor";
+import { CoreFactory, MainModule as KmCoreModule } from 'keyman/engine/core-processor';
+
 import { Codes, type Keyboard, type KeyEvent } from "keyman/engine/keyboard";
 import {
   type Alternate,
@@ -35,7 +36,7 @@ export class InputProcessor {
   private contextDevice: DeviceSpec;
   private kbdProcessor: KeyboardProcessor;
   private lngProcessor: LanguageProcessor;
-  private coreProcessor: CoreProcessor;
+  private km_core: KmCoreModule;
 
   private readonly contextCache = new TranscriptionCache();
 
@@ -51,11 +52,10 @@ export class InputProcessor {
     this.contextDevice = device;
     this.kbdProcessor = new KeyboardProcessor(device, options);
     this.lngProcessor = new LanguageProcessor(predictiveTextWorker, this.contextCache);
-    this.coreProcessor = new CoreProcessor();
   }
 
   public async init(paths: PathConfiguration) {
-    this.coreProcessor.init(paths.basePath);
+    this.km_core = await CoreFactory.createCoreProcessor(paths.basePath);
   }
 
   public get languageProcessor(): LanguageProcessor {
@@ -70,6 +70,10 @@ export class InputProcessor {
     return this.keyboardProcessor.keyboardInterface;
   }
 
+  public get keymanCore(): KmCoreModule {
+    return this.km_core;
+  }
+
   public get activeKeyboard(): Keyboard {
     return this.keyboardInterface.activeKeyboard;
   }
diff --git a/web/src/test/auto/dom/cases/core-processor/basic.tests.ts b/web/src/test/auto/dom/cases/core-processor/basic.tests.ts
index 767d2e2fbb9..8c9e0754ab3 100644
--- a/web/src/test/auto/dom/cases/core-processor/basic.tests.ts
+++ b/web/src/test/auto/dom/cases/core-processor/basic.tests.ts
@@ -1,21 +1,38 @@
 import { assert } from 'chai';
-import { CoreProcessor } from 'keyman/engine/core-processor';
+import { CoreFactory, KM_CORE_STATUS } from 'keyman/engine/core-processor';
 
-const coreurl = '/web/build/engine/core-processor/obj/import/core';
+const coreurl = '/build/engine/core-processor/obj/import/core';
 
 // Test the CoreProcessor interface.
 describe('CoreProcessor', function () {
+  async function loadKeyboardBlob(uri: string) {
+    const response = await fetch(uri);
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status} ${response.statusText}`);
+    }
+
+    const buffer = await response.arrayBuffer();
+    return new Uint8Array(buffer);
+  }
+
   it('can initialize without errors', async function () {
-    const kp = new CoreProcessor();
-    assert.isTrue(await kp.init(coreurl));
+    assert.isNotNull(await CoreFactory.createCoreProcessor(coreurl));
   });
 
   it('can call temp function', async function () {
-    const kp = new CoreProcessor();
-    await kp.init(coreurl);
-    const a = kp.tmp_wasm_attributes();
+    const km_core = await CoreFactory.createCoreProcessor(coreurl);
+    const a = km_core.tmp_wasm_attributes();
     assert.isNotNull(a);
     assert.isNumber(a.max_context);
     console.dir(a);
   });
+
+  it('can load a keyboard from blob', async function () {
+    const km_core = await CoreFactory.createCoreProcessor(coreurl);
+    const blob = await loadKeyboardBlob('/common/test/resources/keyboards/test_8568_deadkeys.kmx')
+    const result = km_core.keyboard_load_from_blob('test', blob);
+    assert.equal(result.status, KM_CORE_STATUS.OK);
+    assert.isNotNull(result.object);
+    result.delete();
+  });
 });
diff --git a/web/src/test/auto/dom/web-test-runner.config.mjs b/web/src/test/auto/dom/web-test-runner.config.mjs
index ec3d64ac8fd..48a3a4f9f3b 100644
--- a/web/src/test/auto/dom/web-test-runner.config.mjs
+++ b/web/src/test/auto/dom/web-test-runner.config.mjs
@@ -92,6 +92,8 @@ export default {
     function rewriteResourcePath(context, next) {
       if(context.url.startsWith('/resources/')) {
         context.url = '/web/src/test/auto' + context.url;
+      } else if (context.url.startsWith('/build/')) {
+        context.url = '/web' + context.url;
       }
 
       return next();

From 69cb2fda59ecaa8e125aa4ab43695666b0e42b92 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 6 Jan 2025 14:29:57 +0100
Subject: [PATCH 050/254] fix(core): use a specific flag for adjusting
 alignments

This change adds a new flag `KMX_REQUIRES_REALIGNMENT` instead of the
previous `KMX_64BIT` for the cases where we have to re-align the KMX data
at pointer boundaries. Renamed because Emscripten also needs the
re-alignment even though it's 32-bit.

Addresses code review comments.
---
 common/include/km_types.h       | 12 ++++++++++--
 core/src/kmx/kmx_file.cpp       | 12 ++++++------
 core/src/kmx/kmx_processevent.h |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/common/include/km_types.h b/common/include/km_types.h
index 68d741afb01..54f2a335492 100644
--- a/common/include/km_types.h
+++ b/common/include/km_types.h
@@ -14,12 +14,20 @@
 
 #if defined(__LP64__) || defined(_LP64)
 /* 64-bit, g++ */
-#define KMX_64BIT
+#define KMX_REQUIRES_REALIGNMENT
 #endif
 
 #if defined(_WIN64) && !defined(USE_64)
 /* 64-bit, Windows */
-#define KMX_64BIT
+#define KMX_REQUIRES_REALIGNMENT
+#endif
+
+#if defined(__EMSCRIPTEN__)
+// Emscripten/WASM. Emscripten even though it uses 32-bit (and not 64-bit
+// pointers like the 64-bit architectures above) requires 32-bit alignment
+// for pointers which we don't always have in the KMX data from file
+// (see #12844).
+#define KMX_REQUIRES_REALIGNMENT
 #endif
 
 typedef uint32_t   KMX_DWORD;
diff --git a/core/src/kmx/kmx_file.cpp b/core/src/kmx/kmx_file.cpp
index 9a4100c754d..ab90df7d528 100644
--- a/core/src/kmx/kmx_file.cpp
+++ b/core/src/kmx/kmx_file.cpp
@@ -68,11 +68,11 @@ KMX_BOOL KMX_ProcessEvent::LoadKeyboardFromBlob(
 
   *lpKeyboard = NULL;
 
-#if defined(KMX_64BIT) || defined(__EMSCRIPTEN__)
+#ifdef KMX_REQUIRES_REALIGNMENT
   // allocate enough memory for expanded data structure + original data.
   // Expanded data structure is no more than double the size of data on
-  // disk (8-byte pointers) - on disk the "pointers" are relative to the
-  // beginning of the file.
+  // disk (8-byte pointers for 64-bit architectures) - on disk the
+  // "pointers" are relative to the beginning of the file.
   // We save the original data at the end of buf; we don't copy strings, so
   // those will remain in the location at the end of the buffer.
   buf = new KMX_BYTE[sz * 3];
@@ -84,7 +84,7 @@ KMX_BOOL KMX_ProcessEvent::LoadKeyboardFromBlob(
     DebugLog("Not allocmem");
     return FALSE;
   }
-#if defined(KMX_64BIT) || defined(__EMSCRIPTEN__)
+#ifdef KMX_REQUIRES_REALIGNMENT
   filebase = buf + sz * 2;
 #else
   filebase = buf;
@@ -103,7 +103,7 @@ KMX_BOOL KMX_ProcessEvent::LoadKeyboardFromBlob(
     return FALSE;
   }
 
-#if defined(KMX_64BIT) || defined(__EMSCRIPTEN__)
+#ifdef KMX_REQUIRES_REALIGNMENT
   kbp = CopyKeyboard(buf, filebase);
 #else
   kbp = FixupKeyboard(buf, filebase);
@@ -132,7 +132,7 @@ PKMX_WCHAR KMX_ProcessEvent::StringOffset(PKMX_BYTE base, KMX_DWORD offset)
   return (PKMX_WCHAR)(base + offset);
 }
 
-#if defined(KMX_64BIT) || defined(__EMSCRIPTEN__)
+#ifdef KMX_REQUIRES_REALIGNMENT
 /**
   CopyKeyboard will copy the data read into bufp from x86-sized structures into
   x64-sized structures starting at `base`
diff --git a/core/src/kmx/kmx_processevent.h b/core/src/kmx/kmx_processevent.h
index 202541e4550..7cca24965d2 100644
--- a/core/src/kmx/kmx_processevent.h
+++ b/core/src/kmx/kmx_processevent.h
@@ -57,7 +57,7 @@ class KMX_ProcessEvent {
   KMX_BOOL LoadKeyboardFromBlob(PKMX_BYTE buf, size_t sz, LPKEYBOARD* lpKeyboard);
   KMX_BOOL VerifyKeyboard(PKMX_BYTE filebase, size_t sz);
   KMX_BOOL VerifyChecksum(PKMX_BYTE buf,  size_t sz);
-#if defined(KMX_64BIT) || defined(__EMSCRIPTEN__)
+#ifdef KMX_REQUIRES_REALIGNMENT
   LPKEYBOARD CopyKeyboard(PKMX_BYTE bufp, PKMX_BYTE base);
 #else
   LPKEYBOARD FixupKeyboard(PKMX_BYTE bufp, PKMX_BYTE base);

From 2e5722705b367ca812b8388db538657f738ce3d1 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 6 Jan 2025 15:12:09 +0100
Subject: [PATCH 051/254] feat(web): address code review comments

---
 core/include/keyman/keyman_core_api.h         |  1 +
 .../engine/core-processor/src/core-factory.ts | 19 +++++++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/core/include/keyman/keyman_core_api.h b/core/include/keyman/keyman_core_api.h
index af77ddfb2ca..c0e8de96270 100644
--- a/core/include/keyman/keyman_core_api.h
+++ b/core/include/keyman/keyman_core_api.h
@@ -309,6 +309,7 @@ non-zero value is an error).
 
 -->
 // keep in sync with web/src/engine/core-processor/src/core-factory.ts
+// (see https://github.com/emscripten-core/emscripten/issues/18585)
 <!--
 ```c */
 enum km_core_status_codes {
diff --git a/web/src/engine/core-processor/src/core-factory.ts b/web/src/engine/core-processor/src/core-factory.ts
index 516e6f521df..ded35ef1a22 100644
--- a/web/src/engine/core-processor/src/core-factory.ts
+++ b/web/src/engine/core-processor/src/core-factory.ts
@@ -22,17 +22,12 @@ export enum KM_CORE_STATUS {
 
 export class CoreFactory {
   public static async createCoreProcessor(baseurl: string): Promise<MainModule> {
-    try {
-      const module = await import(baseurl + '/km-core.js');
-      const createCoreProcessor = module.default;
-      return await createCoreProcessor({
-        locateFile: function (path: string, scriptDirectory: string) {
-          return baseurl + '/' + path;
-        }
-      });
-    } catch (e: any) {
-      console.log('got execption in CoreFactory.createCoreProcessor', e);
-      return null;
-    }
+    const module = await import(baseurl + '/km-core.js');
+    const createCoreProcessor = module.default;
+    return await createCoreProcessor({
+      locateFile: function (path: string, scriptDirectory: string) {
+        return baseurl + '/' + path;
+      }
+    });
   }
 }
\ No newline at end of file

From a13981ebc96573a7018c8e1948a23bae8fabd3b2 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 14 Jan 2025 11:27:52 +0100
Subject: [PATCH 052/254] feat(web): fix test failures

Several tests failed because of async issues, so I went through where
we should wait and didn't.
---
 web/src/app/browser/src/keymanEngine.ts        |  4 ++--
 web/src/app/ui/build.sh                        |  4 ++++
 web/src/app/ui/kmwuibutton.ts                  |  6 +++---
 web/src/app/ui/kmwuifloat.ts                   |  6 +++---
 web/src/app/ui/kmwuitoggle.ts                  | 18 +++++++++---------
 web/src/app/ui/kmwuitoolbar.ts                 |  8 ++++----
 .../engine/main/src/headless/inputProcessor.ts |  8 ++++----
 web/src/engine/main/src/keymanEngine.ts        |  2 +-
 .../test/auto/integrated/cases/basics.tests.ts | 12 ++++++------
 web/src/test/auto/integrated/test_utils.ts     | 18 +++++++++---------
 .../auto/integrated/web-test-runner.config.mjs |  6 ++++++
 11 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 3c30740e81b..e2b7d5be63b 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -191,11 +191,11 @@ export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration,
     // globe key - are accessible.
     //
     // The `super` call above initializes `keyboardRequisitioner`, as needed here.
-    this.keyboardRequisitioner.cloudQueryEngine.once('unboundregister', () => {
+    this.keyboardRequisitioner.cloudQueryEngine.once('unboundregister', async () => {
       if(!this.contextManager.activeKeyboard?.keyboard) {
         // Autoselects this.keyboardRequisitioner.cache.defaultStub, which will be
         // set to an actual keyboard on mobile devices.
-        this.setActiveKeyboard('', '');
+        await this.setActiveKeyboard('', '');
       }
     });
 
diff --git a/web/src/app/ui/build.sh b/web/src/app/ui/build.sh
index a0ac5c4007b..4557a67430c 100755
--- a/web/src/app/ui/build.sh
+++ b/web/src/app/ui/build.sh
@@ -64,6 +64,10 @@ compile_and_copy() {
   mkdir -p "$KEYMAN_ROOT/web/build/app/resources/ui"
   cp -R "$KEYMAN_ROOT/web/src/resources/ui/." "$KEYMAN_ROOT/web/build/app/resources/ui/"
 
+  # Copy Keyman Core build artifacts for local reference
+  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/ui/debug/"
+  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/ui/release/"
+
   # Update the build/publish copy of our build artifacts
   prepare
 }
diff --git a/web/src/app/ui/kmwuibutton.ts b/web/src/app/ui/kmwuibutton.ts
index 5bdb01dff88..f0e6dfde21b 100644
--- a/web/src/app/ui/kmwuibutton.ts
+++ b/web/src/app/ui/kmwuibutton.ts
@@ -17,7 +17,7 @@ if(!keyman?.ui?.name) {
 
   /**
    * Do not enclose in an anonymous function, as the compiler may create
-   * global scope variables to replace true, false, null, whcih can then collide
+   * global scope variables to replace true, false, null, which can then collide
    * with other variables.
    * Instead, use the --output-wrapper command during optimization, which will
    * add the anonymous function to enclose all code, including those optimized
@@ -96,7 +96,7 @@ if(!keyman?.ui?.name) {
        * @param       {Event}  _id   keyboard selection event
        * @return      {boolean}
        */
-      readonly _SelectKeyboard = (_id: Event) => {
+      readonly _SelectKeyboard = async (_id: Event): Promise<boolean> => {
         let id: string = '';
         if(typeof(_id) == 'object') {
           let t: HTMLElement = null;
@@ -124,7 +124,7 @@ if(!keyman?.ui?.name) {
             _k.className='selected';
           }
           this._KMWSel = _k;
-          keymanweb.setActiveKeyboard(_name,_lgc);
+          await keymanweb.setActiveKeyboard(_name,_lgc);
         } else {
           _name=null;
         }
diff --git a/web/src/app/ui/kmwuifloat.ts b/web/src/app/ui/kmwuifloat.ts
index 8d06534ad7c..b2bb980ede9 100644
--- a/web/src/app/ui/kmwuifloat.ts
+++ b/web/src/app/ui/kmwuifloat.ts
@@ -442,15 +442,15 @@ if(!keyman?.ui?.name) {
        * @param       {Object}    e       event
        * Description  Change active keyboard in response to user selection event
        */
-      readonly SelectKeyboardChange = (e: Event) => {
+      readonly SelectKeyboardChange = async (e: Event) => {
         keymanweb.activatingUI(true);
 
         if(this.KeyboardSelector.value != '-') {
           var i=this.KeyboardSelector.selectedIndex;
           var t=this.KeyboardSelector.options[i].value.split(':');
-          keymanweb.setActiveKeyboard(t[0],t[1]);
+          await keymanweb.setActiveKeyboard(t[0],t[1]);
         } else {
-          keymanweb.setActiveKeyboard('');
+          await keymanweb.setActiveKeyboard('');
         }
 
         //if(osk['show']) osk['show'](osk['isEnabled']()); handled by keyboard change event???
diff --git a/web/src/app/ui/kmwuitoggle.ts b/web/src/app/ui/kmwuitoggle.ts
index e354b0c97e5..487e1743b63 100644
--- a/web/src/app/ui/kmwuitoggle.ts
+++ b/web/src/app/ui/kmwuitoggle.ts
@@ -180,7 +180,7 @@ if(!keyman?.ui?.name) {
       /**
        * Toggle a single keyboard on or off - KMW button control event
        **/
-      readonly switchSingleKbd = () => {
+      readonly switchSingleKbd = async () => {
         const _v = keymanweb.getActiveKeyboard() == '';
         let nLastKbd=0, kbdName='', lgCode='';
 
@@ -195,10 +195,10 @@ if(!keyman?.ui?.name) {
 
           kbdName = this.keyboards[nLastKbd]._InternalName;
           lgCode = this.keyboards[nLastKbd]._LanguageCode;
-          keymanweb.setActiveKeyboard(kbdName,lgCode);
+          await keymanweb.setActiveKeyboard(kbdName,lgCode);
           this.lastActiveKeyboard = nLastKbd;
         } else {
-          keymanweb.setActiveKeyboard('');
+          await keymanweb.setActiveKeyboard('');
         }
 
         if(this.kbdButton) {
@@ -209,7 +209,7 @@ if(!keyman?.ui?.name) {
       /**
        * Switch to the next keyboard in the list - KMW button control event
        **/
-      readonly switchNextKbd = () => {
+      readonly switchNextKbd = async () => {
         let _v = (keymanweb.getActiveKeyboard() == '');
         let kbdName='', lgCode='';
 
@@ -220,16 +220,16 @@ if(!keyman?.ui?.name) {
 
           kbdName = this.keyboards[0]._InternalName;
           lgCode = this.keyboards[0]._LanguageCode;
-          keymanweb.setActiveKeyboard(kbdName,lgCode);
+          await keymanweb.setActiveKeyboard(kbdName,lgCode);
           this.lastActiveKeyboard = 0;
         } else {
           if(this.lastActiveKeyboard == this.keyboards.length-1) {
-            keymanweb.setActiveKeyboard('');
+            await keymanweb.setActiveKeyboard('');
             _v = false;
           } else {
             kbdName = this.keyboards[++this.lastActiveKeyboard]._InternalName;
             lgCode = this.keyboards[this.lastActiveKeyboard]._LanguageCode;
-            keymanweb.setActiveKeyboard(kbdName,lgCode);
+            await keymanweb.setActiveKeyboard(kbdName,lgCode);
             _v = true;
           }
         }
@@ -551,7 +551,7 @@ if(!keyman?.ui?.name) {
        * @param       {number}  _kbd
        * Description  Select a keyboard from the drop down menu
        **/
-      selectKbd(_kbd: number) {
+      async selectKbd(_kbd: number): Promise<boolean> {
         let _name,_lgCode;
         if(_kbd < 0) {
           _name = '';
@@ -561,7 +561,7 @@ if(!keyman?.ui?.name) {
           _lgCode = this.keyboards[_kbd]._LanguageCode;
         }
 
-        keymanweb.setActiveKeyboard(_name,_lgCode);
+        await keymanweb.setActiveKeyboard(_name,_lgCode);
         keymanweb.focusLastActiveElement();
         this.kbdButton._setSelected(_name != '');
         if(_kbd >= 0) {
diff --git a/web/src/app/ui/kmwuitoolbar.ts b/web/src/app/ui/kmwuitoolbar.ts
index bf1cd6b8f2b..37fab0e7970 100644
--- a/web/src/app/ui/kmwuitoolbar.ts
+++ b/web/src/app/ui/kmwuitoolbar.ts
@@ -813,7 +813,7 @@ if(!keyman?.ui?.name) {
        * @param       {boolean} updateKeyman
        * @return      {boolean}
        **/
-      selectKeyboard(event: Event, lang: LanguageEntry, kbd: KeyboardDetail, updateKeyman: boolean) {
+      async selectKeyboard(event: Event, lang: LanguageEntry, kbd: KeyboardDetail, updateKeyman: boolean) {
         keymanweb.activatingUI(true);
 
         if(this.selectedLanguage) {
@@ -834,7 +834,7 @@ if(!keyman?.ui?.name) {
         // Return focus to input area and activate the selected keyboard
         this.addKeyboardToList(lang, kbd);
         if(updateKeyman) {
-          keymanweb.setActiveKeyboard(kbd.InternalName, kbd.LanguageCode).then(() => {
+          await keymanweb.setActiveKeyboard(kbd.InternalName, kbd.LanguageCode).then(() => {
             // Restore focus _after_ the keyboard finishes loading.
             this.setLastFocus();
           });
@@ -936,7 +936,7 @@ if(!keyman?.ui?.name) {
        * @return      {boolean}
        * Description  Update the UI when all keyboards disabled by user
        **/
-      readonly offButtonClickEvent = (event: Event) => {
+      readonly offButtonClickEvent = async (event: Event) => {
         if(this.toolbarNode.className != 'kmw_controls_disabled') {
           this.hideKeyboardsForLanguage(null);
           if(this.selectedLanguage) {
@@ -952,7 +952,7 @@ if(!keyman?.ui?.name) {
 
         // Return the focus to the input area and set the active keyboard to nothing
         this.setLastFocus();
-        keymanweb.setActiveKeyboard('','');
+        await keymanweb.setActiveKeyboard('','');
 
         //Save current state when deselecting a keyboard (may not be needed)
         this.saveCookie();
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index cf30f574cd1..17bb667be70 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -36,7 +36,7 @@ export class InputProcessor {
   private contextDevice: DeviceSpec;
   private kbdProcessor: KeyboardProcessor;
   private lngProcessor: LanguageProcessor;
-  private km_core: KmCoreModule;
+  private km_core: Promise<KmCoreModule>;
 
   private readonly contextCache = new TranscriptionCache();
 
@@ -54,8 +54,8 @@ export class InputProcessor {
     this.lngProcessor = new LanguageProcessor(predictiveTextWorker, this.contextCache);
   }
 
-  public async init(paths: PathConfiguration) {
-    this.km_core = await CoreFactory.createCoreProcessor(paths.basePath);
+  public init(paths: PathConfiguration) {
+    this.km_core = CoreFactory.createCoreProcessor(paths.basePath);
   }
 
   public get languageProcessor(): LanguageProcessor {
@@ -70,7 +70,7 @@ export class InputProcessor {
     return this.keyboardProcessor.keyboardInterface;
   }
 
-  public get keymanCore(): KmCoreModule {
+  public get keymanCore(): Promise<KmCoreModule> {
     return this.km_core;
   }
 
diff --git a/web/src/engine/main/src/keymanEngine.ts b/web/src/engine/main/src/keymanEngine.ts
index 774235cee0d..996ee48aa9d 100644
--- a/web/src/engine/main/src/keymanEngine.ts
+++ b/web/src/engine/main/src/keymanEngine.ts
@@ -238,7 +238,7 @@ export default class KeymanEngine<
     // Initialize supplementary plane string extensions
     String.kmwEnableSupplementaryPlane(true);
 
-    await this.core.init(config.paths);
+    this.core.init(config.paths);
 
     // Since we're not sandboxing keyboard loads yet, we just use `window` as the jsGlobal object.
     // All components initialized below require a properly-configured `config.paths` or similar.
diff --git a/web/src/test/auto/integrated/cases/basics.tests.ts b/web/src/test/auto/integrated/cases/basics.tests.ts
index 6103701fd83..b44907f2432 100644
--- a/web/src/test/auto/integrated/cases/basics.tests.ts
+++ b/web/src/test/auto/integrated/cases/basics.tests.ts
@@ -20,7 +20,7 @@ describe('Basic KeymanWeb', function() {
     assert.isFalse(DEVICE_DETECT_FAILURE, "Cannot run due to device detection failure.");
   })
 
-  beforeEach(function() {
+  beforeEach(async function(): Promise<any> {
     this.timeout(baseTimeout);
 
     const singleton = document.createElement('input');
@@ -55,7 +55,7 @@ if(!device.touchable) {
   describe('Basic Toggle UI', function() {
     this.timeout(baseTimeout);
 
-    beforeEach(async function() {
+    beforeEach(async function(): Promise<any> {
       this.timeout(baseTimeout);
 
       const singleton = document.createElement('input');
@@ -77,7 +77,7 @@ if(!device.touchable) {
       // UI-module specific typings are currently not available.
       const ui = keyman.ui as any;
 
-      assert(ui.initialized, 'Initialization flag is set to false!');
+      assert.isTrue(ui.initialized, 'Initialization flag is set to false!');
       assert.isNotNull(ui.controller, 'Failed to create the controller element!');
 
       var divs = document.getElementsByTagName("div");
@@ -95,7 +95,7 @@ if(!device.touchable) {
 
   describe('Basic Button UI', function() {
 
-    beforeEach(async function() {
+    beforeEach(async function(): Promise<any> {
       this.timeout(baseTimeout);
 
       const singleton = document.createElement('input');
@@ -123,7 +123,7 @@ if(!device.touchable) {
 
   describe('Basic Float UI', function() {
 
-    beforeEach(async function() {
+    beforeEach(async function(): Promise<any> {
       this.timeout(baseTimeout);
 
       const singleton = document.createElement('input');
@@ -164,7 +164,7 @@ if(!device.touchable) {
 
   describe('Basic Toolbar UI', function() {
 
-    beforeEach(async function() {
+    beforeEach(async function(): Promise<any> {
       this.timeout(baseTimeout);
 
       const singleton = document.createElement('input');
diff --git a/web/src/test/auto/integrated/test_utils.ts b/web/src/test/auto/integrated/test_utils.ts
index 9cacb46cb04..585fac80849 100644
--- a/web/src/test/auto/integrated/test_utils.ts
+++ b/web/src/test/auto/integrated/test_utils.ts
@@ -24,9 +24,9 @@ try {
   DEVICE_DETECT_FAILURE = true;
 }
 
-// // Keyman test suite utility methods
+// Keyman test suite utility methods
 
-export function setupKMW(kmwOptions: BrowserInitOptionSpec | string, timeout: number) {
+export async function setupKMW(kmwOptions: BrowserInitOptionSpec | string, timeout: number): Promise<any> {
   let ui: string;
 
   if(typeof(kmwOptions) == 'string' || typeof(kmwOptions) == 'undefined' || kmwOptions == null) {
@@ -69,13 +69,13 @@ export function setupKMW(kmwOptions: BrowserInitOptionSpec | string, timeout: nu
     compositePromise = Promise.all([kmwPromise, uiPromise]);
   }
 
-  return compositePromise.then(() => {
-    if(window[keyman_window]) {
-      return window[keyman_window].init(kmwOptions);
-    } else {
-      return Promise.reject();
-    }
-  });
+  await compositePromise;
+
+  if(window[keyman_window]) {
+    return window[keyman_window].init(kmwOptions);
+  } else {
+    return Promise.reject();
+  }
 }
 
 /**
diff --git a/web/src/test/auto/integrated/web-test-runner.config.mjs b/web/src/test/auto/integrated/web-test-runner.config.mjs
index 5aa4c749220..557f7b5c6ba 100644
--- a/web/src/test/auto/integrated/web-test-runner.config.mjs
+++ b/web/src/test/auto/integrated/web-test-runner.config.mjs
@@ -34,6 +34,12 @@ export default {
         context.url = '/common/test' + context.url;
       }
 
+      return next();
+    },
+    function rewriteWasmContentType(context, next) {
+      if (context.url.endsWith('.wasm')) {
+        context.headers['content-type'] = 'application/wasm';
+      }
       return next();
     }
   ],

From d82fa81ef6e782f9e8919f7cfdc9b0ff5f3a936f Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 5 Dec 2024 18:05:58 +0100
Subject: [PATCH 053/254] refactor(web): rename JS `Keyboard` class to
 `JSKeyboard`

---
 web/src/app/browser/src/contextManager.ts     | 10 ++--
 .../app/browser/src/hardwareEventKeyboard.ts  |  4 +-
 web/src/app/browser/src/keymanEngine.ts       | 16 +++---
 web/src/app/webview/src/contextManager.ts     |  8 +--
 .../app/webview/src/passthroughKeyboard.ts    |  4 +-
 .../engine/js-processor/src/kbdInterface.ts   |  8 +--
 .../js-processor/src/keyboardProcessor.ts     |  6 +-
 .../src/stubAndKeyboardCache.ts               | 32 +++++------
 web/src/engine/keyboard/src/index.ts          |  2 +-
 web/src/engine/keyboard/src/keyEvent.ts       |  6 +-
 .../keyboard/src/keyboards/activeLayout.ts    |  6 +-
 .../keyboard/src/keyboards/defaultLayouts.ts  |  6 +-
 .../engine/keyboard/src/keyboards/keyboard.ts |  6 +-
 .../keyboard/src/keyboards/keyboardHarness.ts |  6 +-
 .../src/keyboards/keyboardLoaderBase.ts       | 10 ++--
 .../keyboards/loaders/domKeyboardLoader.ts    |  4 +-
 .../keyboards/loaders/nodeKeyboardLoader.ts   |  4 +-
 web/src/engine/main/src/contextManagerBase.ts | 20 +++----
 web/src/engine/main/src/hardKeyboard.ts       |  4 +-
 .../main/src/headless/inputProcessor.ts       |  6 +-
 web/src/engine/main/src/keymanEngine.ts       |  6 +-
 web/src/engine/osk/src/banner/banner.ts       |  4 +-
 .../engine/osk/src/banner/bannerController.ts |  6 +-
 .../engine/osk/src/banner/suggestionBanner.ts |  4 +-
 .../engine/osk/src/components/helpPageView.ts |  6 +-
 web/src/engine/osk/src/components/titleBar.ts |  4 +-
 web/src/engine/osk/src/index.ts               |  2 +-
 .../osk/src/keyboard-layout/oskLayerGroup.ts  |  4 +-
 web/src/engine/osk/src/views/oskView.ts       | 12 ++--
 web/src/engine/osk/src/visualKeyboard.ts      | 12 ++--
 .../cases/keyboard/domKeyboardLoader.tests.ts |  8 +--
 web/src/test/auto/dom/kbdLoader.ts            |  6 +-
 .../hardware-event-processing.tests.ts        | 56 +++++++++----------
 .../js-processor/bundled-module.tests.js      |  2 +-
 .../js-processor/engine/stores.tests.js       |  4 +-
 .../stubAndKeyboardCache.tests.js             |  2 +-
 36 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index c2254c1fdd5..875b2a1c1e3 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -1,4 +1,4 @@
-import { type Keyboard, KeyboardScriptError } from 'keyman/engine/keyboard';
+import { type JSKeyboard, KeyboardScriptError } from 'keyman/engine/keyboard';
 import { type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { CookieSerializer } from 'keyman/engine/dom-utils';
 import { eventOutputTarget, outputTargetForElement, PageContextAttachment } from 'keyman/engine/attachment';
@@ -25,7 +25,7 @@ export interface KeyboardCookie {
  *
  * @param       {Object}      Ptarg      Target element
  */
-function _SetTargDir(Ptarg: HTMLElement, activeKeyboard: Keyboard) {
+function _SetTargDir(Ptarg: HTMLElement, activeKeyboard: JSKeyboard) {
   const elDir = activeKeyboard?.isRTL ? 'rtl' : 'ltr';
 
   if(Ptarg) {
@@ -41,14 +41,14 @@ function _SetTargDir(Ptarg: HTMLElement, activeKeyboard: Keyboard) {
 }
 
 export default class ContextManager extends ContextManagerBase<BrowserConfiguration> {
-  private _activeKeyboard: {keyboard: Keyboard, metadata: KeyboardStub};
+  private _activeKeyboard: {keyboard: JSKeyboard, metadata: KeyboardStub};
   private cookieManager = new CookieSerializer<KeyboardCookie>('KeymanWeb_Keyboard');
   readonly focusAssistant = new FocusAssistant(() => this.activeTarget?.isForcingScroll());
   readonly page: PageContextAttachment;
   private mostRecentTarget: OutputTarget<any>;
   private currentTarget: OutputTarget<any>;
 
-  private globalKeyboard: {keyboard: Keyboard, metadata: KeyboardStub};
+  private globalKeyboard: {keyboard: JSKeyboard, metadata: KeyboardStub};
 
   private _eventsObj: () => LegacyEventEmitter<LegacyAPIEvents>;
   private domEventTracker = new DomEventTracker();
@@ -385,7 +385,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
   }
 
   // Note:  is part of the keyboard activation process.  Not to be called directly by published API.
-  activateKeyboardForTarget(kbd: {keyboard: Keyboard, metadata: KeyboardStub}, target: OutputTarget<any>) {
+  activateKeyboardForTarget(kbd: {keyboard: JSKeyboard, metadata: KeyboardStub}, target: OutputTarget<any>) {
     let attachment = target?.getElement()._kmwAttachment;
 
     if(!attachment) {
diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts
index 0bb594e8975..b323cdefbd8 100644
--- a/web/src/app/browser/src/hardwareEventKeyboard.ts
+++ b/web/src/app/browser/src/hardwareEventKeyboard.ts
@@ -1,4 +1,4 @@
-import { Codes, DeviceSpec, KeyEvent, KeyMapping, Keyboard } from 'keyman/engine/keyboard';
+import { Codes, DeviceSpec, KeyEvent, KeyMapping, JSKeyboard } from 'keyman/engine/keyboard';
 import { KeyboardProcessor } from 'keyman/engine/js-processor';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
@@ -10,7 +10,7 @@ import { eventOutputTarget, outputTargetForElement } from 'keyman/engine/attachm
 import ContextManager from './contextManager.js';
 
 type KeyboardState = {
-  activeKeyboard: Keyboard,
+  activeKeyboard: JSKeyboard,
   modStateFlags: number,
   baseLayout: string
 }
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index e2b7d5be63b..559f3d8fd65 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -7,7 +7,7 @@ import {
   VisualKeyboard
 } from 'keyman/engine/osk';
 import { ErrorStub, KeyboardStub, CloudQueryResult, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage';
-import { DeviceSpec, Keyboard } from "keyman/engine/keyboard";
+import { DeviceSpec, JSKeyboard } from "keyman/engine/keyboard";
 import KeyboardObject = KeymanWebKeyboard.KeyboardObject;
 
 import * as views from './viewsAnchorpoint.js';
@@ -271,7 +271,7 @@ export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration,
    * Function     setKeyboardForControl
    * Scope        Public
    * @param       {Element}    Pelem    Control element
-   * @param       {string|null=}    Pkbd     Keyboard (Clears the set keyboard if set to null.)
+   * @param       {string|null=}    Pkbd     JSKeyboard (Clears the set keyboard if set to null.)
    * @param       {string|null=}     Plc      Language Code
    * Description  Set default keyboard for the control
    *
@@ -385,12 +385,12 @@ export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration,
    * This is a public API function documented at
    * https://help.keyman.com/developer/engine/web/current-version/reference/core/getKeyboard.
    *
-   * @param       {Object}    Lstub      Keyboard stub object
-   * @param       {Object}    Lkbd       Keyboard script object
+   * @param       {Object}    Lstub      JSKeyboard stub object
+   * @param       {Object}    Lkbd       JSKeyboard script object
    * @return      {Object}               Copy of keyboard identification strings
    *
    */
-  private _GetKeyboardDetail = function(Lstub: KeyboardStub, Lkbd: Keyboard) { // I2078 - Full keyboard detail
+  private _GetKeyboardDetail = function(Lstub: KeyboardStub, Lkbd: JSKeyboard) { // I2078 - Full keyboard detail
     let Lr = {
       Name: Lstub.KN,
       InternalName: Lstub.KI,
@@ -425,13 +425,13 @@ export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration,
    * See https://help.keyman.com/developer/engine/web/current-version/reference/core/isCJK
    */
   public isCJK(k0?: KeyboardObject | ReturnType<KeymanEngine['_GetKeyboardDetail']> /* [b/c Toolbar UI]*/) {
-    let kbd: Keyboard;
+    let kbd: JSKeyboard;
     if(k0) {
       let kbdDetail = k0 as ReturnType<KeymanEngine['_GetKeyboardDetail']>;
       if(kbdDetail.KeyboardID){
         kbd = this.keyboardRequisitioner.cache.getKeyboard(kbdDetail.KeyboardID);
       } else {
-        kbd = new Keyboard(k0);
+        kbd = new JSKeyboard(k0);
       }
     } else {
       kbd = this.core.activeKeyboard;
@@ -669,7 +669,7 @@ export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration,
     argFormFactor?: DeviceSpec.FormFactor,
     argLayerId?: string
   ): HTMLElement {
-    let PKbd: Keyboard = null;
+    let PKbd: JSKeyboard = null;
 
     if(PInternalName != null) {
       PKbd = this.keyboardRequisitioner.cache.getKeyboard(PInternalName);
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index 4507f44f551..274bc3c3efe 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -1,4 +1,4 @@
-import { type Keyboard  } from 'keyman/engine/keyboard';
+import { type JSKeyboard  } from 'keyman/engine/keyboard';
 import { Mock, OutputTarget, Transcription, findCommonSubstringEndIndex, isEmptyTransform, TextTransform } from 'keyman/engine/js-processor';
 import { KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { ContextManagerBase } from 'keyman/engine/main';
@@ -116,7 +116,7 @@ export default class ContextManager extends ContextManagerBase<WebviewConfigurat
   // yet to be modularized at this time, though.)
   private _rawContext: ContextHost;
 
-  private _activeKeyboard: {keyboard: Keyboard, metadata: KeyboardStub};
+  private _activeKeyboard: {keyboard: JSKeyboard, metadata: KeyboardStub};
 
   constructor(engineConfig: WebviewConfiguration) {
     super(engineConfig);
@@ -136,7 +136,7 @@ export default class ContextManager extends ContextManagerBase<WebviewConfigurat
     return this._activeKeyboard;
   }
 
-  activateKeyboardForTarget(kbd: {keyboard: Keyboard, metadata: KeyboardStub}, target: OutputTarget) {
+  activateKeyboardForTarget(kbd: {keyboard: JSKeyboard, metadata: KeyboardStub}, target: OutputTarget) {
     // `target` is irrelevant for `app/webview`, as it'll only ever use 'global' keyboard settings.
 
     // Clone the object to prevent accidental by-reference changes.
@@ -192,7 +192,7 @@ export default class ContextManager extends ContextManagerBase<WebviewConfigurat
   protected prepareKeyboardForActivation(
     keyboardId: string,
     languageCode?: string
-  ): {keyboard: Promise<Keyboard>, metadata: KeyboardStub} {
+  ): {keyboard: Promise<JSKeyboard>, metadata: KeyboardStub} {
     const originalKeyboard = this.activeKeyboard;
     const activatingKeyboard = super.prepareKeyboardForActivation(keyboardId, languageCode);
 
diff --git a/web/src/app/webview/src/passthroughKeyboard.ts b/web/src/app/webview/src/passthroughKeyboard.ts
index 25dec7a8e68..8ce8864293d 100644
--- a/web/src/app/webview/src/passthroughKeyboard.ts
+++ b/web/src/app/webview/src/passthroughKeyboard.ts
@@ -1,10 +1,10 @@
-import { DeviceSpec, Keyboard, KeyEvent, ManagedPromise } from 'keyman/engine/keyboard';
+import { DeviceSpec, JSKeyboard, KeyEvent, ManagedPromise } from 'keyman/engine/keyboard';
 
 import { HardKeyboard, processForMnemonicsAndLegacy } from 'keyman/engine/main';
 
 export default class PassthroughKeyboard extends HardKeyboard {
   readonly baseDevice: DeviceSpec;
-  public activeKeyboard: Keyboard;
+  public activeKeyboard: JSKeyboard;
 
   constructor(baseDevice: DeviceSpec) {
     super();
diff --git a/web/src/engine/js-processor/src/kbdInterface.ts b/web/src/engine/js-processor/src/kbdInterface.ts
index b39b2baea25..9a2ee4c1909 100644
--- a/web/src/engine/js-processor/src/kbdInterface.ts
+++ b/web/src/engine/js-processor/src/kbdInterface.ts
@@ -7,7 +7,7 @@
 
 import { type DeviceSpec } from "@keymanapp/web-utils";
 import { ModifierKeyConstants } from '@keymanapp/common-types';
-import { Codes, type KeyEvent, KeyMapping, Keyboard, KeyboardHarness, KeyboardKeymanGlobal, VariableStoreDictionary } from "keyman/engine/keyboard";
+import { Codes, type KeyEvent, KeyMapping, JSKeyboard, KeyboardHarness, KeyboardKeymanGlobal, VariableStoreDictionary } from "keyman/engine/keyboard";
 import type OutputTarget from './outputTarget.js';
 import { type Deadkey } from './deadkeys.js';
 import { Mock } from "./mock.js";
@@ -180,7 +180,7 @@ export default class KeyboardInterface extends KeyboardHarness {
   _AnyIndices:  number[] = [];    // AnyIndex - array of any/index match indices
 
   // Must be accessible to some of the keyboard API methods.
-  activeKeyboard: Keyboard;
+  activeKeyboard: JSKeyboard;
   activeDevice: DeviceSpec;
 
   variableStoreSerializer?: VariableStoreSerializer;
@@ -222,7 +222,7 @@ export default class KeyboardInterface extends KeyboardHarness {
   /**
    * Function     registerKeyboard  KR
    * Scope        Public
-   * @param       {Object}      Pk      Keyboard  object
+   * @param       {Object}      Pk      JSKeyboard  object
    * Description  Registers a keyboard with KeymanWeb once its script has fully loaded.
    *
    *              In web-core, this also activates the keyboard; in other modules, this method
@@ -231,7 +231,7 @@ export default class KeyboardInterface extends KeyboardHarness {
   registerKeyboard(Pk: any): void {
     // NOTE:  This implementation is web-core specific and is intentionally replaced, whole-sale,
     //        by DOM-aware code.
-    let keyboard = new Keyboard(Pk);
+    let keyboard = new JSKeyboard(Pk);
     this.loadedKeyboard = keyboard;
   }
 
diff --git a/web/src/engine/js-processor/src/keyboardProcessor.ts b/web/src/engine/js-processor/src/keyboardProcessor.ts
index dea537dfdf6..93ec35bfe1b 100644
--- a/web/src/engine/js-processor/src/keyboardProcessor.ts
+++ b/web/src/engine/js-processor/src/keyboardProcessor.ts
@@ -9,7 +9,7 @@
 import { EventEmitter } from 'eventemitter3';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 import {
-  Codes, type Keyboard, MinimalKeymanGlobal, KeyEvent, Layouts,
+  Codes, type JSKeyboard, MinimalKeymanGlobal, KeyEvent, Layouts,
   DefaultRules, EmulationKeystrokes
 } from "keyman/engine/keyboard";
 import { Mock } from "./mock.js";
@@ -87,11 +87,11 @@ export default class KeyboardProcessor extends EventEmitter<EventMap> {
     this.defaultRules = options.defaultOutputRules || KeyboardProcessor.DEFAULT_OPTIONS.defaultOutputRules;
   }
 
-  public get activeKeyboard(): Keyboard {
+  public get activeKeyboard(): JSKeyboard {
     return this.keyboardInterface.activeKeyboard;
   }
 
-  public set activeKeyboard(keyboard: Keyboard) {
+  public set activeKeyboard(keyboard: JSKeyboard) {
     this.keyboardInterface.activeKeyboard = keyboard;
 
     // All old deadkeys and keyboard-specific cache should immediately be invalidated
diff --git a/web/src/engine/keyboard-storage/src/stubAndKeyboardCache.ts b/web/src/engine/keyboard-storage/src/stubAndKeyboardCache.ts
index 67d62446bee..523da41fbf9 100644
--- a/web/src/engine/keyboard-storage/src/stubAndKeyboardCache.ts
+++ b/web/src/engine/keyboard-storage/src/stubAndKeyboardCache.ts
@@ -1,4 +1,4 @@
-import { Keyboard, KeyboardLoaderBase as KeyboardLoader } from "keyman/engine/keyboard";
+import { JSKeyboard, KeyboardLoaderBase as KeyboardLoader } from "keyman/engine/keyboard";
 import { EventEmitter } from "eventemitter3";
 
 import KeyboardStub from "./keyboardStub.js";
@@ -38,12 +38,12 @@ interface EventMap {
   /**
    * Indicates that the specified Keyboard has just been added to the cache.
    */
-  keyboardadded: (keyboard: Keyboard) => void;
+  keyboardadded: (keyboard: JSKeyboard) => void;
 }
 
 export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
   private stubSetTable: Record<string, Record<string, KeyboardStub>> = {};
-  private keyboardTable: Record<string, Keyboard | Promise<Keyboard>> = {};
+  private keyboardTable: Record<string, JSKeyboard | Promise<JSKeyboard>> = {};
 
   private readonly keyboardLoader: KeyboardLoader;
 
@@ -52,11 +52,11 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
     this.keyboardLoader = keyboardLoader;
   }
 
-  getKeyboardForStub(stub: KeyboardStub): Keyboard {
+  getKeyboardForStub(stub: KeyboardStub): JSKeyboard {
     return stub ? this.getKeyboard(stub.KI) : null;
   }
 
-  getKeyboard(keyboardID: string): Keyboard {
+  getKeyboard(keyboardID: string): JSKeyboard {
     if(!keyboardID) {
       return null;
     }
@@ -112,14 +112,14 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
     }
   }
 
-  addKeyboard(keyboard: Keyboard) {
+  addKeyboard(keyboard: JSKeyboard) {
     const keyboardID = prefixed(keyboard.id);
     this.keyboardTable[keyboardID] = keyboard;
 
     this.emit('keyboardadded', keyboard);
   }
 
-  fetchKeyboardForStub(stub: KeyboardStub) : Promise<Keyboard> {
+  fetchKeyboardForStub(stub: KeyboardStub) : Promise<JSKeyboard> {
     return this.fetchKeyboard(stub.KI);
   }
 
@@ -134,7 +134,7 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
     return cachedEntry instanceof Promise;
   }
 
-  fetchKeyboard(keyboardID: string): Promise<Keyboard> {
+  fetchKeyboard(keyboardID: string): Promise<JSKeyboard> {
     if(!keyboardID) {
       throw new Error("Keyboard ID must be specified");
     }
@@ -146,7 +146,7 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
     keyboardID = prefixed(keyboardID);
 
     const cachedEntry = this.keyboardTable[keyboardID];
-    if(cachedEntry instanceof Keyboard) {
+    if(cachedEntry instanceof JSKeyboard) {
       return Promise.resolve(cachedEntry);
     } else if(cachedEntry instanceof Promise) {
       return cachedEntry;
@@ -189,12 +189,12 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
   }
 
   getStub(keyboardID: string, languageID: string): KeyboardStub;
-  getStub(keyboard: Keyboard, languageID?: string): KeyboardStub;
-  getStub(arg0: string | Keyboard, arg1?: string): KeyboardStub {
+  getStub(keyboard: JSKeyboard, languageID?: string): KeyboardStub;
+  getStub(arg0: string | JSKeyboard, arg1?: string): KeyboardStub {
     let keyboardID: string;
     let languageID = arg1 || '---';
 
-    if(arg0 instanceof Keyboard) {
+    if(arg0 instanceof JSKeyboard) {
       keyboardID = arg0.id;
     } else {
       keyboardID = arg0;
@@ -221,12 +221,12 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
   /**
    * Removes all metadata (stubs) associated with a specific keyboard from the cache, optionally
    * removing the cached keyboard as well.
-   * @param keyboard Either the keyboard ID or `Keyboard` instance
-   * @param purge If `true`, will also purge the `Keyboard` instance itself from the cache.
+   * @param keyboard Either the keyboard ID or `JSKeyboard` instance
+   * @param purge If `true`, will also purge the `JSKeyboard` instance itself from the cache.
    *              If `false`, only forgets the metadata (stubs).
    */
-  forgetKeyboard(keyboard: string | Keyboard, purge: boolean = false) {
-    let id: string = (keyboard instanceof Keyboard) ? keyboard.id : prefixed(keyboard);
+  forgetKeyboard(keyboard: string | JSKeyboard, purge: boolean = false) {
+    let id: string = (keyboard instanceof JSKeyboard) ? keyboard.id : prefixed(keyboard);
 
     if(this.stubSetTable[id]) {
       delete this.stubSetTable[id];
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index 6047426af9f..9106201c126 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -1,6 +1,6 @@
 export * from "./keyboards/activeLayout.js";
 export * from "./keyboards/defaultLayouts.js";
-export { default as Keyboard } from "./keyboards/keyboard.js";
+export { default as JSKeyboard } from "./keyboards/keyboard.js";
 export * from "./keyboards/keyboard.js";
 export { KeyboardHarness, KeyboardKeymanGlobal, MinimalCodesInterface, MinimalKeymanGlobal } from "./keyboards/keyboardHarness.js";
 export { KeyboardLoaderBase } from "./keyboards/keyboardLoaderBase.js";
diff --git a/web/src/engine/keyboard/src/keyEvent.ts b/web/src/engine/keyboard/src/keyEvent.ts
index c359558b1fe..eb8b1533548 100644
--- a/web/src/engine/keyboard/src/keyEvent.ts
+++ b/web/src/engine/keyboard/src/keyEvent.ts
@@ -6,7 +6,7 @@
 // a key event.  The most straightforward way to integrate Web OSK events on other platforms is to have
 // other platforms recognize and utilize this type.
 
-import type Keyboard from "./keyboards/keyboard.js";
+import type JSKeyboard from "./keyboards/keyboard.js";
 import { type DeviceSpec } from "@keymanapp/web-utils";
 
 import Codes from './codes.js';
@@ -44,7 +44,7 @@ export interface KeyEventSpec {
    * guarantee that the keyboard instance known to the handler has not changed during JS execution
    * since the user's interaction that raised the event.
    */
-  srcKeyboard?: Keyboard;
+  srcKeyboard?: JSKeyboard;
 
   // Holds a generated fat-finger distribution (when appropriate)
   keyDistribution?: KeyDistribution;
@@ -85,7 +85,7 @@ export default class KeyEvent implements KeyEventSpec {
    * guarantee that the keyboard instance known to the handler has not changed during JS execution
    * since the user's interaction that raised the event.
    */
-  srcKeyboard?: Keyboard;
+  srcKeyboard?: JSKeyboard;
 
   // Holds relevant event properties leading to construction of this KeyEvent.
   source?: any; // Technically, KeyEvent|MouseEvent|Touch - but those are DOM types that must be kept out of headless mode.
diff --git a/web/src/engine/keyboard/src/keyboards/activeLayout.ts b/web/src/engine/keyboard/src/keyboards/activeLayout.ts
index c440511f172..692ef65c016 100644
--- a/web/src/engine/keyboard/src/keyboards/activeLayout.ts
+++ b/web/src/engine/keyboard/src/keyboards/activeLayout.ts
@@ -3,7 +3,7 @@ import KeyEvent, { KeyEventSpec } from "../keyEvent.js";
 import KeyMapping from "../keyMapping.js";
 import { ButtonClasses, Layouts } from "./defaultLayouts.js";
 import type { LayoutKey, LayoutSubKey, LayoutRow, LayoutLayer, LayoutFormFactor, ButtonClass } from "./defaultLayouts.js";
-import type Keyboard from "./keyboard.js";
+import type JSKeyboard from "./keyboard.js";
 
 import { TouchLayout } from "@keymanapp/common-types";
 import TouchLayoutDefaultHint = TouchLayout.TouchLayoutDefaultHint;
@@ -776,7 +776,7 @@ export class ActiveLayout implements LayoutFormFactor{
   font: string;
   keyLabels: boolean;
   isDefault?: boolean;
-  keyboard: Keyboard;
+  keyboard: JSKeyboard;
   formFactor: DeviceSpec.FormFactor;
   defaultHint: TouchLayoutDefaultHint;
   displayUnderlying?: boolean;
@@ -851,7 +851,7 @@ export class ActiveLayout implements LayoutFormFactor{
    * @param layout
    * @param formFactor
    */
-  static polyfill(layout: TouchLayoutSpec, keyboard: Keyboard, formFactor: DeviceSpec.FormFactor): ActiveLayout {
+  static polyfill(layout: TouchLayoutSpec, keyboard: JSKeyboard, formFactor: DeviceSpec.FormFactor): ActiveLayout {
     /* c8 ignore start */
     if(layout == null) {
       throw new Error("Cannot build an ActiveLayout for a null specification.");
diff --git a/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts b/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts
index 4b08f4bef34..9106ff30e64 100644
--- a/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts
+++ b/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts
@@ -20,7 +20,7 @@ import ButtonClasses = TouchLayout.TouchLayoutKeySp;
 export { ButtonClasses };
 
 import Codes from "../codes.js";
-import type Keyboard from "./keyboard.js";
+import type JSKeyboard from "./keyboard.js";
 
 // The following types provide type definitions for the full JSON format we use for visual keyboard definitions.
 export type ButtonClass       =  0 | 1 | 2 | 3 | 4 | /*5 | 6 | 7 |*/ 8 | 9 | 10;
@@ -87,11 +87,11 @@ export class Layouts {
   * Build a default layout for keyboards with no explicit layout
   *
   * @param   {Object}  PVK         raw specifications
-  * @param   {Keyboard} keyboard   keyboard object (as loaded)
+  * @param   {JSKeyboard} keyboard   keyboard object (as loaded)
   * @param   {string} formFactor   (really utils.FormFactor)
   * @return  {LayoutFormFactor}
   */
-  static buildDefaultLayout(PVK: EncodedVisualKeyboard, keyboard: Keyboard, formFactor: string): LayoutFormFactor {
+  static buildDefaultLayout(PVK: EncodedVisualKeyboard, keyboard: JSKeyboard, formFactor: string): LayoutFormFactor {
     // Build a layout using the default for the device
     let layoutType = formFactor as keyof TouchLayout.TouchLayoutFile;
 
diff --git a/web/src/engine/keyboard/src/keyboards/keyboard.ts b/web/src/engine/keyboard/src/keyboards/keyboard.ts
index 753ae3bd55b..b49f0258107 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboard.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboard.ts
@@ -52,7 +52,7 @@ type KmwKeyboardObject = KeyboardObject & {
  * and keyboard-centered functionality in an object-oriented way without modifying the
  * wrapped keyboard itself.
  */
-export default class Keyboard {
+export default class JSKeyboard {
   public static DEFAULT_SCRIPT_OBJECT: KmwKeyboardObject = {
     'gs': function(outputTarget: OutputTarget, keystroke: KeyEvent) { return false; }, // no matching rules; rely on defaultRuleOutput entirely
     'KI': '', // The currently-existing default keyboard ID; we already have checks that focus against this.
@@ -74,7 +74,7 @@ export default class Keyboard {
     if(keyboardScript) {
       this.scriptObject = keyboardScript;
     } else {
-      this.scriptObject = Keyboard.DEFAULT_SCRIPT_OBJECT;
+      this.scriptObject = JSKeyboard.DEFAULT_SCRIPT_OBJECT;
     }
     this.layoutStates = {};
   }
@@ -101,7 +101,7 @@ export default class Keyboard {
   }
 
   get isHollow(): boolean {
-    return this.scriptObject == Keyboard.DEFAULT_SCRIPT_OBJECT;
+    return this.scriptObject == JSKeyboard.DEFAULT_SCRIPT_OBJECT;
   }
 
   get id(): string {
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts b/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts
index bb2e2d5ccb1..8e83f31c778 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts
@@ -1,4 +1,4 @@
-import Keyboard from "./keyboard.js";
+import JSKeyboard from "./keyboard.js";
 import Codes from "../codes.js";
 import { DeviceSpec } from '@keymanapp/web-utils';
 
@@ -64,7 +64,7 @@ export class KeyboardHarness {
   /**
    * This field serves as the receptacle for a successfully-loaded Keyboard.
    */
-  public loadedKeyboard: Keyboard = null;
+  public loadedKeyboard: JSKeyboard = null;
 
   /**
    * Keyman keyboards register themselves into the Keyman Engine for Web by directly
@@ -84,7 +84,7 @@ export class KeyboardHarness {
     if(this.loadedKeyboard) {
       throw new Error("Unexpected state:  the most-recently loaded keyboard field was not properly reset.");
     }
-    this.loadedKeyboard = new Keyboard(scriptObject);
+    this.loadedKeyboard = new JSKeyboard(scriptObject);
   }
 
   // Is evaluated on script-load for some keyboards using variable stores.
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
index 5ca3d4c8ced..6a203f6ce11 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
@@ -1,4 +1,4 @@
-import Keyboard from "./keyboard.js";
+import JSKeyboard from "./keyboard.js";
 import { KeyboardHarness } from "./keyboardHarness.js";
 import KeyboardProperties from "./keyboardProperties.js";
 import { KeyboardLoadErrorBuilder, StubBasedErrorBuilder, UriBasedErrorBuilder } from './keyboardLoadError.js';
@@ -22,7 +22,7 @@ export abstract class KeyboardLoaderBase {
    * @param uri  The URI of the keyboard to load.
    * @returns    A Promise that resolves to the loaded keyboard.
    */
-  public loadKeyboardFromPath(uri: string): Promise<Keyboard> {
+  public loadKeyboardFromPath(uri: string): Promise<JSKeyboard> {
     this.harness.install();
     return this.loadKeyboardInternal(uri, new UriBasedErrorBuilder(uri));
   }
@@ -33,12 +33,12 @@ export abstract class KeyboardLoaderBase {
    * @param stub  The stub of the keyboard to load.
    * @returns     A Promise that resolves to the loaded keyboard.
    */
-  public async loadKeyboardFromStub(stub: KeyboardStub): Promise<Keyboard> {
+  public async loadKeyboardFromStub(stub: KeyboardStub): Promise<JSKeyboard> {
     this.harness.install();
     return this.loadKeyboardInternal(stub.filename, new StubBasedErrorBuilder(stub));
   }
 
-  private async loadKeyboardInternal(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
+  private async loadKeyboardInternal(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<JSKeyboard> {
     const byteArray = await this.loadKeyboardBlob(uri, errorBuilder);
 
     if (byteArray.slice(0, 4) == Uint8Array.from([0x4b, 0x58, 0x54, 0x53])) { // 'KXTS'
@@ -60,5 +60,5 @@ export abstract class KeyboardLoaderBase {
 
   protected abstract loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Uint8Array>;
 
-  protected abstract loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard>;
+  protected abstract loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<JSKeyboard>;
 }
\ No newline at end of file
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
index a6df76aff1b..0a273be4497 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
+++ b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
@@ -2,7 +2,7 @@
 
 ///<reference lib="dom" />
 
-import { default as Keyboard } from '../keyboard.js';
+import { default as JSKeyboard } from '../keyboard.js';
 import { KeyboardHarness, MinimalKeymanGlobal } from '../keyboardHarness.js';
 import { KeyboardLoaderBase } from '../keyboardLoaderBase.js';
 import { KeyboardLoadErrorBuilder } from '../keyboardLoadError.js';
@@ -54,7 +54,7 @@ export class DOMKeyboardLoader extends KeyboardLoaderBase {
     return new Uint8Array(buffer);
   }
 
-  protected async loadKeyboardFromScript(script: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
+  protected async loadKeyboardFromScript(script: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<JSKeyboard> {
     try {
       this.evalScriptInContext(script, this.harness._jsGlobal);
     } catch (e) {
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
index 6ec27364fce..437028e4f32 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
+++ b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
@@ -3,7 +3,7 @@ import { readFile } from 'node:fs/promises';
 
 import { globalObject } from '@keymanapp/web-utils';
 
-import { default as Keyboard } from '../keyboard.js';
+import { default as JSKeyboard } from '../keyboard.js';
 import { KeyboardHarness, MinimalKeymanGlobal } from '../keyboardHarness.js';
 import { KeyboardLoaderBase } from '../keyboardLoaderBase.js';
 import { KeyboardLoadErrorBuilder } from '../keyboardLoadError.js';
@@ -41,7 +41,7 @@ export class NodeKeyboardLoader extends KeyboardLoaderBase {
     return Uint8Array.from(buffer);
   }
 
-  protected async loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
+  protected async loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<JSKeyboard> {
     let script;
     try {
       script = new vm.Script(scriptSrc);
diff --git a/web/src/engine/main/src/contextManagerBase.ts b/web/src/engine/main/src/contextManagerBase.ts
index 17fed71bd2e..fa187ce2e65 100644
--- a/web/src/engine/main/src/contextManagerBase.ts
+++ b/web/src/engine/main/src/contextManagerBase.ts
@@ -1,5 +1,5 @@
 import { EventEmitter } from 'eventemitter3';
-import { ManagedPromise, type Keyboard } from 'keyman/engine/keyboard';
+import { ManagedPromise, type JSKeyboard } from 'keyman/engine/keyboard';
 import { type KeyboardInterface, type OutputTarget } from 'keyman/engine/js-processor';
 import { StubAndKeyboardCache, type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { PredictionContext } from 'keyman/engine/interfaces';
@@ -37,7 +37,7 @@ interface EventMap {
    * @param kbd
    * @returns
    */
-  'keyboardchange': (kbd: {keyboard: Keyboard, metadata: KeyboardStub}) => void;
+  'keyboardchange': (kbd: {keyboard: JSKeyboard, metadata: KeyboardStub}) => void;
 }
 
 export interface ContextManagerConfiguration {
@@ -65,7 +65,7 @@ export interface ContextManagerConfiguration {
 
 interface PendingActivation {
   target: OutputTarget,
-  keyboard: Promise<Keyboard>,
+  keyboard: Promise<JSKeyboard>,
   stub: KeyboardStub;
 }
 
@@ -124,7 +124,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
     this.predictionContext.resetContext();
   }
 
-  abstract get activeKeyboard(): {keyboard: Keyboard, metadata: KeyboardStub};
+  abstract get activeKeyboard(): {keyboard: JSKeyboard, metadata: KeyboardStub};
 
   /**
    * Determines the 'target' currently used to determine which keyboard should be active.
@@ -143,7 +143,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
    * @param kbd
    * @param target
    */
-  protected abstract activateKeyboardForTarget(kbd: {keyboard: Keyboard, metadata: KeyboardStub}, target: OutputTarget): void;
+  protected abstract activateKeyboardForTarget(kbd: {keyboard: JSKeyboard, metadata: KeyboardStub}, target: OutputTarget): void;
 
   /**
    * Checks the pending keyboard-activation array for an entry corresponding to the specified
@@ -178,7 +178,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
    * @returns
    */
   protected async deferredKeyboardActivation(
-    kbdPromise: Promise<Keyboard>,
+    kbdPromise: Promise<JSKeyboard>,
     metadata: KeyboardStub,
     target: OutputTarget
   ): Promise<PendingActivation> {
@@ -263,7 +263,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
       this.emit('beforekeyboardchange', activatingKeyboard.metadata);
     }
 
-    let kbdStubPair: { keyboard: Keyboard, metadata: KeyboardStub } = null;
+    let kbdStubPair: { keyboard: JSKeyboard, metadata: KeyboardStub } = null;
     if(keyboard) {
       kbdStubPair = {
         keyboard: keyboard,
@@ -298,7 +298,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
   protected prepareKeyboardForActivation(
     keyboardId: string,
     languageCode?: string
-  ): {keyboard: Promise<Keyboard>, metadata: KeyboardStub} {
+  ): {keyboard: Promise<JSKeyboard>, metadata: KeyboardStub} {
     // Set default language code
     languageCode ||= '';
 
@@ -333,7 +333,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
     }
 
     // Determine if the keyboard was previously loaded but is not active; use the cached, pre-loaded version if so.
-    let keyboard: Keyboard;
+    let keyboard: JSKeyboard;
     if(keyboard = this.keyboardCache.getKeyboardForStub(requestedStub)) {
       return {
         keyboard: Promise.resolve(keyboard),
@@ -351,7 +351,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
         this.emit('keyboardasyncload', requestedStub, completionPromise.corePromise);
 
         let keyboardPromise = this.keyboardCache.fetchKeyboardForStub(requestedStub);
-        let timeoutPromise = new Promise<Keyboard>((resolve, reject) => {
+        let timeoutPromise = new Promise<JSKeyboard>((resolve, reject) => {
           const timeoutMsg = `Sorry, the ${requestedStub.name} keyboard for ${requestedStub.langName} is not currently available.`;
           window.setTimeout(() => reject(new Error(timeoutMsg)), ContextManagerBase.TIMEOUT_THRESHOLD);
         });
diff --git a/web/src/engine/main/src/hardKeyboard.ts b/web/src/engine/main/src/hardKeyboard.ts
index 60f2b362004..62cc91e63bb 100644
--- a/web/src/engine/main/src/hardKeyboard.ts
+++ b/web/src/engine/main/src/hardKeyboard.ts
@@ -1,5 +1,5 @@
 import { EventEmitter } from "eventemitter3";
-import { Keyboard, KeyMapping, KeyEvent, Codes } from "keyman/engine/keyboard";
+import { JSKeyboard, KeyMapping, KeyEvent, Codes } from "keyman/engine/keyboard";
 import { type RuleBehavior } from 'keyman/engine/js-processor';
 import { KeyEventSourceInterface } from 'keyman/engine/osk';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
@@ -13,7 +13,7 @@ interface EventMap {
 
 export default class HardKeyboard extends EventEmitter<EventMap> implements KeyEventSourceInterface<EventMap> { }
 
-export function processForMnemonicsAndLegacy(s: KeyEvent, activeKeyboard: Keyboard, baseLayout: string): KeyEvent {
+export function processForMnemonicsAndLegacy(s: KeyEvent, activeKeyboard: JSKeyboard, baseLayout: string): KeyEvent {
   // Mnemonic handling.
   if(activeKeyboard && activeKeyboard.isMnemonic) {
     // The following will never set a code corresponding to a modifier key, so it's fine to do this,
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index 17bb667be70..055800238e1 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -7,7 +7,7 @@ import { globalObject, DeviceSpec } from "@keymanapp/web-utils";
 
 import { CoreFactory, MainModule as KmCoreModule } from 'keyman/engine/core-processor';
 
-import { Codes, type Keyboard, type KeyEvent } from "keyman/engine/keyboard";
+import { Codes, type JSKeyboard, type KeyEvent } from "keyman/engine/keyboard";
 import {
   type Alternate,
   isEmptyTransform,
@@ -74,11 +74,11 @@ export class InputProcessor {
     return this.km_core;
   }
 
-  public get activeKeyboard(): Keyboard {
+  public get activeKeyboard(): JSKeyboard {
     return this.keyboardInterface.activeKeyboard;
   }
 
-  public set activeKeyboard(keyboard: Keyboard) {
+  public set activeKeyboard(keyboard: JSKeyboard) {
     this.keyboardInterface.activeKeyboard = keyboard;
 
     // All old deadkeys and keyboard-specific cache should immediately be invalidated
diff --git a/web/src/engine/main/src/keymanEngine.ts b/web/src/engine/main/src/keymanEngine.ts
index 996ee48aa9d..d603dcd9f98 100644
--- a/web/src/engine/main/src/keymanEngine.ts
+++ b/web/src/engine/main/src/keymanEngine.ts
@@ -1,4 +1,4 @@
-import { type KeyEvent, type Keyboard, KeyboardKeymanGlobal } from "keyman/engine/keyboard";
+import { type KeyEvent, type JSKeyboard, KeyboardKeymanGlobal } from "keyman/engine/keyboard";
 import { OutputTarget, ProcessorInitOptions, RuleBehavior } from 'keyman/engine/js-processor';
 import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard/dom-keyboard-loader";
 import { InputProcessor } from './headless/inputProcessor.js';
@@ -554,8 +554,8 @@ export default class KeymanEngine<
    *
    * See https://help.keyman.com/developer/engine/web/current-version/reference/core/isChiral
    */
-  public isChiral(k0?: string | Keyboard) {
-    let kbd: Keyboard;
+  public isChiral(k0?: string | JSKeyboard) {
+    let kbd: JSKeyboard;
     if(k0) {
       if(typeof k0 == 'string') {
         const kbdObj = this.keyboardRequisitioner.cache.getKeyboard(k0);
diff --git a/web/src/engine/osk/src/banner/banner.ts b/web/src/engine/osk/src/banner/banner.ts
index e38b6b6625d..6bbadccfba3 100644
--- a/web/src/engine/osk/src/banner/banner.ts
+++ b/web/src/engine/osk/src/banner/banner.ts
@@ -1,4 +1,4 @@
-import { Keyboard, KeyboardProperties } from 'keyman/engine/keyboard';
+import { JSKeyboard, KeyboardProperties } from 'keyman/engine/keyboard';
 import { createUnselectableElement } from 'keyman/engine/dom-utils';
 
 // Base class for a banner above the keyboard in the OSK
@@ -98,7 +98,7 @@ export abstract class Banner {
    * @param keyboard
    * @param keyboardProperties
    */
-  public configureForKeyboard(keyboard: Keyboard, keyboardProperties: KeyboardProperties) { }
+  public configureForKeyboard(keyboard: JSKeyboard, keyboardProperties: KeyboardProperties) { }
 
   public readonly refreshLayout?: () => void;
 
diff --git a/web/src/engine/osk/src/banner/bannerController.ts b/web/src/engine/osk/src/banner/bannerController.ts
index 7fbc8ceb9bb..f9bd68466fd 100644
--- a/web/src/engine/osk/src/banner/bannerController.ts
+++ b/web/src/engine/osk/src/banner/bannerController.ts
@@ -6,7 +6,7 @@ import { BannerView } from './bannerView.js';
 import { Banner } from './banner.js';
 import { BlankBanner } from './blankBanner.js';
 import { HTMLBanner } from './htmlBanner.js';
-import { Keyboard, KeyboardProperties } from 'keyman/engine/keyboard';
+import { JSKeyboard, KeyboardProperties } from 'keyman/engine/keyboard';
 
 export class BannerController {
   private container: BannerView;
@@ -17,7 +17,7 @@ export class BannerController {
 
   private _inactiveBanner: Banner;
 
-  private keyboard: Keyboard;
+  private keyboard: JSKeyboard;
   private keyboardStub: KeyboardProperties;
 
   /**
@@ -105,7 +105,7 @@ export class BannerController {
    * @param keyboard
    * @param keyboardProperties
    */
-  public configureForKeyboard(keyboard: Keyboard, keyboardProperties: KeyboardProperties) {
+  public configureForKeyboard(keyboard: JSKeyboard, keyboardProperties: KeyboardProperties) {
     this.keyboard = keyboard;
     this.keyboardStub = keyboardProperties;
 
diff --git a/web/src/engine/osk/src/banner/suggestionBanner.ts b/web/src/engine/osk/src/banner/suggestionBanner.ts
index 0c4ccb420a7..108087fe320 100644
--- a/web/src/engine/osk/src/banner/suggestionBanner.ts
+++ b/web/src/engine/osk/src/banner/suggestionBanner.ts
@@ -13,7 +13,7 @@ import {
 
 import { BANNER_GESTURE_SET } from './bannerGestureSet.js';
 
-import { DeviceSpec, Keyboard, KeyboardProperties, timedPromise } from 'keyman/engine/keyboard';
+import { DeviceSpec, JSKeyboard, KeyboardProperties, timedPromise } from 'keyman/engine/keyboard';
 import { Banner } from './banner.js';
 import { ParsedLengthStyle } from '../lengthStyle.js';
 import { getFontSizeStyle } from '../fontSizeUtils.js';
@@ -675,7 +675,7 @@ export class SuggestionBanner extends Banner {
     return result;
   }
 
-  public configureForKeyboard(keyboard: Keyboard, keyboardProperties: KeyboardProperties) {
+  public configureForKeyboard(keyboard: JSKeyboard, keyboardProperties: KeyboardProperties) {
     const rtl = keyboard.isRTL;
 
     // Removes all previous children.  (.replaceChildren requires Chrome for Android 86.)
diff --git a/web/src/engine/osk/src/components/helpPageView.ts b/web/src/engine/osk/src/components/helpPageView.ts
index af489a2686f..85d7ff241bd 100644
--- a/web/src/engine/osk/src/components/helpPageView.ts
+++ b/web/src/engine/osk/src/components/helpPageView.ts
@@ -1,15 +1,15 @@
-import { Keyboard } from 'keyman/engine/keyboard';
+import { JSKeyboard } from 'keyman/engine/keyboard';
 
 import KeyboardView from './keyboardView.interface.js';
 import { ParsedLengthStyle } from "../lengthStyle.js";
 
 export default class HelpPageView implements KeyboardView {
-  private readonly kbd: Keyboard;
+  private readonly kbd: JSKeyboard;
   public readonly element: HTMLDivElement;
 
   private static readonly ID = 'kmw-osk-help-page';
 
-  constructor(keyboard: Keyboard) {
+  constructor(keyboard: JSKeyboard) {
     this.kbd = keyboard;
 
     var Ldiv = this.element = document.createElement('div');
diff --git a/web/src/engine/osk/src/components/titleBar.ts b/web/src/engine/osk/src/components/titleBar.ts
index dd4eba3df7f..dcde10f9c9c 100644
--- a/web/src/engine/osk/src/components/titleBar.ts
+++ b/web/src/engine/osk/src/components/titleBar.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'eventemitter3';
 
-import { Keyboard } from 'keyman/engine/keyboard';
+import { JSKeyboard } from 'keyman/engine/keyboard';
 
 import OSKViewComponent from './oskViewComponent.interface.js';
 import { ParsedLengthStyle } from '../lengthStyle.js';
@@ -102,7 +102,7 @@ export default class TitleBar extends EventEmitter<EventMap, TitleBar> implement
     this._caption.innerHTML = str;
   }
 
-  public setTitleFromKeyboard(keyboard: Keyboard) {
+  public setTitleFromKeyboard(keyboard: JSKeyboard) {
     let title = "<span style='font-weight:bold'>" + keyboard?.name + '</span>';  // I1972  // I2186
     this._caption.innerHTML = title;
   }
diff --git a/web/src/engine/osk/src/index.ts b/web/src/engine/osk/src/index.ts
index f010697d966..121b8f43375 100644
--- a/web/src/engine/osk/src/index.ts
+++ b/web/src/engine/osk/src/index.ts
@@ -1,4 +1,4 @@
-export { Codes, DeviceSpec, Keyboard, KeyboardProperties, SpacebarText } from 'keyman/engine/keyboard';
+export { Codes, DeviceSpec, JSKeyboard, KeyboardProperties, SpacebarText } from 'keyman/engine/keyboard';
 
 export { default as OSKView } from './views/oskView.js';
 export { default as FloatingOSKView, FloatingOSKViewConfiguration } from './views/floatingOskView.js';
diff --git a/web/src/engine/osk/src/keyboard-layout/oskLayerGroup.ts b/web/src/engine/osk/src/keyboard-layout/oskLayerGroup.ts
index 4bf4bc01b49..44bc01a6f90 100644
--- a/web/src/engine/osk/src/keyboard-layout/oskLayerGroup.ts
+++ b/web/src/engine/osk/src/keyboard-layout/oskLayerGroup.ts
@@ -1,4 +1,4 @@
-import { type DeviceSpec, Keyboard, ActiveLayout, ButtonClasses } from 'keyman/engine/keyboard';
+import { type DeviceSpec, JSKeyboard, ActiveLayout, ButtonClasses } from 'keyman/engine/keyboard';
 
 import { InputSample } from '@keymanapp/gesture-recognizer';
 
@@ -24,7 +24,7 @@ export default class OSKLayerGroup {
   private _activeLayerId: string = 'default';
   private _heightPadding: number;
 
-  public constructor(vkbd: VisualKeyboard, keyboard: Keyboard, formFactor: DeviceSpec.FormFactor) {
+  public constructor(vkbd: VisualKeyboard, keyboard: JSKeyboard, formFactor: DeviceSpec.FormFactor) {
     const layout = keyboard.layout(formFactor);
     this.spec = layout;
     this.vkbd = vkbd;
diff --git a/web/src/engine/osk/src/views/oskView.ts b/web/src/engine/osk/src/views/oskView.ts
index 53a9bbe253b..480ed5f99c2 100644
--- a/web/src/engine/osk/src/views/oskView.ts
+++ b/web/src/engine/osk/src/views/oskView.ts
@@ -13,7 +13,7 @@ import { type KeyElement } from '../keyElement.js';
 import {
   Codes,
   DeviceSpec,
-  Keyboard,
+  JSKeyboard,
   KeyboardProperties,
   ManagedPromise,
   type MinimalCodesInterface
@@ -169,7 +169,7 @@ export default abstract class OSKView
   private _boxBaseTouchEventCancel: (e: TouchEvent) => boolean;
 
   private keyboardData: {
-    keyboard: Keyboard,
+    keyboard: JSKeyboard,
     metadata: KeyboardProperties
   };
 
@@ -533,14 +533,14 @@ export default abstract class OSKView
   }
 
   public get activeKeyboard(): {
-    keyboard: Keyboard,
+    keyboard: JSKeyboard,
     metadata: KeyboardProperties
   } {
     return this.keyboardData;
   }
 
   public set activeKeyboard(keyboardData: {
-    keyboard: Keyboard,
+    keyboard: JSKeyboard,
     metadata: KeyboardProperties
   }) {
     this.keyboardData = keyboardData;
@@ -782,7 +782,7 @@ export default abstract class OSKView
     this.postKeyboardLoad();
   }
 
-  private _GenerateKeyboardView(keyboard: Keyboard, keyboardMetadata: KeyboardProperties): KeyboardView {
+  private _GenerateKeyboardView(keyboard: JSKeyboard, keyboardMetadata: KeyboardProperties): KeyboardView {
     let device = this.targetDevice;
 
     this._Box.className = "";
@@ -815,7 +815,7 @@ export default abstract class OSKView
    * @param       {Object}      keyboard    The keyboard to visualize
    * Description  Generates the visual keyboard element and attaches it to KMW
    */
-  private _GenerateVisualKeyboard(keyboard: Keyboard, keyboardMetadata: KeyboardProperties): VisualKeyboard {
+  private _GenerateVisualKeyboard(keyboard: JSKeyboard, keyboardMetadata: KeyboardProperties): VisualKeyboard {
     let device = this.targetDevice;
 
     const resourcePath = getResourcePath(this.config);
diff --git a/web/src/engine/osk/src/visualKeyboard.ts b/web/src/engine/osk/src/visualKeyboard.ts
index 570a82a209d..9828604abdf 100644
--- a/web/src/engine/osk/src/visualKeyboard.ts
+++ b/web/src/engine/osk/src/visualKeyboard.ts
@@ -5,7 +5,7 @@ import {
   ActiveLayout,
   DeviceSpec,
   type InternalKeyboardFont,
-  Keyboard,
+  JSKeyboard,
   KeyboardProperties,
   KeyDistribution,
   KeyEvent,
@@ -87,7 +87,7 @@ export interface VisualKeyboardConfiguration extends CommonConfiguration {
   /**
    * The Keyman keyboard on which to base the on-screen keyboard being represented.
    */
-  keyboard: Keyboard,
+  keyboard: JSKeyboard,
 
   /**
    * Metadata about the keyboard, such as relevant fonts, display name, and language code.
@@ -242,7 +242,7 @@ export default class VisualKeyboard extends EventEmitter<EventMap> implements Ke
   public deferLayout: boolean;
 
   // The keyboard object corresponding to this VisualKeyboard.
-  public readonly layoutKeyboard: Keyboard;
+  public readonly layoutKeyboard: JSKeyboard;
   public readonly layoutKeyboardProperties: KeyboardProperties;
 
   get layerId(): string {
@@ -349,7 +349,7 @@ export default class VisualKeyboard extends EventEmitter<EventMap> implements Ke
     if (!this.layoutKeyboard) {
       // May occasionally be null in embedded contexts; have seen this when iOS engine sets
       // keyboard height during change of keyboards.
-      this.layoutKeyboard = new Keyboard(null);
+      this.layoutKeyboard = new JSKeyboard(null);
     }
 
     this.layerGroup = new OSKLayerGroup(this, this.layoutKeyboard, formFactor);
@@ -1424,7 +1424,7 @@ export default class VisualKeyboard extends EventEmitter<EventMap> implements Ke
    * Create copy of the OSK that can be used for embedding in documentation or help
    * The currently active keyboard will be returned if PInternalName is null
    *
-   *  @param  {Keyboard}           PKbd            the keyboard object to be displayed
+   *  @param  {JSKeyboard}           PKbd            the keyboard object to be displayed
    *  @param  {KeyboardProperties} kbdProperties   the metadata stub for the keyboard
    *  @param  {Object}             pathConfig      an OSK path-configuration instance
    *  @param  {string=}            argFormFactor   layout form factor, defaulting to 'desktop'
@@ -1434,7 +1434,7 @@ export default class VisualKeyboard extends EventEmitter<EventMap> implements Ke
    *  @return {Object}                            DIV object with filled keyboard layer content
    */
   static buildDocumentationKeyboard(
-    PKbd: Keyboard,
+    PKbd: JSKeyboard,
     kbdProperties: KeyboardProperties,
     pathConfig: OSKResourcePathConfiguration,
     argFormFactor: DeviceSpec.FormFactor,
diff --git a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
index 7f2f48e2c12..46d6399c2a8 100644
--- a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
+++ b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 
 import { DOMKeyboardLoader } from 'keyman/engine/keyboard/dom-keyboard-loader';
-import { extendString, KeyboardHarness, Keyboard, MinimalKeymanGlobal, DeviceSpec, KeyboardKeymanGlobal, KeyboardDownloadError, KeyboardScriptError } from 'keyman/engine/keyboard';
+import { extendString, KeyboardHarness, JSKeyboard, MinimalKeymanGlobal, DeviceSpec, KeyboardKeymanGlobal, KeyboardDownloadError, KeyboardScriptError } from 'keyman/engine/keyboard';
 import { KeyboardInterface, Mock } from 'keyman/engine/js-processor';
 import { assertThrowsAsync } from 'keyman/tools/testing/test-utils';
 
@@ -49,7 +49,7 @@ describe('Keyboard loading in DOM', function() {
   it('`window`, disabled rule processing', async () => {
     const harness = new KeyboardHarness(window, MinimalKeymanGlobal);
     let keyboardLoader = new DOMKeyboardLoader(harness);
-    let keyboard: Keyboard = await keyboardLoader.loadKeyboardFromPath('/common/test/resources/keyboards/khmer_angkor.js');
+    let keyboard: JSKeyboard = await keyboardLoader.loadKeyboardFromPath('/common/test/resources/keyboards/khmer_angkor.js');
 
     assert.isOk(keyboard);
     assert.equal(keyboard.id, 'Keyboard_khmer_angkor');
@@ -67,7 +67,7 @@ describe('Keyboard loading in DOM', function() {
   it('`window`, enabled rule processing', async () => {
     const harness = new KeyboardInterface(window, MinimalKeymanGlobal);
     const keyboardLoader = new DOMKeyboardLoader(harness);
-    const keyboard: Keyboard = await keyboardLoader.loadKeyboardFromPath('/common/test/resources/keyboards/khmer_angkor.js');
+    const keyboard: JSKeyboard = await keyboardLoader.loadKeyboardFromPath('/common/test/resources/keyboards/khmer_angkor.js');
     harness.activeKeyboard = keyboard;
 
     assert.isOk(keyboard);
@@ -99,7 +99,7 @@ describe('Keyboard loading in DOM', function() {
     let keyboardLoader = new DOMKeyboardLoader(harness);
 
     // Preload a keyboard and make it active.
-    const test_kbd: Keyboard = await keyboardLoader.loadKeyboardFromPath('/common/test/resources/keyboards/test_917.js');
+    const test_kbd: JSKeyboard = await keyboardLoader.loadKeyboardFromPath('/common/test/resources/keyboards/test_917.js');
     harness.activeKeyboard = test_kbd;
     assert.isNotOk(harness.loadedKeyboard);
 
diff --git a/web/src/test/auto/dom/kbdLoader.ts b/web/src/test/auto/dom/kbdLoader.ts
index b0d092c12d5..4509ab4cf87 100644
--- a/web/src/test/auto/dom/kbdLoader.ts
+++ b/web/src/test/auto/dom/kbdLoader.ts
@@ -3,7 +3,7 @@ import {
 } from 'keyman/engine/keyboard/dom-keyboard-loader';
 
 import {
-  Keyboard,
+  JSKeyboard,
   KeyboardProperties,
   MinimalKeymanGlobal
 } from 'keyman/engine/keyboard';
@@ -21,11 +21,11 @@ export function loadKeyboardsFromStubs(apiStubs: any, baseDir: string) {
   baseDir = baseDir || './';
   const keyboards: {
     [key: string]: {
-      keyboard: Keyboard,
+      keyboard: JSKeyboard,
       metadata: KeyboardStub
     }
   } = {};
-  let priorPromise: Promise<void | Keyboard> = Promise.resolve();
+  let priorPromise: Promise<void | JSKeyboard> = Promise.resolve();
   for(const stub of apiStubs) {
     // We are keeping this strictly sequential because we don't have sandboxed
     // loading yet; lack of sandboxing means that all loading keyboards compete
diff --git a/web/src/test/auto/headless/app/browser/hardware-event-processing.tests.ts b/web/src/test/auto/headless/app/browser/hardware-event-processing.tests.ts
index d00425362d1..0643c88a862 100644
--- a/web/src/test/auto/headless/app/browser/hardware-event-processing.tests.ts
+++ b/web/src/test/auto/headless/app/browser/hardware-event-processing.tests.ts
@@ -4,7 +4,7 @@ import { preprocessKeyboardEvent } from 'keyman/app/browser';
 import { processForMnemonicsAndLegacy } from 'keyman/engine/main';
 import { PhysicalInputEventSpec } from '@keymanapp/recorder-core';
 import { DeviceSpec } from '@keymanapp/web-utils';
-import { Codes, Keyboard, KeyEvent } from 'keyman/engine/keyboard';
+import { Codes, JSKeyboard, KeyEvent } from 'keyman/engine/keyboard';
 
 const ModifierCodes = Codes.modifierCodes;
 const KeyCodes = Codes.keyCodes;
@@ -24,7 +24,7 @@ describe("app/browser: hardware event processing", () => {
           modifierSet: PhysicalInputEventSpec.modifierCodes.Shift,
           location: 1
         }) as any as KeyboardEvent, {
-          activeKeyboard: new Keyboard({ KM: 0 }),
+          activeKeyboard: new JSKeyboard({ KM: 0 }),
           modStateFlags: 0,
           baseLayout: 'us'
         },
@@ -46,7 +46,7 @@ describe("app/browser: hardware event processing", () => {
           keyCode: KeyCodes.K_A,
           modifierSet: 0
         }) as any as KeyboardEvent, {
-          activeKeyboard: new Keyboard({ KM: 0 }),
+          activeKeyboard: new JSKeyboard({ KM: 0 }),
           modStateFlags: 0,
           baseLayout: 'us'
         },
@@ -66,7 +66,7 @@ describe("app/browser: hardware event processing", () => {
           location: 1
         }) as any as KeyboardEvent, {
           // KMBM:  Keyman Modifier BitMask
-          activeKeyboard: new Keyboard({KM: 0}),
+          activeKeyboard: new JSKeyboard({KM: 0}),
           modStateFlags: 0,
           baseLayout: 'us'
         },
@@ -86,7 +86,7 @@ describe("app/browser: hardware event processing", () => {
           location: 1
         }) as any as KeyboardEvent, {
           // KMBM:  Keyman Modifier BitMask
-          activeKeyboard: new Keyboard({KM: 0}),
+          activeKeyboard: new JSKeyboard({KM: 0}),
           modStateFlags: ModifierCodes.ALT,
           baseLayout: 'us'
         },
@@ -108,7 +108,7 @@ describe("app/browser: hardware event processing", () => {
           location: 1
         }) as any as KeyboardEvent, {
           // KMBM:  Keyman Modifier BitMask
-          activeKeyboard: new Keyboard({KM:0, KMBM: Codes.modifierBitmasks.CHIRAL}),
+          activeKeyboard: new JSKeyboard({KM:0, KMBM: Codes.modifierBitmasks.CHIRAL}),
           modStateFlags: 0,
           baseLayout: 'us'
         },
@@ -127,7 +127,7 @@ describe("app/browser: hardware event processing", () => {
           modifierSet: 0
         }) as any as KeyboardEvent, {
           // KMBM:  Keyman Modifier BitMask
-          activeKeyboard: new Keyboard({KM: 0, KMBM: Codes.modifierBitmasks.CHIRAL}),
+          activeKeyboard: new JSKeyboard({KM: 0, KMBM: Codes.modifierBitmasks.CHIRAL}),
           modStateFlags: 0,
           baseLayout: 'us'
         },
@@ -147,7 +147,7 @@ describe("app/browser: hardware event processing", () => {
           location: 1
         }) as any as KeyboardEvent, {
           // KMBM:  Keyman Modifier BitMask
-          activeKeyboard: new Keyboard({KM: 0, KMBM: Codes.modifierBitmasks.CHIRAL}),
+          activeKeyboard: new JSKeyboard({KM: 0, KMBM: Codes.modifierBitmasks.CHIRAL}),
           modStateFlags: 0,
           baseLayout: 'us'
         },
@@ -167,7 +167,7 @@ describe("app/browser: hardware event processing", () => {
           location: 1
         }) as any as KeyboardEvent, {
           // KMBM:  Keyman Modifier BitMask
-          activeKeyboard: new Keyboard({KM: 0, KMBM: Codes.modifierBitmasks.CHIRAL}),
+          activeKeyboard: new JSKeyboard({KM: 0, KMBM: Codes.modifierBitmasks.CHIRAL}),
           modStateFlags: ModifierCodes.LALT,
           baseLayout: 'us'
         },
@@ -188,7 +188,7 @@ describe("app/browser: hardware event processing", () => {
           modifierSet: PhysicalInputEventSpec.modifierCodes.Shift,
           location: 1
         }) as any as KeyboardEvent, {
-          activeKeyboard: new Keyboard({ KM: 1 }),
+          activeKeyboard: new JSKeyboard({ KM: 1 }),
           modStateFlags: 0,
           baseLayout: 'us'
         },
@@ -206,7 +206,7 @@ describe("app/browser: hardware event processing", () => {
           keyCode: KeyCodes.K_A,
           modifierSet: 0
         }) as any as KeyboardEvent, {
-          activeKeyboard: new Keyboard({ KM: 1 }),
+          activeKeyboard: new JSKeyboard({ KM: 1 }),
           modStateFlags: 0,
           baseLayout: 'us'
         },
@@ -227,7 +227,7 @@ describe("app/browser: hardware event processing", () => {
           modifierSet: PhysicalInputEventSpec.modifierCodes.Shift,
           location: 1
         }) as any as KeyboardEvent, {
-          activeKeyboard: new Keyboard({ KM: undefined }),
+          activeKeyboard: new JSKeyboard({ KM: undefined }),
           modStateFlags: 0,
           baseLayout: 'us'
         },
@@ -245,7 +245,7 @@ describe("app/browser: hardware event processing", () => {
           keyCode: KeyCodes.K_A,
           modifierSet: 0
         }) as any as KeyboardEvent, {
-          activeKeyboard: new Keyboard({ KM: undefined }),
+          activeKeyboard: new JSKeyboard({ KM: undefined }),
           modStateFlags: 0,
           baseLayout: 'us'
         },
@@ -264,7 +264,7 @@ describe("app/browser: hardware event processing", () => {
           modifierSet: PhysicalInputEventSpec.modifierCodes.Alt,
           location: 0
         }) as any as KeyboardEvent, {
-          activeKeyboard: new Keyboard({ KM: undefined }),
+          activeKeyboard: new JSKeyboard({ KM: undefined }),
           // Internally assumes that the ALT-press event was previously handled, with this as
           // the resulting modifier state at the time of key-press.
           modStateFlags: ModifierCodes.LALT,
@@ -298,7 +298,7 @@ describe("app/browser: hardware event processing", () => {
 
         const finalKeyEvent = processForMnemonicsAndLegacy(
           baseKeyEvent,
-          new Keyboard({KM: 0}),
+          new JSKeyboard({KM: 0}),
           'us'
         );
 
@@ -317,7 +317,7 @@ describe("app/browser: hardware event processing", () => {
 
         const finalKeyEvent = processForMnemonicsAndLegacy(
           baseKeyEvent,
-          new Keyboard({KM: 0}),
+          new JSKeyboard({KM: 0}),
           'us'
         );
 
@@ -336,7 +336,7 @@ describe("app/browser: hardware event processing", () => {
 
         const finalKeyEvent = processForMnemonicsAndLegacy(
           baseKeyEvent,
-          new Keyboard({KM: 0}),
+          new JSKeyboard({KM: 0}),
           'us'
         );
 
@@ -355,7 +355,7 @@ describe("app/browser: hardware event processing", () => {
 
         const finalKeyEvent = processForMnemonicsAndLegacy(
           baseKeyEvent,
-          new Keyboard({KM: 0}),
+          new JSKeyboard({KM: 0}),
           'us'
         );
 
@@ -376,7 +376,7 @@ describe("app/browser: hardware event processing", () => {
 
         const finalKeyEvent = processForMnemonicsAndLegacy(
           baseKeyEvent,
-          new Keyboard({KM:0, KMBM: Codes.modifierBitmasks.CHIRAL}),
+          new JSKeyboard({KM:0, KMBM: Codes.modifierBitmasks.CHIRAL}),
           'us'
         );
 
@@ -395,7 +395,7 @@ describe("app/browser: hardware event processing", () => {
 
         const finalKeyEvent = processForMnemonicsAndLegacy(
           baseKeyEvent,
-          new Keyboard({KM:0, KMBM: Codes.modifierBitmasks.CHIRAL}),
+          new JSKeyboard({KM:0, KMBM: Codes.modifierBitmasks.CHIRAL}),
           'us'
         );
 
@@ -414,7 +414,7 @@ describe("app/browser: hardware event processing", () => {
 
         const finalKeyEvent = processForMnemonicsAndLegacy(
           baseKeyEvent,
-          new Keyboard({KM:0, KMBM: Codes.modifierBitmasks.CHIRAL}),
+          new JSKeyboard({KM:0, KMBM: Codes.modifierBitmasks.CHIRAL}),
           'us'
         );
 
@@ -433,7 +433,7 @@ describe("app/browser: hardware event processing", () => {
 
         const finalKeyEvent = processForMnemonicsAndLegacy(
           baseKeyEvent,
-          new Keyboard({KM:0, KMBM: Codes.modifierBitmasks.CHIRAL}),
+          new JSKeyboard({KM:0, KMBM: Codes.modifierBitmasks.CHIRAL}),
           'us'
         );
 
@@ -454,7 +454,7 @@ describe("app/browser: hardware event processing", () => {
 
         const finalKeyEvent = processForMnemonicsAndLegacy(
           baseKeyEvent,
-          new Keyboard({KM:1}),
+          new JSKeyboard({KM:1}),
           'us'
         );
 
@@ -477,7 +477,7 @@ describe("app/browser: hardware event processing", () => {
 
         const finalKeyEvent = processForMnemonicsAndLegacy(
           baseKeyEvent,
-          new Keyboard({KM:1}),
+          new JSKeyboard({KM:1}),
           'us'
         );
 
@@ -503,7 +503,7 @@ describe("app/browser: hardware event processing", () => {
 
         const finalKeyEvent = processForMnemonicsAndLegacy(
           baseKeyEvent,
-          new Keyboard({KM:undefined}),
+          new JSKeyboard({KM:undefined}),
           'us'
         );
 
@@ -527,7 +527,7 @@ describe("app/browser: hardware event processing", () => {
 
         const finalKeyEvent = processForMnemonicsAndLegacy(
           baseKeyEvent,
-          new Keyboard({KM:undefined}),
+          new JSKeyboard({KM:undefined}),
           'us'
         );
 
@@ -551,7 +551,7 @@ describe("app/browser: hardware event processing", () => {
 
         const finalKeyEvent = processForMnemonicsAndLegacy(
           baseKeyEvent,
-          new Keyboard({KM:undefined}),
+          new JSKeyboard({KM:undefined}),
           'us'
         );
 
@@ -578,7 +578,7 @@ describe("app/browser: hardware event processing", () => {
 
         const finalKeyEvent = processForMnemonicsAndLegacy(
           baseKeyEvent,
-          new Keyboard({KM:undefined}),
+          new JSKeyboard({KM:undefined}),
           'us'
         );
 
diff --git a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
index a6b80d50043..05829985ae9 100644
--- a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
@@ -46,7 +46,7 @@ describe('Bundled ES Module for js-processor', function() {
 describe('Bundled ES Module for keyboard', function () {
   describe('Keyboard', function () {
     it('should initialize without errors', function () {
-      let kp = new Package2.Keyboard();
+      let kp = new Package2.JSKeyboard();
       assert.isNotNull(kp);
     });
   });
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
index 8174cbe0779..31eb5a2af57 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { Keyboard } from 'keyman/engine/keyboard';
+import { JSKeyboard } from 'keyman/engine/keyboard';
 import { KeyboardProcessor } from 'keyman/engine/js-processor';
 import { extendString } from '@keymanapp/web-utils';
 
@@ -24,7 +24,7 @@ describe('Engine - Stores', function() {
     let processor = new KeyboardProcessor(device);
     // A 'hollow' Keyboard that only follows default rules.  That said, we need a Keyboard
     // instance to host cache data for our exploded store tests.
-    processor.activeKeyboard = new Keyboard();
+    processor.activeKeyboard = new JSKeyboard();
 
     // Function defined at top of file; creates supplementary pairs for extended Unicode codepoints.
     var u = toSupplementaryPairString;
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/stubAndKeyboardCache.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/stubAndKeyboardCache.tests.js
index 7260b9982e7..d8b52dea376 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/stubAndKeyboardCache.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/stubAndKeyboardCache.tests.js
@@ -62,7 +62,7 @@ describe('StubAndKeyboardCache', function () {
     assert.strictEqual(cache.defaultStub, galaxie_stub);
   });
 
-  it('loads & caches `Keyboard`s, `Keyboard` promise pending resolution', async () => {
+  it('loads & caches `JSKeyboard`s, `JSKeyboard` promise pending resolution', async () => {
     let keyboardLoader = new NodeKeyboardLoader(new KeyboardHarness({}, MinimalKeymanGlobal));
     const cache = new StubAndKeyboardCache(keyboardLoader);
 

From b82aa5fd8f35b83365d46f170988a3ed0b985a25 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 5 Dec 2024 18:19:04 +0100
Subject: [PATCH 054/254] refactor(web): remove default from JSKeyboard and
 export explicitly

---
 web/src/engine/keyboard/src/index.ts                            | 2 +-
 web/src/engine/keyboard/src/keyEvent.ts                         | 2 +-
 web/src/engine/keyboard/src/keyboards/activeLayout.ts           | 2 +-
 web/src/engine/keyboard/src/keyboards/defaultLayouts.ts         | 2 +-
 web/src/engine/keyboard/src/keyboards/keyboard.ts               | 2 +-
 web/src/engine/keyboard/src/keyboards/keyboardHarness.ts        | 2 +-
 web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts     | 2 +-
 .../engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts  | 2 +-
 .../engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index 9106201c126..f0c875f0d1e 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -1,6 +1,6 @@
 export * from "./keyboards/activeLayout.js";
 export * from "./keyboards/defaultLayouts.js";
-export { default as JSKeyboard } from "./keyboards/keyboard.js";
+export { JSKeyboard } from "./keyboards/keyboard.js";
 export * from "./keyboards/keyboard.js";
 export { KeyboardHarness, KeyboardKeymanGlobal, MinimalCodesInterface, MinimalKeymanGlobal } from "./keyboards/keyboardHarness.js";
 export { KeyboardLoaderBase } from "./keyboards/keyboardLoaderBase.js";
diff --git a/web/src/engine/keyboard/src/keyEvent.ts b/web/src/engine/keyboard/src/keyEvent.ts
index eb8b1533548..07cfb0704d0 100644
--- a/web/src/engine/keyboard/src/keyEvent.ts
+++ b/web/src/engine/keyboard/src/keyEvent.ts
@@ -6,7 +6,7 @@
 // a key event.  The most straightforward way to integrate Web OSK events on other platforms is to have
 // other platforms recognize and utilize this type.
 
-import type JSKeyboard from "./keyboards/keyboard.js";
+import { type JSKeyboard } from "./keyboards/keyboard.js";
 import { type DeviceSpec } from "@keymanapp/web-utils";
 
 import Codes from './codes.js';
diff --git a/web/src/engine/keyboard/src/keyboards/activeLayout.ts b/web/src/engine/keyboard/src/keyboards/activeLayout.ts
index 692ef65c016..8558afd07c6 100644
--- a/web/src/engine/keyboard/src/keyboards/activeLayout.ts
+++ b/web/src/engine/keyboard/src/keyboards/activeLayout.ts
@@ -3,7 +3,7 @@ import KeyEvent, { KeyEventSpec } from "../keyEvent.js";
 import KeyMapping from "../keyMapping.js";
 import { ButtonClasses, Layouts } from "./defaultLayouts.js";
 import type { LayoutKey, LayoutSubKey, LayoutRow, LayoutLayer, LayoutFormFactor, ButtonClass } from "./defaultLayouts.js";
-import type JSKeyboard from "./keyboard.js";
+import { type JSKeyboard } from "./keyboard.js";
 
 import { TouchLayout } from "@keymanapp/common-types";
 import TouchLayoutDefaultHint = TouchLayout.TouchLayoutDefaultHint;
diff --git a/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts b/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts
index 9106ff30e64..7d9591f318c 100644
--- a/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts
+++ b/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts
@@ -20,7 +20,7 @@ import ButtonClasses = TouchLayout.TouchLayoutKeySp;
 export { ButtonClasses };
 
 import Codes from "../codes.js";
-import type JSKeyboard from "./keyboard.js";
+import { type JSKeyboard } from "./keyboard.js";
 
 // The following types provide type definitions for the full JSON format we use for visual keyboard definitions.
 export type ButtonClass       =  0 | 1 | 2 | 3 | 4 | /*5 | 6 | 7 |*/ 8 | 9 | 10;
diff --git a/web/src/engine/keyboard/src/keyboards/keyboard.ts b/web/src/engine/keyboard/src/keyboards/keyboard.ts
index b49f0258107..df3eeb91c41 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboard.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboard.ts
@@ -52,7 +52,7 @@ type KmwKeyboardObject = KeyboardObject & {
  * and keyboard-centered functionality in an object-oriented way without modifying the
  * wrapped keyboard itself.
  */
-export default class JSKeyboard {
+export class JSKeyboard {
   public static DEFAULT_SCRIPT_OBJECT: KmwKeyboardObject = {
     'gs': function(outputTarget: OutputTarget, keystroke: KeyEvent) { return false; }, // no matching rules; rely on defaultRuleOutput entirely
     'KI': '', // The currently-existing default keyboard ID; we already have checks that focus against this.
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts b/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts
index 8e83f31c778..02ec53674fd 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts
@@ -1,4 +1,4 @@
-import JSKeyboard from "./keyboard.js";
+import { JSKeyboard } from "./keyboard.js";
 import Codes from "../codes.js";
 import { DeviceSpec } from '@keymanapp/web-utils';
 
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
index 6a203f6ce11..4ea9e5ff177 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
@@ -1,4 +1,4 @@
-import JSKeyboard from "./keyboard.js";
+import { JSKeyboard } from "./keyboard.js";
 import { KeyboardHarness } from "./keyboardHarness.js";
 import KeyboardProperties from "./keyboardProperties.js";
 import { KeyboardLoadErrorBuilder, StubBasedErrorBuilder, UriBasedErrorBuilder } from './keyboardLoadError.js';
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
index 0a273be4497..d1fbf64f703 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
+++ b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
@@ -2,7 +2,7 @@
 
 ///<reference lib="dom" />
 
-import { default as JSKeyboard } from '../keyboard.js';
+import { JSKeyboard } from '../keyboard.js';
 import { KeyboardHarness, MinimalKeymanGlobal } from '../keyboardHarness.js';
 import { KeyboardLoaderBase } from '../keyboardLoaderBase.js';
 import { KeyboardLoadErrorBuilder } from '../keyboardLoadError.js';
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
index 437028e4f32..52680b7ad62 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
+++ b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
@@ -3,7 +3,7 @@ import { readFile } from 'node:fs/promises';
 
 import { globalObject } from '@keymanapp/web-utils';
 
-import { default as JSKeyboard } from '../keyboard.js';
+import { JSKeyboard } from '../keyboard.js';
 import { KeyboardHarness, MinimalKeymanGlobal } from '../keyboardHarness.js';
 import { KeyboardLoaderBase } from '../keyboardLoaderBase.js';
 import { KeyboardLoadErrorBuilder } from '../keyboardLoadError.js';

From dfaf75c7506e1e32e0481f7c41f12b05cd11b9a4 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 5 Dec 2024 18:23:50 +0100
Subject: [PATCH 055/254] refactor(web): rename `keyboard.ts` to
 `jsKeyboard.ts`

---
 web/src/engine/keyboard/src/index.ts                          | 4 ++--
 web/src/engine/keyboard/src/keyEvent.ts                       | 2 +-
 web/src/engine/keyboard/src/keyboards/activeLayout.ts         | 2 +-
 web/src/engine/keyboard/src/keyboards/defaultLayouts.ts       | 2 +-
 .../keyboard/src/keyboards/{keyboard.ts => jsKeyboard.ts}     | 0
 web/src/engine/keyboard/src/keyboards/keyboardHarness.ts      | 2 +-
 web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts   | 2 +-
 .../keyboard/src/keyboards/loaders/domKeyboardLoader.ts       | 2 +-
 .../keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts      | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
 rename web/src/engine/keyboard/src/keyboards/{keyboard.ts => jsKeyboard.ts} (100%)

diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index f0c875f0d1e..a08d6222134 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -1,7 +1,7 @@
 export * from "./keyboards/activeLayout.js";
 export * from "./keyboards/defaultLayouts.js";
-export { JSKeyboard } from "./keyboards/keyboard.js";
-export * from "./keyboards/keyboard.js";
+export { JSKeyboard } from "./keyboards/jsKeyboard.js";
+export * from "./keyboards/jsKeyboard.js";
 export { KeyboardHarness, KeyboardKeymanGlobal, MinimalCodesInterface, MinimalKeymanGlobal } from "./keyboards/keyboardHarness.js";
 export { KeyboardLoaderBase } from "./keyboards/keyboardLoaderBase.js";
 export { KeyboardLoadErrorBuilder, KeyboardMissingError, KeyboardScriptError, KeyboardDownloadError, InvalidKeyboardError } from './keyboards/keyboardLoadError.js'
diff --git a/web/src/engine/keyboard/src/keyEvent.ts b/web/src/engine/keyboard/src/keyEvent.ts
index 07cfb0704d0..5b0e81eced7 100644
--- a/web/src/engine/keyboard/src/keyEvent.ts
+++ b/web/src/engine/keyboard/src/keyEvent.ts
@@ -6,7 +6,7 @@
 // a key event.  The most straightforward way to integrate Web OSK events on other platforms is to have
 // other platforms recognize and utilize this type.
 
-import { type JSKeyboard } from "./keyboards/keyboard.js";
+import { type JSKeyboard } from "./keyboards/jsKeyboard.js";
 import { type DeviceSpec } from "@keymanapp/web-utils";
 
 import Codes from './codes.js';
diff --git a/web/src/engine/keyboard/src/keyboards/activeLayout.ts b/web/src/engine/keyboard/src/keyboards/activeLayout.ts
index 8558afd07c6..cdec5598a43 100644
--- a/web/src/engine/keyboard/src/keyboards/activeLayout.ts
+++ b/web/src/engine/keyboard/src/keyboards/activeLayout.ts
@@ -3,7 +3,7 @@ import KeyEvent, { KeyEventSpec } from "../keyEvent.js";
 import KeyMapping from "../keyMapping.js";
 import { ButtonClasses, Layouts } from "./defaultLayouts.js";
 import type { LayoutKey, LayoutSubKey, LayoutRow, LayoutLayer, LayoutFormFactor, ButtonClass } from "./defaultLayouts.js";
-import { type JSKeyboard } from "./keyboard.js";
+import { type JSKeyboard } from "./jsKeyboard.js";
 
 import { TouchLayout } from "@keymanapp/common-types";
 import TouchLayoutDefaultHint = TouchLayout.TouchLayoutDefaultHint;
diff --git a/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts b/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts
index 7d9591f318c..722c222a470 100644
--- a/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts
+++ b/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts
@@ -20,7 +20,7 @@ import ButtonClasses = TouchLayout.TouchLayoutKeySp;
 export { ButtonClasses };
 
 import Codes from "../codes.js";
-import { type JSKeyboard } from "./keyboard.js";
+import { type JSKeyboard } from "./jsKeyboard.js";
 
 // The following types provide type definitions for the full JSON format we use for visual keyboard definitions.
 export type ButtonClass       =  0 | 1 | 2 | 3 | 4 | /*5 | 6 | 7 |*/ 8 | 9 | 10;
diff --git a/web/src/engine/keyboard/src/keyboards/keyboard.ts b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/keyboard.ts
rename to web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts b/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts
index 02ec53674fd..c38e335e422 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts
@@ -1,4 +1,4 @@
-import { JSKeyboard } from "./keyboard.js";
+import { JSKeyboard } from "./jsKeyboard.js";
 import Codes from "../codes.js";
 import { DeviceSpec } from '@keymanapp/web-utils';
 
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
index 4ea9e5ff177..660b19f0325 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
@@ -1,4 +1,4 @@
-import { JSKeyboard } from "./keyboard.js";
+import { JSKeyboard } from "./jsKeyboard.js";
 import { KeyboardHarness } from "./keyboardHarness.js";
 import KeyboardProperties from "./keyboardProperties.js";
 import { KeyboardLoadErrorBuilder, StubBasedErrorBuilder, UriBasedErrorBuilder } from './keyboardLoadError.js';
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
index d1fbf64f703..7f1b0dcfddd 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
+++ b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
@@ -2,7 +2,7 @@
 
 ///<reference lib="dom" />
 
-import { JSKeyboard } from '../keyboard.js';
+import { JSKeyboard } from '../jsKeyboard.js';
 import { KeyboardHarness, MinimalKeymanGlobal } from '../keyboardHarness.js';
 import { KeyboardLoaderBase } from '../keyboardLoaderBase.js';
 import { KeyboardLoadErrorBuilder } from '../keyboardLoadError.js';
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
index 52680b7ad62..9ae64fac2c9 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
+++ b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
@@ -3,7 +3,7 @@ import { readFile } from 'node:fs/promises';
 
 import { globalObject } from '@keymanapp/web-utils';
 
-import { JSKeyboard } from '../keyboard.js';
+import { JSKeyboard } from '../jsKeyboard.js';
 import { KeyboardHarness, MinimalKeymanGlobal } from '../keyboardHarness.js';
 import { KeyboardLoaderBase } from '../keyboardLoaderBase.js';
 import { KeyboardLoadErrorBuilder } from '../keyboardLoadError.js';

From 62cd0d65095cb973b138531364d02aa900ad3f2f Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 6 Dec 2024 16:30:33 +0100
Subject: [PATCH 056/254] refactor(web): rename `KeyboardInterface` class to
 `JSKeyboardInterface`

Also rename file from `kbdInterface.ts` to `jsKeyboardInterface.ts`.
---
 web/src/app/browser/src/beepHandler.ts        |  6 +-
 web/src/engine/js-processor/src/index.ts      |  4 +-
 ...kbdInterface.ts => jsKeyboardInterface.ts} | 10 +--
 .../js-processor/src/keyboardProcessor.ts     |  8 +--
 .../engine/js-processor/src/systemStores.ts   |  2 +-
 web/src/engine/main/src/contextManagerBase.ts |  4 +-
 .../main/src/headless/inputProcessor.ts       |  4 +-
 web/src/engine/main/src/keyboardInterface.ts  |  2 +-
 .../cases/keyboard/domKeyboardLoader.tests.ts | 12 ++--
 web/src/test/auto/dom/kbdLoader.ts            |  4 +-
 .../engine/js-processor/basic-engine.tests.js |  4 +-
 .../engine/js-processor/chirality.tests.js    | 62 +++++++++----------
 .../engine/js-processor/deadkeys.tests.js     |  4 +-
 .../js-processor/engine/context.tests.js      |  6 +-
 .../engine/notany_context.tests.js            |  4 +-
 .../engine/unmatched_final_group.tests.js     |  4 +-
 .../engine/js-processor/kbdInterface.tests.ts | 10 +--
 .../non-positional-rules.tests.js             |  6 +-
 .../specialized-backspace.tests.js            | 10 +--
 .../engine/keyboard/keyboard-loading.tests.js |  4 +-
 .../keyboard/keyboardLoaderBase.tests.ts      | 12 ++--
 .../testing/recorder-core/src/nodeProctor.ts  |  4 +-
 22 files changed, 93 insertions(+), 93 deletions(-)
 rename web/src/engine/js-processor/src/{kbdInterface.ts => jsKeyboardInterface.ts} (99%)

diff --git a/web/src/app/browser/src/beepHandler.ts b/web/src/app/browser/src/beepHandler.ts
index eb6d6583ee4..5427b5024a8 100644
--- a/web/src/app/browser/src/beepHandler.ts
+++ b/web/src/app/browser/src/beepHandler.ts
@@ -1,4 +1,4 @@
-import { type KeyboardInterface } from 'keyman/engine/js-processor';
+import { type JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { DesignIFrame, OutputTarget } from 'keyman/engine/element-wrappers';
 
 // Utility object used to handle beep (keyboard error response) operations.
@@ -17,9 +17,9 @@ class BeepData {
 }
 
 export class BeepHandler {
-  readonly keyboardInterface: KeyboardInterface;
+  readonly keyboardInterface: JSKeyboardInterface;
 
-  constructor(keyboardInterface: KeyboardInterface) {
+  constructor(keyboardInterface: JSKeyboardInterface) {
     this.keyboardInterface = keyboardInterface;
   }
 
diff --git a/web/src/engine/js-processor/src/index.ts b/web/src/engine/js-processor/src/index.ts
index 1755499119c..04b8426923f 100644
--- a/web/src/engine/js-processor/src/index.ts
+++ b/web/src/engine/js-processor/src/index.ts
@@ -1,8 +1,8 @@
 export { default as KeyboardProcessor } from "./keyboardProcessor.js";
 export * from "./keyboardProcessor.js";
 export { default as RuleBehavior } from "./ruleBehavior.js";
-export * from './kbdInterface.js';
-export { default as KeyboardInterface } from "./kbdInterface.js";
+export * from './jsKeyboardInterface.js';
+export { JSKeyboardInterface } from "./jsKeyboardInterface.js";
 export * from "./systemStores.js";
 export * from "./deadkeys.js";
 export { default as OutputTarget } from "./outputTarget.js";
diff --git a/web/src/engine/js-processor/src/kbdInterface.ts b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
similarity index 99%
rename from web/src/engine/js-processor/src/kbdInterface.ts
rename to web/src/engine/js-processor/src/jsKeyboardInterface.ts
index 9a2ee4c1909..2ce481c2be2 100644
--- a/web/src/engine/js-processor/src/kbdInterface.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
@@ -165,7 +165,7 @@ class CachedContextEx {
 
 //#endregion
 
-export default class KeyboardInterface extends KeyboardHarness {
+export class JSKeyboardInterface extends KeyboardHarness {
   static readonly GLOBAL_NAME = 'KeymanWeb';
 
   cachedContext: CachedContext = new CachedContext();
@@ -571,7 +571,7 @@ export default class KeyboardInterface extends KeyboardHarness {
     var modifierBitmask = bitmask & Codes.modifierBitmasks["ALL"];
     var stateBitmask = bitmask & Codes.stateBitmasks["ALL"];
 
-    const eventModifiers = KeyboardInterface.matchModifiersToRuleChirality(e.Lmodifiers, Lruleshift);
+    const eventModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(e.Lmodifiers, Lruleshift);
 
     if(e.vkCode > 255) {
       keyCode = e.vkCode; // added to support extended (touch-hold) keys for mnemonic layouts
@@ -1101,7 +1101,7 @@ export default class KeyboardInterface extends KeyboardHarness {
   }
 
   /**
-   * Publishes the KeyboardInterface's shorthand API names.  As this assigns the current functions
+   * Publishes the JSKeyboardInterface's shorthand API names.  As this assigns the current functions
    * held by the longform versions, note that this should be called after replacing any of them via
    * JS method extension.
    *
@@ -1112,7 +1112,7 @@ export default class KeyboardInterface extends KeyboardHarness {
     // Keyboard callbacks
     let prototype = this.prototype;
 
-    var exportKBCallback = function(miniName: string, longName: keyof KeyboardInterface) {
+    var exportKBCallback = function(miniName: string, longName: keyof JSKeyboardInterface) {
       if(prototype[longName]) {
         // @ts-ignore
         prototype[miniName] = prototype[longName];
@@ -1151,5 +1151,5 @@ export default class KeyboardInterface extends KeyboardHarness {
 
 (function() {
   // This will be the only call within the keyboard module.
-  KeyboardInterface.__publishShorthandAPI();
+  JSKeyboardInterface.__publishShorthandAPI();
 }());
diff --git a/web/src/engine/js-processor/src/keyboardProcessor.ts b/web/src/engine/js-processor/src/keyboardProcessor.ts
index 93ec35bfe1b..f2141ae2e68 100644
--- a/web/src/engine/js-processor/src/keyboardProcessor.ts
+++ b/web/src/engine/js-processor/src/keyboardProcessor.ts
@@ -15,7 +15,7 @@ import {
 import { Mock } from "./mock.js";
 import type OutputTarget from "./outputTarget.js";
 import RuleBehavior from "./ruleBehavior.js";
-import KeyboardInterface from './kbdInterface.js';
+import { JSKeyboardInterface }  from './jsKeyboardInterface.js';
 import { DeviceSpec, globalObject } from "@keymanapp/web-utils";
 import { type MutableSystemStore, SystemStoreIDs } from "./systemStores.js";
 
@@ -28,7 +28,7 @@ export type LogMessageHandler = (str: string) => void;
 
 export interface ProcessorInitOptions {
   baseLayout?: string;
-  keyboardInterface?: KeyboardInterface;
+  keyboardInterface?: JSKeyboardInterface;
   defaultOutputRules?: DefaultRules; // Takes the class def object, not an instance thereof.
 }
 
@@ -55,7 +55,7 @@ export default class KeyboardProcessor extends EventEmitter<EventMap> {
   // Needed for AltGr simulation.
   modStateFlags: number = 0;
 
-  keyboardInterface: KeyboardInterface;
+  keyboardInterface: JSKeyboardInterface;
 
   /**
    * Indicates the device (platform) to be used for non-keystroke events,
@@ -83,7 +83,7 @@ export default class KeyboardProcessor extends EventEmitter<EventMap> {
     this.contextDevice = device;
 
     this.baseLayout = options.baseLayout || KeyboardProcessor.DEFAULT_OPTIONS.baseLayout;
-    this.keyboardInterface = options.keyboardInterface || new KeyboardInterface(globalObject(), MinimalKeymanGlobal);
+    this.keyboardInterface = options.keyboardInterface || new JSKeyboardInterface(globalObject(), MinimalKeymanGlobal);
     this.defaultRules = options.defaultOutputRules || KeyboardProcessor.DEFAULT_OPTIONS.defaultOutputRules;
   }
 
diff --git a/web/src/engine/js-processor/src/systemStores.ts b/web/src/engine/js-processor/src/systemStores.ts
index 3288c9feff8..ea5e654b84c 100644
--- a/web/src/engine/js-processor/src/systemStores.ts
+++ b/web/src/engine/js-processor/src/systemStores.ts
@@ -1,5 +1,5 @@
 import { type KeyboardHarness } from 'keyman/engine/keyboard';
-import { StoreNonCharEntry } from './kbdInterface.js';
+import { StoreNonCharEntry } from './jsKeyboardInterface.js';
 
 export enum SystemStoreIDs {
   TSS_LAYER = 33,
diff --git a/web/src/engine/main/src/contextManagerBase.ts b/web/src/engine/main/src/contextManagerBase.ts
index fa187ce2e65..9abc503c65c 100644
--- a/web/src/engine/main/src/contextManagerBase.ts
+++ b/web/src/engine/main/src/contextManagerBase.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'eventemitter3';
 import { ManagedPromise, type JSKeyboard } from 'keyman/engine/keyboard';
-import { type KeyboardInterface, type OutputTarget } from 'keyman/engine/js-processor';
+import { type JSKeyboardInterface, type OutputTarget } from 'keyman/engine/js-processor';
 import { StubAndKeyboardCache, type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { PredictionContext } from 'keyman/engine/interfaces';
 import { EngineConfiguration } from './engineConfiguration.js';
@@ -99,7 +99,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
     this.keyboardCache = config.keyboardCache;
   }
 
-  insertText(kbdInterface: KeyboardInterface, Ptext: string, PdeadKey: number) {
+  insertText(kbdInterface: JSKeyboardInterface, Ptext: string, PdeadKey: number) {
     // Find the correct output target to manipulate.
     const outputTarget = this.activeTarget;
 
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index 055800238e1..6dc5f19f264 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -11,7 +11,7 @@ import { Codes, type JSKeyboard, type KeyEvent } from "keyman/engine/keyboard";
 import {
   type Alternate,
   isEmptyTransform,
-  KeyboardInterface,
+  JSKeyboardInterface,
   KeyboardProcessor,
   Mock,
   type OutputTarget,
@@ -66,7 +66,7 @@ export class InputProcessor {
     return this.kbdProcessor;
   }
 
-  public get keyboardInterface(): KeyboardInterface {
+  public get keyboardInterface(): JSKeyboardInterface {
     return this.keyboardProcessor.keyboardInterface;
   }
 
diff --git a/web/src/engine/main/src/keyboardInterface.ts b/web/src/engine/main/src/keyboardInterface.ts
index df1a24aa5d6..d36d8f6ebf1 100644
--- a/web/src/engine/main/src/keyboardInterface.ts
+++ b/web/src/engine/main/src/keyboardInterface.ts
@@ -1,5 +1,5 @@
 import { KeymanWebKeyboard } from '@keymanapp/common-types';
-import { KeyboardInterface as KeyboardInterfaceBase } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface as KeyboardInterfaceBase } from 'keyman/engine/js-processor';
 import { KeyboardStub, RawKeyboardStub, toUnprefixedKeyboardId as unprefixed } from 'keyman/engine/keyboard-storage';
 
 import KeyboardObject = KeymanWebKeyboard.KeyboardObject;
diff --git a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
index 46d6399c2a8..f23f87f31e2 100644
--- a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
+++ b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
@@ -2,14 +2,14 @@ import { assert } from 'chai';
 
 import { DOMKeyboardLoader } from 'keyman/engine/keyboard/dom-keyboard-loader';
 import { extendString, KeyboardHarness, JSKeyboard, MinimalKeymanGlobal, DeviceSpec, KeyboardKeymanGlobal, KeyboardDownloadError, KeyboardScriptError } from 'keyman/engine/keyboard';
-import { KeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
 import { assertThrowsAsync } from 'keyman/tools/testing/test-utils';
 
 declare let window: typeof globalThis;
 // KeymanEngine from the web/ folder... when available.
 // At this level, though... we just mock it.
 declare let keyman: KeyboardKeymanGlobal;
-declare let KeymanWeb: KeyboardInterface;
+declare let KeymanWeb: JSKeyboardInterface;
 
 // Note:  rule processing tests will fail if string extensions are not established beforehand.
 extendString();
@@ -29,7 +29,7 @@ describe('Keyboard loading in DOM', function() {
   })
 
   it('throws error when keyboard does not exist', async () => {
-    const harness = new KeyboardInterface(window, MinimalKeymanGlobal);
+    const harness = new JSKeyboardInterface(window, MinimalKeymanGlobal);
     const keyboardLoader = new DOMKeyboardLoader(harness);
     const nonExisting = '/does/not/exist.js';
 
@@ -38,7 +38,7 @@ describe('Keyboard loading in DOM', function() {
   });
 
   it('throws error when keyboard is invalid', async () => {
-    const harness = new KeyboardInterface(window, MinimalKeymanGlobal);
+    const harness = new JSKeyboardInterface(window, MinimalKeymanGlobal);
     const keyboardLoader = new DOMKeyboardLoader(harness);
     const nonKeyboardPath = '/common/test/resources/index.mjs';
 
@@ -65,7 +65,7 @@ describe('Keyboard loading in DOM', function() {
   });
 
   it('`window`, enabled rule processing', async () => {
-    const harness = new KeyboardInterface(window, MinimalKeymanGlobal);
+    const harness = new JSKeyboardInterface(window, MinimalKeymanGlobal);
     const keyboardLoader = new DOMKeyboardLoader(harness);
     const keyboard: JSKeyboard = await keyboardLoader.loadKeyboardFromPath('/common/test/resources/keyboards/khmer_angkor.js');
     harness.activeKeyboard = keyboard;
@@ -95,7 +95,7 @@ describe('Keyboard loading in DOM', function() {
   });
 
   it('load keyboards successfully in parallel without side effects', async () => {
-    let harness = new KeyboardInterface(window, MinimalKeymanGlobal);
+    let harness = new JSKeyboardInterface(window, MinimalKeymanGlobal);
     let keyboardLoader = new DOMKeyboardLoader(harness);
 
     // Preload a keyboard and make it active.
diff --git a/web/src/test/auto/dom/kbdLoader.ts b/web/src/test/auto/dom/kbdLoader.ts
index 4509ab4cf87..92968460f29 100644
--- a/web/src/test/auto/dom/kbdLoader.ts
+++ b/web/src/test/auto/dom/kbdLoader.ts
@@ -8,10 +8,10 @@ import {
   MinimalKeymanGlobal
 } from 'keyman/engine/keyboard';
 
-import { KeyboardInterface } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { KeyboardStub } from 'keyman/engine/keyboard-storage';
 
-const loader = new DOMKeyboardLoader(new KeyboardInterface(window, MinimalKeymanGlobal));
+const loader = new DOMKeyboardLoader(new JSKeyboardInterface(window, MinimalKeymanGlobal));
 
 export function loadKeyboardFromPath(path: string) {
   return loader.loadKeyboardFromPath(path);
diff --git a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
index 68eb5136e3d..916ba061d40 100644
--- a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
@@ -5,7 +5,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { KeyboardInterface } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
@@ -24,7 +24,7 @@ describe('Engine - Basic Simulation', function() {
 
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
-    let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
+    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
     let keyboard = await keyboardLoader.loadKeyboardFromPath('../../../../../common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
diff --git a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
index c2220b7f5d2..c3e909f90ef 100644
--- a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
@@ -5,7 +5,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { KeyboardInterface } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
@@ -25,7 +25,7 @@ describe('Engine - Chirality', function() {
 
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
-    let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
+    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
     let keyboard = await keyboardLoader.loadKeyboardFromPath('../../../../../common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
@@ -70,16 +70,16 @@ describe('Engine - Chirality', function() {
 
       // We should get the same results whether or not there actually is a corresponding modifier
       // expected by the rule we're examining.
-      let mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE);
+      let mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE);
       assert.equal(targetModifiers, mappedModifiers);
 
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | CTRL_CODE);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | CTRL_CODE);
       assert.equal(targetModifiers, mappedModifiers);
 
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | LCTRL_CODE);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | LCTRL_CODE);
       assert.equal(targetModifiers, mappedModifiers);
 
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | RCTRL_CODE);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | RCTRL_CODE);
       assert.equal(targetModifiers, mappedModifiers);
     });
 
@@ -89,16 +89,16 @@ describe('Engine - Chirality', function() {
 
       // We should get the same results whether or not there actually is a corresponding modifier
       // expected by the rule we're examining.
-      let mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE);
+      let mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE);
       assert.equal(targetModifiers, mappedModifiers);
 
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | ALT_CODE);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | ALT_CODE);
       assert.equal(targetModifiers, mappedModifiers);
 
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | LALT_CODE);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | LALT_CODE);
       assert.equal(targetModifiers, mappedModifiers);
 
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | RALT_CODE);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | RALT_CODE);
       assert.equal(targetModifiers, mappedModifiers);
     });
 
@@ -108,27 +108,27 @@ describe('Engine - Chirality', function() {
 
       // We should get the same results whether or not there actually is a corresponding modifier
       // expected by the rule we're examining.
-      let mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE);
+      let mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE);
       assert.equal(targetModifiers, mappedModifiers);
 
       let ctrlPlusAlt = ALT_CODE | CTRL_CODE;
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | ctrlPlusAlt);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | ctrlPlusAlt);
       assert.equal(targetModifiers, mappedModifiers);
 
       let leftVariant = LALT_CODE | LCTRL_CODE;
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | leftVariant);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | leftVariant);
       assert.equal(targetModifiers, mappedModifiers);
 
       let rightVariant = RALT_CODE | RCTRL_CODE;
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | rightVariant);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | rightVariant);
       assert.equal(targetModifiers, mappedModifiers);
 
       let mixedVariant1 = LALT_CODE | CTRL_CODE;
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | mixedVariant1);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | mixedVariant1);
       assert.equal(targetModifiers, mappedModifiers);
 
       let mixedVariant2 = ALT_CODE | RCTRL_CODE;
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | mixedVariant2);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | mixedVariant2);
       assert.equal(targetModifiers, mappedModifiers);
     });
 
@@ -139,14 +139,14 @@ describe('Engine - Chirality', function() {
 
       // We should get the same results whether or not there actually is a corresponding modifier
       // expected by the rule we're examining.
-      let mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialCtrlModifiers1, VIRTUAL_KEY_CODE);
+      let mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialCtrlModifiers1, VIRTUAL_KEY_CODE);
       assert.equal(ctrlTargetModifiers, mappedModifiers);
 
       let initialCtrlModifiers2   =  VIRTUAL_KEY_CODE | RCTRL_CODE;
 
       // We should get the same results whether or not there actually is a corresponding modifier
       // expected by the rule we're examining.
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialCtrlModifiers2, VIRTUAL_KEY_CODE);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialCtrlModifiers2, VIRTUAL_KEY_CODE);
       assert.equal(ctrlTargetModifiers, mappedModifiers);
 
       let altTargetModifiers   = VIRTUAL_KEY_CODE | ALT_CODE;
@@ -155,14 +155,14 @@ describe('Engine - Chirality', function() {
 
       // We should get the same results whether or not there actually is a corresponding modifier
       // expected by the rule we're examining.
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialAltModifiers1, VIRTUAL_KEY_CODE);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialAltModifiers1, VIRTUAL_KEY_CODE);
       assert.equal(altTargetModifiers, mappedModifiers);
 
       let initialAltModifiers2 = VIRTUAL_KEY_CODE | RALT_CODE;
 
       // We should get the same results whether or not there actually is a corresponding modifier
       // expected by the rule we're examining.
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialAltModifiers2, VIRTUAL_KEY_CODE);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialAltModifiers2, VIRTUAL_KEY_CODE);
       assert.equal(altTargetModifiers, mappedModifiers);
     });
 
@@ -173,14 +173,14 @@ describe('Engine - Chirality', function() {
 
       // We should get the same results whether or not there actually is a corresponding modifier
       // expected by the rule we're examining.
-      let mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialCtrlModifiers1, VIRTUAL_KEY_CODE | CTRL_CODE);
+      let mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialCtrlModifiers1, VIRTUAL_KEY_CODE | CTRL_CODE);
       assert.equal(ctrlTargetModifiers, mappedModifiers);
 
       let initialCtrlModifiers2 = VIRTUAL_KEY_CODE | RCTRL_CODE;
 
       // We should get the same results whether or not there actually is a corresponding modifier
       // expected by the rule we're examining.
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialCtrlModifiers2, VIRTUAL_KEY_CODE | CTRL_CODE);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialCtrlModifiers2, VIRTUAL_KEY_CODE | CTRL_CODE);
       assert.equal(ctrlTargetModifiers, mappedModifiers);
 
       let altTargetModifiers   = VIRTUAL_KEY_CODE | ALT_CODE;
@@ -189,14 +189,14 @@ describe('Engine - Chirality', function() {
 
       // We should get the same results whether or not there actually is a corresponding modifier
       // expected by the rule we're examining.
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialAltModifiers1, VIRTUAL_KEY_CODE | ALT_CODE);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialAltModifiers1, VIRTUAL_KEY_CODE | ALT_CODE);
       assert.equal(altTargetModifiers, mappedModifiers);
 
       let initialAltModifiers2 = VIRTUAL_KEY_CODE | RALT_CODE;
 
       // We should get the same results whether or not there actually is a corresponding modifier
       // expected by the rule we're examining.
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialAltModifiers2, VIRTUAL_KEY_CODE | ALT_CODE);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialAltModifiers2, VIRTUAL_KEY_CODE | ALT_CODE);
       assert.equal(altTargetModifiers, mappedModifiers);
     });
 
@@ -205,10 +205,10 @@ describe('Engine - Chirality', function() {
 
       let targetModifiers  = VIRTUAL_KEY_CODE | ALT_CODE | CTRL_CODE;
 
-      let mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | LALT_CODE | LCTRL_CODE);
+      let mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | LALT_CODE | LCTRL_CODE);
       assert.equal(targetModifiers, mappedModifiers);
 
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | RALT_CODE | RCTRL_CODE);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | RALT_CODE | RCTRL_CODE);
       assert.equal(targetModifiers, mappedModifiers);
     });
 
@@ -217,10 +217,10 @@ describe('Engine - Chirality', function() {
 
       let targetModifiers  = VIRTUAL_KEY_CODE | LALT_CODE | LCTRL_CODE;
 
-      let mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | LALT_CODE | LCTRL_CODE);
+      let mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | LALT_CODE | LCTRL_CODE);
       assert.equal(targetModifiers, mappedModifiers);
 
-      mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | RALT_CODE | RCTRL_CODE);
+      mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | RALT_CODE | RCTRL_CODE);
       assert.equal(targetModifiers, mappedModifiers);
     });
 
@@ -229,7 +229,7 @@ describe('Engine - Chirality', function() {
 
       let modifierTarget   = VIRTUAL_KEY_CODE | LALT_CODE |  CTRL_CODE;
 
-      let mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | LALT_CODE | CTRL_CODE);
+      let mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | LALT_CODE | CTRL_CODE);
       assert.equal(modifierTarget, mappedModifiers);
     });
 
@@ -238,7 +238,7 @@ describe('Engine - Chirality', function() {
 
       let modifierTarget   = VIRTUAL_KEY_CODE |  ALT_CODE | LCTRL_CODE;
 
-      let mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | ALT_CODE | RCTRL_CODE);
+      let mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | ALT_CODE | RCTRL_CODE);
       assert.equal(modifierTarget, mappedModifiers);
     });
 
@@ -247,7 +247,7 @@ describe('Engine - Chirality', function() {
 
       let modifierTarget   = VIRTUAL_KEY_CODE | ALT_CODE | LCTRL_CODE | SHIFT_CODE;
 
-      let mappedModifiers = KeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | LALT_CODE | RCTRL_CODE);
+      let mappedModifiers = JSKeyboardInterface.matchModifiersToRuleChirality(initialModifiers, VIRTUAL_KEY_CODE | LALT_CODE | RCTRL_CODE);
       assert.equal(modifierTarget, mappedModifiers);
     });
   });
diff --git a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
index fd5d1457d3d..23301ecce53 100644
--- a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
@@ -5,7 +5,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { KeyboardInterface } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
@@ -24,7 +24,7 @@ describe('Engine - Deadkeys', function() {
 
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
-    let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
+    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
     let keyboard = await keyboardLoader.loadKeyboardFromPath('../../../../../common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
index a355ead2650..22532205d2d 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
@@ -4,7 +4,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { KeyboardInterface, KeyboardProcessor, Mock } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, KeyboardProcessor, Mock } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
 import { NodeProctor, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
@@ -14,7 +14,7 @@ import { NodeProctor, RecordedKeystrokeSequence } from '@keymanapp/recorder-core
  * ---------------------
  *
  * This suite contains two types of tests, both designed to test all possible variations
- * of behaviors that `KeyboardInterface.fullContextMatch` may be expected to handle.
+ * of behaviors that `JSKeyboardInterface.fullContextMatch` may be expected to handle.
  *
  * Type 1:  White-box tests for validity of the generated context-cache
  * - uses only the `baseSequence` of each test spec definition; does not
@@ -986,7 +986,7 @@ var NOTANY_NUL_RULE_SET = [ NOTANY_NUL_TEST_1, NOTANY_NUL_TEST_2, NOTANY_NUL_TES
 
 describe('Engine - Context Matching', function() {
   before(async function() {
-    let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
+    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
     const keyboard = await keyboardLoader.loadKeyboardFromPath(require.resolve('@keymanapp/common-test-resources/keyboards/test_simple_deadkeys.js'));
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
index ecc7dd92d0d..fef2dd69b8b 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
@@ -4,7 +4,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { KeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { NodeProctor, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
 import { extendString } from '@keymanapp/web-utils';
@@ -56,7 +56,7 @@ function runStringRuleSet(input, output) {
 
 describe('Engine - notany() and context()', function() {
   before(async function() {
-    let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
+    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
     const keyboard = await keyboardLoader.loadKeyboardFromPath(require.resolve('@keymanapp/common-test-resources/keyboards/test_917.js'));
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
index 8bfee041ebe..e503c59cd65 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
@@ -5,7 +5,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { KeyboardInterface } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
@@ -23,7 +23,7 @@ describe('Engine - Unmatched Final Groups', function() {
 
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
-    let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
+    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
     const keyboard = await keyboardLoader.loadKeyboardFromPath('../../../../../common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
diff --git a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
index c58a7d91910..e015a9ee784 100644
--- a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
+++ b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
@@ -4,7 +4,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { DeviceSpec, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { KeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
 describe('Headless keyboard loading', function () {
@@ -24,7 +24,7 @@ describe('Headless keyboard loading', function () {
   describe('Full harness loading', () => {
     it('successfully loads', async function () {
       // -- START: Standard Recorder-based unit test loading boilerplate --
-      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
       const keyboardLoader = new NodeKeyboardLoader(harness);
       const keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
       harness.activeKeyboard = keyboard;
@@ -36,7 +36,7 @@ describe('Headless keyboard loading', function () {
 
     it('can evaluate rules', async function () {
       // -- START: Standard Recorder-based unit test loading boilerplate --
-      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
       const keyboardLoader = new NodeKeyboardLoader(harness);
       const keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
       harness.activeKeyboard = keyboard;
@@ -47,7 +47,7 @@ describe('Headless keyboard loading', function () {
     });
 
     it('does not change the active kehboard', async function () {
-      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
       const keyboardLoader = new NodeKeyboardLoader(harness);
       const lao_keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
       assert.isNotOk(harness.activeKeyboard);
@@ -67,7 +67,7 @@ describe('Headless keyboard loading', function () {
     it('throws distinct errors', async function () {
       const invalidPath = 'totally_invalid_path.js';
 
-      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
       const keyboardLoader = new NodeKeyboardLoader(harness);
       let missingError;
       try {
diff --git a/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js b/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
index a65cec6708d..1d320e0b936 100644
--- a/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
@@ -5,7 +5,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { Codes, KeyEvent, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { KeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
 // Compare and contrast the unit tests here with those for app/browser key-event unit testing
@@ -27,7 +27,7 @@ describe('Engine - rule processing', function() {
 
     before(async () => {
       // -- START: Standard keyboard unit test loading boilerplate --
-      let harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      let harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
       let keyboardLoader = new NodeKeyboardLoader(harness);
       let keyboard = await keyboardLoader.loadKeyboardFromPath(ipaPath);
       // --  END:  Standard keyboard unit test loading boilerplate --
@@ -106,7 +106,7 @@ describe('Engine - rule processing', function() {
 
     before(async () => {
       // -- START: Standard keyboard unit test loading boilerplate --
-      let harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      let harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
       let keyboardLoader = new NodeKeyboardLoader(harness);
       let keyboard = await keyboardLoader.loadKeyboardFromPath(armenianPath);
       // --  END:  Standard keyboard unit test loading boilerplate --
diff --git a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
index 7e35817f07f..42012760dbb 100644
--- a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
@@ -5,7 +5,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { Codes, KeyEvent, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { KeyboardInterface, KeyboardProcessor, Mock } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, KeyboardProcessor, Mock } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
@@ -80,7 +80,7 @@ describe('Engine - specialized backspace handling', function() {
 
   before(async () => {
     // -- START: Standard keyboard unit test loading boilerplate --
-    let harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+    let harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
     let keyboardLoader = new NodeKeyboardLoader(harness);
     let keyboard = await keyboardLoader.loadKeyboardFromPath(ipaPath);
     // --  END:  Standard keyboard unit test loading boilerplate --
@@ -94,7 +94,7 @@ describe('Engine - specialized backspace handling', function() {
     // --------------
 
     // -- START: Standard keyboard unit test loading boilerplate --
-    harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+    harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
     keyboardLoader = new NodeKeyboardLoader(harness);
     keyboard = await keyboardLoader.loadKeyboardFromPath(angkorPath);
     // --  END:  Standard keyboard unit test loading boilerplate --
@@ -107,7 +107,7 @@ describe('Engine - specialized backspace handling', function() {
 
     // --------------
 
-    harness = new KeyboardInterface(globalThis, MinimalKeymanGlobal);
+    harness = new JSKeyboardInterface(globalThis, MinimalKeymanGlobal);
     harness.install();
     // Sets the keyboard as the harness's "loaded" keyboard, but not "active".
     harness.KR(new DUMMIED_KEYS_KEYBOARD_SCRIPT());
@@ -117,7 +117,7 @@ describe('Engine - specialized backspace handling', function() {
 
     // --------------
 
-    harness = new KeyboardInterface(globalThis, MinimalKeymanGlobal);
+    harness = new JSKeyboardInterface(globalThis, MinimalKeymanGlobal);
     harness.install();
     // Sets the keyboard as the harness's "loaded" keyboard, but not "active".
     harness.KR(new DOUBLED_BKSP_KEYBOARD_SCRIPT());
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js b/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
index 0dd89a36148..f319b207316 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
@@ -4,7 +4,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { KeyboardHarness, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { KeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
 describe('Headless keyboard loading', function() {
@@ -58,7 +58,7 @@ describe('Headless keyboard loading', function() {
 
       // Runs a blank KeyEvent through the keyboard's rule processing...
       // but via separate harness configured with a different captured global.
-      let ruleHarness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      let ruleHarness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
       ruleHarness.activeKeyboard = keyboard;
       try {
         ruleHarness.processKeystroke(new Mock(), keyboard.constructNullKeyEvent(device));
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
index 96699df9767..01b66544ec4 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
@@ -4,7 +4,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { KeyboardHarness, MinimalKeymanGlobal, KeyboardDownloadError, DeviceSpec, InvalidKeyboardError } from 'keyman/engine/keyboard';
-import { KeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { assertThrowsAsync, assertThrows } from 'keyman/tools/testing/test-utils';
 
@@ -25,7 +25,7 @@ describe('Headless keyboard loading', function() {
   describe('Minimal harness loading', () => {
     it('successfully loads a single keyboard from filesystem', async ()  => {
       // -- START: Standard Recorder-based unit test loading boilerplate --
-      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
       const keyboardLoader = new NodeKeyboardLoader(harness);
       const keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
       // --  END:  Standard Recorder-based unit test loading boilerplate --
@@ -41,7 +41,7 @@ describe('Headless keyboard loading', function() {
     });
 
     it('throws error when keyboard does not exist', async () => {
-      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
       const keyboardLoader = new NodeKeyboardLoader(harness);
 
       await assertThrowsAsync(async () => await keyboardLoader.loadKeyboardFromPath(nonExisting),
@@ -49,7 +49,7 @@ describe('Headless keyboard loading', function() {
     });
 
     it('throws error when keyboard is invalid', async () => {
-      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
       const keyboardLoader = new NodeKeyboardLoader(harness);
 
       await assertThrowsAsync(async () => await keyboardLoader.loadKeyboardFromPath(nonKeyboardPath),
@@ -58,7 +58,7 @@ describe('Headless keyboard loading', function() {
 
     it('successfully loads (has variable stores)', async () => {
       // -- START: Standard Recorder-based unit test loading boilerplate --
-      const harness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
       const keyboardLoader = new NodeKeyboardLoader(harness);
       const keyboard = await keyboardLoader.loadKeyboardFromPath(ipaPath);
       // --  END:  Standard Recorder-based unit test loading boilerplate --
@@ -81,7 +81,7 @@ describe('Headless keyboard loading', function() {
       // This shows an important detail: the 'global' object is effectively
       // closure-captured. (Similar constraints may occur when experimenting with
       // 'sandboxed' keyboard loading in the DOM!)
-      const ruleHarness = new KeyboardInterface({}, MinimalKeymanGlobal);
+      const ruleHarness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
       ruleHarness.activeKeyboard = keyboard;
       assertThrows(() => ruleHarness.processKeystroke(new Mock(), keyboard.constructNullKeyEvent(device)), 'k.KKM is not a function');
     });
diff --git a/web/src/tools/testing/recorder-core/src/nodeProctor.ts b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
index 204ef219394..61554e2db59 100644
--- a/web/src/tools/testing/recorder-core/src/nodeProctor.ts
+++ b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
@@ -11,7 +11,7 @@ import {
 import { KeyEvent, KeyEventSpec, KeyboardHarness } from "keyman/engine/keyboard";
 import { Mock, type OutputTarget } from "keyman/engine/js-processor";
 import { DeviceSpec } from "@keymanapp/web-utils";
-import { KeyboardInterface, KeyboardProcessor } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, KeyboardProcessor } from 'keyman/engine/js-processor';
 
 export default class NodeProctor extends Proctor {
   private keyboardWithHarness: KeyboardHarness;
@@ -57,7 +57,7 @@ export default class NodeProctor extends Proctor {
 
     // Establish a fresh processor, setting its keyboard appropriately for the test.
     let processor = new KeyboardProcessor(this.device);
-    processor.keyboardInterface = this.keyboardWithHarness as KeyboardInterface;
+    processor.keyboardInterface = this.keyboardWithHarness as JSKeyboardInterface;
     const keyboard = processor.activeKeyboard;
 
     if(sequence instanceof RecordedKeystrokeSequence) {

From bd724a574e0dacd3b50431a78aad5d92a41c0809 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 6 Dec 2024 16:36:01 +0100
Subject: [PATCH 057/254] refactor(web): rename `KeyboardProcessor` class to
 `JSKeyboardProcessor`

Also rename file `keyboardProcessor.ts` to `jsKeyboardProcessor.ts`.
---
 web/src/app/browser/src/hardwareEventKeyboard.ts |  6 +++---
 web/src/engine/js-processor/src/index.ts         |  4 ++--
 ...yboardProcessor.ts => jsKeyboardProcessor.ts} | 10 +++++-----
 web/src/engine/js-processor/src/ruleBehavior.ts  |  4 ++--
 .../engine/main/src/headless/inputProcessor.ts   |  8 ++++----
 .../engine/js-processor/engine/context.tests.js  |  6 +++---
 .../js-processor/specialized-backspace.tests.js  | 16 ++++++++--------
 .../testing/recorder-core/src/nodeProctor.ts     |  4 ++--
 8 files changed, 29 insertions(+), 29 deletions(-)
 rename web/src/engine/js-processor/src/{keyboardProcessor.ts => jsKeyboardProcessor.ts} (98%)

diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts
index b323cdefbd8..75238e6410b 100644
--- a/web/src/app/browser/src/hardwareEventKeyboard.ts
+++ b/web/src/app/browser/src/hardwareEventKeyboard.ts
@@ -1,5 +1,5 @@
 import { Codes, DeviceSpec, KeyEvent, KeyMapping, JSKeyboard } from 'keyman/engine/keyboard';
-import { KeyboardProcessor } from 'keyman/engine/js-processor';
+import { JSKeyboardProcessor } from 'keyman/engine/js-processor';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
 import { HardKeyboard, processForMnemonicsAndLegacy } from 'keyman/engine/main';
@@ -209,13 +209,13 @@ export default class HardwareEventKeyboard extends HardKeyboard {
   // - `modStateFlags`
   // - `baseLayout`
   // - `doModifierPress()` - for modifier updates on key-up.
-  private readonly processor: KeyboardProcessor;
+  private readonly processor: JSKeyboardProcessor;
   private readonly contextManager: ContextManager;
   private domEventTracker = new DomEventTracker();
 
   private swallowKeypress: boolean = false;
 
-  constructor(hardDevice: DeviceSpec, processor: KeyboardProcessor, contextManager: ContextManager) {
+  constructor(hardDevice: DeviceSpec, processor: JSKeyboardProcessor, contextManager: ContextManager) {
     super();
     this.hardDevice = hardDevice;
     this.contextManager = contextManager;
diff --git a/web/src/engine/js-processor/src/index.ts b/web/src/engine/js-processor/src/index.ts
index 04b8426923f..4042d72c181 100644
--- a/web/src/engine/js-processor/src/index.ts
+++ b/web/src/engine/js-processor/src/index.ts
@@ -1,5 +1,5 @@
-export { default as KeyboardProcessor } from "./keyboardProcessor.js";
-export * from "./keyboardProcessor.js";
+export { JSKeyboardProcessor } from "./jsKeyboardProcessor.js";
+export * from "./jsKeyboardProcessor.js";
 export { default as RuleBehavior } from "./ruleBehavior.js";
 export * from './jsKeyboardInterface.js';
 export { JSKeyboardInterface } from "./jsKeyboardInterface.js";
diff --git a/web/src/engine/js-processor/src/keyboardProcessor.ts b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
similarity index 98%
rename from web/src/engine/js-processor/src/keyboardProcessor.ts
rename to web/src/engine/js-processor/src/jsKeyboardProcessor.ts
index f2141ae2e68..cbd4d7ca4a0 100644
--- a/web/src/engine/js-processor/src/keyboardProcessor.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
@@ -33,10 +33,10 @@ export interface ProcessorInitOptions {
 }
 
 interface EventMap {
-  statekeychange: (stateKeys: typeof KeyboardProcessor.prototype.stateKeys) => void;
+  statekeychange: (stateKeys: typeof JSKeyboardProcessor.prototype.stateKeys) => void;
 }
 
-export default class KeyboardProcessor extends EventEmitter<EventMap> {
+export class JSKeyboardProcessor extends EventEmitter<EventMap> {
   public static readonly DEFAULT_OPTIONS: ProcessorInitOptions = {
     baseLayout: 'us',
     defaultOutputRules: new DefaultRules()
@@ -77,14 +77,14 @@ export default class KeyboardProcessor extends EventEmitter<EventMap> {
     super();
 
     if(!options) {
-      options = KeyboardProcessor.DEFAULT_OPTIONS;
+      options = JSKeyboardProcessor.DEFAULT_OPTIONS;
     }
 
     this.contextDevice = device;
 
-    this.baseLayout = options.baseLayout || KeyboardProcessor.DEFAULT_OPTIONS.baseLayout;
+    this.baseLayout = options.baseLayout || JSKeyboardProcessor.DEFAULT_OPTIONS.baseLayout;
     this.keyboardInterface = options.keyboardInterface || new JSKeyboardInterface(globalObject(), MinimalKeymanGlobal);
-    this.defaultRules = options.defaultOutputRules || KeyboardProcessor.DEFAULT_OPTIONS.defaultOutputRules;
+    this.defaultRules = options.defaultOutputRules || JSKeyboardProcessor.DEFAULT_OPTIONS.defaultOutputRules;
   }
 
   public get activeKeyboard(): JSKeyboard {
diff --git a/web/src/engine/js-processor/src/ruleBehavior.ts b/web/src/engine/js-processor/src/ruleBehavior.ts
index fd736f0fd82..b00577b09db 100644
--- a/web/src/engine/js-processor/src/ruleBehavior.ts
+++ b/web/src/engine/js-processor/src/ruleBehavior.ts
@@ -1,4 +1,4 @@
-import KeyboardProcessor from "./keyboardProcessor.js";
+import { JSKeyboardProcessor } from "./jsKeyboardProcessor.js";
 import { VariableStoreDictionary } from "keyman/engine/keyboard";
 import OutputTarget, { type Transcription } from './outputTarget.js';
 import { Mock } from "./mock.js";
@@ -65,7 +65,7 @@ export default class RuleBehavior {
    */
   triggerKeyDefault?: boolean;
 
-  finalize(processor: KeyboardProcessor, outputTarget: OutputTarget, readonly: boolean) {
+  finalize(processor: JSKeyboardProcessor, outputTarget: OutputTarget, readonly: boolean) {
     if(!this.transcription) {
       throw "Cannot finalize a RuleBehavior with no transcription.";
     }
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index 6dc5f19f264..7a4cfbb478b 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -12,7 +12,7 @@ import {
   type Alternate,
   isEmptyTransform,
   JSKeyboardInterface,
-  KeyboardProcessor,
+  JSKeyboardProcessor,
   Mock,
   type OutputTarget,
   RuleBehavior,
@@ -34,7 +34,7 @@ export class InputProcessor {
    * entry points.
    */
   private contextDevice: DeviceSpec;
-  private kbdProcessor: KeyboardProcessor;
+  private kbdProcessor: JSKeyboardProcessor;
   private lngProcessor: LanguageProcessor;
   private km_core: Promise<KmCoreModule>;
 
@@ -50,7 +50,7 @@ export class InputProcessor {
     }
 
     this.contextDevice = device;
-    this.kbdProcessor = new KeyboardProcessor(device, options);
+    this.kbdProcessor = new JSKeyboardProcessor(device, options);
     this.lngProcessor = new LanguageProcessor(predictiveTextWorker, this.contextCache);
   }
 
@@ -62,7 +62,7 @@ export class InputProcessor {
     return this.lngProcessor;
   }
 
-  public get keyboardProcessor(): KeyboardProcessor {
+  public get keyboardProcessor(): JSKeyboardProcessor {
     return this.kbdProcessor;
   }
 
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
index 22532205d2d..7456c311b85 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
@@ -4,7 +4,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { JSKeyboardInterface, KeyboardProcessor, Mock } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, JSKeyboardProcessor, Mock } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
 import { NodeProctor, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
@@ -68,7 +68,7 @@ function runEngineRuleSet(ruleSet, defaultNoun) {
       ruleSeq.test(proctor, target);
 
       // Now for the real test!
-      let processor = new KeyboardProcessor(device);
+      let processor = new JSKeyboardProcessor(device);
       processor.keyboardInterface = keyboardWithHarness;
       var res = processor.keyboardInterface.fullContextMatch(ruleDef.n, target, ruleDef.rule);
 
@@ -1007,7 +1007,7 @@ describe('Engine - Context Matching', function() {
       ruleSeq.test(proctor, target);
 
       // Now for the real test!
-      let processor = new KeyboardProcessor(device);
+      let processor = new JSKeyboardProcessor(device);
       processor.keyboardInterface = keyboardWithHarness;
       var res = processor.keyboardInterface._BuildExtendedContext(ruleDef.n, ruleDef.ln, target);
 
diff --git a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
index 42012760dbb..d8430ab99b4 100644
--- a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
@@ -5,7 +5,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { Codes, KeyEvent, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { JSKeyboardInterface, KeyboardProcessor, Mock } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, JSKeyboardProcessor, Mock } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
@@ -138,7 +138,7 @@ describe('Engine - specialized backspace handling', function() {
       device: device
     });
 
-    const processor = new KeyboardProcessor(TEST_DEVICE, {
+    const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: angkorWithHarness
     });
     const result = processor.processKeystroke(event, contextSource);
@@ -169,7 +169,7 @@ describe('Engine - specialized backspace handling', function() {
     // A specialized test keyboard that handles keys without emitting any content.
     // We want to ensure error cases without output, on null context, don't act
     // like backspaces.
-    const processor = new KeyboardProcessor(TEST_DEVICE, {
+    const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: dummiedWithHarness
     });
     const result = processor.processKeystroke(event, contextSource);
@@ -201,7 +201,7 @@ describe('Engine - specialized backspace handling', function() {
       device: device
     });
 
-    const processor = new KeyboardProcessor(TEST_DEVICE, {
+    const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: angkorWithHarness
     });
     const result = processor.processKeystroke(event, contextSource);
@@ -236,7 +236,7 @@ describe('Engine - specialized backspace handling', function() {
       device: device
     });
 
-    const processor = new KeyboardProcessor(TEST_DEVICE, {
+    const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: angkorWithHarness
     });
     const result = processor.processKeystroke(event, contextSource);
@@ -264,7 +264,7 @@ describe('Engine - specialized backspace handling', function() {
       device: device
     });
 
-    const processor = new KeyboardProcessor(TEST_DEVICE, {
+    const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: ipaWithHarness
     });
     const result = processor.processKeystroke(event, contextSource);
@@ -295,7 +295,7 @@ describe('Engine - specialized backspace handling', function() {
     // A specialized test keyboard that duplicates backspaces when sufficient
     // context exists.
 
-    const processor = new KeyboardProcessor(TEST_DEVICE, {
+    const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: bksp2xWithHarness
     });
     const result = processor.processKeystroke(event, contextSource);
@@ -330,7 +330,7 @@ describe('Engine - specialized backspace handling', function() {
     // A specialized test keyboard that handles keys without emitting any content.
     // We want to ensure error cases without output, on null context, don't act
     // like backspaces.
-    const processor = new KeyboardProcessor(TEST_DEVICE, {
+    const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: dummiedWithHarness
     });
     const result = processor.processKeystroke(event, contextSource);
diff --git a/web/src/tools/testing/recorder-core/src/nodeProctor.ts b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
index 61554e2db59..58be39cc799 100644
--- a/web/src/tools/testing/recorder-core/src/nodeProctor.ts
+++ b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
@@ -11,7 +11,7 @@ import {
 import { KeyEvent, KeyEventSpec, KeyboardHarness } from "keyman/engine/keyboard";
 import { Mock, type OutputTarget } from "keyman/engine/js-processor";
 import { DeviceSpec } from "@keymanapp/web-utils";
-import { JSKeyboardInterface, KeyboardProcessor } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 
 export default class NodeProctor extends Proctor {
   private keyboardWithHarness: KeyboardHarness;
@@ -56,7 +56,7 @@ export default class NodeProctor extends Proctor {
     }
 
     // Establish a fresh processor, setting its keyboard appropriately for the test.
-    let processor = new KeyboardProcessor(this.device);
+    let processor = new JSKeyboardProcessor(this.device);
     processor.keyboardInterface = this.keyboardWithHarness as JSKeyboardInterface;
     const keyboard = processor.activeKeyboard;
 

From f8ed96a2c6cdb64c6c8ed094c13f1b1867f07aa2 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 5 Dec 2024 18:39:43 +0100
Subject: [PATCH 058/254] refactor(web): explicitly list exports

---
 web/src/engine/js-processor/src/index.ts | 6 ++----
 web/src/engine/keyboard/src/index.ts     | 7 +++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/web/src/engine/js-processor/src/index.ts b/web/src/engine/js-processor/src/index.ts
index 4042d72c181..ed2b06427c4 100644
--- a/web/src/engine/js-processor/src/index.ts
+++ b/web/src/engine/js-processor/src/index.ts
@@ -1,8 +1,6 @@
-export { JSKeyboardProcessor } from "./jsKeyboardProcessor.js";
-export * from "./jsKeyboardProcessor.js";
+export { BeepHandler, JSKeyboardProcessor, LogMessageHandler, ProcessorInitOptions } from "./jsKeyboardProcessor.js";
 export { default as RuleBehavior } from "./ruleBehavior.js";
-export * from './jsKeyboardInterface.js';
-export { JSKeyboardInterface } from "./jsKeyboardInterface.js";
+export { JSKeyboardInterface, KeyInformation, StoreNonCharEntry } from "./jsKeyboardInterface.js";
 export * from "./systemStores.js";
 export * from "./deadkeys.js";
 export { default as OutputTarget } from "./outputTarget.js";
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index a08d6222134..7bd587d303e 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -1,7 +1,6 @@
-export * from "./keyboards/activeLayout.js";
-export * from "./keyboards/defaultLayouts.js";
-export { JSKeyboard } from "./keyboards/jsKeyboard.js";
-export * from "./keyboards/jsKeyboard.js";
+export { ActiveKeyBase, ActiveKey, ActiveSubKey, ActiveRow, ActiveLayer, ActiveLayout } from "./keyboards/activeLayout.js";
+export { ButtonClass, ButtonClasses, LayoutLayer, LayoutFormFactor, LayoutRow, LayoutKey, LayoutSubKey, Layouts } from "./keyboards/defaultLayouts.js";
+export { JSKeyboard, LayoutState, VariableStoreDictionary } from "./keyboards/jsKeyboard.js";
 export { KeyboardHarness, KeyboardKeymanGlobal, MinimalCodesInterface, MinimalKeymanGlobal } from "./keyboards/keyboardHarness.js";
 export { KeyboardLoaderBase } from "./keyboards/keyboardLoaderBase.js";
 export { KeyboardLoadErrorBuilder, KeyboardMissingError, KeyboardScriptError, KeyboardDownloadError, InvalidKeyboardError } from './keyboards/keyboardLoadError.js'

From 08b261c0d3d606aaf42e1c0c06454fcc43db6c35 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 4 Dec 2024 18:19:02 +0100
Subject: [PATCH 059/254] feat(web): add `Keyboard` and `KMXKeyboard` classes

The `Keyboard` class can be either a JS or KMX keyboard. Also make use
of the `Keyboard` class where it makes sense and add TODOs in the places
that still need to be implemented for KMX keyboard support.
---
 web/src/app/browser/src/beepHandler.ts        | 13 +--
 web/src/app/browser/src/contextManager.ts     | 10 ++-
 web/src/app/browser/src/keymanEngine.ts       | 28 +++++--
 web/src/app/webview/src/contextManager.ts     |  9 ++-
 .../app/webview/src/passthroughKeyboard.ts    |  4 +-
 .../src/stubAndKeyboardCache.ts               | 20 ++---
 web/src/engine/keyboard/build.sh              |  1 +
 web/src/engine/keyboard/src/index.ts          |  4 +-
 .../src/keyboards/keyboardLoaderBase.ts       | 21 ++++-
 .../src/keyboards/keyboardMinimalInterface.ts |  5 ++
 .../keyboard/src/keyboards/kmxKeyboard.ts     | 24 ++++++
 web/src/engine/main/src/contextManagerBase.ts | 20 ++---
 web/src/engine/main/src/hardKeyboard.ts       | 80 ++++++++++---------
 .../main/src/headless/inputProcessor.ts       | 11 ++-
 web/src/engine/main/src/keymanEngine.ts       | 38 +++++----
 web/src/engine/osk/src/index.ts               |  2 +-
 web/src/engine/osk/src/views/oskView.ts       | 20 ++---
 .../cases/keyboard/domKeyboardLoader.tests.ts | 52 ++++++------
 web/src/test/auto/dom/kbdLoader.ts            |  7 +-
 .../engine/js-processor/kbdInterface.tests.ts | 14 ++--
 .../engine/keyboard/keyboard.tests.ts         |  5 +-
 .../keyboard/keyboardLoaderBase.tests.ts      |  7 +-
 .../integrated/web-test-runner.config.mjs     |  2 +-
 .../testing/bulk_rendering/renderer_core.ts   | 28 ++++---
 24 files changed, 261 insertions(+), 164 deletions(-)
 create mode 100644 web/src/engine/keyboard/src/keyboards/keyboardMinimalInterface.ts
 create mode 100644 web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts

diff --git a/web/src/app/browser/src/beepHandler.ts b/web/src/app/browser/src/beepHandler.ts
index 5427b5024a8..1c1de463a8c 100644
--- a/web/src/app/browser/src/beepHandler.ts
+++ b/web/src/app/browser/src/beepHandler.ts
@@ -1,4 +1,5 @@
 import { type JSKeyboardInterface } from 'keyman/engine/js-processor';
+import { JSKeyboard, type KeyboardMinimalInterface } from 'keyman/engine/keyboard';
 import { DesignIFrame, OutputTarget } from 'keyman/engine/element-wrappers';
 
 // Utility object used to handle beep (keyboard error response) operations.
@@ -17,9 +18,9 @@ class BeepData {
 }
 
 export class BeepHandler {
-  readonly keyboardInterface: JSKeyboardInterface;
+  readonly keyboardInterface: KeyboardMinimalInterface;
 
-  constructor(keyboardInterface: JSKeyboardInterface) {
+  constructor(keyboardInterface: KeyboardMinimalInterface) {
     this.keyboardInterface = keyboardInterface;
   }
 
@@ -75,11 +76,13 @@ export class BeepHandler {
    * Description  Reset/terminate beep or flash (not currently used: Aug 2011)
    */
   readonly reset = () => {
-    this.keyboardInterface.resetContextCache();
+    // TODO-web-core: implement for KMX keyboards if needed
+    if (this.keyboardInterface.activeKeyboard instanceof JSKeyboard) {
+      (this.keyboardInterface as JSKeyboardInterface).resetContextCache();
+    }
 
-    var Lbo;
     this._BeepTimeout = 0;
-    for(Lbo=0;Lbo<this._BeepObjects.length;Lbo++) { // I1511 - array prototype extended
+    for(let Lbo=0;Lbo<this._BeepObjects.length;Lbo++) { // I1511 - array prototype extended
       this._BeepObjects[Lbo].reset();
     }
     this._BeepObjects = [];
diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index 875b2a1c1e3..527b47f5ab2 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -1,4 +1,4 @@
-import { type JSKeyboard, KeyboardScriptError } from 'keyman/engine/keyboard';
+import { JSKeyboard, type Keyboard, KeyboardScriptError } from 'keyman/engine/keyboard';
 import { type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { CookieSerializer } from 'keyman/engine/dom-utils';
 import { eventOutputTarget, outputTargetForElement, PageContextAttachment } from 'keyman/engine/attachment';
@@ -23,10 +23,12 @@ export interface KeyboardCookie {
  * has the same directionality, text runs will be re-ordered which is confusing and causes
  * incorrect caret positioning
  *
- * @param       {Object}      Ptarg      Target element
+ * @param       {Object}      Ptarg           Target element
+ * @param       {Keyboard}    activeKeyboard  The active keyboard
  */
-function _SetTargDir(Ptarg: HTMLElement, activeKeyboard: JSKeyboard) {
-  const elDir = activeKeyboard?.isRTL ? 'rtl' : 'ltr';
+function _SetTargDir(Ptarg: HTMLElement, activeKeyboard: Keyboard) {
+  // TODO-web-core: do we need to support RTL in Core?
+  const elDir = activeKeyboard instanceof JSKeyboard && activeKeyboard?.isRTL ? 'rtl' : 'ltr';
 
   if(Ptarg) {
     if(Ptarg instanceof Ptarg.ownerDocument.defaultView.HTMLInputElement
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 559f3d8fd65..31cac7a216d 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -7,7 +7,7 @@ import {
   VisualKeyboard
 } from 'keyman/engine/osk';
 import { ErrorStub, KeyboardStub, CloudQueryResult, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage';
-import { DeviceSpec, JSKeyboard } from "keyman/engine/keyboard";
+import { DeviceSpec, JSKeyboard, Keyboard } from "keyman/engine/keyboard";
 import KeyboardObject = KeymanWebKeyboard.KeyboardObject;
 
 import * as views from './viewsAnchorpoint.js';
@@ -425,7 +425,7 @@ export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration,
    * See https://help.keyman.com/developer/engine/web/current-version/reference/core/isCJK
    */
   public isCJK(k0?: KeyboardObject | ReturnType<KeymanEngine['_GetKeyboardDetail']> /* [b/c Toolbar UI]*/) {
-    let kbd: JSKeyboard;
+    let kbd: Keyboard;
     if(k0) {
       let kbdDetail = k0 as ReturnType<KeymanEngine['_GetKeyboardDetail']>;
       if(kbdDetail.KeyboardID){
@@ -437,7 +437,8 @@ export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration,
       kbd = this.core.activeKeyboard;
     }
 
-    return kbd && kbd.isCJK;
+    // TODO-web-core: implement for KMX keyboards if needed
+    return kbd && kbd instanceof JSKeyboard && kbd.isCJK;
   }
 
   /**
@@ -453,7 +454,12 @@ export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration,
     const stub = this.keyboardRequisitioner.cache.getStub(PInternalName, PlgCode);
     const keyboard = this.keyboardRequisitioner.cache.getKeyboardForStub(stub);
 
-    return stub && this._GetKeyboardDetail(stub, keyboard);
+    if (keyboard instanceof JSKeyboard) {
+      return stub && this._GetKeyboardDetail(stub, keyboard);
+    } else {
+      // TODO-web-core: implement for KMX keyboards if needed
+      return null;
+    }
   }
 
   /**
@@ -478,8 +484,12 @@ export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration,
       // In Chrome, (including on Android), Array.prototype.find() requires Chrome 45.
       // This is a later version than the default on our oldest-supported Android devices.
       const Lkbd = cache.getKeyboardForStub(Lstub);
-      const Lrn = this._GetKeyboardDetail(Lstub, Lkbd);  // I2078 - Full keyboard detail
-      Lr.push(Lrn);
+      if (Lkbd instanceof JSKeyboard) {
+        const Lrn = this._GetKeyboardDetail(Lstub, Lkbd);  // I2078 - Full keyboard detail
+        Lr.push(Lrn);
+      } else {
+        // TODO-web-core: implement for KMX keyboards if needed
+      }
     }
     return Lr;
   }
@@ -669,13 +679,17 @@ export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration,
     argFormFactor?: DeviceSpec.FormFactor,
     argLayerId?: string
   ): HTMLElement {
-    let PKbd: JSKeyboard = null;
+    let PKbd: Keyboard = null;
 
     if(PInternalName != null) {
       PKbd = this.keyboardRequisitioner.cache.getKeyboard(PInternalName);
     }
 
     PKbd = PKbd || this.core.activeKeyboard;
+    if (!(PKbd instanceof JSKeyboard)) {
+      // TODO-web-core: implement for KMX keyboards if needed
+      return null;
+    }
     let Pstub = this.keyboardRequisitioner.cache.getStub(PKbd);
 
     // help.keyman.com will set this function in place to specify the desired
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index 274bc3c3efe..3cf1c3a423d 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -1,4 +1,4 @@
-import { type JSKeyboard  } from 'keyman/engine/keyboard';
+import { JSKeyboard, Keyboard  } from 'keyman/engine/keyboard';
 import { Mock, OutputTarget, Transcription, findCommonSubstringEndIndex, isEmptyTransform, TextTransform } from 'keyman/engine/js-processor';
 import { KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { ContextManagerBase } from 'keyman/engine/main';
@@ -192,7 +192,7 @@ export default class ContextManager extends ContextManagerBase<WebviewConfigurat
   protected prepareKeyboardForActivation(
     keyboardId: string,
     languageCode?: string
-  ): {keyboard: Promise<JSKeyboard>, metadata: KeyboardStub} {
+  ): {keyboard: Promise<Keyboard>, metadata: KeyboardStub} {
     const originalKeyboard = this.activeKeyboard;
     const activatingKeyboard = super.prepareKeyboardForActivation(keyboardId, languageCode);
 
@@ -203,7 +203,10 @@ export default class ContextManager extends ContextManagerBase<WebviewConfigurat
     // That said, it's best to keep it around for now and verify later.
     if(originalKeyboard?.metadata?.id == activatingKeyboard?.metadata?.id) {
       activatingKeyboard.keyboard = activatingKeyboard.keyboard.then((kbd) => {
-        kbd.refreshLayouts()
+        // TODO-web-core: Do we need to refresh layouts for KMX keyboards also?
+        if (kbd instanceof JSKeyboard) {
+          kbd.refreshLayouts();
+        }
         return kbd;
       });
     }
diff --git a/web/src/app/webview/src/passthroughKeyboard.ts b/web/src/app/webview/src/passthroughKeyboard.ts
index 8ce8864293d..25dec7a8e68 100644
--- a/web/src/app/webview/src/passthroughKeyboard.ts
+++ b/web/src/app/webview/src/passthroughKeyboard.ts
@@ -1,10 +1,10 @@
-import { DeviceSpec, JSKeyboard, KeyEvent, ManagedPromise } from 'keyman/engine/keyboard';
+import { DeviceSpec, Keyboard, KeyEvent, ManagedPromise } from 'keyman/engine/keyboard';
 
 import { HardKeyboard, processForMnemonicsAndLegacy } from 'keyman/engine/main';
 
 export default class PassthroughKeyboard extends HardKeyboard {
   readonly baseDevice: DeviceSpec;
-  public activeKeyboard: JSKeyboard;
+  public activeKeyboard: Keyboard;
 
   constructor(baseDevice: DeviceSpec) {
     super();
diff --git a/web/src/engine/keyboard-storage/src/stubAndKeyboardCache.ts b/web/src/engine/keyboard-storage/src/stubAndKeyboardCache.ts
index 523da41fbf9..d9db65dc0ae 100644
--- a/web/src/engine/keyboard-storage/src/stubAndKeyboardCache.ts
+++ b/web/src/engine/keyboard-storage/src/stubAndKeyboardCache.ts
@@ -1,4 +1,4 @@
-import { JSKeyboard, KeyboardLoaderBase as KeyboardLoader } from "keyman/engine/keyboard";
+import { type Keyboard, JSKeyboard, KeyboardLoaderBase as KeyboardLoader } from "keyman/engine/keyboard";
 import { EventEmitter } from "eventemitter3";
 
 import KeyboardStub from "./keyboardStub.js";
@@ -38,12 +38,12 @@ interface EventMap {
   /**
    * Indicates that the specified Keyboard has just been added to the cache.
    */
-  keyboardadded: (keyboard: JSKeyboard) => void;
+  keyboardadded: (keyboard: Keyboard) => void;
 }
 
 export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
   private stubSetTable: Record<string, Record<string, KeyboardStub>> = {};
-  private keyboardTable: Record<string, JSKeyboard | Promise<JSKeyboard>> = {};
+  private keyboardTable: Record<string, Keyboard | Promise<Keyboard>> = {};
 
   private readonly keyboardLoader: KeyboardLoader;
 
@@ -52,11 +52,11 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
     this.keyboardLoader = keyboardLoader;
   }
 
-  getKeyboardForStub(stub: KeyboardStub): JSKeyboard {
+  getKeyboardForStub(stub: KeyboardStub): Keyboard {
     return stub ? this.getKeyboard(stub.KI) : null;
   }
 
-  getKeyboard(keyboardID: string): JSKeyboard {
+  getKeyboard(keyboardID: string): Keyboard {
     if(!keyboardID) {
       return null;
     }
@@ -112,14 +112,14 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
     }
   }
 
-  addKeyboard(keyboard: JSKeyboard) {
+  addKeyboard(keyboard: Keyboard) {
     const keyboardID = prefixed(keyboard.id);
     this.keyboardTable[keyboardID] = keyboard;
 
     this.emit('keyboardadded', keyboard);
   }
 
-  fetchKeyboardForStub(stub: KeyboardStub) : Promise<JSKeyboard> {
+  fetchKeyboardForStub(stub: KeyboardStub) : Promise<Keyboard> {
     return this.fetchKeyboard(stub.KI);
   }
 
@@ -134,7 +134,7 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
     return cachedEntry instanceof Promise;
   }
 
-  fetchKeyboard(keyboardID: string): Promise<JSKeyboard> {
+  fetchKeyboard(keyboardID: string): Promise<Keyboard> {
     if(!keyboardID) {
       throw new Error("Keyboard ID must be specified");
     }
@@ -166,7 +166,9 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
 
     promise.then((kbd) => {
       // Overrides the built-in ID in case of keyboard namespacing.
-      kbd.scriptObject["KI"] = keyboardID;
+      if (kbd instanceof JSKeyboard) {
+        kbd.scriptObject["KI"] = keyboardID;
+      }
       this.addKeyboard(kbd);
     }).catch((err) => {
       delete this.keyboardTable[keyboardID];
diff --git a/web/src/engine/keyboard/build.sh b/web/src/engine/keyboard/build.sh
index 6390243b9a3..b3e6ba81337 100755
--- a/web/src/engine/keyboard/build.sh
+++ b/web/src/engine/keyboard/build.sh
@@ -22,6 +22,7 @@ builder_describe \
   "@/web/src/tools/testing/recorder-core  test" \
   "@/web/src/tools/es-bundling" \
   "@/web/src/engine/common/web-utils" \
+  "@/web/src/engine/core-processor" \
   configure \
   clean \
   build \
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index 7bd587d303e..8ba9aaa8899 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -1,8 +1,10 @@
 export { ActiveKeyBase, ActiveKey, ActiveSubKey, ActiveRow, ActiveLayer, ActiveLayout } from "./keyboards/activeLayout.js";
 export { ButtonClass, ButtonClasses, LayoutLayer, LayoutFormFactor, LayoutRow, LayoutKey, LayoutSubKey, Layouts } from "./keyboards/defaultLayouts.js";
 export { JSKeyboard, LayoutState, VariableStoreDictionary } from "./keyboards/jsKeyboard.js";
+export { KeyboardMinimalInterface } from './keyboards/keyboardMinimalInterface.js';
+export { KMXKeyboard } from './keyboards/kmxKeyboard.js';
 export { KeyboardHarness, KeyboardKeymanGlobal, MinimalCodesInterface, MinimalKeymanGlobal } from "./keyboards/keyboardHarness.js";
-export { KeyboardLoaderBase } from "./keyboards/keyboardLoaderBase.js";
+export { Keyboard, KeyboardLoaderBase } from "./keyboards/keyboardLoaderBase.js";
 export { KeyboardLoadErrorBuilder, KeyboardMissingError, KeyboardScriptError, KeyboardDownloadError, InvalidKeyboardError } from './keyboards/keyboardLoadError.js'
 export {
   CloudKeyboardFont,
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
index 660b19f0325..cba8d0f2461 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
@@ -1,12 +1,16 @@
+import { MainModule as KmCoreModule, KM_CORE_STATUS } from 'keyman/engine/core-processor';
 import { JSKeyboard } from "./jsKeyboard.js";
+import { KMXKeyboard } from './kmxKeyboard.js';
 import { KeyboardHarness } from "./keyboardHarness.js";
 import KeyboardProperties from "./keyboardProperties.js";
 import { KeyboardLoadErrorBuilder, StubBasedErrorBuilder, UriBasedErrorBuilder } from './keyboardLoadError.js';
 
 export type KeyboardStub = KeyboardProperties & { filename: string };
+export type Keyboard = JSKeyboard | KMXKeyboard;
 
 export abstract class KeyboardLoaderBase {
   private _harness: KeyboardHarness;
+  protected _km_core: Promise<KmCoreModule>;
 
   public get harness(): KeyboardHarness {
     return this._harness;
@@ -16,13 +20,17 @@ export abstract class KeyboardLoaderBase {
     this._harness = harness;
   }
 
+  public set coreModule(km_core: Promise<KmCoreModule>) {
+    this._km_core = km_core;
+  }
+
   /**
    * Load a keyboard from a remote or local URI.
    *
    * @param uri  The URI of the keyboard to load.
    * @returns    A Promise that resolves to the loaded keyboard.
    */
-  public loadKeyboardFromPath(uri: string): Promise<JSKeyboard> {
+  public loadKeyboardFromPath(uri: string): Promise<Keyboard> {
     this.harness.install();
     return this.loadKeyboardInternal(uri, new UriBasedErrorBuilder(uri));
   }
@@ -33,17 +41,22 @@ export abstract class KeyboardLoaderBase {
    * @param stub  The stub of the keyboard to load.
    * @returns     A Promise that resolves to the loaded keyboard.
    */
-  public async loadKeyboardFromStub(stub: KeyboardStub): Promise<JSKeyboard> {
+  public async loadKeyboardFromStub(stub: KeyboardStub): Promise<Keyboard> {
     this.harness.install();
     return this.loadKeyboardInternal(stub.filename, new StubBasedErrorBuilder(stub));
   }
 
-  private async loadKeyboardInternal(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<JSKeyboard> {
+  private async loadKeyboardInternal(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
     const byteArray = await this.loadKeyboardBlob(uri, errorBuilder);
 
     if (byteArray.slice(0, 4) == Uint8Array.from([0x4b, 0x58, 0x54, 0x53])) { // 'KXTS'
       // KMX or LDML (KMX+) keyboard
-      console.error("KMX keyboard loading is not yet implemented!");
+      const result = (await this._km_core).keyboard_load_from_blob(uri, byteArray);
+      if (result.status == KM_CORE_STATUS.OK) {
+        // extract keyboard name from URI
+        const id = uri.split('#')[0].split('?')[0].split('/').pop().split('.')[0];
+        return new KMXKeyboard(id, result.object);
+      }
       return null;
     }
 
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardMinimalInterface.ts b/web/src/engine/keyboard/src/keyboards/keyboardMinimalInterface.ts
new file mode 100644
index 00000000000..564a7b2acb9
--- /dev/null
+++ b/web/src/engine/keyboard/src/keyboards/keyboardMinimalInterface.ts
@@ -0,0 +1,5 @@
+import { Keyboard } from './keyboardLoaderBase.js';
+
+export interface KeyboardMinimalInterface {
+    activeKeyboard: Keyboard;
+}
\ No newline at end of file
diff --git a/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts b/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts
new file mode 100644
index 00000000000..34ffd5f9f07
--- /dev/null
+++ b/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts
@@ -0,0 +1,24 @@
+import { km_core_keyboard } from 'keyman/engine/core-processor';
+
+/**
+ * Acts as a wrapper class for KMX(+) Keyman keyboards
+ */
+export class KMXKeyboard {
+
+  constructor(id: string, keyboard: km_core_keyboard) {
+    this.id = id;
+    this.keyboard = keyboard;
+  }
+
+  id: string;
+  keyboard: km_core_keyboard;
+
+  get isMnemonic(): boolean {
+    return false;
+  }
+
+  get version(): string {
+    // TODO-web-core: get version from `km_core_keyboard_get_attrs`
+    return '';
+  }
+}
diff --git a/web/src/engine/main/src/contextManagerBase.ts b/web/src/engine/main/src/contextManagerBase.ts
index 9abc503c65c..98ce5e6d605 100644
--- a/web/src/engine/main/src/contextManagerBase.ts
+++ b/web/src/engine/main/src/contextManagerBase.ts
@@ -1,5 +1,5 @@
 import { EventEmitter } from 'eventemitter3';
-import { ManagedPromise, type JSKeyboard } from 'keyman/engine/keyboard';
+import { ManagedPromise, type Keyboard } from 'keyman/engine/keyboard';
 import { type JSKeyboardInterface, type OutputTarget } from 'keyman/engine/js-processor';
 import { StubAndKeyboardCache, type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { PredictionContext } from 'keyman/engine/interfaces';
@@ -37,7 +37,7 @@ interface EventMap {
    * @param kbd
    * @returns
    */
-  'keyboardchange': (kbd: {keyboard: JSKeyboard, metadata: KeyboardStub}) => void;
+  'keyboardchange': (kbd: {keyboard: Keyboard, metadata: KeyboardStub}) => void;
 }
 
 export interface ContextManagerConfiguration {
@@ -65,7 +65,7 @@ export interface ContextManagerConfiguration {
 
 interface PendingActivation {
   target: OutputTarget,
-  keyboard: Promise<JSKeyboard>,
+  keyboard: Promise<Keyboard>,
   stub: KeyboardStub;
 }
 
@@ -124,7 +124,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
     this.predictionContext.resetContext();
   }
 
-  abstract get activeKeyboard(): {keyboard: JSKeyboard, metadata: KeyboardStub};
+  abstract get activeKeyboard(): {keyboard: Keyboard, metadata: KeyboardStub};
 
   /**
    * Determines the 'target' currently used to determine which keyboard should be active.
@@ -143,7 +143,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
    * @param kbd
    * @param target
    */
-  protected abstract activateKeyboardForTarget(kbd: {keyboard: JSKeyboard, metadata: KeyboardStub}, target: OutputTarget): void;
+  protected abstract activateKeyboardForTarget(kbd: {keyboard: Keyboard, metadata: KeyboardStub}, target: OutputTarget): void;
 
   /**
    * Checks the pending keyboard-activation array for an entry corresponding to the specified
@@ -178,7 +178,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
    * @returns
    */
   protected async deferredKeyboardActivation(
-    kbdPromise: Promise<JSKeyboard>,
+    kbdPromise: Promise<Keyboard>,
     metadata: KeyboardStub,
     target: OutputTarget
   ): Promise<PendingActivation> {
@@ -263,7 +263,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
       this.emit('beforekeyboardchange', activatingKeyboard.metadata);
     }
 
-    let kbdStubPair: { keyboard: JSKeyboard, metadata: KeyboardStub } = null;
+    let kbdStubPair: { keyboard: Keyboard, metadata: KeyboardStub } = null;
     if(keyboard) {
       kbdStubPair = {
         keyboard: keyboard,
@@ -298,7 +298,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
   protected prepareKeyboardForActivation(
     keyboardId: string,
     languageCode?: string
-  ): {keyboard: Promise<JSKeyboard>, metadata: KeyboardStub} {
+  ): {keyboard: Promise<Keyboard>, metadata: KeyboardStub} {
     // Set default language code
     languageCode ||= '';
 
@@ -333,7 +333,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
     }
 
     // Determine if the keyboard was previously loaded but is not active; use the cached, pre-loaded version if so.
-    let keyboard: JSKeyboard;
+    let keyboard: Keyboard;
     if(keyboard = this.keyboardCache.getKeyboardForStub(requestedStub)) {
       return {
         keyboard: Promise.resolve(keyboard),
@@ -351,7 +351,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
         this.emit('keyboardasyncload', requestedStub, completionPromise.corePromise);
 
         let keyboardPromise = this.keyboardCache.fetchKeyboardForStub(requestedStub);
-        let timeoutPromise = new Promise<JSKeyboard>((resolve, reject) => {
+        let timeoutPromise = new Promise<Keyboard>((resolve, reject) => {
           const timeoutMsg = `Sorry, the ${requestedStub.name} keyboard for ${requestedStub.langName} is not currently available.`;
           window.setTimeout(() => reject(new Error(timeoutMsg)), ContextManagerBase.TIMEOUT_THRESHOLD);
         });
diff --git a/web/src/engine/main/src/hardKeyboard.ts b/web/src/engine/main/src/hardKeyboard.ts
index 62cc91e63bb..09806caa21c 100644
--- a/web/src/engine/main/src/hardKeyboard.ts
+++ b/web/src/engine/main/src/hardKeyboard.ts
@@ -1,5 +1,5 @@
 import { EventEmitter } from "eventemitter3";
-import { JSKeyboard, KeyMapping, KeyEvent, Codes } from "keyman/engine/keyboard";
+import { JSKeyboard, Keyboard, KeyMapping, KeyEvent, Codes } from "keyman/engine/keyboard";
 import { type RuleBehavior } from 'keyman/engine/js-processor';
 import { KeyEventSourceInterface } from 'keyman/engine/osk';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
@@ -13,47 +13,55 @@ interface EventMap {
 
 export default class HardKeyboard extends EventEmitter<EventMap> implements KeyEventSourceInterface<EventMap> { }
 
-export function processForMnemonicsAndLegacy(s: KeyEvent, activeKeyboard: JSKeyboard, baseLayout: string): KeyEvent {
-  // Mnemonic handling.
-  if(activeKeyboard && activeKeyboard.isMnemonic) {
-    // The following will never set a code corresponding to a modifier key, so it's fine to do this,
-    // which may change the value of Lcode, here.
-
-    s.setMnemonicCode(!!(s.Lmodifiers & ModifierKeyConstants.K_SHIFTFLAG), !!(s.Lmodifiers & ModifierKeyConstants.CAPITALFLAG));
+export function processForMnemonicsAndLegacy(s: KeyEvent, activeKeyboard: Keyboard, baseLayout: string): KeyEvent {
+  if (!activeKeyboard) {
+    return s;
   }
 
-  // Other minor physical-keyboard adjustments
-  if(activeKeyboard && !activeKeyboard.isMnemonic) {
-    // Positional Layout
+  if (activeKeyboard instanceof JSKeyboard) {
+    // Mnemonic handling.
+    if (activeKeyboard.isMnemonic) {
+      // The following will never set a code corresponding to a modifier key, so it's fine to do this,
+      // which may change the value of Lcode, here.
 
-    /* 13/03/2007 MCD: Swedish: Start mapping of keystroke to US keyboard */
-    var Lbase = KeyMapping.languageMap[baseLayout];
-    if(Lbase && Lbase['k'+s.Lcode]) {
-      s.Lcode=Lbase['k'+s.Lcode];
+      s.setMnemonicCode(!!(s.Lmodifiers & ModifierKeyConstants.K_SHIFTFLAG), !!(s.Lmodifiers & ModifierKeyConstants.CAPITALFLAG));
     }
-    /* 13/03/2007 MCD: Swedish: End mapping of keystroke to US keyboard */
+    // Other minor physical-keyboard adjustments
+    if (!activeKeyboard.isMnemonic) {
+      // Positional Layout
+
+      /* 13/03/2007 MCD: Swedish: Start mapping of keystroke to US keyboard */
+      const Lbase = KeyMapping.languageMap[baseLayout];
+      if (Lbase && Lbase['k' + s.Lcode]) {
+        s.Lcode = Lbase['k' + s.Lcode];
+      }
+      /* 13/03/2007 MCD: Swedish: End mapping of keystroke to US keyboard */
 
-    // The second conditional component (re 0x60):  if CTRL or ALT is held down...
-    // Do not remap for legacy keyboard compatibility, do not pass Go, do not collect $200.
-    // This effectively only permits `default` and `shift` for legacy keyboards.
-    //
-    // Third:  DO, however, track direct presses of any main modifier key.  The OSK should
-    // reflect the current modifier state even for legacy keyboards.
-    if(!activeKeyboard.definesPositionalOrMnemonic &&
-       !(s.Lmodifiers & Codes.modifierBitmasks.NON_LEGACY) &&
-       !s.isModifier) {
-      // Support version 1.0 KeymanWeb keyboards that do not define positional vs mnemonic
-      s = new KeyEvent({
-        Lcode: KeyMapping._USKeyCodeToCharCode(s),
-        Lmodifiers: 0,
-        LisVirtualKey: false,
-        vkCode: s.Lcode, // Helps to merge OSK and physical keystroke control paths.
-        Lstates: s.Lstates,
-        kName: '',
-        device: s.device,
-        isSynthetic: false
-      });
+      // The second conditional component (re 0x60):  if CTRL or ALT is held down...
+      // Do not remap for legacy keyboard compatibility, do not pass Go, do not collect $200.
+      // This effectively only permits `default` and `shift` for legacy keyboards.
+      //
+      // Third:  DO, however, track direct presses of any main modifier key.  The OSK should
+      // reflect the current modifier state even for legacy keyboards.
+      if (!activeKeyboard.definesPositionalOrMnemonic &&
+        !(s.Lmodifiers & Codes.modifierBitmasks.NON_LEGACY) &&
+        !s.isModifier) {
+        // Support version 1.0 KeymanWeb keyboards that do not define positional vs mnemonic
+        s = new KeyEvent({
+          Lcode: KeyMapping._USKeyCodeToCharCode(s),
+          Lmodifiers: 0,
+          LisVirtualKey: false,
+          vkCode: s.Lcode, // Helps to merge OSK and physical keystroke control paths.
+          Lstates: s.Lstates,
+          kName: '',
+          device: s.device,
+          isSynthetic: false
+        });
+      }
     }
+  } else {
+    // KMX keyboard
+    // TODO-web-core: forward to Core
   }
 
   return s;
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index 7a4cfbb478b..da9f848cb5a 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -7,11 +7,10 @@ import { globalObject, DeviceSpec } from "@keymanapp/web-utils";
 
 import { CoreFactory, MainModule as KmCoreModule } from 'keyman/engine/core-processor';
 
-import { Codes, type JSKeyboard, type KeyEvent } from "keyman/engine/keyboard";
+import { Codes, JSKeyboard, KeyboardMinimalInterface, type Keyboard, type KeyEvent } from "keyman/engine/keyboard";
 import {
   type Alternate,
   isEmptyTransform,
-  JSKeyboardInterface,
   JSKeyboardProcessor,
   Mock,
   type OutputTarget,
@@ -66,7 +65,7 @@ export class InputProcessor {
     return this.kbdProcessor;
   }
 
-  public get keyboardInterface(): JSKeyboardInterface {
+  public get keyboardInterface(): KeyboardMinimalInterface {
     return this.keyboardProcessor.keyboardInterface;
   }
 
@@ -74,11 +73,11 @@ export class InputProcessor {
     return this.km_core;
   }
 
-  public get activeKeyboard(): JSKeyboard {
+  public get activeKeyboard(): Keyboard {
     return this.keyboardInterface.activeKeyboard;
   }
 
-  public set activeKeyboard(keyboard: JSKeyboard) {
+  public set activeKeyboard(keyboard: Keyboard) {
     this.keyboardInterface.activeKeyboard = keyboard;
 
     // All old deadkeys and keyboard-specific cache should immediately be invalidated
@@ -156,7 +155,7 @@ export class InputProcessor {
 
     // The default OSK layout for desktop devices does not include nextlayer info, relying on modifier detection here.
     // It's the OSK equivalent to doModifierPress on 'desktop' form factors.
-    if((formFactor == DeviceSpec.FormFactor.Desktop || !this.activeKeyboard || this.activeKeyboard.usesDesktopLayoutOnDevice(keyEvent.device)) && fromOSK) {
+    if((formFactor == DeviceSpec.FormFactor.Desktop || !this.activeKeyboard || (this.activeKeyboard instanceof JSKeyboard && this.activeKeyboard.usesDesktopLayoutOnDevice(keyEvent.device))) && fromOSK) {
       // If it's a desktop OSK style and this triggers a layer change,
       // a modifier key was clicked.  No output expected, so it's safe to instantly exit.
       if(this.keyboardProcessor.selectLayer(keyEvent)) {
diff --git a/web/src/engine/main/src/keymanEngine.ts b/web/src/engine/main/src/keymanEngine.ts
index d603dcd9f98..61183f496f9 100644
--- a/web/src/engine/main/src/keymanEngine.ts
+++ b/web/src/engine/main/src/keymanEngine.ts
@@ -1,8 +1,8 @@
-import { type KeyEvent, type JSKeyboard, KeyboardKeymanGlobal } from "keyman/engine/keyboard";
+import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal } from "keyman/engine/keyboard";
 import { OutputTarget, ProcessorInitOptions, RuleBehavior } from 'keyman/engine/js-processor';
 import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard/dom-keyboard-loader";
 import { InputProcessor } from './headless/inputProcessor.js';
-import { OSKView } from "keyman/engine/osk";
+import { OSKView, JSKeyboardData } from "keyman/engine/osk";
 import { KeyboardRequisitioner, ModelCache, toUnprefixedKeyboardId as unprefixed } from "keyman/engine/keyboard-storage";
 import { ModelSpec, PredictionContext } from "keyman/engine/interfaces";
 
@@ -146,11 +146,11 @@ export default class KeymanEngine<
       });
     });
 
-    this.contextManager.on('keyboardchange', (kbd) => {
+    this.contextManager.on('keyboardchange', (kbdData: { keyboard: Keyboard, metadata: KeyboardProperties }) => {
       // Hide OSK and do not update keyboard list if using internal keyboard (desktops).
       // Condition will not be met for touch form-factors; they force selection of a
       // default keyboard.
-      if(!kbd) {
+      if(!kbdData) {
         this.osk.startHide(false);
       }
 
@@ -158,11 +158,11 @@ export default class KeymanEngine<
         this.refreshModel();
         // Triggers context resets that can trigger layout stuff.
         // It's not the final such context-reset, though.
-        this.core.activeKeyboard = kbd?.keyboard;
+        this.core.activeKeyboard = kbdData?.keyboard;
 
         this.legacyAPIEvents.callEvent('keyboardchange', {
-          internalName: kbd?.metadata.id ?? '',
-          languageCode: kbd?.metadata.langId ?? ''
+          internalName: kbdData?.metadata.id ?? '',
+          languageCode: kbdData?.metadata.langId ?? ''
         });
       }
 
@@ -174,10 +174,10 @@ export default class KeymanEngine<
         If possible, we want to only perform layout operations once the correct layer is
         set to active.
       */
-      if(this.osk) {
+      if(this.osk && (!kbdData || kbdData.keyboard instanceof JSKeyboard)) { // TODO-web-core: add support for OSK for KMX keyboards
         this.osk.batchLayoutAfter(() => {
           prepareKeyboardSwap();
-          this.osk.activeKeyboard = kbd;
+          this.osk.activeKeyboard = kbdData ? { keyboard: kbdData.keyboard as JSKeyboard, metadata: kbdData.metadata } : undefined;
           // Note:  when embedded within the mobile apps, the keyboard will still be visible
           // at this time.
 
@@ -243,6 +243,7 @@ export default class KeymanEngine<
     // Since we're not sandboxing keyboard loads yet, we just use `window` as the jsGlobal object.
     // All components initialized below require a properly-configured `config.paths` or similar.
     const keyboardLoader = new KeyboardLoader(this.interface, config.applyCacheBusting);
+    keyboardLoader.coreModule = this.core.keymanCore;
     this.keyboardRequisitioner = new KeyboardRequisitioner(keyboardLoader, new DOMCloudRequester(), this.config.paths);
     this.modelCache = new ModelCache();
     const kbdCache = this.keyboardRequisitioner.cache;
@@ -382,7 +383,7 @@ export default class KeymanEngine<
     this.core.keyboardProcessor.contextDevice = value?.targetDevice ?? this.config.softDevice;
     if(value) {
       // Don't build an OSK if no keyboard is available yet; avoid the extra flash.
-      if(this.contextManager.activeKeyboard) {
+      if (this.contextManager.activeKeyboard && this.contextManager.activeKeyboard instanceof JSKeyboardData) { // TODO-web-core: add support for OSK for KMX keyboards
         value.activeKeyboard = this.contextManager.activeKeyboard;
       }
       value.on('keyevent', this.keyEventListener);
@@ -555,22 +556,29 @@ export default class KeymanEngine<
    * See https://help.keyman.com/developer/engine/web/current-version/reference/core/isChiral
    */
   public isChiral(k0?: string | JSKeyboard) {
-    let kbd: JSKeyboard;
+    let jsKbd: JSKeyboard;
     if(k0) {
       if(typeof k0 == 'string') {
         const kbdObj = this.keyboardRequisitioner.cache.getKeyboard(k0);
-        if(!kbdObj) {
+        if (!kbdObj) {
           throw new Error(`Keyboard '${k0}' has not been loaded.`);
+        } else if (!(kbdObj instanceof JSKeyboard)) {
+          return false; // TODO-web-core: implement for KMX keyboards
         } else {
           k0 = kbdObj;
         }
       }
 
-      kbd = k0;
+      jsKbd = k0;
     } else {
-      kbd = this.core.activeKeyboard;
+      const kbd = this.core.activeKeyboard;
+      if (kbd instanceof JSKeyboard) {
+        jsKbd = kbd;
+      } else {
+        return false; // TODO-web-core: implement for KMX keyboards
+      }
     }
-    return kbd.isChiral;
+    return jsKbd.isChiral;
   }
 
   /**
diff --git a/web/src/engine/osk/src/index.ts b/web/src/engine/osk/src/index.ts
index 121b8f43375..4140e1537dd 100644
--- a/web/src/engine/osk/src/index.ts
+++ b/web/src/engine/osk/src/index.ts
@@ -1,6 +1,6 @@
 export { Codes, DeviceSpec, JSKeyboard, KeyboardProperties, SpacebarText } from 'keyman/engine/keyboard';
 
-export { default as OSKView } from './views/oskView.js';
+export { default as OSKView, JSKeyboardData } from './views/oskView.js';
 export { default as FloatingOSKView, FloatingOSKViewConfiguration } from './views/floatingOskView.js';
 export { default as AnchoredOSKView } from './views/anchoredOskView.js';
 export { default as InlinedOSKView } from './views/inlinedOskView.js';
diff --git a/web/src/engine/osk/src/views/oskView.ts b/web/src/engine/osk/src/views/oskView.ts
index 480ed5f99c2..43123fef2c9 100644
--- a/web/src/engine/osk/src/views/oskView.ts
+++ b/web/src/engine/osk/src/views/oskView.ts
@@ -59,6 +59,11 @@ export interface LegacyOSKEventMap {
   }): void;
 }
 
+export class JSKeyboardData {
+  keyboard: JSKeyboard;
+  metadata: KeyboardProperties;
+};
+
 /**
  * For now, these will serve as undocumented, internal events.  We need a proper
  * design round and discussion before we consider promoting them to long-term,
@@ -168,10 +173,7 @@ export default abstract class OSKView
   private _boxBaseTouchStart:       (e: TouchEvent) => boolean;
   private _boxBaseTouchEventCancel: (e: TouchEvent) => boolean;
 
-  private keyboardData: {
-    keyboard: JSKeyboard,
-    metadata: KeyboardProperties
-  };
+  private keyboardData: JSKeyboardData;
 
   /**
    * Provides the current parameterization for timings and distances used by
@@ -532,17 +534,11 @@ export default abstract class OSKView
     }
   }
 
-  public get activeKeyboard(): {
-    keyboard: JSKeyboard,
-    metadata: KeyboardProperties
-  } {
+  public get activeKeyboard(): JSKeyboardData {
     return this.keyboardData;
   }
 
-  public set activeKeyboard(keyboardData: {
-    keyboard: JSKeyboard,
-    metadata: KeyboardProperties
-  }) {
+  public set activeKeyboard(keyboardData: JSKeyboardData) {
     this.keyboardData = keyboardData;
     this.loadActiveKeyboard();
 
diff --git a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
index f23f87f31e2..55cd21037d0 100644
--- a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
+++ b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 
 import { DOMKeyboardLoader } from 'keyman/engine/keyboard/dom-keyboard-loader';
-import { extendString, KeyboardHarness, JSKeyboard, MinimalKeymanGlobal, DeviceSpec, KeyboardKeymanGlobal, KeyboardDownloadError, KeyboardScriptError } from 'keyman/engine/keyboard';
+import { extendString, KeyboardHarness, JSKeyboard, MinimalKeymanGlobal, DeviceSpec, KeyboardKeymanGlobal, KeyboardDownloadError, KeyboardScriptError, Keyboard } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
 import { assertThrowsAsync } from 'keyman/tools/testing/test-utils';
 
@@ -49,12 +49,14 @@ describe('Keyboard loading in DOM', function() {
   it('`window`, disabled rule processing', async () => {
     const harness = new KeyboardHarness(window, MinimalKeymanGlobal);
     let keyboardLoader = new DOMKeyboardLoader(harness);
-    let keyboard: JSKeyboard = await keyboardLoader.loadKeyboardFromPath('/common/test/resources/keyboards/khmer_angkor.js');
+    let keyboard: Keyboard = await keyboardLoader.loadKeyboardFromPath('/common/test/resources/keyboards/khmer_angkor.js');
 
     assert.isOk(keyboard);
-    assert.equal(keyboard.id, 'Keyboard_khmer_angkor');
-    assert.isTrue(keyboard.isChiral);
-    assert.isFalse(keyboard.isCJK);
+    assert.instanceOf(keyboard, JSKeyboard);
+    const jsKeyboard = keyboard as JSKeyboard;
+    assert.equal(jsKeyboard.id, 'Keyboard_khmer_angkor');
+    assert.isTrue(jsKeyboard.isChiral);
+    assert.isFalse(jsKeyboard.isCJK);
     assert.isOk(KeymanWeb);
     assert.isOk(keyman);
     assert.isOk(keyman.osk);
@@ -65,24 +67,26 @@ describe('Keyboard loading in DOM', function() {
   });
 
   it('`window`, enabled rule processing', async () => {
-    const harness = new JSKeyboardInterface(window, MinimalKeymanGlobal);
-    const keyboardLoader = new DOMKeyboardLoader(harness);
-    const keyboard: JSKeyboard = await keyboardLoader.loadKeyboardFromPath('/common/test/resources/keyboards/khmer_angkor.js');
-    harness.activeKeyboard = keyboard;
+    const jsHarness = new JSKeyboardInterface(window, MinimalKeymanGlobal);
+    const keyboardLoader = new DOMKeyboardLoader(jsHarness);
+    const keyboard: Keyboard = await keyboardLoader.loadKeyboardFromPath('/common/test/resources/keyboards/khmer_angkor.js');
+    const jsKeyboard = keyboard as JSKeyboard;
+    jsHarness.activeKeyboard = jsKeyboard;
 
     assert.isOk(keyboard);
-    assert.equal(keyboard.id, 'Keyboard_khmer_angkor');
-    assert.isTrue(keyboard.isChiral);
-    assert.isFalse(keyboard.isCJK);
+    assert.instanceOf(keyboard, JSKeyboard);
+    assert.equal(jsKeyboard.id, 'Keyboard_khmer_angkor');
+    assert.isTrue(jsKeyboard.isChiral);
+    assert.isFalse(jsKeyboard.isCJK);
     assert.isOk(KeymanWeb);
     assert.isOk(keyman);
     assert.isOk(keyman.osk);
     assert.isOk(keyman.osk.keyCodes);
 
     // TODO:  verify actual rule processing.
-    const nullKeyEvent = keyboard.constructNullKeyEvent(device);
+    const nullKeyEvent = jsKeyboard.constructNullKeyEvent(device);
     const mock = new Mock();
-    const result = harness.processKeystroke(mock, nullKeyEvent);
+    const result = jsHarness.processKeystroke(mock, nullKeyEvent);
 
     assert.isOk(result);
     assert.isOk(KeymanWeb);
@@ -91,17 +95,19 @@ describe('Keyboard loading in DOM', function() {
     assert.isOk(keyman.osk.keyCodes);
 
     // Should be cleared post-keyboard-load.
-    assert.isNotOk(harness.loadedKeyboard);
+    assert.isNotOk(jsHarness.loadedKeyboard);
   });
 
   it('load keyboards successfully in parallel without side effects', async () => {
-    let harness = new JSKeyboardInterface(window, MinimalKeymanGlobal);
-    let keyboardLoader = new DOMKeyboardLoader(harness);
+    let jsHarness = new JSKeyboardInterface(window, MinimalKeymanGlobal);
+    let keyboardLoader = new DOMKeyboardLoader(jsHarness);
 
     // Preload a keyboard and make it active.
-    const test_kbd: JSKeyboard = await keyboardLoader.loadKeyboardFromPath('/common/test/resources/keyboards/test_917.js');
-    harness.activeKeyboard = test_kbd;
-    assert.isNotOk(harness.loadedKeyboard);
+    const test_kbd: Keyboard = await keyboardLoader.loadKeyboardFromPath('/common/test/resources/keyboards/test_917.js');
+    assert.instanceOf(test_kbd, JSKeyboard);
+    const test_jskbd = test_kbd as JSKeyboard;
+    jsHarness.activeKeyboard = test_jskbd;
+    assert.isNotOk(jsHarness.loadedKeyboard);
 
     // With an active keyboard, load three keyboards but activate none of them.
     const lao_keyboard_promise = keyboardLoader.loadKeyboardFromPath('/common/test/resources/keyboards/lao_2008_basic.js');
@@ -113,8 +119,8 @@ describe('Keyboard loading in DOM', function() {
     const lao_keyboard = await lao_keyboard_promise;
     const khmer_keyboard = await khmer_keyboard_promise;
 
-    assert.strictEqual(test_kbd, harness.activeKeyboard);
-    assert.isNotOk(harness.loadedKeyboard);
+    assert.strictEqual(test_kbd, jsHarness.activeKeyboard);
+    assert.isNotOk(jsHarness.loadedKeyboard);
 
     assert.isOk(lao_keyboard);
     assert.isOk(chiral_keyboard);
@@ -125,6 +131,6 @@ describe('Keyboard loading in DOM', function() {
     assert.equal(khmer_keyboard.id, "Keyboard_khmer_angkor");
     assert.equal(chiral_keyboard.id, "Keyboard_test_chirality");
 
-    harness.activeKeyboard = lao_keyboard;
+    jsHarness.activeKeyboard = lao_keyboard as JSKeyboard;
   });
 });
diff --git a/web/src/test/auto/dom/kbdLoader.ts b/web/src/test/auto/dom/kbdLoader.ts
index 92968460f29..a9a01dfe2c8 100644
--- a/web/src/test/auto/dom/kbdLoader.ts
+++ b/web/src/test/auto/dom/kbdLoader.ts
@@ -37,7 +37,12 @@ export function loadKeyboardsFromStubs(apiStubs: any, baseDir: string) {
       const overwriteLoader = (id: number, path: string) => {
         const loader = loadKeyboardFromPath(path);
         return loader.then(kbd => {
-          keyboards[stub.id].keyboard = kbd;
+          if (kbd instanceof JSKeyboard) {
+            keyboards[stub.id].keyboard = kbd;
+          } else {
+            // TODO-web-core: implement for KMX keyboards if needed
+            keyboards[stub.id].keyboard = null;
+          }
         });
       }
       keyboards[stub.id] = {
diff --git a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
index e015a9ee784..b8a68dd55c2 100644
--- a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
+++ b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
@@ -3,7 +3,7 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { DeviceSpec, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
+import { DeviceSpec, JSKeyboard, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
@@ -24,10 +24,10 @@ describe('Headless keyboard loading', function () {
   describe('Full harness loading', () => {
     it('successfully loads', async function () {
       // -- START: Standard Recorder-based unit test loading boilerplate --
-      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
-      const keyboardLoader = new NodeKeyboardLoader(harness);
+      const jsHarness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
+      const keyboardLoader = new NodeKeyboardLoader(jsHarness);
       const keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
-      harness.activeKeyboard = keyboard;
+      jsHarness.activeKeyboard = keyboard as JSKeyboard;
       // --  END:  Standard Recorder-based unit test loading boilerplate --
 
       // This part provides assurance that the keyboard properly loaded.
@@ -39,11 +39,11 @@ describe('Headless keyboard loading', function () {
       const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
       const keyboardLoader = new NodeKeyboardLoader(harness);
       const keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
-      harness.activeKeyboard = keyboard;
+      harness.activeKeyboard = keyboard as JSKeyboard;
       // --  END:  Standard Recorder-based unit test loading boilerplate --
 
       // Runs a blank KeyEvent through the keyboard's rule processing.
-      harness.processKeystroke(new Mock(), keyboard.constructNullKeyEvent(device));
+      harness.processKeystroke(new Mock(), (keyboard as JSKeyboard).constructNullKeyEvent(device));
     });
 
     it('does not change the active kehboard', async function () {
@@ -56,7 +56,7 @@ describe('Headless keyboard loading', function () {
       // This part provides assurance that the keyboard properly loaded.
       assert.equal(lao_keyboard.id, "Keyboard_lao_2008_basic");
 
-      harness.activeKeyboard = lao_keyboard;
+      harness.activeKeyboard = lao_keyboard as JSKeyboard;
 
       const khmer_keyboard = await keyboardLoader.loadKeyboardFromPath(khmerPath);
       assert.strictEqual(lao_keyboard, harness.activeKeyboard);
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
index e089b64fe7b..3ebeaaa58f4 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
@@ -3,7 +3,7 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { KeyboardHarness, MinimalKeymanGlobal, DeviceSpec } from 'keyman/engine/keyboard';
+import { KeyboardHarness, MinimalKeymanGlobal, DeviceSpec, JSKeyboard } from 'keyman/engine/keyboard';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
 
@@ -14,7 +14,8 @@ describe('Keyboard tests', function () {
     // -- START: Standard Recorder-based unit test loading boilerplate --
     const harness = new KeyboardHarness({}, MinimalKeymanGlobal);
     const keyboardLoader = new NodeKeyboardLoader(harness);
-    const km_keyboard = await keyboardLoader.loadKeyboardFromPath(khmerPath);
+    const keyboard = await keyboardLoader.loadKeyboardFromPath(khmerPath);
+    const km_keyboard = keyboard as JSKeyboard;
     // --  END:  Standard Recorder-based unit test loading boilerplate --
 
     // `khmer_angkor` - supports longpresses, but not flicks or multitaps.
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
index 01b66544ec4..76d5fdc1b1c 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
@@ -3,7 +3,7 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { KeyboardHarness, MinimalKeymanGlobal, KeyboardDownloadError, DeviceSpec, InvalidKeyboardError } from 'keyman/engine/keyboard';
+import { KeyboardHarness, MinimalKeymanGlobal, KeyboardDownloadError, DeviceSpec, InvalidKeyboardError, JSKeyboard } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { assertThrowsAsync, assertThrows } from 'keyman/tools/testing/test-utils';
@@ -76,14 +76,15 @@ describe('Headless keyboard loading', function() {
       const keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
       // --  END:  Standard Recorder-based unit test loading boilerplate --
 
+      assert.instanceOf(keyboard, JSKeyboard);
       // Runs a blank KeyEvent through the keyboard's rule processing...
       // but via separate harness configured with a different captured global.
       // This shows an important detail: the 'global' object is effectively
       // closure-captured. (Similar constraints may occur when experimenting with
       // 'sandboxed' keyboard loading in the DOM!)
       const ruleHarness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
-      ruleHarness.activeKeyboard = keyboard;
-      assertThrows(() => ruleHarness.processKeystroke(new Mock(), keyboard.constructNullKeyEvent(device)), 'k.KKM is not a function');
+      ruleHarness.activeKeyboard = keyboard as JSKeyboard;
+      assertThrows(() => ruleHarness.processKeystroke(new Mock(), (keyboard as JSKeyboard).constructNullKeyEvent(device)), 'k.KKM is not a function');
     });
   });
 });
diff --git a/web/src/test/auto/integrated/web-test-runner.config.mjs b/web/src/test/auto/integrated/web-test-runner.config.mjs
index 557f7b5c6ba..72ebce8f996 100644
--- a/web/src/test/auto/integrated/web-test-runner.config.mjs
+++ b/web/src/test/auto/integrated/web-test-runner.config.mjs
@@ -24,7 +24,7 @@ export default {
   concurrency: 10,
   nodeResolve: true,
   files: [
-    'web/build/test/integrated//**/*.tests.mjs',
+    'web/build/test/integrated/**/*.tests.mjs',
     // '**/*.tests.html'
   ],
   middleware: [
diff --git a/web/src/tools/testing/bulk_rendering/renderer_core.ts b/web/src/tools/testing/bulk_rendering/renderer_core.ts
index 50c5ca24948..5bdd1527d1d 100644
--- a/web/src/tools/testing/bulk_rendering/renderer_core.ts
+++ b/web/src/tools/testing/bulk_rendering/renderer_core.ts
@@ -3,7 +3,7 @@ import { DeviceDetector } from 'keyman/engine/main';
 import { type DeviceSpec } from '@keymanapp/web-utils';
 
 import type { KeymanEngine } from 'keyman/app/browser';
-import type { FloatingOSKView } from 'keyman/engine/osk';
+import { JSKeyboard, type FloatingOSKView } from 'keyman/engine/osk';
 
 declare var keyman: KeymanEngine;
 
@@ -114,19 +114,23 @@ export class BatchRenderer {
       eleDescription.appendChild(document.createElement('br'));
 
       const keyboard = keyman.core.activeKeyboard;
-      // Some keyboards, such as sil_euro_latin and sil_ipa, no longer specify this property.
-      if(keyboard['_legacyLayoutSpec']) {
-        eleDescription.appendChild(document.createTextNode('Font:  ' + keyboard['_legacyLayoutSpec'].F));
-      } else {
-        // They instead specify only the post-KMW-10 touch-layout format.
-        const layout = keyboard.layout(formFactor);
-        if(!layout) {
-          eleDescription.appendChild(document.createTextNode('Keyboard is help-text based'));
+      if (keyboard instanceof JSKeyboard) {
+        // Some keyboards, such as sil_euro_latin and sil_ipa, no longer specify this property.
+        if (keyboard['_legacyLayoutSpec']) {
+          eleDescription.appendChild(document.createTextNode('Font:  ' + keyboard['_legacyLayoutSpec'].F));
         } else {
-          eleDescription.appendChild(document.createTextNode('Font:  ' + layout.font));
+          // They instead specify only the post-KMW-10 touch-layout format.
+          const layout = keyboard.layout(formFactor);
+          if (!layout) {
+            eleDescription.appendChild(document.createTextNode('Keyboard is help-text based'));
+          } else {
+            eleDescription.appendChild(document.createTextNode('Font:  ' + layout.font));
+          }
         }
+      } else {
+        // TODO-web-core: implement for KMX keyboards
+        eleDescription.appendChild(document.createTextNode('Keyboard is help-text based'));
       }
-
     } else {
       eleDescription.appendChild(document.createTextNode('Unable to load this keyboard!'));
     }
@@ -168,7 +172,7 @@ export class BatchRenderer {
 
       // Uses 'private' APIs that may be subject to change in the future.  Keep it updated!
       let layers: string[];
-      if(!isMobile) {
+      if(!isMobile && keyman.core.activeKeyboard instanceof JSKeyboard) {
         // The desktop OSK will be overpopulated, with a number of blank layers to display in most cases.
         // We instead rely upon the KLS definition to ensure we keep the renders sparse.
         //

From b384884d7988b77b1a2656d8d9d740ef3316dc36 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 20 Jan 2025 15:05:23 +0100
Subject: [PATCH 060/254] chore(linux): fix build failures

Strange that it didn't fail before - renaming of `KeyboardProcessor` to
`JSKeyboardProcessor` happened in PR #12824.
---
 .../engine/js-processor/basic-init.tests.js        | 14 +++++++-------
 .../engine/js-processor/bundled-module.tests.js    |  4 ++--
 .../engine/js-processor/chirality.tests.js         |  2 +-
 .../engine/js-processor/engine/stores.tests.js     |  4 ++--
 .../engine/main/headless/inputProcessor.tests.js   |  6 +++---
 .../main/headless/languageProcessor.tests.js       |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js b/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
index cabdb9d4322..7625041a6f5 100644
--- a/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
@@ -3,7 +3,7 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { KeyboardProcessor } from 'keyman/engine/js-processor';
+import { JSKeyboardProcessor } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
 global.keyman = {}; // So that keyboard-based checks against the global `keyman` succeed.
@@ -12,17 +12,17 @@ global.keyman = {}; // So that keyboard-based checks against the global `keyman`
 // Initialize supplementary plane string extensions
 String.kmwEnableSupplementaryPlane(false);
 
-// Test the KeyboardProcessor interface.
-describe('KeyboardProcessor', function() {
+// Test the JSKeyboardProcessor interface.
+describe('JSKeyboardProcessor', function() {
   describe('[[constructor]]', function () {
     it('should initialize without errors', function () {
-      let kp = new KeyboardProcessor();
+      let kp = new JSKeyboardProcessor();
       assert.isNotNull(kp);
     });
 
     it('has expected default values after initialization', function () {
-      let kp = new KeyboardProcessor();
-      assert.equal('us', kp.baseLayout, 'KeyboardProcessor has unexpected base layout')
+      let kp = new JSKeyboardProcessor();
+      assert.equal('us', kp.baseLayout, 'JSKeyboardProcessor has unexpected base layout')
       assert.isNotNull(global.KeymanWeb, 'KeymanWeb global was not automatically installed');
       assert.equal('default', kp.layerId, 'Default layer is not set to "default"');
       assert.isUndefined(kp.activeKeyboard, 'Initialized with already-active keyboard');
@@ -31,7 +31,7 @@ describe('KeyboardProcessor', function() {
 
   describe('activeKeyboard', function() {
     it('is automatically set (in headless) on keyboard load', async function () {
-      let kp = new KeyboardProcessor();
+      let kp = new JSKeyboardProcessor();
 
       // These two lines will load a keyboard from its file; headless-mode `registerKeyboard` will
       // automatically set the keyboard as active.
diff --git a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
index 05829985ae9..bda99fb8c23 100644
--- a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
@@ -14,9 +14,9 @@ var toSupplementaryPairString = function(code){
 let u = toSupplementaryPairString;
 
 describe('Bundled ES Module for js-processor', function() {
-  describe('KeyboardProcessor', function () {
+  describe('JSKeyboardProcessor', function () {
     it('should initialize without errors', function () {
-      let kp = new Package.KeyboardProcessor();
+      let kp = new Package.JSKeyboardProcessor();
       assert.isNotNull(kp);
     });
   });
diff --git a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
index c3e909f90ef..371822d1f7d 100644
--- a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
@@ -50,7 +50,7 @@ describe('Engine - Chirality', function() {
         await set.test(proctor);
       });
     } else {
-      it.skip(set.toTestName() + " - modifier state simulation for OSK not yet supported in headless KeyboardProcessor");
+      it.skip(set.toTestName() + " - modifier state simulation for OSK not yet supported in headless JSKeyboardProcessor");
     }
   }
 
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
index 31eb5a2af57..58241cc9fa7 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 
 import { JSKeyboard } from 'keyman/engine/keyboard';
-import { KeyboardProcessor } from 'keyman/engine/js-processor';
+import { JSKeyboardProcessor } from 'keyman/engine/js-processor';
 import { extendString } from '@keymanapp/web-utils';
 
 extendString();
@@ -21,7 +21,7 @@ describe('Engine - Stores', function() {
   }
 
   it('Store \'Explosion\'', function() {
-    let processor = new KeyboardProcessor(device);
+    let processor = new JSKeyboardProcessor(device);
     // A 'hollow' Keyboard that only follows default rules.  That said, we need a Keyboard
     // instance to host cache data for our exploded store tests.
     processor.activeKeyboard = new JSKeyboard();
diff --git a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
index 56aa2f3e5ed..2684fe52fcc 100644
--- a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
@@ -25,7 +25,7 @@ let device = {
 // Initialize supplementary plane string extensions
 String.kmwEnableSupplementaryPlane(false);
 
-// Test the KeyboardProcessor interface.
+// Test the JSKeyboardProcessor interface.
 describe('InputProcessor', function() {
   describe('[[constructor]]', function () {
     it('should initialize without errors', function () {
@@ -50,7 +50,7 @@ describe('InputProcessor', function() {
 
         // These checks are lifted from the keyboard init checks found in
         // web/src/test/auto/headless/engine/js-processor/basic-init.js.
-        assert.equal('us', core.keyboardProcessor.baseLayout, 'KeyboardProcessor has unexpected base layout')
+        assert.equal('us', core.keyboardProcessor.baseLayout, 'JSKeyboardProcessor has unexpected base layout')
         assert.isNotNull(global.KeymanWeb, 'KeymanWeb global was not automatically installed');
         assert.equal('default', core.keyboardProcessor.layerId, 'Default layer is not set to "default"');
         assert.isUndefined(core.keyboardProcessor.activeKeyboard, 'Initialized with already-active keyboard');
@@ -181,7 +181,7 @@ describe('InputProcessor', function() {
     let keyboardWithHarness;
     let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/8568_deadkeys.json'));
     // For convenience we define the key sequence in a test file although we don't use the
-    // rest of the recorder stuff since it uses only KeyboardProcessor, not InputProcessor.
+    // rest of the recorder stuff since it uses only JSKeyboardProcessor, not InputProcessor.
     let testDefinitions = new KeyboardTest(JSON.parse(testJSONtext));
 
     before(async function () {
diff --git a/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
index e4572de21d0..ed1740322a3 100644
--- a/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
@@ -20,7 +20,7 @@ global.keyman = {}; // So that keyboard-based checks against the global `keyman`
 // Initialize supplementary plane string extensions
 String.kmwEnableSupplementaryPlane(false);
 
-// Test the KeyboardProcessor interface.
+// Test the JSKeyboardProcessor interface.
 describe('LanguageProcessor', function() {
   let worker;
   const callbacks = new TestCompilerCallbacks();

From 2bf58bc0b9b13a2a9b7ae0efdbe0068589763d78 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 20 Jan 2025 15:33:08 +0100
Subject: [PATCH 061/254] feat(web): make properties of `KMXKeyboard` read-only

Addresses code review comment.
---
 .../engine/keyboard/src/keyboards/kmxKeyboard.ts | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts b/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts
index 34ffd5f9f07..7667ba0131f 100644
--- a/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts
+++ b/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts
@@ -6,12 +6,12 @@ import { km_core_keyboard } from 'keyman/engine/core-processor';
 export class KMXKeyboard {
 
   constructor(id: string, keyboard: km_core_keyboard) {
-    this.id = id;
-    this.keyboard = keyboard;
+    this._id = id;
+    this._keyboard = keyboard;
   }
 
-  id: string;
-  keyboard: km_core_keyboard;
+  private _id: string;
+  private _keyboard: km_core_keyboard;
 
   get isMnemonic(): boolean {
     return false;
@@ -21,4 +21,12 @@ export class KMXKeyboard {
     // TODO-web-core: get version from `km_core_keyboard_get_attrs`
     return '';
   }
+
+  get id(): string {
+    return this._id;
+  }
+
+  get keyboard(): km_core_keyboard {
+    return this._keyboard;
+  }
 }

From fbfa3b5cc244d8e67e98177b02332bf41fa49557 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 17 Jan 2025 18:41:02 +0100
Subject: [PATCH 062/254] feat(core): add unit tests for the WASM version of
 Core API

Note that this requires adding an additional `km-core-node.mjs`
module (since the tests are run with node). We can't create one that
would work for both web and node - if we do trying to load the `km-core.js`
fails with `km-core.mjs: Could not resolve import "module".`
---
 core/src/meson.build                   |   16 +-
 core/tests/unit/kmx/meson.build        |    4 +-
 core/tests/unit/meson.build            |    1 +
 core/tests/unit/wasm/meson.build       |    5 +
 core/tests/unit/wasm/package-lock.json | 1425 ++++++++++++++++++++++++
 core/tests/unit/wasm/package.json      |   16 +
 core/tests/unit/wasm/wasm.tests.js     |   42 +
 web/src/test/auto/headless/README.md   |    8 +
 8 files changed, 1514 insertions(+), 3 deletions(-)
 create mode 100644 core/tests/unit/wasm/meson.build
 create mode 100644 core/tests/unit/wasm/package-lock.json
 create mode 100644 core/tests/unit/wasm/package.json
 create mode 100644 core/tests/unit/wasm/wasm.tests.js
 create mode 100644 web/src/test/auto/headless/README.md

diff --git a/core/src/meson.build b/core/src/meson.build
index ec76b843d86..128d72b7f76 100644
--- a/core/src/meson.build
+++ b/core/src/meson.build
@@ -156,6 +156,13 @@ if cpp_compiler.get_id() == 'emscripten'
     '-sENVIRONMENT=web,webview',
     # '-sERROR_ON_UNDEFINED_SYMBOLS=0'
   ]
+  node_links = [
+    '--whole-archive',
+    '-sALLOW_MEMORY_GROWTH=1',
+    '-sMODULARIZE=1', '-sEXPORT_NAME=createCoreProcessor',
+    '-sEXPORT_ES6',
+    '-sENVIRONMENT=node',
+  ]
 endif
 
 lib = library('keymancore',
@@ -187,12 +194,19 @@ pkg.generate(
     libraries: lib)
 
 if cpp_compiler.get_id() == 'emscripten'
-  # Build an executable
+  # Build an executable for web/webview
   host = executable('km-core',
     cpp_args: defns + extra_defns,
     include_directories: inc,
     link_args: links + host_links + extra_links,
     objects: lib.extract_all_objects(recursive: false))
+  # Build an executable for node (used for testing)
+  host = executable('km-core-node',
+    cpp_args: defns + extra_defns,
+    include_directories: inc,
+    link_args: links + node_links + extra_links,
+    objects: lib.extract_all_objects(recursive: false),
+    name_suffix: 'mjs')
 
   if get_option('buildtype') == 'release'
     # TODO: #12888
diff --git a/core/tests/unit/kmx/meson.build b/core/tests/unit/kmx/meson.build
index 421a133eefb..2b521a57120 100644
--- a/core/tests/unit/kmx/meson.build
+++ b/core/tests/unit/kmx/meson.build
@@ -212,7 +212,7 @@ kbd_log = custom_target(test_kbd + '.kmx'.underscorify(),
   input: kbd_src,
   command: kmc_cmd + ['build', '--debug', '--no-compiler-version', '@INPUT@', '--out-file', kbd_obj]
 )
-  test('imx_list', imx_e,  depends: kbd_log, args: [kbd_obj] )
+test('imx_list', imx_e,  depends: kbd_log, args: [kbd_obj] )
 
 external_e = executable('ext_event_tests', ['kmx_external_event.tests.cpp', common_test_files],
                 cpp_args: defns + warns,
@@ -231,4 +231,4 @@ kbd_log = custom_target(test_kbd + '.kmx'.underscorify(),
   input: kbd_src,
   command: kmc_cmd + ['build', '--debug', '--no-compiler-version', '@INPUT@', '--out-file', kbd_obj]
 )
-  test('ext_event', external_e,  depends: kbd_log, args: [kbd_obj] )
+test('ext_event', external_e,  depends: kbd_log, args: [kbd_obj] )
diff --git a/core/tests/unit/meson.build b/core/tests/unit/meson.build
index 0637ace96e5..3f661f6cac4 100644
--- a/core/tests/unit/meson.build
+++ b/core/tests/unit/meson.build
@@ -53,3 +53,4 @@ subdir('utftest')
 subdir('kmnkbd')
 subdir('kmx')
 subdir('ldml')
+subdir('wasm')
diff --git a/core/tests/unit/wasm/meson.build b/core/tests/unit/wasm/meson.build
new file mode 100644
index 00000000000..b5638944071
--- /dev/null
+++ b/core/tests/unit/wasm/meson.build
@@ -0,0 +1,5 @@
+if cpp_compiler.get_id() == 'emscripten'
+  npm = find_program('npm', required: true)
+
+  test('wasm-tests', npm, args: ['test'], workdir: meson.current_source_dir())
+endif
diff --git a/core/tests/unit/wasm/package-lock.json b/core/tests/unit/wasm/package-lock.json
new file mode 100644
index 00000000000..f2c3485da56
--- /dev/null
+++ b/core/tests/unit/wasm/package-lock.json
@@ -0,0 +1,1425 @@
+{
+  "name": "wasm-tests",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "wasm-tests",
+      "version": "1.0.0",
+      "license": "MIT",
+      "devDependencies": {
+        "chai": "^5.1.2",
+        "mocha": "^11.0.1"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/assertion-error": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/chai": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.2.tgz",
+      "integrity": "sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assertion-error": "^2.0.1",
+        "check-error": "^2.1.1",
+        "deep-eql": "^5.0.1",
+        "loupe": "^3.1.0",
+        "pathval": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
+      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/cliui/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/deep-eql": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
+      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/diff": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
+      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/foreground-child": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/loupe": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.2.tgz",
+      "integrity": "sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/mocha": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.0.1.tgz",
+      "integrity": "sha512-+3GkODfsDG71KSCQhc4IekSW+ItCK/kiez1Z28ksWvYhKXV/syxMlerR/sC7whDp7IyreZ4YxceMLdTs5hQE8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-colors": "^4.1.3",
+        "browser-stdout": "^1.3.1",
+        "chokidar": "^3.5.3",
+        "debug": "^4.3.5",
+        "diff": "^5.2.0",
+        "escape-string-regexp": "^4.0.0",
+        "find-up": "^5.0.0",
+        "glob": "^10.4.5",
+        "he": "^1.2.0",
+        "js-yaml": "^4.1.0",
+        "log-symbols": "^4.1.0",
+        "minimatch": "^5.1.6",
+        "ms": "^2.1.3",
+        "serialize-javascript": "^6.0.2",
+        "strip-json-comments": "^3.1.1",
+        "supports-color": "^8.1.1",
+        "workerpool": "^6.5.1",
+        "yargs": "^16.2.0",
+        "yargs-parser": "^20.2.9",
+        "yargs-unparser": "^2.0.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha.js"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0"
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/pathval": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
+      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.16"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/workerpool": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
+      "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-unparser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/yargs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/core/tests/unit/wasm/package.json b/core/tests/unit/wasm/package.json
new file mode 100644
index 00000000000..9736ad249e0
--- /dev/null
+++ b/core/tests/unit/wasm/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "wasm-tests",
+  "version": "1.0.0",
+  "description": "Unit tests for WASM version of Core",
+  "main": "tests.js",
+  "type": "module",
+  "scripts": {
+    "test": "mocha ."
+  },
+  "author": "SIL Global",
+  "license": "MIT",
+  "devDependencies": {
+    "chai": "^5.1.2",
+    "mocha": "^11.0.1"
+  }
+}
diff --git a/core/tests/unit/wasm/wasm.tests.js b/core/tests/unit/wasm/wasm.tests.js
new file mode 100644
index 00000000000..c4faafe6940
--- /dev/null
+++ b/core/tests/unit/wasm/wasm.tests.js
@@ -0,0 +1,42 @@
+import { assert } from 'chai';
+import { fileURLToPath, pathToFileURL } from 'url';
+import fs from 'fs';
+import path from 'path';
+
+let km_core = null;
+
+describe('Unit tests for wasm Core API', function () {
+  let __dirname = null;
+
+  before(async function () {
+    // Define __dirname for ES modules
+    const filename = fileURLToPath(import.meta.url);
+    __dirname = path.join(path.dirname(filename), '../../../build/wasm/debug');
+
+    let km_core_file = path.join(__dirname, 'src/km-core-node.mjs');
+    if (!fs.existsSync(km_core_file)) {
+      __dirname = path.join(path.dirname(filename), '../../../build/wasm/release');
+      km_core_file = path.join(__dirname, 'src/km-core-node.mjs');
+    }
+    const wasmdir = path.dirname(km_core_file);
+    const module = await import(pathToFileURL(km_core_file));
+    const createCoreProcessor = module.default;
+    km_core = await createCoreProcessor({
+      locateFile: function (path, scriptDirectory) {
+        return wasmdir + '/' + path;
+      }
+    });
+  });
+
+  it('can load keyboard from blob', function () {
+    // Setup
+    const kmxdata = fs.readFileSync(path.join(__dirname, 'tests/unit/kmx/k_020___deadkeys_and_backspace.kmx'));
+
+    // Execute
+    const result = km_core.keyboard_load_from_blob('k_020___deadkeys_and_backspace', kmxdata);
+
+    // Verify
+    assert.equal(result.status, 0);
+    assert.isNotNull(result.keyboard);
+  });
+});
diff --git a/web/src/test/auto/headless/README.md b/web/src/test/auto/headless/README.md
new file mode 100644
index 00000000000..e496cf8a2a5
--- /dev/null
+++ b/web/src/test/auto/headless/README.md
@@ -0,0 +1,8 @@
+# Headless unit tests
+
+The tests in this directory will be run by the corresponding project
+under `src`.
+
+For example, `src/test/auto/headless/engine/js-processor` are the tests
+for `src/engine/js-processor` and will be run from
+`src/engine/js-processor/build.sh`.

From fe3e02cf9e918a1f9c8a2354a623aca0060120ff Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Sat, 1 Mar 2025 17:14:48 +0100
Subject: [PATCH 063/254] feat(web): implement getting properties of
 KMXKeyboard

---
 core/src/wasm.cpp                             | 85 +++++++++++++++++++
 core/tests/unit/wasm/wasm.tests.js            | 18 +++-
 .../src/{core-factory.ts => KM_Core.ts}       | 18 +++-
 web/src/engine/core-processor/src/index.ts    |  6 +-
 .../src/keyboards/keyboardLoaderBase.ts       | 13 +--
 .../keyboard/src/keyboards/kmxKeyboard.ts     | 20 ++---
 .../main/src/headless/inputProcessor.ts       | 12 +--
 web/src/engine/main/src/keymanEngine.ts       |  3 +-
 .../dom/cases/core-processor/basic.tests.ts   | 24 ++++--
 9 files changed, 155 insertions(+), 44 deletions(-)
 rename web/src/engine/core-processor/src/{core-factory.ts => KM_Core.ts} (70%)

diff --git a/core/src/wasm.cpp b/core/src/wasm.cpp
index a0dc5c1f790..6b30dbfc526 100644
--- a/core/src/wasm.cpp
+++ b/core/src/wasm.cpp
@@ -14,6 +14,45 @@
 
 namespace em = emscripten;
 
+// This little bit of magic gives us implicit bindings for any `std::vector`,
+// so long as we bind `emscripten::value_object<T>`, and comes from:
+// https://github.com/emscripten-core/emscripten/issues/11070#issuecomment-717675128
+namespace emscripten {
+namespace internal {
+
+template <typename T, typename Allocator>
+struct BindingType<std::vector<T, Allocator>> {
+    using ValBinding = BindingType<val>;
+    using WireType = ValBinding::WireType;
+
+#if __EMSCRIPTEN_major__ == 3 && __EMSCRIPTEN_minor__ == 1 && __EMSCRIPTEN_tiny__ >= 60
+    // emscripten-core/emscripten#21692
+    static WireType toWireType(const std::vector<T, Allocator> &vec, rvp::default_tag) {
+        return ValBinding::toWireType(val::array(vec), rvp::default_tag{});
+    }
+#else
+    static WireType toWireType(const std::vector<T, Allocator> &vec) {
+        return ValBinding::toWireType(val::array(vec));
+    }
+#endif
+
+    static std::vector<T, Allocator> fromWireType(WireType value) {
+        return vecFromJSArray<T>(ValBinding::fromWireType(value));
+    }
+};
+
+template <typename T>
+struct TypeID<T,
+              typename std::enable_if_t<std::is_same<
+                  typename Canonicalized<T>::type,
+                  std::vector<typename Canonicalized<T>::type::value_type,
+                              typename Canonicalized<T>::type::allocator_type>>::value>> {
+    static constexpr TYPEID get() { return TypeID<val>::get(); }
+};
+
+}  // namespace internal
+}  // namespace emscripten
+
 constexpr km_core_attr const engine_attrs = {
   256,
   KM_CORE_LIB_CURRENT,
@@ -27,6 +66,20 @@ EMSCRIPTEN_KEEPALIVE km_core_attr const& tmp_wasm_attributes() {
   return engine_attrs;
 }
 
+struct km_core_option_item_wasm {
+  std::u16string   key;
+  std::u16string   value;
+  uint8_t          scope;
+};
+
+
+class km_core_keyboard_attrs_wasm {
+public:
+  std::u16string version_string;
+  std::u16string id;
+  std::vector<km_core_option_item_wasm> default_options;
+};
+
 template <typename T> class CoreReturn {
 public:
   CoreReturn(int status = 0, const T* obj = nullptr) : status(status), object(obj) {
@@ -64,6 +117,26 @@ km_core_keyboard_load_from_blob_wasm(
   return new CoreReturn<km_core_keyboard>(retVal, keyboard_ptr);
 }
 
+EMSCRIPTEN_KEEPALIVE const CoreReturn<km_core_keyboard_attrs_wasm>*
+km_core_keyboard_get_attrs_wasm(const km_core_keyboard* keyboard) {
+  const km_core_keyboard_attrs* attrs = nullptr;
+  km_core_status retVal = km_core_keyboard_get_attrs(keyboard, &attrs);
+  km_core_keyboard_attrs_wasm* attrs_wasm = nullptr;
+  if (attrs) {
+    attrs_wasm = new km_core_keyboard_attrs_wasm();
+    attrs_wasm->version_string = std::u16string(attrs->version_string);
+    attrs_wasm->id = std::u16string(attrs->id);
+    for (const km_core_option_item* item = attrs->default_options; item->key; ++item) {
+      km_core_option_item_wasm item_wasm;
+      item_wasm.key = std::u16string(item->key);
+      item_wasm.value = std::u16string(item->value);
+      item_wasm.scope = item->scope;
+      attrs_wasm->default_options.push_back(item_wasm);
+    }
+  }
+  return new CoreReturn<km_core_keyboard_attrs_wasm>(retVal, attrs_wasm);
+}
+
 EMSCRIPTEN_BINDINGS(core_interface) {
 
   em::value_object<km_core_attr>("km_core_attr")
@@ -74,6 +147,10 @@ EMSCRIPTEN_BINDINGS(core_interface) {
     .field("technology", &km_core_attr::technology)
     //.field("vendor", &km_core_attr::vendor, em::allow_raw_pointers())
     ;
+  em::value_object<km_core_option_item_wasm>("km_core_option_item")
+    .field("key", &km_core_option_item_wasm::key)
+    .field("value", &km_core_option_item_wasm::value)
+    .field("scope", &km_core_option_item_wasm::scope);
 
   em::function("tmp_wasm_attributes", &tmp_wasm_attributes);
 
@@ -99,7 +176,15 @@ EMSCRIPTEN_BINDINGS(core_interface) {
   em::class_<CoreReturn<km_core_keyboard>>("CoreKeyboardReturn")
       .property("status", &CoreReturn<km_core_keyboard>::getStatus)
       .property("object", &CoreReturn<km_core_keyboard>::getObject, em::allow_raw_pointers());
+  em::class_<CoreReturn<km_core_keyboard_attrs_wasm>>("CoreKeyboardAttrsReturn")
+      .property("status", &CoreReturn<km_core_keyboard_attrs_wasm>::getStatus)
+      .property("object", &CoreReturn<km_core_keyboard_attrs_wasm>::getObject, em::allow_raw_pointers());
+  em::class_<km_core_keyboard_attrs_wasm>("km_core_keyboard_attrs")
+    .property("version_string", &km_core_keyboard_attrs_wasm::version_string)
+    .property("id", &km_core_keyboard_attrs_wasm::id)
+    .property("default_options", &km_core_keyboard_attrs_wasm::default_options);
 
   em::function("keyboard_load_from_blob", &km_core_keyboard_load_from_blob_wasm, em::allow_raw_pointers());
+  em::function("keyboard_get_attrs", &km_core_keyboard_get_attrs_wasm, em::allow_raw_pointers());
 }
 #endif
diff --git a/core/tests/unit/wasm/wasm.tests.js b/core/tests/unit/wasm/wasm.tests.js
index c4faafe6940..a69dfc34048 100644
--- a/core/tests/unit/wasm/wasm.tests.js
+++ b/core/tests/unit/wasm/wasm.tests.js
@@ -37,6 +37,22 @@ describe('Unit tests for wasm Core API', function () {
 
     // Verify
     assert.equal(result.status, 0);
-    assert.isNotNull(result.keyboard);
+    assert.isOk(result.object);
+  });
+
+  it('can get keyboard attributes', function () {
+    // Setup
+    const kmxdata = fs.readFileSync(path.join(__dirname, 'tests/unit/kmx/k_022___options_with_preset.kmx'));
+    const keyboard = km_core.keyboard_load_from_blob('k_022___options_with_preset', kmxdata).object;
+
+    // Execute
+    const result = km_core.keyboard_get_attrs(keyboard);
+
+    // Verify
+    assert.equal(result.status, 0);
+    assert.isOk(result.object);
+    assert.equal(result.object.id, 'k_022___options_with_preset');
+    assert.equal(result.object.version_string, '0.0');
+    assert.deepEqual(result.object.default_options, [{ key: 'foo', value: '0', scope: 1 }]);
   });
 });
diff --git a/web/src/engine/core-processor/src/core-factory.ts b/web/src/engine/core-processor/src/KM_Core.ts
similarity index 70%
rename from web/src/engine/core-processor/src/core-factory.ts
rename to web/src/engine/core-processor/src/KM_Core.ts
index ded35ef1a22..c8ca4a56c7f 100644
--- a/web/src/engine/core-processor/src/core-factory.ts
+++ b/web/src/engine/core-processor/src/KM_Core.ts
@@ -1,6 +1,6 @@
 // Keyman is copyright (C) SIL International. MIT License.
 
-import { type MainModule } from './import/core/keymancore.js';
+import { type MainModule as KMXCoreModule } from './import/core/keymancore.js';
 
 // Unfortunately embind has an open issue with enums and typescript where it
 // only generates a type for the enum, but not the values in a usable way.
@@ -20,14 +20,24 @@ export enum KM_CORE_STATUS {
   OS_ERROR = 0x80000000
 }
 
-export class CoreFactory {
-  public static async createCoreProcessor(baseurl: string): Promise<MainModule> {
+export class KM_Core {
+  private static km_core: KMXCoreModule = null;
+
+  static get instance(): KMXCoreModule {
+    return this.km_core;
+  }
+
+  public static async createCoreProcessor(baseurl: string): Promise<KMXCoreModule> {
     const module = await import(baseurl + '/km-core.js');
     const createCoreProcessor = module.default;
-    return await createCoreProcessor({
+    const km_core = createCoreProcessor({
       locateFile: function (path: string, scriptDirectory: string) {
         return baseurl + '/' + path;
       }
     });
+    km_core.then((core: KMXCoreModule) => {
+      this.km_core = core;
+    });
+    return km_core;
   }
 }
\ No newline at end of file
diff --git a/web/src/engine/core-processor/src/index.ts b/web/src/engine/core-processor/src/index.ts
index ecd943b494c..d34471a2cc9 100644
--- a/web/src/engine/core-processor/src/index.ts
+++ b/web/src/engine/core-processor/src/index.ts
@@ -1,3 +1,3 @@
-export { CoreFactory, KM_CORE_STATUS } from './core-factory.js';
-import { type MainModule, type km_core_keyboard, type CoreKeyboardReturn } from './import/core/keymancore.js';
-export { MainModule, km_core_keyboard, CoreKeyboardReturn };
+export { KM_Core, KM_CORE_STATUS } from './KM_Core.js';
+import { type km_core_keyboard } from './import/core/keymancore.js';
+export { km_core_keyboard };
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
index cba8d0f2461..64acb6acca3 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
@@ -1,4 +1,4 @@
-import { MainModule as KmCoreModule, KM_CORE_STATUS } from 'keyman/engine/core-processor';
+import { KM_Core, KM_CORE_STATUS } from 'keyman/engine/core-processor';
 import { JSKeyboard } from "./jsKeyboard.js";
 import { KMXKeyboard } from './kmxKeyboard.js';
 import { KeyboardHarness } from "./keyboardHarness.js";
@@ -10,7 +10,6 @@ export type Keyboard = JSKeyboard | KMXKeyboard;
 
 export abstract class KeyboardLoaderBase {
   private _harness: KeyboardHarness;
-  protected _km_core: Promise<KmCoreModule>;
 
   public get harness(): KeyboardHarness {
     return this._harness;
@@ -20,10 +19,6 @@ export abstract class KeyboardLoaderBase {
     this._harness = harness;
   }
 
-  public set coreModule(km_core: Promise<KmCoreModule>) {
-    this._km_core = km_core;
-  }
-
   /**
    * Load a keyboard from a remote or local URI.
    *
@@ -51,11 +46,9 @@ export abstract class KeyboardLoaderBase {
 
     if (byteArray.slice(0, 4) == Uint8Array.from([0x4b, 0x58, 0x54, 0x53])) { // 'KXTS'
       // KMX or LDML (KMX+) keyboard
-      const result = (await this._km_core).keyboard_load_from_blob(uri, byteArray);
+      const result = KM_Core.instance.keyboard_load_from_blob(uri, byteArray);
       if (result.status == KM_CORE_STATUS.OK) {
-        // extract keyboard name from URI
-        const id = uri.split('#')[0].split('?')[0].split('/').pop().split('.')[0];
-        return new KMXKeyboard(id, result.object);
+        return new KMXKeyboard(result.object);
       }
       return null;
     }
diff --git a/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts b/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts
index 7667ba0131f..88e3c1ddbc3 100644
--- a/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts
+++ b/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts
@@ -1,29 +1,29 @@
-import { km_core_keyboard } from 'keyman/engine/core-processor';
+import { KM_Core, km_core_keyboard } from 'keyman/engine/core-processor';
 
 /**
  * Acts as a wrapper class for KMX(+) Keyman keyboards
  */
 export class KMXKeyboard {
 
-  constructor(id: string, keyboard: km_core_keyboard) {
-    this._id = id;
-    this._keyboard = keyboard;
+  constructor(private _keyboard: km_core_keyboard) {
   }
 
-  private _id: string;
-  private _keyboard: km_core_keyboard;
-
   get isMnemonic(): boolean {
     return false;
   }
 
   get version(): string {
-    // TODO-web-core: get version from `km_core_keyboard_get_attrs`
-    return '';
+    const attrs = KM_Core.instance.keyboard_get_attrs(this._keyboard);
+    const version = attrs.object.version_string;
+    attrs.delete();
+    return version;
   }
 
   get id(): string {
-    return this._id;
+    const attrs = KM_Core.instance.keyboard_get_attrs(this._keyboard);
+    const id = attrs.object.id;
+    attrs.delete();
+    return id;
   }
 
   get keyboard(): km_core_keyboard {
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index da9f848cb5a..8cab289d268 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -5,7 +5,7 @@ import { LanguageProcessor }  from "./languageProcessor.js";
 import type { ModelSpec, PathConfiguration }  from "keyman/engine/interfaces";
 import { globalObject, DeviceSpec } from "@keymanapp/web-utils";
 
-import { CoreFactory, MainModule as KmCoreModule } from 'keyman/engine/core-processor';
+import { KM_Core } from 'keyman/engine/core-processor';
 
 import { Codes, JSKeyboard, KeyboardMinimalInterface, type Keyboard, type KeyEvent } from "keyman/engine/keyboard";
 import {
@@ -35,7 +35,7 @@ export class InputProcessor {
   private contextDevice: DeviceSpec;
   private kbdProcessor: JSKeyboardProcessor;
   private lngProcessor: LanguageProcessor;
-  private km_core: Promise<KmCoreModule>;
+
 
   private readonly contextCache = new TranscriptionCache();
 
@@ -53,8 +53,8 @@ export class InputProcessor {
     this.lngProcessor = new LanguageProcessor(predictiveTextWorker, this.contextCache);
   }
 
-  public init(paths: PathConfiguration) {
-    this.km_core = CoreFactory.createCoreProcessor(paths.basePath);
+  public async init(paths: PathConfiguration): Promise<void> {
+    await KM_Core.createCoreProcessor(paths.basePath);
   }
 
   public get languageProcessor(): LanguageProcessor {
@@ -69,10 +69,6 @@ export class InputProcessor {
     return this.keyboardProcessor.keyboardInterface;
   }
 
-  public get keymanCore(): Promise<KmCoreModule> {
-    return this.km_core;
-  }
-
   public get activeKeyboard(): Keyboard {
     return this.keyboardInterface.activeKeyboard;
   }
diff --git a/web/src/engine/main/src/keymanEngine.ts b/web/src/engine/main/src/keymanEngine.ts
index 61183f496f9..052b4551d07 100644
--- a/web/src/engine/main/src/keymanEngine.ts
+++ b/web/src/engine/main/src/keymanEngine.ts
@@ -238,12 +238,11 @@ export default class KeymanEngine<
     // Initialize supplementary plane string extensions
     String.kmwEnableSupplementaryPlane(true);
 
-    this.core.init(config.paths);
+    await this.core.init(config.paths);
 
     // Since we're not sandboxing keyboard loads yet, we just use `window` as the jsGlobal object.
     // All components initialized below require a properly-configured `config.paths` or similar.
     const keyboardLoader = new KeyboardLoader(this.interface, config.applyCacheBusting);
-    keyboardLoader.coreModule = this.core.keymanCore;
     this.keyboardRequisitioner = new KeyboardRequisitioner(keyboardLoader, new DOMCloudRequester(), this.config.paths);
     this.modelCache = new ModelCache();
     const kbdCache = this.keyboardRequisitioner.cache;
diff --git a/web/src/test/auto/dom/cases/core-processor/basic.tests.ts b/web/src/test/auto/dom/cases/core-processor/basic.tests.ts
index 8c9e0754ab3..ddf3bb1b74f 100644
--- a/web/src/test/auto/dom/cases/core-processor/basic.tests.ts
+++ b/web/src/test/auto/dom/cases/core-processor/basic.tests.ts
@@ -1,5 +1,5 @@
 import { assert } from 'chai';
-import { CoreFactory, KM_CORE_STATUS } from 'keyman/engine/core-processor';
+import { KM_Core, KM_CORE_STATUS } from 'keyman/engine/core-processor';
 
 const coreurl = '/build/engine/core-processor/obj/import/core';
 
@@ -16,23 +16,35 @@ describe('CoreProcessor', function () {
   }
 
   it('can initialize without errors', async function () {
-    assert.isNotNull(await CoreFactory.createCoreProcessor(coreurl));
+    assert.isOk(await KM_Core.createCoreProcessor(coreurl));
   });
 
   it('can call temp function', async function () {
-    const km_core = await CoreFactory.createCoreProcessor(coreurl);
+    const km_core = await KM_Core.createCoreProcessor(coreurl);
     const a = km_core.tmp_wasm_attributes();
-    assert.isNotNull(a);
+    assert.isOk(a);
     assert.isNumber(a.max_context);
     console.dir(a);
   });
 
   it('can load a keyboard from blob', async function () {
-    const km_core = await CoreFactory.createCoreProcessor(coreurl);
+    const km_core = await KM_Core.createCoreProcessor(coreurl);
     const blob = await loadKeyboardBlob('/common/test/resources/keyboards/test_8568_deadkeys.kmx')
     const result = km_core.keyboard_load_from_blob('test', blob);
     assert.equal(result.status, KM_CORE_STATUS.OK);
-    assert.isNotNull(result.object);
+    assert.isOk(result.object);
+    result.delete();
+  });
+
+  it('can get version from keyboard', async function () {
+    const km_core = await KM_Core.createCoreProcessor(coreurl);
+    const blob = await loadKeyboardBlob('/common/test/resources/keyboards/test_8568_deadkeys.kmx')
+    const keyboard = km_core.keyboard_load_from_blob('test', blob);
+    const result = km_core.keyboard_get_attrs(keyboard.object);
+
+    assert.equal(result.status, KM_CORE_STATUS.OK);
+    assert.isOk(result.object);
+    assert.equal(result.object.version_string, '0.0');
     result.delete();
   });
 });

From 8e8816adc208a94b53e1b0f20f2abca34ef1928e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 3 Mar 2025 11:28:39 +0100
Subject: [PATCH 064/254] feat(web): fix tests

---
 web/src/engine/main/src/keymanEngine.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/engine/main/src/keymanEngine.ts b/web/src/engine/main/src/keymanEngine.ts
index 052b4551d07..c5e5af7ca7f 100644
--- a/web/src/engine/main/src/keymanEngine.ts
+++ b/web/src/engine/main/src/keymanEngine.ts
@@ -238,8 +238,6 @@ export default class KeymanEngine<
     // Initialize supplementary plane string extensions
     String.kmwEnableSupplementaryPlane(true);
 
-    await this.core.init(config.paths);
-
     // Since we're not sandboxing keyboard loads yet, we just use `window` as the jsGlobal object.
     // All components initialized below require a properly-configured `config.paths` or similar.
     const keyboardLoader = new KeyboardLoader(this.interface, config.applyCacheBusting);
@@ -334,6 +332,8 @@ export default class KeymanEngine<
     });
     //
     // #endregion
+
+    await this.core.init(config.paths);
   }
 
   /**

From c297c66a64405303e5600a8d3c3dc022ca4d6d86 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Sat, 1 Mar 2025 18:33:17 +0100
Subject: [PATCH 065/254] feat(core): expose state and event API to WASM

---
 core/include/keyman/keyman_core_api.h | 10 ++--
 core/src/km_core_keyboard_api.cpp     |  2 +-
 core/src/km_core_processevent_api.cpp | 11 +++--
 core/src/km_core_state_api.cpp        |  6 +--
 core/src/wasm.cpp                     | 37 ++++++++++++++-
 core/tests/unit/wasm/wasm.tests.js    | 67 ++++++++++++++++++++++++++-
 6 files changed, 116 insertions(+), 17 deletions(-)

diff --git a/core/include/keyman/keyman_core_api.h b/core/include/keyman/keyman_core_api.h
index c0e8de96270..b0d8eeaf73f 100644
--- a/core/include/keyman/keyman_core_api.h
+++ b/core/include/keyman/keyman_core_api.h
@@ -1166,7 +1166,7 @@ returned by [km_core_keyboard_load_from_blob].
 ```c */
 KMN_API
 void
-km_core_keyboard_dispose(km_core_keyboard *keyboard);
+km_core_keyboard_dispose(km_core_keyboard const* keyboard);
 
 /*
 ```
@@ -1384,7 +1384,7 @@ the environment passed.
 ```c */
 KMN_API
 km_core_status
-km_core_state_create(km_core_keyboard *keyboard,
+km_core_state_create(km_core_keyboard const *keyboard,
                     km_core_option_item const *env,
                     km_core_state **out);
 
@@ -1470,7 +1470,7 @@ invalid.
 ```c */
 KMN_API
 void
-km_core_state_dispose(km_core_state *state);
+km_core_state_dispose(km_core_state const *state);
 
 /*
 ```
@@ -1677,7 +1677,7 @@ the state may also be modified.
 ```c */
 KMN_API
 km_core_status
-km_core_process_event(km_core_state *state,
+km_core_process_event(km_core_state const *state,
                      km_core_virtual_key vk,
                      uint16_t modifier_state,
                      uint8_t is_key_down,
@@ -1733,7 +1733,7 @@ the state may also be modified.
 KMN_API
 km_core_status
 km_core_event(
-  km_core_state *state,
+  km_core_state const *state,
   uint32_t event,
   void* data
 );
diff --git a/core/src/km_core_keyboard_api.cpp b/core/src/km_core_keyboard_api.cpp
index cef9f99162b..ab24e7b2929 100644
--- a/core/src/km_core_keyboard_api.cpp
+++ b/core/src/km_core_keyboard_api.cpp
@@ -81,7 +81,7 @@ km_core_keyboard_load_from_blob(
 }
 
 void
-km_core_keyboard_dispose(km_core_keyboard *keyboard)
+km_core_keyboard_dispose(km_core_keyboard const* keyboard)
 {
   delete keyboard;
 }
diff --git a/core/src/km_core_processevent_api.cpp b/core/src/km_core_processevent_api.cpp
index a2bca95ea8b..736e5ee6e0f 100644
--- a/core/src/km_core_processevent_api.cpp
+++ b/core/src/km_core_processevent_api.cpp
@@ -15,7 +15,7 @@
 
 km_core_status
 km_core_event(
-  km_core_state *state,
+  km_core_state const *state,
   uint32_t event,
   void* data
 ) {
@@ -37,19 +37,20 @@ km_core_event(
       return KM_CORE_STATUS_INVALID_ARGUMENT;
   }
 
-  return state->processor().external_event(state, event, data);
+  return const_cast<km_core_state*>(state)->processor().external_event(const_cast<km_core_state*>(state), event, data);
 }
 
 km_core_status
-km_core_process_event(km_core_state *state,
+km_core_process_event(km_core_state const *state_,
                      km_core_virtual_key vk,
                      uint16_t modifier_state,
                      uint8_t is_key_down,
                      uint16_t event_flags) {
-  assert(state != nullptr);
-  if(state == nullptr) {
+  assert(state_ != nullptr);
+  if(state_ == nullptr) {
     return KM_CORE_STATUS_INVALID_ARGUMENT;
   }
+  km_core_state *state = const_cast<km_core_state*>(state_);
   km_core_status status = state->processor().process_event(state, vk, modifier_state, is_key_down, event_flags);
 
   if (state_should_invalidate_context(state, vk, modifier_state, is_key_down, event_flags)) {
diff --git a/core/src/km_core_state_api.cpp b/core/src/km_core_state_api.cpp
index 6c74cd159ba..134067ca8d8 100644
--- a/core/src/km_core_state_api.cpp
+++ b/core/src/km_core_state_api.cpp
@@ -28,7 +28,7 @@ using namespace km::core;
 // Forward declarations
 class context;
 
-km_core_status km_core_state_create(km_core_keyboard * keyboard,
+km_core_status km_core_state_create(km_core_keyboard const *keyboard,
                                   km_core_option_item const *env,
                                   km_core_state ** out)
 {
@@ -38,7 +38,7 @@ km_core_status km_core_state_create(km_core_keyboard * keyboard,
 
   try
   {
-    *out = new km_core_state(static_cast<abstract_processor&>(*keyboard), env);
+    *out = new km_core_state(static_cast<abstract_processor&>(*const_cast<km_core_keyboard*>(keyboard)), env);
   }
   catch (std::bad_alloc &)
   {
@@ -60,7 +60,7 @@ km_core_status km_core_state_clone(km_core_state const *state,
 }
 
 
-void km_core_state_dispose(km_core_state *state)
+void km_core_state_dispose(km_core_state const *state)
 {
   delete state;
 }
diff --git a/core/src/wasm.cpp b/core/src/wasm.cpp
index 6b30dbfc526..8b50b79af77 100644
--- a/core/src/wasm.cpp
+++ b/core/src/wasm.cpp
@@ -9,8 +9,9 @@
 #define EXTERN EMSCRIPTEN_KEEPALIVE
 #endif
 
-#include "processor.hpp"
 #include <keyman_core.h>
+#include "processor.hpp"
+#include "state.hpp"
 
 namespace em = emscripten;
 
@@ -137,6 +138,30 @@ km_core_keyboard_get_attrs_wasm(const km_core_keyboard* keyboard) {
   return new CoreReturn<km_core_keyboard_attrs_wasm>(retVal, attrs_wasm);
 }
 
+EMSCRIPTEN_KEEPALIVE const CoreReturn<km_core_state>*
+km_core_state_create_wasm(const km_core_keyboard* keyboard,
+                          const std::vector<km_core_option_item_wasm>& env) {
+  km_core_option_item* env_c = new km_core_option_item[env.size() + 1];
+  for (size_t i = 0; i < env.size(); ++i) {
+    env_c[i].key = env[i].key.c_str();
+    env_c[i].value = env[i].value.c_str();
+    env_c[i].scope = env[i].scope;
+  }
+  env_c[env.size()] = {nullptr, nullptr, 0};
+
+  km_core_state* state = nullptr;
+  km_core_status retVal = km_core_state_create(keyboard, env_c, &state);
+  delete[] env_c;
+  return new CoreReturn<km_core_state>(retVal, state);
+}
+
+EMSCRIPTEN_KEEPALIVE const CoreReturn<km_core_state>*
+km_core_state_clone_wasm(const km_core_state* state) {
+  km_core_state* new_state = nullptr;
+  km_core_status retVal = km_core_state_clone(state, &new_state);
+  return new CoreReturn<km_core_state>(retVal, new_state);
+}
+
 EMSCRIPTEN_BINDINGS(core_interface) {
 
   em::value_object<km_core_attr>("km_core_attr")
@@ -184,7 +209,17 @@ EMSCRIPTEN_BINDINGS(core_interface) {
     .property("id", &km_core_keyboard_attrs_wasm::id)
     .property("default_options", &km_core_keyboard_attrs_wasm::default_options);
 
+  em::class_<km_core_state>("km_core_state");
+  em::class_<CoreReturn<km_core_state>>("CoreStateReturn")
+      .property("status", &CoreReturn<km_core_state>::getStatus)
+      .property("object", &CoreReturn<km_core_state>::getObject, em::allow_raw_pointers());
+
   em::function("keyboard_load_from_blob", &km_core_keyboard_load_from_blob_wasm, em::allow_raw_pointers());
+  em::function("keyboard_dispose", &km_core_keyboard_dispose, em::allow_raw_pointers());
   em::function("keyboard_get_attrs", &km_core_keyboard_get_attrs_wasm, em::allow_raw_pointers());
+  em::function("state_create", &km_core_state_create_wasm, em::allow_raw_pointers());
+  em::function("state_clone", &km_core_state_clone_wasm, em::allow_raw_pointers());
+  em::function("state_dispose", &km_core_state_dispose, em::allow_raw_pointers());
+  em::function("process_event", &km_core_process_event, em::allow_raw_pointers());
 }
 #endif
diff --git a/core/tests/unit/wasm/wasm.tests.js b/core/tests/unit/wasm/wasm.tests.js
index a69dfc34048..2b5f86a3bed 100644
--- a/core/tests/unit/wasm/wasm.tests.js
+++ b/core/tests/unit/wasm/wasm.tests.js
@@ -40,10 +40,25 @@ describe('Unit tests for wasm Core API', function () {
     assert.isOk(result.object);
   });
 
+  function loadKeyboard(name) {
+    const kmxdata = fs.readFileSync(path.join(__dirname, `tests/unit/kmx/${name}.kmx`));
+    const result = km_core.keyboard_load_from_blob(name, kmxdata);
+    assert.equal(result.status, 0);
+    assert.isOk(result.object);
+    return result.object;
+  }
+
+  it('can dispose keyboard', function () {
+    // Setup
+    const keyboard = loadKeyboard('k_020___deadkeys_and_backspace');
+
+    // Execute
+    km_core.keyboard_dispose(keyboard);
+  });
+
   it('can get keyboard attributes', function () {
     // Setup
-    const kmxdata = fs.readFileSync(path.join(__dirname, 'tests/unit/kmx/k_022___options_with_preset.kmx'));
-    const keyboard = km_core.keyboard_load_from_blob('k_022___options_with_preset', kmxdata).object;
+    const keyboard = loadKeyboard('k_022___options_with_preset');
 
     // Execute
     const result = km_core.keyboard_get_attrs(keyboard);
@@ -55,4 +70,52 @@ describe('Unit tests for wasm Core API', function () {
     assert.equal(result.object.version_string, '0.0');
     assert.deepEqual(result.object.default_options, [{ key: 'foo', value: '0', scope: 1 }]);
   });
+
+  it('can create the state object', function () {
+    // Setup
+    const keyboard = loadKeyboard('k_020___deadkeys_and_backspace');
+
+    // Execute
+    const result = km_core.state_create(keyboard, []);
+
+    // Verify
+    assert.equal(result.status, 0);
+    assert.isOk(result.object);
+  });
+
+  it('can dispose the state object', function () {
+    // Setup
+    const keyboard = loadKeyboard('k_020___deadkeys_and_backspace');
+    const state = km_core.state_create(keyboard, []);
+
+    // Execute
+    km_core.state_dispose(state.object);
+  });
+
+  it('can clone the state object', function () {
+    // Setup
+    const keyboard = loadKeyboard('k_020___deadkeys_and_backspace');
+    const state = km_core.state_create(keyboard, []);
+
+    // Execute
+    const result = km_core.state_clone(state.object);
+
+    // Verify
+    assert.equal(result.status, 0);
+    assert.isOk(result.object);
+    // TODO-web-core: add deeper tests
+  });
+
+  it('can process event', function () {
+    // Setup
+    const keyboard = loadKeyboard('k_020___deadkeys_and_backspace');
+    const state = km_core.state_create(keyboard, []);
+
+    // Execute
+    const status = km_core.process_event(state.object, 0x20, 0, 1, 0);
+
+    // Verify
+    assert.equal(status, 0);
+    // TODO-web-core: add more asserts
+  });
 });

From b2cccdd996ae71a9c3fa07591ed1525f8375f70c Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 3 Mar 2025 10:01:12 +0100
Subject: [PATCH 066/254] feat(core): expose context and actions APIs to WASM

---
 core/include/keyman/keyman_core_api.h |  2 +-
 core/src/km_core_state_api.cpp        |  3 +-
 core/src/wasm.cpp                     | 63 +++++++++++++++++++++++++++
 core/tests/unit/wasm/wasm.tests.js    | 27 ++++++++++--
 4 files changed, 90 insertions(+), 5 deletions(-)

diff --git a/core/include/keyman/keyman_core_api.h b/core/include/keyman/keyman_core_api.h
index b0d8eeaf73f..6ed5847894f 100644
--- a/core/include/keyman/keyman_core_api.h
+++ b/core/include/keyman/keyman_core_api.h
@@ -1538,7 +1538,7 @@ Returns a debug formatted string of the context from the state.
 ```c */
 KMN_API
 km_core_cu *
-km_core_state_context_debug(km_core_state *state, km_core_debug_context_type context_type);
+km_core_state_context_debug(const km_core_state *state, km_core_debug_context_type context_type);
 
 /*
 ```
diff --git a/core/src/km_core_state_api.cpp b/core/src/km_core_state_api.cpp
index 134067ca8d8..82e24909f01 100644
--- a/core/src/km_core_state_api.cpp
+++ b/core/src/km_core_state_api.cpp
@@ -301,10 +301,11 @@ km_core_cu * _new_error_string(std::u16string const str) {
 }
 
 km_core_cu * km_core_state_context_debug(
-  km_core_state *state,
+  const km_core_state *state_,
   km_core_debug_context_type context_type
 ) {
   km_core_context_item * context_items = nullptr;
+  km_core_state* state = const_cast<km_core_state*>(state_);
 
   if(context_type == KM_CORE_DEBUG_CONTEXT_INTERMEDIATE) {
     if(km_core_state_get_intermediate_context(state, &context_items) != KM_CORE_STATUS_OK) {
diff --git a/core/src/wasm.cpp b/core/src/wasm.cpp
index 8b50b79af77..34487f937d7 100644
--- a/core/src/wasm.cpp
+++ b/core/src/wasm.cpp
@@ -81,6 +81,17 @@ class km_core_keyboard_attrs_wasm {
   std::vector<km_core_option_item_wasm> default_options;
 };
 
+class km_core_actions_wasm {
+public:
+  unsigned int code_points_to_delete;
+  std::u32string output;
+  std::vector<km_core_option_item_wasm> persist_options;
+  bool do_alert;
+  bool emit_keystroke;
+  int new_caps_lock_state;
+  std::u32string deleted_context;
+};
+
 template <typename T> class CoreReturn {
 public:
   CoreReturn(int status = 0, const T* obj = nullptr) : status(status), object(obj) {
@@ -162,6 +173,44 @@ km_core_state_clone_wasm(const km_core_state* state) {
   return new CoreReturn<km_core_state>(retVal, new_state);
 }
 
+EMSCRIPTEN_KEEPALIVE int
+km_core_state_context_set_if_needed_wasm(
+  km_core_state const* state,
+std::u16string application_context) {
+  return km_core_state_context_set_if_needed(const_cast<km_core_state*>(state), application_context.c_str());
+}
+
+EMSCRIPTEN_KEEPALIVE std::u16string
+km_core_state_context_debug_wasm(const km_core_state* state, int context_type) {
+  std::u16string context;
+  km_core_cu* context_c = km_core_state_context_debug(state, static_cast<km_core_debug_context_type>(context_type));
+  if (context_c) {
+    context = std::u16string(context_c);
+    km_core_cu_dispose(context_c);
+  }
+  return context;
+}
+
+EMSCRIPTEN_KEEPALIVE km_core_actions_wasm*
+km_core_state_get_actions_wasm(km_core_state const *state) {
+  km_core_actions const* actions = km_core_state_get_actions(state);
+  km_core_actions_wasm* actions_wasm = new km_core_actions_wasm();
+  actions_wasm->code_points_to_delete = actions->code_points_to_delete;
+  actions_wasm->output = std::u32string(actions->output);
+  actions_wasm->do_alert = actions->do_alert;
+  actions_wasm->emit_keystroke = actions->emit_keystroke;
+  actions_wasm->new_caps_lock_state = actions->new_caps_lock_state;
+  actions_wasm->deleted_context = std::u32string(actions->deleted_context);
+  for (const km_core_option_item* item = actions->persist_options; item->key; ++item) {
+    km_core_option_item_wasm item_wasm;
+    item_wasm.key = std::u16string(item->key);
+    item_wasm.value = std::u16string(item->value);
+    item_wasm.scope = item->scope;
+    actions_wasm->persist_options.push_back(item_wasm);
+  }
+  return actions_wasm;
+}
+
 EMSCRIPTEN_BINDINGS(core_interface) {
 
   em::value_object<km_core_attr>("km_core_attr")
@@ -208,6 +257,14 @@ EMSCRIPTEN_BINDINGS(core_interface) {
     .property("version_string", &km_core_keyboard_attrs_wasm::version_string)
     .property("id", &km_core_keyboard_attrs_wasm::id)
     .property("default_options", &km_core_keyboard_attrs_wasm::default_options);
+  em::class_<km_core_actions_wasm>("km_core_actions")
+    .property("code_points_to_delete", &km_core_actions_wasm::code_points_to_delete)
+    .property("output", &km_core_actions_wasm::output)
+    .property("persist_options", &km_core_actions_wasm::persist_options)
+    .property("do_alert", &km_core_actions_wasm::do_alert)
+    .property("emit_keystroke", &km_core_actions_wasm::emit_keystroke)
+    .property("new_caps_lock_state", &km_core_actions_wasm::new_caps_lock_state)
+    .property("deleted_context", &km_core_actions_wasm::deleted_context);
 
   em::class_<km_core_state>("km_core_state");
   em::class_<CoreReturn<km_core_state>>("CoreStateReturn")
@@ -221,5 +278,11 @@ EMSCRIPTEN_BINDINGS(core_interface) {
   em::function("state_clone", &km_core_state_clone_wasm, em::allow_raw_pointers());
   em::function("state_dispose", &km_core_state_dispose, em::allow_raw_pointers());
   em::function("process_event", &km_core_process_event, em::allow_raw_pointers());
+
+  em::function("state_context_set_if_needed", &km_core_state_context_set_if_needed_wasm, em::allow_raw_pointers());
+  em::function("state_context_clear", &km_core_state_context_clear, em::allow_raw_pointers());
+  em::function("state_context_debug", &km_core_state_context_debug_wasm, em::allow_raw_pointers());
+
+  em::function("state_get_actions", &km_core_state_get_actions_wasm, em::allow_raw_pointers());
 }
 #endif
diff --git a/core/tests/unit/wasm/wasm.tests.js b/core/tests/unit/wasm/wasm.tests.js
index 2b5f86a3bed..fd349d023ba 100644
--- a/core/tests/unit/wasm/wasm.tests.js
+++ b/core/tests/unit/wasm/wasm.tests.js
@@ -109,13 +109,34 @@ describe('Unit tests for wasm Core API', function () {
   it('can process event', function () {
     // Setup
     const keyboard = loadKeyboard('k_020___deadkeys_and_backspace');
-    const state = km_core.state_create(keyboard, []);
+    const state = km_core.state_create(keyboard, []).object;
 
     // Execute
-    const status = km_core.process_event(state.object, 0x20, 0, 1, 0);
+    const status = km_core.process_event(state, 0x20, 0, 1, 0);
 
     // Verify
     assert.equal(status, 0);
-    // TODO-web-core: add more asserts
+
+    const actions = km_core.state_get_actions(state);
+    assert.equal(actions.output, ' ');
+    assert.lengthOf(actions.persist_options, 0);
+    assert.equal(actions.do_alert, false);
+    assert.equal(actions.emit_keystroke, false);
+    assert.equal(actions.new_caps_lock_state, -1);
+    assert.equal(actions.deleted_context, '');
+  });
+
+  it('can set the context', function () {
+    const keyboard = loadKeyboard('k_020___deadkeys_and_backspace');
+    const state = km_core.state_create(keyboard, []).object;
+
+    // Execute
+    const status = km_core.state_context_set_if_needed(state, 'abc');
+
+    // Verify
+    assert.equal(status, 1); // KM_CORE_CONTEXT_STATUS_UPDATED
+
+    const context = km_core.state_context_debug(state, 0);
+    assert.equal(context, '|abc| (len: 3) [ U+0061 U+0062 U+0063 ]');
   });
 });

From bd1c610d65cb79064c0d955c51f98d98cdc89f50 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 3 Mar 2025 11:06:15 +0100
Subject: [PATCH 067/254] refactor(web): rename base `KeymanEngine` to
 `KeymanEngineBase`

---
 web/src/app/browser/src/context/pageIntegrationHandlers.ts  | 2 +-
 web/src/app/browser/src/debug-main.ts                       | 2 +-
 web/src/app/browser/src/keyboardInterface.ts                | 2 +-
 web/src/app/browser/src/keymanEngine.ts                     | 4 ++--
 web/src/app/browser/src/languageMenu.ts                     | 2 +-
 web/src/app/browser/src/oskConfiguration.ts                 | 2 +-
 web/src/app/browser/src/release-main.ts                     | 2 +-
 web/src/app/browser/src/test-index.ts                       | 2 +-
 web/src/app/browser/src/utils/rotationProcessor.ts          | 2 +-
 web/src/app/browser/src/viewsAnchorpoint.ts                 | 2 +-
 web/src/app/webview/src/debug-main.ts                       | 2 +-
 web/src/app/webview/src/keymanEngine.ts                     | 4 ++--
 web/src/app/webview/src/oskConfiguration.ts                 | 2 +-
 web/src/app/webview/src/release-main.ts                     | 2 +-
 web/src/engine/main/src/index.ts                            | 2 +-
 web/src/engine/main/src/keyboardInterface.ts                | 6 +++---
 .../main/src/{keymanEngine.ts => keymanEngineBase.ts}       | 4 ++--
 17 files changed, 22 insertions(+), 22 deletions(-)
 rename web/src/engine/main/src/{keymanEngine.ts => keymanEngineBase.ts} (99%)

diff --git a/web/src/app/browser/src/context/pageIntegrationHandlers.ts b/web/src/app/browser/src/context/pageIntegrationHandlers.ts
index 807ddf73ee1..293d3cc0bf2 100644
--- a/web/src/app/browser/src/context/pageIntegrationHandlers.ts
+++ b/web/src/app/browser/src/context/pageIntegrationHandlers.ts
@@ -1,6 +1,6 @@
 import { DomEventTracker } from 'keyman/engine/events';
 
-import KeymanEngine from "../keymanEngine.js";
+import { KeymanEngine } from "../keymanEngine.js";
 import { FocusAssistant } from './focusAssistant.js';
 import { RotationProcessor } from '../utils/rotationProcessor.js';
 
diff --git a/web/src/app/browser/src/debug-main.ts b/web/src/app/browser/src/debug-main.ts
index 2613cf3a112..d0be8929a51 100644
--- a/web/src/app/browser/src/debug-main.ts
+++ b/web/src/app/browser/src/debug-main.ts
@@ -1,4 +1,4 @@
-import KeymanEngine from './keymanEngine.js'
+import { KeymanEngine } from './keymanEngine.js'
 import { SourcemappedWorker } from '@keymanapp/lexical-model-layer/web'
 
  /**
diff --git a/web/src/app/browser/src/keyboardInterface.ts b/web/src/app/browser/src/keyboardInterface.ts
index 9607c7a92d6..e9b0bda3795 100644
--- a/web/src/app/browser/src/keyboardInterface.ts
+++ b/web/src/app/browser/src/keyboardInterface.ts
@@ -3,7 +3,7 @@ import { FloatingOSKView } from 'keyman/engine/osk';
 import { KeyboardInterface as KeyboardInterfaceBase } from 'keyman/engine/main';
 
 import ContextManager from './contextManager.js';
-import KeymanEngine from './keymanEngine.js';
+import { KeymanEngine } from './keymanEngine.js';
 
 export default class KeyboardInterface extends KeyboardInterfaceBase<ContextManager> {
   constructor(
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 31cac7a216d..b9c528abb44 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -1,5 +1,5 @@
 import { KeymanWebKeyboard } from '@keymanapp/common-types';
-import { KeymanEngine as KeymanEngineBase, DeviceDetector } from 'keyman/engine/main';
+import { KeymanEngineBase, DeviceDetector } from 'keyman/engine/main';
 import { getAbsoluteY } from 'keyman/engine/dom-utils';
 import { OutputTarget } from 'keyman/engine/element-wrappers';
 import {
@@ -28,7 +28,7 @@ import { HotkeyManager } from './hotkeyManager.js';
 import { BeepHandler } from './beepHandler.js';
 import KeyboardInterface from './keyboardInterface.js';
 
-export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, ContextManager, HardwareEventKeyboard> {
+export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, ContextManager, HardwareEventKeyboard> {
   touchLanguageMenu?: LanguageMenu;
   private pageIntegration: PageIntegrationHandlers;
 
diff --git a/web/src/app/browser/src/languageMenu.ts b/web/src/app/browser/src/languageMenu.ts
index d3144de6e5f..cc86e1984bc 100644
--- a/web/src/app/browser/src/languageMenu.ts
+++ b/web/src/app/browser/src/languageMenu.ts
@@ -2,7 +2,7 @@
 import { getAbsoluteX, landscapeView } from "keyman/engine/dom-utils";
 import { KeyboardStub } from "keyman/engine/keyboard-storage";
 
-import KeymanEngine from "./keymanEngine.js";
+import { KeymanEngine } from "./keymanEngine.js";
 import * as util from "./utils/index.js";
 
 interface KeyboardTag {
diff --git a/web/src/app/browser/src/oskConfiguration.ts b/web/src/app/browser/src/oskConfiguration.ts
index 154b9698653..d9f5764671d 100644
--- a/web/src/app/browser/src/oskConfiguration.ts
+++ b/web/src/app/browser/src/oskConfiguration.ts
@@ -1,7 +1,7 @@
 import { OSKView } from "keyman/engine/osk";
 import { KEYMAN_VERSION } from "@keymanapp/keyman-version";
 import ContextManager from "./contextManager.js";
-import KeymanEngine from "./keymanEngine.js";
+import { KeymanEngine } from "./keymanEngine.js";
 import { LanguageMenu } from "./languageMenu.js";
 
 export function setupOskListeners(engine: KeymanEngine, osk: OSKView, contextManager: ContextManager) {
diff --git a/web/src/app/browser/src/release-main.ts b/web/src/app/browser/src/release-main.ts
index 62fefb5ad23..b06adb8f303 100644
--- a/web/src/app/browser/src/release-main.ts
+++ b/web/src/app/browser/src/release-main.ts
@@ -1,4 +1,4 @@
-import KeymanEngine from './keymanEngine.js'
+import { KeymanEngine } from './keymanEngine.js'
 import { Worker } from '@keymanapp/lexical-model-layer/web'
 
  /**
diff --git a/web/src/app/browser/src/test-index.ts b/web/src/app/browser/src/test-index.ts
index 47d3591311d..408b47cba6b 100644
--- a/web/src/app/browser/src/test-index.ts
+++ b/web/src/app/browser/src/test-index.ts
@@ -2,6 +2,6 @@ export { BrowserConfiguration, BrowserInitOptionSpec } from './configuration.js'
 export { default as ContextManager, KeyboardCookie } from "./contextManager.js";
 export { preprocessKeyboardEvent, default as HardwareEventKeyboard } from './hardwareEventKeyboard.js';
 
-export { default as KeymanEngine } from './keymanEngine.js';
+export { KeymanEngine } from './keymanEngine.js';
 export { default as KeyboardInterface } from './keyboardInterface.js';
 export { UIModule } from './uiModuleInterface.js';
diff --git a/web/src/app/browser/src/utils/rotationProcessor.ts b/web/src/app/browser/src/utils/rotationProcessor.ts
index e8141d1ab1a..bb9d98a02c9 100644
--- a/web/src/app/browser/src/utils/rotationProcessor.ts
+++ b/web/src/app/browser/src/utils/rotationProcessor.ts
@@ -1,4 +1,4 @@
-import KeymanEngine from "../keymanEngine.js";
+import { KeymanEngine } from "../keymanEngine.js";
 
 class RotationState {
   innerWidth: number;
diff --git a/web/src/app/browser/src/viewsAnchorpoint.ts b/web/src/app/browser/src/viewsAnchorpoint.ts
index 3df908c402e..474dd245c2d 100644
--- a/web/src/app/browser/src/viewsAnchorpoint.ts
+++ b/web/src/app/browser/src/viewsAnchorpoint.ts
@@ -5,7 +5,7 @@ import {
   FloatingOSKViewConfiguration,
   InlinedOSKView
 } from "keyman/engine/osk";
-import KeymanEngine from "./keymanEngine.js";
+import { KeymanEngine } from "./keymanEngine.js";
 
 function buildBaseOskConfiguration(engine: KeymanEngine) {
   return {
diff --git a/web/src/app/webview/src/debug-main.ts b/web/src/app/webview/src/debug-main.ts
index d903a9d5360..7961212081c 100644
--- a/web/src/app/webview/src/debug-main.ts
+++ b/web/src/app/webview/src/debug-main.ts
@@ -1,4 +1,4 @@
-import KeymanEngine from './keymanEngine.js'
+import { KeymanEngine } from './keymanEngine.js'
 import { SourcemappedWorker } from '@keymanapp/lexical-model-layer/web'
 
  /**
diff --git a/web/src/app/webview/src/keymanEngine.ts b/web/src/app/webview/src/keymanEngine.ts
index d390a6ce1b2..e7bb25bf160 100644
--- a/web/src/app/webview/src/keymanEngine.ts
+++ b/web/src/app/webview/src/keymanEngine.ts
@@ -1,6 +1,6 @@
 import { DeviceSpec, DefaultRules } from 'keyman/engine/keyboard';
 import { RuleBehavior } from 'keyman/engine/js-processor';
-import { KeymanEngine as KeymanEngineBase, KeyboardInterface } from 'keyman/engine/main';
+import { KeymanEngineBase, KeyboardInterface } from 'keyman/engine/main';
 import { AnchoredOSKView, ViewConfiguration, StaticActivator } from 'keyman/engine/osk';
 import { getAbsoluteX, getAbsoluteY } from 'keyman/engine/dom-utils';
 import { toPrefixedKeyboardId, toUnprefixedKeyboardId } from 'keyman/engine/keyboard-storage';
@@ -10,7 +10,7 @@ import ContextManager, { ContextHost } from './contextManager.js';
 import PassthroughKeyboard from './passthroughKeyboard.js';
 import { buildEmbeddedGestureConfig, setupEmbeddedListeners } from './oskConfiguration.js';
 
-export default class KeymanEngine extends KeymanEngineBase<WebviewConfiguration, ContextManager, PassthroughKeyboard> {
+export class KeymanEngine extends KeymanEngineBase<WebviewConfiguration, ContextManager, PassthroughKeyboard> {
   // Ideally, we would be able to auto-detect `sourceUri`: https://stackoverflow.com/a/60244278.
   // But it's too new of a feature to utilize... and also expects to be in a module, when this may
   // be compiled down to an IIFE.
diff --git a/web/src/app/webview/src/oskConfiguration.ts b/web/src/app/webview/src/oskConfiguration.ts
index 9250b5a2a1d..cd0bdd9b4fb 100644
--- a/web/src/app/webview/src/oskConfiguration.ts
+++ b/web/src/app/webview/src/oskConfiguration.ts
@@ -3,7 +3,7 @@ import { DeviceSpec } from "keyman/engine/keyboard";
 import { type EmbeddedGestureConfig } from "keyman/engine/osk";
 
 import { GlobeHint } from './osk/globeHint.js';
-import type KeymanEngine from "./keymanEngine.js";
+import { type KeymanEngine }  from "./keymanEngine.js";
 
 export function setupEmbeddedListeners(engine: KeymanEngine, osk: OSKView) {
   osk.on('globekey', (key, on) => {
diff --git a/web/src/app/webview/src/release-main.ts b/web/src/app/webview/src/release-main.ts
index e594e0b70f6..d456f75e572 100644
--- a/web/src/app/webview/src/release-main.ts
+++ b/web/src/app/webview/src/release-main.ts
@@ -1,4 +1,4 @@
-import KeymanEngine from './keymanEngine.js'
+import { KeymanEngine } from './keymanEngine.js'
 import { Worker } from '@keymanapp/lexical-model-layer/web'
 
  /**
diff --git a/web/src/engine/main/src/index.ts b/web/src/engine/main/src/index.ts
index 9e33d0d4ef5..2a8a8533627 100644
--- a/web/src/engine/main/src/index.ts
+++ b/web/src/engine/main/src/index.ts
@@ -2,7 +2,7 @@ export { EngineConfiguration, InitOptionDefaults, InitOptionSpec } from './engin
 export { ContextManagerBase, ContextManagerConfiguration } from './contextManagerBase.js';
 export { default as HardKeyboard, processForMnemonicsAndLegacy } from './hardKeyboard.js';
 export { default as KeyboardInterface } from './keyboardInterface.js';
-export { default as KeymanEngine } from './keymanEngine.js';
+export { KeymanEngineBase } from './keymanEngineBase.js';
 export { LegacyAPIEvents } from './legacyAPIEvents.js';
 export { VariableStoreCookieSerializer } from './variableStoreCookieSerializer.js';
 export { LanguageProcessor } from './headless/languageProcessor.js';
diff --git a/web/src/engine/main/src/keyboardInterface.ts b/web/src/engine/main/src/keyboardInterface.ts
index d36d8f6ebf1..63e54139c26 100644
--- a/web/src/engine/main/src/keyboardInterface.ts
+++ b/web/src/engine/main/src/keyboardInterface.ts
@@ -6,16 +6,16 @@ import KeyboardObject = KeymanWebKeyboard.KeyboardObject;
 
 import { ContextManagerBase } from './contextManagerBase.js';
 import { VariableStoreCookieSerializer } from "./variableStoreCookieSerializer.js";
-import KeymanEngine from "./keymanEngine.js";
+import { KeymanEngineBase } from "./keymanEngineBase.js";
 import { EngineConfiguration } from "./engineConfiguration.js";
 
 export default class KeyboardInterface<ContextManagerType extends ContextManagerBase<any>> extends KeyboardInterfaceBase {
-  protected readonly engine: KeymanEngine<EngineConfiguration, ContextManagerType, any>;
+  protected readonly engine: KeymanEngineBase<EngineConfiguration, ContextManagerType, any>;
   private stubNamespacer?: (stub: RawKeyboardStub) => void;
 
   constructor(
     _jsGlobal: any,
-    engine: KeymanEngine<any, ContextManagerType, any>,
+    engine: KeymanEngineBase<any, ContextManagerType, any>,
     stubNamespacer?: (stub: RawKeyboardStub) => void
   ) {
     super(_jsGlobal, engine, new VariableStoreCookieSerializer());
diff --git a/web/src/engine/main/src/keymanEngine.ts b/web/src/engine/main/src/keymanEngineBase.ts
similarity index 99%
rename from web/src/engine/main/src/keymanEngine.ts
rename to web/src/engine/main/src/keymanEngineBase.ts
index c5e5af7ca7f..074fdfbb57c 100644
--- a/web/src/engine/main/src/keymanEngine.ts
+++ b/web/src/engine/main/src/keymanEngineBase.ts
@@ -33,7 +33,7 @@ function determineBaseLayout(): string {
 export type KeyEventFullResultCallback = (result: RuleBehavior, error?: Error) => void;
 export type KeyEventFullHandler = (event: KeyEvent, callback?: KeyEventFullResultCallback) => void;
 
-export default class KeymanEngine<
+export class KeymanEngineBase<
   Configuration extends EngineConfiguration,
   ContextManager extends ContextManagerBase<any>,
   HardKeyboard extends HardKeyboardBase
@@ -115,7 +115,7 @@ export default class KeymanEngine<
     worker: Worker,
     config: Configuration,
     contextManager: ContextManager,
-    processorConfigInitializer: (engine: KeymanEngine<Configuration, ContextManager, HardKeyboard>) => ProcessorConfiguration
+    processorConfigInitializer: (engine: KeymanEngineBase<Configuration, ContextManager, HardKeyboard>) => ProcessorConfiguration
   ) {
     this.config = config;
     this.contextManager = contextManager;

From 3b2157cb8334b7e44a542f89e48a9094b946e6f1 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 3 Mar 2025 15:01:00 +0100
Subject: [PATCH 068/254] refactor(web): cleanup OutputTarget class names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- rename `js-processor`'s `OutputTarget` → `OutputTargetBase`
- rename `element-wrappers`' `OutputTarget` → `OutputTargetElementWrapper`
---
 web/src/app/browser/src/beepHandler.ts        |  8 ++--
 web/src/app/browser/src/configuration.ts      |  5 ++-
 web/src/app/browser/src/contextManager.ts     | 26 ++++++------
 .../app/browser/src/defaultBrowserRules.ts    |  4 +-
 web/src/app/browser/src/keyboardInterface.ts  |  4 +-
 web/src/app/browser/src/keymanEngine.ts       |  4 +-
 web/src/app/webview/src/contextManager.ts     |  8 ++--
 .../engine/attachment/src/attachmentInfo.ts   |  6 +--
 .../element-wrappers/src/contentEditable.ts   |  4 +-
 .../element-wrappers/src/designIFrame.ts      |  4 +-
 web/src/engine/element-wrappers/src/index.ts  | 12 +++---
 web/src/engine/element-wrappers/src/input.ts  |  4 +-
 ...arget.ts => outputTargetElementWrapper.ts} |  4 +-
 .../engine/element-wrappers/src/textarea.ts   |  4 +-
 .../element-wrappers/src/wrapElement.ts       | 12 +++---
 web/src/engine/js-processor/src/index.ts      |  6 +--
 .../js-processor/src/jsKeyboardInterface.ts   | 36 ++++++++--------
 .../js-processor/src/jsKeyboardProcessor.ts   | 20 ++++-----
 web/src/engine/js-processor/src/mock.ts       |  6 +--
 .../{outputTarget.ts => outputTargetBase.ts}  | 10 ++---
 .../engine/js-processor/src/ruleBehavior.ts   |  6 +--
 web/src/engine/keyboard/src/defaultRules.ts   |  2 +-
 web/src/engine/keyboard/src/index.ts          |  2 +-
 .../keyboard/src/keyboards/jsKeyboard.ts      |  2 +-
 ...putTarget.interface.ts => outputTarget.ts} |  0
 web/src/engine/main/src/contextManagerBase.ts |  4 +-
 .../engine/main/src/engineConfiguration.ts    |  4 +-
 .../main/src/headless/inputProcessor.ts       | 41 ++++++++++++-------
 .../main/src/headless/languageProcessor.ts    | 29 ++++++++-----
 web/src/engine/main/src/keymanEngineBase.ts   | 14 ++++---
 .../tools/testing/recorder-core/src/index.ts  |  4 +-
 .../testing/recorder-core/src/nodeProctor.ts  |  8 ++--
 .../testing/recorder-core/src/proctor.ts      |  2 +-
 .../tools/testing/recorder/browserProctor.ts  |  2 +-
 34 files changed, 168 insertions(+), 139 deletions(-)
 rename web/src/engine/element-wrappers/src/{outputTarget.ts => outputTargetElementWrapper.ts} (88%)
 rename web/src/engine/js-processor/src/{outputTarget.ts => outputTargetBase.ts} (96%)
 rename web/src/engine/keyboard/src/{outputTarget.interface.ts => outputTarget.ts} (100%)

diff --git a/web/src/app/browser/src/beepHandler.ts b/web/src/app/browser/src/beepHandler.ts
index 1c1de463a8c..4836e03698b 100644
--- a/web/src/app/browser/src/beepHandler.ts
+++ b/web/src/app/browser/src/beepHandler.ts
@@ -1,6 +1,6 @@
 import { type JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { JSKeyboard, type KeyboardMinimalInterface } from 'keyman/engine/keyboard';
-import { DesignIFrame, OutputTarget } from 'keyman/engine/element-wrappers';
+import { DesignIFrame, OutputTargetElementWrapper } from 'keyman/engine/element-wrappers';
 
 // Utility object used to handle beep (keyboard error response) operations.
 class BeepData {
@@ -33,13 +33,13 @@ export class BeepHandler {
    * @param       {Object}      Pelem     element to flash
    * Description  Flash body as substitute for audible beep; notify embedded device to vibrate
    */
-  beep(outputTarget: OutputTarget<any>) {
-    if(!(outputTarget instanceof OutputTarget)) {
+  beep(outputTarget: OutputTargetElementWrapper<any>) {
+    if (!(outputTarget instanceof OutputTargetElementWrapper)) {
       return;
     }
 
     // All code after this point is DOM-based, triggered by the beep.
-    var Pelem: HTMLElement = outputTarget.getElement();
+    let  Pelem: HTMLElement = outputTarget.getElement();
     if(outputTarget instanceof DesignIFrame) {
       Pelem = outputTarget.docRoot; // I1446 - beep sometimes fails to flash when using OSK and rich control
     }
diff --git a/web/src/app/browser/src/configuration.ts b/web/src/app/browser/src/configuration.ts
index df2153df828..4831b74c55b 100644
--- a/web/src/app/browser/src/configuration.ts
+++ b/web/src/app/browser/src/configuration.ts
@@ -1,7 +1,8 @@
 import { EngineConfiguration, InitOptionSpec, InitOptionDefaults } from "keyman/engine/main";
 
-import { OutputTarget as DOMOutputTarget } from 'keyman/engine/element-wrappers';
-import { isEmptyTransform, OutputTarget, RuleBehavior } from 'keyman/engine/js-processor';
+import { OutputTargetElementWrapper as DOMOutputTarget } from 'keyman/engine/element-wrappers';
+import { OutputTarget } from 'keyman/engine/keyboard';
+import { isEmptyTransform, RuleBehavior } from 'keyman/engine/js-processor';
 import { AlertHost } from "./utils/alertHost.js";
 import { whenDocumentReady } from "./utils/documentReady.js";
 
diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index 527b47f5ab2..d64a275aebb 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -3,7 +3,7 @@ import { type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { CookieSerializer } from 'keyman/engine/dom-utils';
 import { eventOutputTarget, outputTargetForElement, PageContextAttachment } from 'keyman/engine/attachment';
 import { DomEventTracker, LegacyEventEmitter } from 'keyman/engine/events';
-import { DesignIFrame, OutputTarget, nestedInstanceOf } from 'keyman/engine/element-wrappers';
+import { DesignIFrame, OutputTargetElementWrapper, nestedInstanceOf } from 'keyman/engine/element-wrappers';
 import {
   ContextManagerBase,
   type KeyboardInterface,
@@ -47,8 +47,8 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
   private cookieManager = new CookieSerializer<KeyboardCookie>('KeymanWeb_Keyboard');
   readonly focusAssistant = new FocusAssistant(() => this.activeTarget?.isForcingScroll());
   readonly page: PageContextAttachment;
-  private mostRecentTarget: OutputTarget<any>;
-  private currentTarget: OutputTarget<any>;
+  private mostRecentTarget: OutputTargetElementWrapper<any>;
+  private currentTarget: OutputTargetElementWrapper<any>;
 
   private globalKeyboard: {keyboard: JSKeyboard, metadata: KeyboardStub};
 
@@ -175,7 +175,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     });
   }
 
-  get activeTarget(): OutputTarget<any> {
+  get activeTarget(): OutputTargetElementWrapper<any> {
     /*
      * Assumption:  the maintainingFocus flag may only be set when there is a current target.
      * This is not enforced proactively at present, but the assumption should hold.  (2023-05-03)
@@ -184,7 +184,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     return this.currentTarget || (maintainingFocus ? this.mostRecentTarget : null);
   }
 
-  get lastActiveTarget(): OutputTarget<any> {
+  get lastActiveTarget(): OutputTargetElementWrapper<any> {
     return this.mostRecentTarget;
   }
 
@@ -229,7 +229,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     }
   }
 
-  public setActiveTarget(target: OutputTarget<any>, sendEvents?: boolean) {
+  public setActiveTarget(target: OutputTargetElementWrapper<any>, sendEvents?: boolean) {
     const previousTarget = this.mostRecentTarget;
     const originalTarget = this.activeTarget; // may differ, depending on focus state.
 
@@ -369,7 +369,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
    *
    * This is based on the current `.activeTarget` and its related attachment metadata.
    */
-  protected currentKeyboardSrcTarget(): OutputTarget<any> {
+  protected currentKeyboardSrcTarget(): OutputTargetElementWrapper<any> {
     let target = this.currentTarget || this.mostRecentTarget;
 
     if(this.isTargetKeyboardIndependent(target)) {
@@ -379,7 +379,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     }
   }
 
-  private isTargetKeyboardIndependent(target: OutputTarget<any>): boolean {
+  private isTargetKeyboardIndependent(target: OutputTargetElementWrapper<any>): boolean {
     let attachmentInfo = target?.getElement()._kmwAttachment;
 
     // If null or undefined, we're in 'global' mode.
@@ -387,7 +387,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
   }
 
   // Note:  is part of the keyboard activation process.  Not to be called directly by published API.
-  activateKeyboardForTarget(kbd: {keyboard: JSKeyboard, metadata: KeyboardStub}, target: OutputTarget<any>) {
+  activateKeyboardForTarget(kbd: { keyboard: JSKeyboard, metadata: KeyboardStub }, target: OutputTargetElementWrapper<any>) {
     let attachment = target?.getElement()._kmwAttachment;
 
     if(!attachment) {
@@ -421,7 +421,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
    * @param target
    * @param metadata
    */
-  public setKeyboardForTarget(target: OutputTarget<any>, kbdId: string, langId: string) {
+  public setKeyboardForTarget(target: OutputTargetElementWrapper<any>, kbdId: string, langId: string) {
     if(target instanceof DesignIFrame) {
       console.warn("'keymanweb.setKeyboardForControl' cannot set keyboard on iframes.");
       return;
@@ -456,7 +456,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     }
   }
 
-  public getKeyboardStubForTarget(target: OutputTarget<any>) {
+  public getKeyboardStubForTarget(target: OutputTargetElementWrapper<any>) {
     if(!this.isTargetKeyboardIndependent(target)) {
       return this.globalKeyboard.metadata;
     } else {
@@ -614,7 +614,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
    *                      The return value indicates whether (true) or not (false) the calling event handler
    *                      should be terminated immediately after the call.
    */
-  _CommonFocusHelper(outputTarget: OutputTarget<any>): boolean {
+  _CommonFocusHelper(outputTarget: OutputTargetElementWrapper<any>): boolean {
     const focusAssistant = this.focusAssistant;
 
     let activeKeyboard = this.activeKeyboard?.keyboard;
@@ -738,7 +738,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     return true;
   }
 
-  doChangeEvent(target: OutputTarget<any>) {
+  doChangeEvent(target: OutputTargetElementWrapper<any>) {
     if(target.changed) {
       let event = new Event('change', {"bubbles": true, "cancelable": false});
       target.getElement().dispatchEvent(event);
diff --git a/web/src/app/browser/src/defaultBrowserRules.ts b/web/src/app/browser/src/defaultBrowserRules.ts
index 4f0ffbe012e..46f80664f7e 100644
--- a/web/src/app/browser/src/defaultBrowserRules.ts
+++ b/web/src/app/browser/src/defaultBrowserRules.ts
@@ -2,9 +2,9 @@ import { ModifierKeyConstants } from '@keymanapp/common-types';
 import {
   Codes,
   DefaultRules,
-  type KeyEvent
+  type KeyEvent,
+  type OutputTarget
 } from 'keyman/engine/keyboard';
-import { type OutputTarget } from 'keyman/engine/js-processor';
 
 import ContextManager from './contextManager.js';
 
diff --git a/web/src/app/browser/src/keyboardInterface.ts b/web/src/app/browser/src/keyboardInterface.ts
index e9b0bda3795..495c1e90edf 100644
--- a/web/src/app/browser/src/keyboardInterface.ts
+++ b/web/src/app/browser/src/keyboardInterface.ts
@@ -1,4 +1,4 @@
-import { type OutputTarget } from 'keyman/engine/element-wrappers';
+import { type OutputTargetElementWrapper } from 'keyman/engine/element-wrappers';
 import { FloatingOSKView } from 'keyman/engine/osk';
 import { KeyboardInterface as KeyboardInterfaceBase } from 'keyman/engine/main';
 
@@ -29,7 +29,7 @@ export default class KeyboardInterface extends KeyboardInterfaceBase<ContextMana
   /**
    * Legacy entry points (non-standard names)- included only to allow existing IME keyboards to continue to be used
    */
-  getLastActiveElement(): OutputTarget<any> {
+  getLastActiveElement(): OutputTargetElementWrapper<any> {
     return this.engine.contextManager.lastActiveTarget;
   }
 
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index b9c528abb44..5902ab6c0b8 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -1,7 +1,7 @@
 import { KeymanWebKeyboard } from '@keymanapp/common-types';
 import { KeymanEngineBase, DeviceDetector } from 'keyman/engine/main';
 import { getAbsoluteY } from 'keyman/engine/dom-utils';
-import { OutputTarget } from 'keyman/engine/element-wrappers';
+import { OutputTargetElementWrapper } from 'keyman/engine/element-wrappers';
 import {
   TwoStateActivator,
   VisualKeyboard
@@ -75,7 +75,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
 
     // Scrolls the document-body to ensure that a focused element remains visible after the OSK appears.
     this.contextManager.on('targetchange', (target) => {
-      const e = (target as OutputTarget<any>)?.getElement();
+      const e = (target as OutputTargetElementWrapper<any>)?.getElement();
       if(this.osk) {
         (this.osk.activationModel as TwoStateActivator<HTMLElement>).activationTrigger = e;
       }
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index 3cf1c3a423d..0979a9cf82d 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -1,5 +1,6 @@
-import { JSKeyboard, Keyboard  } from 'keyman/engine/keyboard';
-import { Mock, OutputTarget, Transcription, findCommonSubstringEndIndex, isEmptyTransform, TextTransform } from 'keyman/engine/js-processor';
+import { JSKeyboard, Keyboard, OutputTarget } from 'keyman/engine/keyboard';
+// TODO-web-core: remove usage of OutputTargetBase, use OutputTarget instead
+import { Mock, Transcription, findCommonSubstringEndIndex, isEmptyTransform, TextTransform, OutputTargetBase } from 'keyman/engine/js-processor';
 import { KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { ContextManagerBase } from 'keyman/engine/main';
 import { WebviewConfiguration } from './configuration.js';
@@ -59,7 +60,8 @@ export class ContextHost extends Mock {
 
   restoreTo(original: OutputTarget): void {
     this.savedState = Mock.from(this);
-    super.restoreTo(original);
+    // TODO-web-core
+    super.restoreTo(original as OutputTargetBase);
   }
 
   updateContext(text: string, selStart: number, selEnd: number): boolean {
diff --git a/web/src/engine/attachment/src/attachmentInfo.ts b/web/src/engine/attachment/src/attachmentInfo.ts
index 02a81114028..05811300cbb 100644
--- a/web/src/engine/attachment/src/attachmentInfo.ts
+++ b/web/src/engine/attachment/src/attachmentInfo.ts
@@ -1,10 +1,10 @@
-import { OutputTarget } from 'keyman/engine/element-wrappers';
+import { OutputTargetElementWrapper } from 'keyman/engine/element-wrappers';
 
 export class AttachmentInfo {
   /**
    * Provides the core interface between the DOM and the actual keyboard.
    */
-  interface:      OutputTarget<any>;
+  interface: OutputTargetElementWrapper<any>;
 
   /**
    * Tracks the control's independent keyboard selection, when applicable.
@@ -21,7 +21,7 @@ export class AttachmentInfo {
    */
   inputMode?: string;
 
-  constructor(eleInterface: OutputTarget<any>, kbd: string, touch?: boolean) {
+  constructor(eleInterface: OutputTargetElementWrapper<any>, kbd: string, touch?: boolean) {
     this.interface = eleInterface;
     this.keyboard = kbd;
   }
diff --git a/web/src/engine/element-wrappers/src/contentEditable.ts b/web/src/engine/element-wrappers/src/contentEditable.ts
index cc532d226b2..0f87c3722b3 100644
--- a/web/src/engine/element-wrappers/src/contentEditable.ts
+++ b/web/src/engine/element-wrappers/src/contentEditable.ts
@@ -1,4 +1,4 @@
-import OutputTarget from './outputTarget.js';
+import { OutputTargetElementWrapper } from './outputTargetElementWrapper.js';
 
 class SelectionCaret {
   node: Node;
@@ -20,7 +20,7 @@ class SelectionRange {
   }
 }
 
-export default class ContentEditable extends OutputTarget<{}> {
+export class ContentEditable extends OutputTargetElementWrapper<{}> {
   root: HTMLElement;
 
   constructor(ele: HTMLElement) {
diff --git a/web/src/engine/element-wrappers/src/designIFrame.ts b/web/src/engine/element-wrappers/src/designIFrame.ts
index 4fdfc5c103f..7ecc22c6a8a 100644
--- a/web/src/engine/element-wrappers/src/designIFrame.ts
+++ b/web/src/engine/element-wrappers/src/designIFrame.ts
@@ -1,4 +1,4 @@
-import OutputTarget from './outputTarget.js';
+import { OutputTargetElementWrapper } from './outputTargetElementWrapper.js';
 
 class SelectionCaret {
   node: Node;
@@ -31,7 +31,7 @@ class StyleCommand {
   }
 }
 
-export default class DesignIFrame extends OutputTarget<{}> {
+export class DesignIFrame extends OutputTargetElementWrapper<{}> {
   root: HTMLIFrameElement;
   doc: Document;
   docRoot: HTMLElement;
diff --git a/web/src/engine/element-wrappers/src/index.ts b/web/src/engine/element-wrappers/src/index.ts
index 06971bdeff9..1cf3e36ecf5 100644
--- a/web/src/engine/element-wrappers/src/index.ts
+++ b/web/src/engine/element-wrappers/src/index.ts
@@ -1,7 +1,7 @@
-export { default as wrapElement } from './wrapElement.js';
-export { default as ContentEditable } from './contentEditable.js';
-export { default as DesignIFrame } from './designIFrame.js';
-export { default as Input } from './input.js';
-export { default as OutputTarget } from './outputTarget.js';
-export { default as TextArea } from './textarea.js';
+export { wrapElement } from './wrapElement.js';
+export { ContentEditable } from './contentEditable.js';
+export { DesignIFrame } from './designIFrame.js';
+export { Input } from './input.js';
+export { OutputTargetElementWrapper } from './outputTargetElementWrapper.js';
+export { TextArea } from './textarea.js';
 export { nestedInstanceOf } from './utils.js';
\ No newline at end of file
diff --git a/web/src/engine/element-wrappers/src/input.ts b/web/src/engine/element-wrappers/src/input.ts
index e70bb6bdfba..d11348a5366 100644
--- a/web/src/engine/element-wrappers/src/input.ts
+++ b/web/src/engine/element-wrappers/src/input.ts
@@ -1,4 +1,4 @@
-import OutputTarget from './outputTarget.js';
+import { OutputTargetElementWrapper } from './outputTargetElementWrapper.js';
 
 interface EventMap  {
   /**
@@ -21,7 +21,7 @@ interface EventMap  {
   'unhandlednewline': (element: HTMLInputElement) => void
 }
 
-export default class Input extends OutputTarget<EventMap> {
+export class Input extends OutputTargetElementWrapper<EventMap> {
   root: HTMLInputElement;
 
   /**
diff --git a/web/src/engine/element-wrappers/src/outputTarget.ts b/web/src/engine/element-wrappers/src/outputTargetElementWrapper.ts
similarity index 88%
rename from web/src/engine/element-wrappers/src/outputTarget.ts
rename to web/src/engine/element-wrappers/src/outputTargetElementWrapper.ts
index 43623af7812..4fd4771a60f 100644
--- a/web/src/engine/element-wrappers/src/outputTarget.ts
+++ b/web/src/engine/element-wrappers/src/outputTargetElementWrapper.ts
@@ -1,7 +1,7 @@
-import { OutputTarget as OutputTargetBase } from "keyman/engine/js-processor";
+import { OutputTargetBase } from "keyman/engine/js-processor";
 import { EventEmitter } from 'eventemitter3';
 
-export default abstract class OutputTarget<EventMap extends EventEmitter.ValidEventTypes> extends OutputTargetBase {
+export abstract class OutputTargetElementWrapper<EventMap extends EventEmitter.ValidEventTypes> extends OutputTargetBase {
   // JS/TS can't do true multiple inheritance, so we maintain class events on a readonly field.
   public readonly events: EventEmitter<EventMap, this> = new EventEmitter<EventMap, this>();
 
diff --git a/web/src/engine/element-wrappers/src/textarea.ts b/web/src/engine/element-wrappers/src/textarea.ts
index 04a8ea3ae89..9c05bec9992 100644
--- a/web/src/engine/element-wrappers/src/textarea.ts
+++ b/web/src/engine/element-wrappers/src/textarea.ts
@@ -1,6 +1,6 @@
-import OutputTarget from './outputTarget.js';
+import { OutputTargetElementWrapper } from './outputTargetElementWrapper.js';
 
-export default class TextArea extends OutputTarget<{}> {
+export class TextArea extends OutputTargetElementWrapper<{}> {
   root: HTMLTextAreaElement;
 
   /**
diff --git a/web/src/engine/element-wrappers/src/wrapElement.ts b/web/src/engine/element-wrappers/src/wrapElement.ts
index 3a3e4d89e56..e2e09d63788 100644
--- a/web/src/engine/element-wrappers/src/wrapElement.ts
+++ b/web/src/engine/element-wrappers/src/wrapElement.ts
@@ -1,11 +1,11 @@
-import type OutputTarget from './outputTarget.js';
-import Input from './input.js';
-import TextArea from './textarea.js';
-import DesignIFrame from './designIFrame.js';
-import ContentEditable from './contentEditable.js';
+import { type OutputTargetElementWrapper }  from './outputTargetElementWrapper.js';
+import { Input } from './input.js';
+import { TextArea } from './textarea.js';
+import { DesignIFrame } from './designIFrame.js';
+import { ContentEditable } from './contentEditable.js';
 import { nestedInstanceOf } from './utils.js';
 
-export default function wrapElement(e: HTMLElement): OutputTarget<any> {
+export function wrapElement(e: HTMLElement): OutputTargetElementWrapper<any> {
   // Complex type scoping is implemented here so that kmwutils.ts is not a dependency for test compilations.
 
   if(nestedInstanceOf(e, "HTMLInputElement")) {
diff --git a/web/src/engine/js-processor/src/index.ts b/web/src/engine/js-processor/src/index.ts
index ed2b06427c4..965367af4a9 100644
--- a/web/src/engine/js-processor/src/index.ts
+++ b/web/src/engine/js-processor/src/index.ts
@@ -1,9 +1,9 @@
 export { BeepHandler, JSKeyboardProcessor, LogMessageHandler, ProcessorInitOptions } from "./jsKeyboardProcessor.js";
-export { default as RuleBehavior } from "./ruleBehavior.js";
+export { RuleBehavior } from "./ruleBehavior.js";
 export { JSKeyboardInterface, KeyInformation, StoreNonCharEntry } from "./jsKeyboardInterface.js";
 export * from "./systemStores.js";
 export * from "./deadkeys.js";
-export { default as OutputTarget } from "./outputTarget.js";
-export * from "./outputTarget.js";
+export { OutputTargetBase } from "./outputTargetBase.js";
+export * from "./outputTargetBase.js";
 export { Mock } from "./mock.js";
 export * from "./stringDivergence.js";
diff --git a/web/src/engine/js-processor/src/jsKeyboardInterface.ts b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
index 3f4d64ef990..2fba38e49c4 100644
--- a/web/src/engine/js-processor/src/jsKeyboardInterface.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
@@ -7,11 +7,11 @@
 
 import { type DeviceSpec } from "@keymanapp/web-utils";
 import { ModifierKeyConstants } from '@keymanapp/common-types';
-import { Codes, type KeyEvent, KeyMapping, JSKeyboard, KeyboardHarness, KeyboardKeymanGlobal, VariableStoreDictionary } from "keyman/engine/keyboard";
-import type OutputTarget from './outputTarget.js';
+import { Codes, type KeyEvent, KeyMapping, JSKeyboard, KeyboardHarness, KeyboardKeymanGlobal, type OutputTarget, VariableStoreDictionary } from "keyman/engine/keyboard";
+import { type OutputTargetBase }  from './outputTargetBase.js';
 import { type Deadkey } from './deadkeys.js';
 import { Mock } from "./mock.js";
-import RuleBehavior from "./ruleBehavior.js";
+import { RuleBehavior }  from "./ruleBehavior.js";
 import { ComplexKeyboardStore, type KeyboardStore, KeyboardStoreElement, SystemStoreIDs, SystemStore, MutableSystemStore, PlatformSystemStore, VariableStore, VariableStoreSerializer } from "./systemStores.js";
 
 //#endregion
@@ -274,7 +274,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *             KC(10,10,Pelem) == "XXXXabcdef"  i.e. return as much as possible of the requested string, where X = \uFFFE
    */
   private KC_(n: number, ln: number, outputTarget: OutputTarget): string {
-    var tempContext = '';
+    let tempContext = '';
 
     // If we have a selection, we have an empty context
     tempContext = outputTarget.isSelectionEmpty() ? outputTarget.getTextBeforeCaret() : "";
@@ -300,7 +300,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *             KN(4,Pelem) == TRUE
    */
   nul(n: number, outputTarget: OutputTarget): boolean {
-    var cx=this.context(n+1, 1, outputTarget);
+    const cx=this.context(n+1, 1, outputTarget);
 
     // With #31, the result will be a replacement character if context is empty.
     return cx === "\uFFFE";
@@ -317,11 +317,11 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * Description  Test keyboard context for match
    */
   contextMatch(n: number, outputTarget: OutputTarget, val: string, ln: number): boolean {
-    var cx=this.context(n, ln, outputTarget);
+    const cx=this.context(n, ln, outputTarget);
     if(cx === val) {
       return true; // I3318
     }
-    outputTarget.deadkeys().resetMatched(); // I3318
+    (outputTarget as OutputTargetBase).deadkeys().resetMatched(); // I3318
     return false;
   }
 
@@ -333,7 +333,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param       {Object}      Pelem   Element to work with (must be currently focused element)
    * @return      {Array}               Context array (of strings and numbers)
    */
-  private _BuildExtendedContext(n: number, ln: number, outputTarget: OutputTarget): CachedExEntry {
+  private _BuildExtendedContext(n: number, ln: number, outputTarget: OutputTargetBase): CachedExEntry {
     var cache: CachedExEntry = this.cachedContextEx.get(n, ln);
     if(cache !== null) {
       return cache;
@@ -390,7 +390,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * A KMW 10+ function designed to bring KMW closer to Keyman Desktop functionality,
    * near-directly modeling (externally) the compiled form of Desktop rules' context section.
    */
-  fullContextMatch(n: number, outputTarget: OutputTarget, rule: ContextEntry[]): boolean {
+  fullContextMatch(n: number, outputTarget: OutputTargetBase, rule: ContextEntry[]): boolean {
     // Stage one:  build the context index map.
     var fullContext = this._BuildExtendedContext(n, rule.length, outputTarget);
     this.ruleContextEx = this.cachedContextEx.clone();
@@ -574,7 +574,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
       retVal = (keyCode == Lrulekey); // I3318, I3555
     }
     if(!retVal) {
-      this.activeTargetOutput.deadkeys().resetMatched();  // I3318
+      (this.activeTargetOutput as OutputTargetBase).deadkeys().resetMatched();  // I3318
     }
     return retVal; // I3318
   };
@@ -760,7 +760,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
 
     // We want to control exactly which deadkeys get removed.
     if(dn > 0) {
-      context = this._BuildExtendedContext(dn, dn, outputTarget);
+      context = this._BuildExtendedContext(dn, dn, (outputTarget as OutputTargetBase));
       let nulCount = 0;
 
       for(var i=0; i < context.valContext.length; i++) {
@@ -768,7 +768,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
 
         if(dk) {
           // Remove deadkey in context.
-          outputTarget.deadkeys().remove(dk);
+          (outputTarget as OutputTargetBase).deadkeys().remove(dk);
 
           // Reduce our reported context size.
           dn--;
@@ -787,7 +787,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
     }
 
     // If a matched deadkey hasn't been deleted, we don't WANT to delete it.
-    outputTarget.deadkeys().resetMatched();
+    (outputTarget as OutputTargetBase).deadkeys().resetMatched();
 
     // Why reinvent the wheel?  Delete the remaining characters by 'inserting a blank string'.
     this.output(dn, outputTarget, '');
@@ -806,7 +806,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
 
     outputTarget.saveProperties();
     outputTarget.clearSelection();
-    outputTarget.deadkeys().deleteMatched(); // I3318
+    (outputTarget as OutputTargetBase).deadkeys().deleteMatched(); // I3318
     if(dn >= 0) {
       // Automatically manages affected deadkey positions.  Does not delete deadkeys b/c legacy behavior support.
       outputTarget.deleteCharsBeforeCaret(dn);
@@ -982,7 +982,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * Description  Calls the keyboard's `begin newContext` group
    * @returns     {RuleBehavior}  Record of commands and state changes that result from executing `begin NewContext`
    */
-  processNewContextEvent(outputTarget: OutputTarget, keystroke: KeyEvent): RuleBehavior {
+  processNewContextEvent(outputTarget: OutputTargetBase, keystroke: KeyEvent): RuleBehavior {
     if(!this.activeKeyboard) {
       throw "No active keyboard for keystroke processing!";
     }
@@ -997,7 +997,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * Description  Calls the keyboard's `begin postKeystroke` group
    * @returns     {RuleBehavior}  Record of commands and state changes that result from executing `begin PostKeystroke`
    */
-  processPostKeystroke(outputTarget: OutputTarget, keystroke: KeyEvent): RuleBehavior {
+  processPostKeystroke(outputTarget: OutputTargetBase, keystroke: KeyEvent): RuleBehavior {
     if(!this.activeKeyboard) {
       throw "No active keyboard for keystroke processing!";
     }
@@ -1012,14 +1012,14 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * Description  Encapsulates calls to keyboard input processing.
    * @returns     {RuleBehavior}  Record of commands and state changes that result from executing `begin Unicode`
    */
-  processKeystroke(outputTarget: OutputTarget, keystroke: KeyEvent): RuleBehavior {
+  processKeystroke(outputTarget: OutputTargetBase, keystroke: KeyEvent): RuleBehavior {
     if(!this.activeKeyboard) {
       throw "No active keyboard for keystroke processing!";
     }
     return this.process(this.activeKeyboard.process.bind(this.activeKeyboard), outputTarget, keystroke, false);
   }
 
-  private process(callee: (outputTarget: OutputTarget, keystroke: KeyEvent) => boolean, outputTarget: OutputTarget, keystroke: KeyEvent, readonly: boolean): RuleBehavior {
+  private process(callee: (outputTarget: OutputTargetBase, keystroke: KeyEvent) => boolean, outputTarget: OutputTargetBase, keystroke: KeyEvent, readonly: boolean): RuleBehavior {
     // Clear internal state tracking data from prior keystrokes.
     if(!outputTarget) {
       throw "No target specified for keyboard output!";
diff --git a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
index cbd4d7ca4a0..bbeb87783ea 100644
--- a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
@@ -13,8 +13,8 @@ import {
   DefaultRules, EmulationKeystrokes
 } from "keyman/engine/keyboard";
 import { Mock } from "./mock.js";
-import type OutputTarget from "./outputTarget.js";
-import RuleBehavior from "./ruleBehavior.js";
+import { type OutputTargetBase }  from "./outputTargetBase.js";
+import { RuleBehavior }  from "./ruleBehavior.js";
 import { JSKeyboardInterface }  from './jsKeyboardInterface.js';
 import { DeviceSpec, globalObject } from "@keymanapp/web-utils";
 import { type MutableSystemStore, SystemStoreIDs } from "./systemStores.js";
@@ -23,7 +23,7 @@ import { type MutableSystemStore, SystemStoreIDs } from "./systemStores.js";
 
 // Also relies on @keymanapp/web-utils, which is included via tsconfig.json.
 
-export type BeepHandler = (outputTarget: OutputTarget) => void;
+export type BeepHandler = (outputTarget: OutputTargetBase) => void;
 export type LogMessageHandler = (str: string) => void;
 
 export interface ProcessorInitOptions {
@@ -128,7 +128,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
    * @param   {boolean} outputTarget  The OutputTarget receiving the KeyEvent
    * @return  {string}
    */
-  defaultRuleBehavior(Lkc: KeyEvent, outputTarget: OutputTarget, readonly: boolean): RuleBehavior {
+  defaultRuleBehavior(Lkc: KeyEvent, outputTarget: OutputTargetBase, readonly: boolean): RuleBehavior {
     let preInput = Mock.from(outputTarget, readonly);
     let ruleBehavior = new RuleBehavior();
 
@@ -198,19 +198,19 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
     return ruleBehavior;
   }
 
-  processNewContextEvent(device: DeviceSpec, outputTarget: OutputTarget): RuleBehavior {
+  processNewContextEvent(device: DeviceSpec, outputTarget: OutputTargetBase): RuleBehavior {
     return this.activeKeyboard ?
       this.keyboardInterface.processNewContextEvent(outputTarget, this.activeKeyboard.constructNullKeyEvent(device, this.stateKeys)) :
       null;
   }
 
-  processPostKeystroke(device: DeviceSpec, outputTarget: OutputTarget): RuleBehavior {
+  processPostKeystroke(device: DeviceSpec, outputTarget: OutputTargetBase): RuleBehavior {
     return this.activeKeyboard ?
       this.keyboardInterface.processPostKeystroke(outputTarget, this.activeKeyboard.constructNullKeyEvent(device, this.stateKeys)) :
       null;
   }
 
-  processKeystroke(keyEvent: KeyEvent, outputTarget: OutputTarget): RuleBehavior {
+  processKeystroke(keyEvent: KeyEvent, outputTarget: OutputTargetBase): RuleBehavior {
     var matchBehavior: RuleBehavior;
 
     // Before keyboard rules apply, check if the left-context is empty.
@@ -539,7 +539,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
 
   // Returns true if the key event is a modifier press, allowing keyPress to return selectively
   // in those cases.
-  doModifierPress(Levent: KeyEvent, outputTarget: OutputTarget, isKeyDown: boolean): boolean {
+  doModifierPress(Levent: KeyEvent, outputTarget: OutputTargetBase, isKeyDown: boolean): boolean {
     if(!this.activeKeyboard) {
       return false;
     }
@@ -573,7 +573,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
    * @returns  {Object}                 A RuleBehavior object describing the cumulative effects of
    *                                    all matched keyboard rules
    */
-  performNewContextEvent(outputTarget: OutputTarget): RuleBehavior {
+  performNewContextEvent(outputTarget: OutputTargetBase): RuleBehavior {
     const ruleBehavior = this.processNewContextEvent(this.contextDevice, outputTarget);
 
     if(ruleBehavior) {
@@ -582,7 +582,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
     return ruleBehavior;
   }
 
-  resetContext(target?: OutputTarget) {
+  resetContext(target?: OutputTargetBase) {
     this.layerId = 'default';
 
     // Make sure all deadkeys for the context get cleared properly.
diff --git a/web/src/engine/js-processor/src/mock.ts b/web/src/engine/js-processor/src/mock.ts
index e44b76e759c..a3d7bec6bc9 100644
--- a/web/src/engine/js-processor/src/mock.ts
+++ b/web/src/engine/js-processor/src/mock.ts
@@ -1,6 +1,6 @@
-import OutputTarget from './outputTarget.js';
+import { OutputTargetBase } from './outputTargetBase.js';
 
-export class Mock extends OutputTarget {
+export class Mock extends OutputTargetBase {
   text: string;
 
   selStart: number;
@@ -25,7 +25,7 @@ export class Mock extends OutputTarget {
   }
 
   // Clones the state of an existing EditableElement, creating a Mock version of its state.
-  static from(outputTarget: OutputTarget, readonly?: boolean) {
+  static from(outputTarget: OutputTargetBase, readonly?: boolean) {
     let clone: Mock;
 
     if (outputTarget instanceof Mock) {
diff --git a/web/src/engine/js-processor/src/outputTarget.ts b/web/src/engine/js-processor/src/outputTargetBase.ts
similarity index 96%
rename from web/src/engine/js-processor/src/outputTarget.ts
rename to web/src/engine/js-processor/src/outputTargetBase.ts
index 4b6aac6af67..d2f182b2de2 100644
--- a/web/src/engine/js-processor/src/outputTarget.ts
+++ b/web/src/engine/js-processor/src/outputTargetBase.ts
@@ -1,7 +1,7 @@
 import { extendString } from "@keymanapp/web-utils";
 import { findCommonSubstringEndIndex } from "./stringDivergence.js";
 import { Mock } from "./mock.js";
-import { OutputTarget as OutputTargetInterface } from 'keyman/engine/keyboard';
+import { OutputTarget } from 'keyman/engine/keyboard';
 
 extendString();
 
@@ -66,7 +66,7 @@ export class Transcription {
 
 export type Alternate = LexicalModelTypes.ProbabilityMass<LexicalModelTypes.Transform>;
 
-export default abstract class OutputTarget implements OutputTargetInterface {
+export abstract class OutputTargetBase implements OutputTarget {
   private _dks: DeadkeyTracker;
 
   constructor() {
@@ -124,7 +124,7 @@ export default abstract class OutputTarget implements OutputTargetInterface {
    * As such, it assumes that the caret is immediately after any inserted text.
    * @param from An output target (preferably a Mock) representing the prior state of the input/output system.
    */
-  buildTransformFrom(original: OutputTarget): TextTransform {
+  buildTransformFrom(original: OutputTargetBase): TextTransform {
     const toLeft = this.getTextBeforeCaret();
     const fromLeft = original.getTextBeforeCaret();
 
@@ -145,7 +145,7 @@ export default abstract class OutputTarget implements OutputTargetInterface {
     return new TextTransform(insertedText, deletedLeft, deletedRight, original.getSelectedText() && !this.getSelectedText());
   }
 
-  buildTranscriptionFrom(original: OutputTarget, keyEvent: KeyEvent, readonly: boolean, alternates?: Alternate[]): Transcription {
+  buildTranscriptionFrom(original: OutputTargetBase, keyEvent: KeyEvent, readonly: boolean, alternates?: Alternate[]): Transcription {
     let transform = this.buildTransformFrom(original);
 
     // If we ever decide to re-add deadkey tracking, this is the place for it.
@@ -157,7 +157,7 @@ export default abstract class OutputTarget implements OutputTargetInterface {
    * Restores the `OutputTarget` to the indicated state.  Designed for use with `Transcription.preInput`.
    * @param original An `OutputTarget` (usually a `Mock`).
    */
-  restoreTo(original: OutputTarget) {
+  restoreTo(original: OutputTargetBase) {
     this.clearSelection();
     // We currently do not restore selected text; the mechanism isn't supported at present for
     // all output target types - especially in regard to re-selecting the text if restored.
diff --git a/web/src/engine/js-processor/src/ruleBehavior.ts b/web/src/engine/js-processor/src/ruleBehavior.ts
index b00577b09db..4cedfe8193a 100644
--- a/web/src/engine/js-processor/src/ruleBehavior.ts
+++ b/web/src/engine/js-processor/src/ruleBehavior.ts
@@ -1,6 +1,6 @@
 import { JSKeyboardProcessor } from "./jsKeyboardProcessor.js";
 import { VariableStoreDictionary } from "keyman/engine/keyboard";
-import OutputTarget, { type Transcription } from './outputTarget.js';
+import { OutputTargetBase, type Transcription } from './outputTargetBase.js';
 import { Mock } from "./mock.js";
 import { type VariableStore } from "./systemStores.js";
 import { LexicalModelTypes } from '@keymanapp/common-types';
@@ -8,7 +8,7 @@ import { LexicalModelTypes } from '@keymanapp/common-types';
 /**
  * Represents the commands and state changes that result from a matched keyboard rule.
  */
-export default class RuleBehavior {
+export class RuleBehavior {
   /**
    * The before-and-after Transform from matching a keyboard rule.  May be `null`
    * if no keyboard rules were matched for the keystroke.
@@ -65,7 +65,7 @@ export default class RuleBehavior {
    */
   triggerKeyDefault?: boolean;
 
-  finalize(processor: JSKeyboardProcessor, outputTarget: OutputTarget, readonly: boolean) {
+  finalize(processor: JSKeyboardProcessor, outputTarget: OutputTargetBase, readonly: boolean) {
     if(!this.transcription) {
       throw "Cannot finalize a RuleBehavior with no transcription.";
     }
diff --git a/web/src/engine/keyboard/src/defaultRules.ts b/web/src/engine/keyboard/src/defaultRules.ts
index a86d32a4beb..4f0ccbf5393 100644
--- a/web/src/engine/keyboard/src/defaultRules.ts
+++ b/web/src/engine/keyboard/src/defaultRules.ts
@@ -7,7 +7,7 @@
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 import Codes from './codes.js';
 import type KeyEvent from './keyEvent.js';
-import { type OutputTarget }  from './outputTarget.interface.js';
+import { type OutputTarget }  from './outputTarget.js';
 
 export enum EmulationKeystrokes {
   Enter = '\n',
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index 8ba9aaa8899..d483f0c7021 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -28,7 +28,7 @@ export * from "./defaultRules.js";
 export { default as KeyEvent } from "./keyEvent.js";
 export * from "./keyEvent.js";
 export { default as KeyMapping } from "./keyMapping.js";
-export { OutputTarget } from "./outputTarget.interface.js";
+export { OutputTarget } from "./outputTarget.js";
 
 export * from "@keymanapp/web-utils";
 
diff --git a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
index df3eeb91c41..12eb6b188bd 100644
--- a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
+++ b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
@@ -2,7 +2,7 @@ import Codes from "../codes.js";
 import { Layouts } from "./defaultLayouts.js";
 import { ActiveKey, ActiveLayout, ActiveSubKey } from "./activeLayout.js";
 import KeyEvent from "../keyEvent.js";
-import { type OutputTarget } from "../outputTarget.interface.js";
+import { type OutputTarget } from "../outputTarget.js";
 import { KeymanWebKeyboard, ModifierKeyConstants, TouchLayout } from "@keymanapp/common-types";
 
 import ComplexKeyboardStore = KeymanWebKeyboard.ComplexKeyboardStore;
diff --git a/web/src/engine/keyboard/src/outputTarget.interface.ts b/web/src/engine/keyboard/src/outputTarget.ts
similarity index 100%
rename from web/src/engine/keyboard/src/outputTarget.interface.ts
rename to web/src/engine/keyboard/src/outputTarget.ts
diff --git a/web/src/engine/main/src/contextManagerBase.ts b/web/src/engine/main/src/contextManagerBase.ts
index 98ce5e6d605..fc82bc81c7a 100644
--- a/web/src/engine/main/src/contextManagerBase.ts
+++ b/web/src/engine/main/src/contextManagerBase.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'eventemitter3';
-import { ManagedPromise, type Keyboard } from 'keyman/engine/keyboard';
-import { type JSKeyboardInterface, type OutputTarget } from 'keyman/engine/js-processor';
+import { ManagedPromise, type Keyboard, type OutputTarget } from 'keyman/engine/keyboard';
+import { type JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { StubAndKeyboardCache, type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { PredictionContext } from 'keyman/engine/interfaces';
 import { EngineConfiguration } from './engineConfiguration.js';
diff --git a/web/src/engine/main/src/engineConfiguration.ts b/web/src/engine/main/src/engineConfiguration.ts
index 40485c0f0f0..8e5daa2c0dd 100644
--- a/web/src/engine/main/src/engineConfiguration.ts
+++ b/web/src/engine/main/src/engineConfiguration.ts
@@ -1,7 +1,7 @@
 import { EventEmitter } from "eventemitter3";
 
-import { DeviceSpec, KeyboardProperties, ManagedPromise, physicalKeyDeviceAlias, SpacebarText } from "keyman/engine/keyboard";
-import { OutputTarget, RuleBehavior } from 'keyman/engine/js-processor';
+import { DeviceSpec, KeyboardProperties, ManagedPromise, OutputTarget, physicalKeyDeviceAlias, SpacebarText } from "keyman/engine/keyboard";
+import { RuleBehavior } from 'keyman/engine/js-processor';
 import { PathConfiguration, PathOptionDefaults, PathOptionSpec } from "keyman/engine/interfaces";
 import { DeviceDetector } from "./headless/deviceDetector.js";
 import { KeyboardStub } from "keyman/engine/keyboard-storage";
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index 8cab289d268..09276a96705 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -7,16 +7,17 @@ import { globalObject, DeviceSpec } from "@keymanapp/web-utils";
 
 import { KM_Core } from 'keyman/engine/core-processor';
 
-import { Codes, JSKeyboard, KeyboardMinimalInterface, type Keyboard, type KeyEvent } from "keyman/engine/keyboard";
+import { Codes, JSKeyboard, KeyboardMinimalInterface, type Keyboard, type KeyEvent, type OutputTarget } from "keyman/engine/keyboard";
+// TODO-web-core: remove usage of OutputTargetBase
 import {
   type Alternate,
   isEmptyTransform,
   JSKeyboardProcessor,
   Mock,
-  type OutputTarget,
   RuleBehavior,
   type ProcessorInitOptions,
-  SystemStoreIDs
+  SystemStoreIDs,
+  OutputTargetBase
 } from 'keyman/engine/js-processor';
 
 import { TranscriptionCache } from "./transcriptionCache.js";
@@ -113,9 +114,11 @@ export class InputProcessor {
           // Has there been a context change at any point during the multitap?  If so, we need
           // to revert it.  If not, we assume it's a layer-change multitap, in which case
           // no such reset is needed.
-          if(!isEmptyTransform(transcription.transform) || !transcription.preInput.isEqual(Mock.from(outputTarget))) {
+          // TODO-web-core
+          if(!isEmptyTransform(transcription.transform) || !transcription.preInput.isEqual(Mock.from(outputTarget as OutputTargetBase))) {
             // Restores full context, including deadkeys in their exact pre-keystroke state.
-            outputTarget.restoreTo(transcription.preInput);
+            // TODO-web-core
+            (outputTarget as OutputTargetBase).restoreTo(transcription.preInput);
           }
           /*
             else:
@@ -161,7 +164,8 @@ export class InputProcessor {
 
     // Will handle keystroke-based non-layer change modifier & state keys, mapping them through the physical keyboard's version
     // of state management.  `doModifierPress` must always run.
-    if(this.keyboardProcessor.doModifierPress(keyEvent, outputTarget, !fromOSK)) {
+    // TODO-web-core
+    if (this.keyboardProcessor.doModifierPress(keyEvent, outputTarget as OutputTargetBase, !fromOSK)) {
       // If run on a desktop platform, we know that modifier & state key presses may not
       // produce output, so we may make an immediate return safely.
       if(!fromOSK) {
@@ -188,13 +192,15 @@ export class InputProcessor {
 
     // Create a "mock" backup of the current outputTarget in its pre-input state.
     // Current, long-existing assumption - it's DOM-backed.
-    let preInputMock = Mock.from(outputTarget, true);
+    // TODO-web-core
+    const preInputMock = Mock.from(outputTarget as OutputTargetBase, true);
 
     const startingLayerId = this.keyboardProcessor.layerId;
 
     // We presently need the true keystroke to run on the FULL context.  That index is still
     // needed for some indexing operations when comparing two different output targets.
-    let ruleBehavior = this.keyboardProcessor.processKeystroke(keyEvent, outputTarget);
+    // TODO-web-core
+    let ruleBehavior = this.keyboardProcessor.processKeystroke(keyEvent, outputTarget as OutputTargetBase);
 
     // Swap layer as appropriate.
     if(keyEvent.kNextLayer) {
@@ -226,11 +232,12 @@ export class InputProcessor {
     if(keepRuleBehavior) {
       // alternates are our fat-finger alternate outputs. We don't build these for keys we detect as
       // layer switch keys
-      let alternates = isOnlyLayerSwitchKey ? null : this.buildAlternates(ruleBehavior, keyEvent, preInputMock);
+      const alternates = isOnlyLayerSwitchKey ? null : this.buildAlternates(ruleBehavior, keyEvent, preInputMock);
 
       // Now that we've done all the keystroke processing needed, ensure any extra effects triggered
       // by the actual keystroke occur.
-      ruleBehavior.finalize(this.keyboardProcessor, outputTarget, false);
+      // TODO-web-core
+      ruleBehavior.finalize(this.keyboardProcessor, outputTarget as OutputTargetBase, false);
 
       // -- All keystroke (and 'alternate') processing is now complete.  Time to finalize everything! --
 
@@ -241,7 +248,8 @@ export class InputProcessor {
     } else {
       // We need a dummy RuleBehavior for keys which have no output (e.g. Shift)
       ruleBehavior = new RuleBehavior();
-      ruleBehavior.transcription = outputTarget.buildTranscriptionFrom(outputTarget, null, false);
+      // TODO-web-core
+      ruleBehavior.transcription = (outputTarget as OutputTargetBase).buildTranscriptionFrom(outputTarget as OutputTargetBase, null, false);
       ruleBehavior.triggersDefaultCommand = true;
     }
 
@@ -260,9 +268,11 @@ export class InputProcessor {
     this.keyboardProcessor.newLayerStore.set(hasLayerChanged ? this.keyboardProcessor.layerId : '');
     this.keyboardProcessor.oldLayerStore.set(hasLayerChanged ? startingLayerId : '');
 
-    let postRuleBehavior = this.keyboardProcessor.processPostKeystroke(this.contextDevice, outputTarget);
-    if(postRuleBehavior) {
-      postRuleBehavior.finalize(this.keyboardProcessor, outputTarget, true);
+    // TODO-web-core
+    const postRuleBehavior = this.keyboardProcessor.processPostKeystroke(this.contextDevice, outputTarget as OutputTargetBase);
+    if (postRuleBehavior) {
+      // TODO-web-core
+      postRuleBehavior.finalize(this.keyboardProcessor, outputTarget as OutputTargetBase, true);
     }
 
     // Yes, even for ruleBehavior.triggersDefaultCommand.  Those tend to change the context.
@@ -385,7 +395,8 @@ export class InputProcessor {
 
   public resetContext(outputTarget?: OutputTarget) {
     // Also handles new-context events, which may modify the layer
-    this.keyboardProcessor.resetContext(outputTarget);
+    // TODO-web-core
+    this.keyboardProcessor.resetContext(outputTarget as OutputTargetBase);
     // With the layer now set, we trigger new predictions.
     this.languageProcessor.invalidateContext(outputTarget, this.keyboardProcessor.layerId);
   }
diff --git a/web/src/engine/main/src/headless/languageProcessor.ts b/web/src/engine/main/src/headless/languageProcessor.ts
index 6783e344c9c..f81ae547a58 100644
--- a/web/src/engine/main/src/headless/languageProcessor.ts
+++ b/web/src/engine/main/src/headless/languageProcessor.ts
@@ -1,6 +1,8 @@
 import { EventEmitter } from "eventemitter3";
 import { LMLayer } from "@keymanapp/lexical-model-layer/web";
-import { OutputTarget, Transcription, Mock } from "keyman/engine/js-processor";
+// TODO-web-core: remove use of OutputTargetBase
+import { Transcription, Mock, OutputTargetBase } from "keyman/engine/js-processor";
+import { OutputTarget } from 'keyman/engine/keyboard';
 import { LanguageProcessorEventMap, ModelSpec, StateChangeEnum, ReadySuggestions } from 'keyman/engine/interfaces';
 import ContextWindow from "./contextWindow.js";
 import { TranscriptionCache } from "./transcriptionCache.js";
@@ -121,8 +123,9 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     // invalidateContext otherwise bypasses .predict()'s check against this.
     if(!this.isActive) {
       return Promise.resolve([]);
-    } else if(outputTarget) {
-      let transcription = outputTarget.buildTranscriptionFrom(outputTarget, null, false);
+    } else if (outputTarget) {
+      // TODO-web-core
+      const transcription = (outputTarget as OutputTargetBase).buildTranscriptionFrom((outputTarget as OutputTargetBase), null, false);
       return this.predict_internal(transcription, true, layerId);
     } else {
       // if there's no active context source, there's nothing to
@@ -138,7 +141,8 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
       return null;
     }
 
-    let context = new ContextWindow(Mock.from(target, false), this.configuration, layerId);
+    // TODO-web-core
+    const context = new ContextWindow(Mock.from((target as OutputTargetBase), false), this.configuration, layerId);
     return this.lmEngine.wordbreak(context);
   }
 
@@ -190,14 +194,16 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
       // Apply the Suggestion!
 
       // Step 1:  determine the final output text
-      let final = Mock.from(original.preInput, false);
+      const final = Mock.from(original.preInput, false);
       final.apply(suggestion.transform);
 
       // Step 2:  build a final, master Transform that will produce the desired results from the CURRENT state.
       // In embedded mode, both Android and iOS are best served by calculating this transform and applying its
       // values as needed for use with their IME interfaces.
-      let transform = final.buildTransformFrom(outputTarget);
-      outputTarget.apply(transform);
+      // TODO-web-core
+      const transform = final.buildTransformFrom((outputTarget as OutputTargetBase));
+      // TODO-web-core
+      (outputTarget as OutputTargetBase).apply(transform);
 
       // Tell the banner that a suggestion was applied, so it can call the
       // keyboard's PostKeystroke entry point as needed
@@ -265,8 +271,10 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     // Step 2:  build a final, master Transform that will produce the desired results from the CURRENT state.
     // In embedded mode, both Android and iOS are best served by calculating this transform and applying its
     // values as needed for use with their IME interfaces.
-    let transform = final.buildTransformFrom(outputTarget);
-    outputTarget.apply(transform);
+    // TODO-web-core
+    const transform = final.buildTransformFrom(outputTarget as OutputTargetBase);
+    // TODO-web-core
+    (outputTarget as OutputTargetBase).apply(transform);
 
     // The reason we need to preserve the additive-inverse 'transformId' property on Reversions.
     let promise = this.currentPromise = this.lmEngine.revertSuggestion(reversion, new ContextWindow(original.preInput, this.configuration, null))
@@ -282,7 +290,8 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
       return null;
     }
 
-    let transcription = outputTarget.buildTranscriptionFrom(outputTarget, null, false);
+    // TODO-web-core
+    const transcription = (outputTarget as OutputTargetBase).buildTranscriptionFrom(outputTarget as OutputTargetBase, null, false);
     return this.predict(transcription, layerId);
   }
 
diff --git a/web/src/engine/main/src/keymanEngineBase.ts b/web/src/engine/main/src/keymanEngineBase.ts
index 074fdfbb57c..b9ea22967a2 100644
--- a/web/src/engine/main/src/keymanEngineBase.ts
+++ b/web/src/engine/main/src/keymanEngineBase.ts
@@ -1,5 +1,6 @@
 import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal } from "keyman/engine/keyboard";
-import { OutputTarget, ProcessorInitOptions, RuleBehavior } from 'keyman/engine/js-processor';
+// TODO-web-core: remove usage of OutputTargetBase
+import { OutputTargetBase, ProcessorInitOptions, RuleBehavior } from 'keyman/engine/js-processor';
 import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard/dom-keyboard-loader";
 import { InputProcessor } from './headless/inputProcessor.js';
 import { OSKView, JSKeyboardData } from "keyman/engine/osk";
@@ -76,7 +77,8 @@ export class KeymanEngineBase<
     outputTarget.invalidateSelection();
     // Deadkey matching continues to be troublesome.
     // Deleting matched deadkeys here seems to correct some of the issues.   (JD 6/6/14)
-    outputTarget.deadkeys().deleteMatched();      // Delete any matched deadkeys before continuing
+    // TODO-web-core
+    (outputTarget as OutputTargetBase).deadkeys().deleteMatched();      // Delete any matched deadkeys before continuing
 
     if(event.isSynthetic) {
       const oskLayer = this.osk.vkbd.layerId;
@@ -274,10 +276,12 @@ export class KeymanEngineBase<
       keyboardProcessor.newLayerStore.set('');
       keyboardProcessor.oldLayerStore.set('');
       // Call the keyboard's entry point.
-      keyboardProcessor.processPostKeystroke(keyboardProcessor.contextDevice, predictionContext.currentTarget as OutputTarget)
+      // TODO-web-core
+      keyboardProcessor.processPostKeystroke(keyboardProcessor.contextDevice, predictionContext.currentTarget as OutputTargetBase)
         // If we have a RuleBehavior as a result, run it on the target. This should
         // only change system store and variable store values.
-        ?.finalize(keyboardProcessor, predictionContext.currentTarget as OutputTarget, true);
+        // TODO-web-core
+        ?.finalize(keyboardProcessor, predictionContext.currentTarget as OutputTargetBase, true);
     });
 
     // #region Event handler wiring
@@ -288,7 +292,7 @@ export class KeymanEngineBase<
     });
 
     kbdCache.on('stubadded', (stub) => {
-      let eventRaiser = () => {
+      const eventRaiser = () => {
         // The corresponding event is needed in order to update UI modules as new keyboard stubs "come online".
         this.legacyAPIEvents.callEvent('keyboardregistered', {
           internalName: stub.KI,
diff --git a/web/src/tools/testing/recorder-core/src/index.ts b/web/src/tools/testing/recorder-core/src/index.ts
index 2a739710232..1e7631d6873 100644
--- a/web/src/tools/testing/recorder-core/src/index.ts
+++ b/web/src/tools/testing/recorder-core/src/index.ts
@@ -1,5 +1,5 @@
-import { Mock, type OutputTarget } from "keyman/engine/js-processor";
-import { KeyDistribution, KeyEvent } from "keyman/engine/keyboard";
+import { Mock } from "keyman/engine/js-processor";
+import { KeyDistribution, KeyEvent, type OutputTarget } from "keyman/engine/keyboard";
 
 import Proctor from "./proctor.js";
 
diff --git a/web/src/tools/testing/recorder-core/src/nodeProctor.ts b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
index 58be39cc799..f65089c0635 100644
--- a/web/src/tools/testing/recorder-core/src/nodeProctor.ts
+++ b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
@@ -8,8 +8,9 @@ import {
   RecordedSyntheticKeystroke
 } from "./index.js";
 
-import { KeyEvent, KeyEventSpec, KeyboardHarness } from "keyman/engine/keyboard";
-import { Mock, type OutputTarget } from "keyman/engine/js-processor";
+import { KeyEvent, KeyEventSpec, KeyboardHarness, type OutputTarget } from "keyman/engine/keyboard";
+// TODO-web-core: remove usage of OutputTargetBase, use OutputTarget instead
+import { Mock, OutputTargetBase } from 'keyman/engine/js-processor';
 import { DeviceSpec } from "@keymanapp/web-utils";
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 
@@ -88,7 +89,8 @@ export default class NodeProctor extends Proctor {
         // We don't care too much about particularities of per-keystroke behavior yet.
         // ... we _could_ if we wanted to, though.  The framework is mostly in place;
         // it's a matter of actually adding the feature.
-        let ruleBehavior = processor.processKeystroke(new KeyEvent(keyEvent), target);
+        // TODO-web-core
+        const ruleBehavior = processor.processKeystroke(new KeyEvent(keyEvent), (target as OutputTargetBase));
 
         if (this.debugMode) {
           console.log("Processing %d:", keyEvent.Lcode);
diff --git a/web/src/tools/testing/recorder-core/src/proctor.ts b/web/src/tools/testing/recorder-core/src/proctor.ts
index ec4f584b048..0242b911a1c 100644
--- a/web/src/tools/testing/recorder-core/src/proctor.ts
+++ b/web/src/tools/testing/recorder-core/src/proctor.ts
@@ -1,5 +1,5 @@
 import { type DeviceSpec } from "@keymanapp/web-utils";
-import { type OutputTarget } from "keyman/engine/js-processor";
+import { type OutputTarget } from "keyman/engine/keyboard";
 
 import type { KeyboardTest, TestSet, TestSequence } from "./index.js";
 
diff --git a/web/src/tools/testing/recorder/browserProctor.ts b/web/src/tools/testing/recorder/browserProctor.ts
index a48e5572cbe..73e5a80ea7f 100644
--- a/web/src/tools/testing/recorder/browserProctor.ts
+++ b/web/src/tools/testing/recorder/browserProctor.ts
@@ -4,7 +4,7 @@
 
 import { type DeviceSpec } from "@keymanapp/web-utils";
 
-import { type OutputTarget } from "keyman/engine/js-processor";
+import { type OutputTarget } from "keyman/engine/keyboard";
 
 import { type KeymanEngine } from 'keyman/app/browser';
 

From 30fc5db6f6c958d84562fb1e8784f626ad8ef77e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 3 Mar 2025 18:06:17 +0100
Subject: [PATCH 069/254] test(web): add stress-test page for loading KMX
 keyboard from blob

This currently occasionally fails when run with WebKit (e.g. Epiphany
browser).
---
 web/src/test/manual/web/core/index.html       |  61 ++++++++++++++++++
 .../manual/web/core/test_8568_deadkeys.kmx    | Bin 0 -> 1326 bytes
 web/src/test/manual/web/index.html            |   1 +
 3 files changed, 62 insertions(+)
 create mode 100644 web/src/test/manual/web/core/index.html
 create mode 100644 web/src/test/manual/web/core/test_8568_deadkeys.kmx

diff --git a/web/src/test/manual/web/core/index.html b/web/src/test/manual/web/core/index.html
new file mode 100644
index 00000000000..989cc88ff7d
--- /dev/null
+++ b/web/src/test/manual/web/core/index.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+
+  <!-- Set the viewport width to match phone and tablet device widths -->
+  <meta name="viewport" content="width=device-width,user-scalable=no" />
+
+  <title>KeymanWeb Core Stress Test</title>
+
+  <script module="es6" type="module">
+    import { KM_Core } from '../../../../../build/engine/core-processor/lib/index.mjs';
+
+    async function loadKeyboardBlob(uri) {
+      const response = await fetch(uri);
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status} ${response.statusText}`);
+      }
+
+      const buffer = await response.arrayBuffer();
+      return new Uint8Array(buffer);
+    }
+
+    let intervalId = null;
+
+    function stress() {
+      if (intervalId) {
+        window.clearInterval(intervalId);
+        intervalId = null;
+        console.log('Stopping stress');
+        return;
+      }
+      intervalId = window.setInterval(doStress, 10);
+    }
+
+    async function doStress() {
+      console.log('Starting to stress');
+      const km_core = await KM_Core.createCoreProcessor('../../../../../build/engine/core-processor/obj/import/core');
+      const blob = await loadKeyboardBlob('./test_8568_deadkeys.kmx')
+      const result = km_core.keyboard_load_from_blob('test', blob);
+      result.delete();
+    }
+
+    window.addEventListener('load', function () {
+      document.getElementById('stress').addEventListener('click', stress);
+    });
+
+  </script>
+</head>
+
+<body>
+  <h2>KeymanWeb Sample Page - Core Testing</h2>
+  <p>This page is designed to stress-test the loading a KMX keyboard from blob.</p>
+  <p>Be sure to reference the developer console for additional feedback. </p>
+  <button id="stress">Stress Test</button>
+  <hr />
+  <h3><a href="../index.html">Return to testing home page</a></h3>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/web/src/test/manual/web/core/test_8568_deadkeys.kmx b/web/src/test/manual/web/core/test_8568_deadkeys.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..88f00e8baf5cb34b76f0c49e74ea59f021eded31
GIT binary patch
literal 1326
zcmZ{kJxtS46vYn(p`e3NR8T{jXc{$!(9)KgIG~`kLD4`p$|Mv}B2v=&5f&#$CkNx;
zWE{{q7$#zjA<V`&7-JlalQB+CPDK6P+lMWKH{5&9J@3BzK6w8QUn-2LO^S4$ekiQL
z0=64B-jBa-l>T7Qf7ZRFN_PRzDa_$E=Oy?8-veI-m+=;OG$O6Rqwp?xJ06GUz#g1G
z-6xFW+u=*#lfd7AD}jFm-v|B;{2KT#@Mqx7>{qz;=>T^Gegr%i_;D~3_z0K_{0cZ8
zcp01v{2q8W@JHYSyq*59z^C|t%9_@MZW5;y(;dyiufc{<7IlNMd9p#W+xVPHS^&#v
zmX}pwM#*au>QlFR@FcO<IZMIK>ibz<V0MMIimXs^9@7k+tn(E41o1k!$Y@NHx}~e&
zAstXwX=R9q=@Qq7PUx&o!4tl=trpislu?Z-uX9w$PqD~+JKsE=OR$Pp7MMS(A?gd%
zOV6mX{U<p=%sZR`^USh4DuZ@g)iY0UAGX>6tDM(m`sC@9qm%6>OB|w8%x}@wH8n##
zsS9MYoW0~{6|4234|;V1wvi`%H?=%T-di_rdrYyTT1Cp0$vP#ClHOF4aizYd4<)my
zChJOl%`sPsb)D_TZQj%-&Gu}k`QLl^z`Of`Z&)j&0k^kSy(RnF_StYhFSbc~jGMMM
zXiMbFxZTuF)36otRXho|7jCvj{uZ|zvoGH49r-6b1-CEX>@)dyJPo&B0J9(D>$v^D
zI$V){lkevj#7@^4v@Y_a_yW7H_?s&7s}t2Wzm*w3lf9Cn=Qd(zwHIkT;@nsxika~y
fk2J-qb<M7{@Ez2&sB5igHmA+wRv)kJVA}J)EJLBg

literal 0
HcmV?d00001

diff --git a/web/src/test/manual/web/index.html b/web/src/test/manual/web/index.html
index 6d608b08d33..4538fad148e 100644
--- a/web/src/test/manual/web/index.html
+++ b/web/src/test/manual/web/index.html
@@ -30,6 +30,7 @@ <h2><a href="./gesture-recognizer/index.html">Stand-alone gesture recognition</a
 
   <h1>Miscellaneous tests for smaller features</h1>
   <h2><a href="./chirality/index.html">Chirality testing/bootstrapping</a></h2>
+  <h2><a href="./core/index.html">KeymanWeb Core Stress Test</a></h2>
   <h2><a href="./options-with-save/index.html">Tests option/variable store functionality</a></h2>
   <h2><a href="./platform/index.html">Platform testing</a></h2>
   <h2><a href="./prediction-ui/index.html">Prediction UI testing</a></h2>

From e16452b7843e862e21602d53e19522bceb517f81 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 4 Mar 2025 13:47:20 +0100
Subject: [PATCH 070/254] test(web): polish stress test for KM_Core

Makes use of modules to make it easier to make additional tests,
establishes an import map, renames to stress.html, and adds the stress
test link to the manual testing home page.
---
 .../manual/web/core/keymanweb_import_map.json |  5 ++++
 .../manual/web/core/load-keyboard-blob.js     |  9 ++++++
 web/src/test/manual/web/core/paths.js         |  1 +
 .../web/core/{index.html => stress.html}      | 28 +++++++++++--------
 web/src/test/manual/web/index.html            |  3 ++
 5 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 web/src/test/manual/web/core/keymanweb_import_map.json
 create mode 100644 web/src/test/manual/web/core/load-keyboard-blob.js
 create mode 100644 web/src/test/manual/web/core/paths.js
 rename web/src/test/manual/web/core/{index.html => stress.html} (70%)

diff --git a/web/src/test/manual/web/core/keymanweb_import_map.json b/web/src/test/manual/web/core/keymanweb_import_map.json
new file mode 100644
index 00000000000..b2013bb33f5
--- /dev/null
+++ b/web/src/test/manual/web/core/keymanweb_import_map.json
@@ -0,0 +1,5 @@
+{
+  "imports": {
+    "keyman/": "../../../../../build/"
+  }
+}
diff --git a/web/src/test/manual/web/core/load-keyboard-blob.js b/web/src/test/manual/web/core/load-keyboard-blob.js
new file mode 100644
index 00000000000..527f0e72038
--- /dev/null
+++ b/web/src/test/manual/web/core/load-keyboard-blob.js
@@ -0,0 +1,9 @@
+export async function loadKeyboardBlob(uri) {
+  const response = await fetch(uri);
+  if (!response.ok) {
+    throw new Error(`HTTP ${response.status} ${response.statusText}`);
+  }
+
+  const buffer = await response.arrayBuffer();
+  return new Uint8Array(buffer);
+}
diff --git a/web/src/test/manual/web/core/paths.js b/web/src/test/manual/web/core/paths.js
new file mode 100644
index 00000000000..5b595711fa3
--- /dev/null
+++ b/web/src/test/manual/web/core/paths.js
@@ -0,0 +1 @@
+export const CORE_WASM = '../../../../../build/engine/core-processor/obj/import/core';
diff --git a/web/src/test/manual/web/core/index.html b/web/src/test/manual/web/core/stress.html
similarity index 70%
rename from web/src/test/manual/web/core/index.html
rename to web/src/test/manual/web/core/stress.html
index 989cc88ff7d..14c1bded17b 100644
--- a/web/src/test/manual/web/core/index.html
+++ b/web/src/test/manual/web/core/stress.html
@@ -9,18 +9,22 @@
 
   <title>KeymanWeb Core Stress Test</title>
 
-  <script module="es6" type="module">
-    import { KM_Core } from '../../../../../build/engine/core-processor/lib/index.mjs';
-
-    async function loadKeyboardBlob(uri) {
-      const response = await fetch(uri);
-      if (!response.ok) {
-        throw new Error(`HTTP ${response.status} ${response.statusText}`);
+  <!--
+    Import map defines where we can find KeymanWeb compiled modules; this must
+    be specified inline.
+  -->
+  <script type="importmap">
+    {
+      "imports": {
+        "keyman/": "../../../../../build/"
       }
-
-      const buffer = await response.arrayBuffer();
-      return new Uint8Array(buffer);
     }
+  </script>
+
+  <script module="es6" type="module">
+    import { KM_Core } from 'keyman/engine/core-processor/lib/index.mjs';
+    import { CORE_WASM } from './paths.js';
+    import { loadKeyboardBlob } from './load-keyboard-blob.js';
 
     let intervalId = null;
 
@@ -36,7 +40,7 @@
 
     async function doStress() {
       console.log('Starting to stress');
-      const km_core = await KM_Core.createCoreProcessor('../../../../../build/engine/core-processor/obj/import/core');
+      const km_core = await KM_Core.createCoreProcessor(CORE_WASM);
       const blob = await loadKeyboardBlob('./test_8568_deadkeys.kmx')
       const result = km_core.keyboard_load_from_blob('test', blob);
       result.delete();
@@ -51,7 +55,7 @@
 
 <body>
   <h2>KeymanWeb Sample Page - Core Testing</h2>
-  <p>This page is designed to stress-test the loading a KMX keyboard from blob.</p>
+  <p>This page is designed to stress-test the loading a KMX keyboard from blob. It will repeatedly load a .kmx using </p>
   <p>Be sure to reference the developer console for additional feedback. </p>
   <button id="stress">Stress Test</button>
   <hr />
diff --git a/web/src/test/manual/web/index.html b/web/src/test/manual/web/index.html
index 4538fad148e..79df856b26d 100644
--- a/web/src/test/manual/web/index.html
+++ b/web/src/test/manual/web/index.html
@@ -46,6 +46,9 @@ <h2><a href="./issue29/index.html">Test desktop MutationObserver functionality</
   <h2><a href="./issue62/index.html">Light test for touch-based MutationObserver functionality</a></h2>
   <h2><a href="./issue63/index.html">Test/stress-test touch-based MutationObserver functionality</a></h2>
 
+  <h1>Keyman Core tests</h1>
+  <h2><a href="./core/stress.html">Stress-test kmx blob loader</a></h2>
+
   <h1>Issue Testing</h1>
   <h2><a href="./empty-row/index.html">Tests OSK handling of empty rows</a></h2>
   <h2><a href="./keyboard-errors/index.html">Tests keyboard error-handling functionality</a></h2>

From 024f1a918e1e704b5f3b1f4265432a4a525af814 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 4 Mar 2025 13:51:03 +0100
Subject: [PATCH 071/254] test(web): remove unnecessary import map standalone
 file

---
 web/src/test/manual/web/core/keymanweb_import_map.json | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 web/src/test/manual/web/core/keymanweb_import_map.json

diff --git a/web/src/test/manual/web/core/keymanweb_import_map.json b/web/src/test/manual/web/core/keymanweb_import_map.json
deleted file mode 100644
index b2013bb33f5..00000000000
--- a/web/src/test/manual/web/core/keymanweb_import_map.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "imports": {
-    "keyman/": "../../../../../build/"
-  }
-}

From 5c7030ffa2b0a2c134350968e0aa690b500e7709 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 5 Mar 2025 18:05:35 +0100
Subject: [PATCH 072/254] refactor(core): address code review comment

---
 core/tests/unit/wasm/wasm.tests.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/tests/unit/wasm/wasm.tests.js b/core/tests/unit/wasm/wasm.tests.js
index fd349d023ba..110ff6f8882 100644
--- a/core/tests/unit/wasm/wasm.tests.js
+++ b/core/tests/unit/wasm/wasm.tests.js
@@ -48,6 +48,14 @@ describe('Unit tests for wasm Core API', function () {
     return result.object;
   }
 
+  function createState(keyboardName) {
+    const keyboard = loadKeyboard(keyboardName);
+    const state = km_core.state_create(keyboard, []);
+    assert.equal(state.status, 0);
+    assert.isOk(state.object);
+    return state.object;
+  }
+
   it('can dispose keyboard', function () {
     // Setup
     const keyboard = loadKeyboard('k_020___deadkeys_and_backspace');
@@ -108,8 +116,7 @@ describe('Unit tests for wasm Core API', function () {
 
   it('can process event', function () {
     // Setup
-    const keyboard = loadKeyboard('k_020___deadkeys_and_backspace');
-    const state = km_core.state_create(keyboard, []).object;
+    const state = createState('k_020___deadkeys_and_backspace');
 
     // Execute
     const status = km_core.process_event(state, 0x20, 0, 1, 0);
@@ -127,8 +134,8 @@ describe('Unit tests for wasm Core API', function () {
   });
 
   it('can set the context', function () {
-    const keyboard = loadKeyboard('k_020___deadkeys_and_backspace');
-    const state = km_core.state_create(keyboard, []).object;
+    // Setup
+    const state = createState('k_020___deadkeys_and_backspace');
 
     // Execute
     const status = km_core.state_context_set_if_needed(state, 'abc');

From 626a43f6a1160ad1203ae5e346361f7976fc916b Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 5 Mar 2025 18:21:49 +0100
Subject: [PATCH 073/254] docs(web): update parameter name in function headers

Addresses code review comment.
---
 .../js-processor/src/jsKeyboardInterface.ts   | 101 +++++++++---------
 1 file changed, 50 insertions(+), 51 deletions(-)

diff --git a/web/src/engine/js-processor/src/jsKeyboardInterface.ts b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
index 2fba38e49c4..dcaea0a8be2 100644
--- a/web/src/engine/js-processor/src/jsKeyboardInterface.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
@@ -238,10 +238,10 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * Get *cached or uncached* keyboard context for a specified range, relative to caret
    *
-   * @param       {number}      n       Number of characters to move back from caret
-   * @param       {number}      ln      Number of characters to return
-   * @param       {Object}      Pelem   Element to work with (must be currently focused element)
-   * @return      {string}              Context string
+   * @param       {number}      n             Number of characters to move back from caret
+   * @param       {number}      ln            Number of characters to return
+   * @param       {Object}      outputTarget  Element to work with (must be currently focused element)
+   * @return      {string}                    Context string
    *
    * Example     [abcdef|ghi] as INPUT, with the caret position marked by |:
    *             KC(2,1,Pelem) == "e"
@@ -263,10 +263,10 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * Get (uncached) keyboard context for a specified range, relative to caret
    *
-   * @param       {number}      n       Number of characters to move back from caret
-   * @param       {number}      ln      Number of characters to return
-   * @param       {Object}      Pelem   Element to work with (must be currently focused element)
-   * @return      {string}              Context string
+   * @param       {number}      n             Number of characters to move back from caret
+   * @param       {number}      ln            Number of characters to return
+   * @param       {Object}      outputTarget  Element to work with (must be currently focused element)
+   * @return      {string}                    Context string
    *
    * Example     [abcdef|ghi] as INPUT, with the caret position marked by |:
    *             KC(2,1,Pelem) == "e"
@@ -289,9 +289,9 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * Function     nul           KN
    * Scope        Public
-   * @param       {number}      n       Length of context to check
-   * @param       {Object}      Ptarg   Element to work with (must be currently focused element)
-   * @return      {boolean}             True if length of context is less than or equal to n
+   * @param       {number}      n             Length of context to check
+   * @param       {Object}      outputTarget  Element to work with (must be currently focused element)
+   * @return      {boolean}                   True if length of context is less than or equal to n
    * Description  Test length of context, return true if the length of the context is less than or equal to n
    *
    * Example     [abc|def] as INPUT, with the caret position marked by |:
@@ -309,11 +309,11 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * Function     contextMatch  KCM
    * Scope        Public
-   * @param       {number}      n       Number of characters to move back from caret
-   * @param       {Object}      Ptarg   Focused element
-   * @param       {string}      val     String to match
-   * @param       {number}      ln      Number of characters to return
-   * @return      {boolean}             True if selected context matches val
+   * @param       {number}      n             Number of characters to move back from caret
+   * @param       {Object}      outputTarget  Focused element
+   * @param       {string}      val           String to match
+   * @param       {number}      ln            Number of characters to return
+   * @return      {boolean}                   True if selected context matches val
    * Description  Test keyboard context for match
    */
   contextMatch(n: number, outputTarget: OutputTarget, val: string, ln: number): boolean {
@@ -328,10 +328,10 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * Builds the *cached or uncached* keyboard context for a specified range, relative to caret
    *
-   * @param       {number}      n       Number of characters to move back from caret
-   * @param       {number}      ln      Number of characters to return
-   * @param       {Object}      Pelem   Element to work with (must be currently focused element)
-   * @return      {Array}               Context array (of strings and numbers)
+   * @param       {number}      n             Number of characters to move back from caret
+   * @param       {number}      ln            Number of characters to return
+   * @param       {Object}      outputTarget  Element to work with (must be currently focused element)
+   * @return      {Array}                     Context array (of strings and numbers)
    */
   private _BuildExtendedContext(n: number, ln: number, outputTarget: OutputTargetBase): CachedExEntry {
     var cache: CachedExEntry = this.cachedContextEx.get(n, ln);
@@ -382,10 +382,10 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * Function       fullContextMatch    KFCM
    * Scope          Private
-   * @param         {number}    n       Number of characters to move back from caret
-   * @param         {Object}    Ptarg   Focused element
-   * @param         {Array}     rule    An array of ContextEntries to match.
-   * @return        {boolean}           True if the fully-specified rule context matches the current KMW state.
+   * @param         {number}    n             Number of characters to move back from caret
+   * @param         {Object}    outputTarget  Focused element
+   * @param         {Array}     rule          An array of ContextEntries to match.
+   * @return        {boolean}                 True if the fully-specified rule context matches the current KMW state.
    *
    * A KMW 10+ function designed to bring KMW closer to Keyman Desktop functionality,
    * near-directly modeling (externally) the compiled form of Desktop rules' context section.
@@ -608,10 +608,10 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * Function     deadkeyMatch  KDM
    * Scope        Public
-   * @param       {number}      n       offset from current cursor position
-   * @param       {Object}      Ptarg   target element
-   * @param       {number}      d       deadkey
-   * @return      {boolean}             True if deadkey found selected context matches val
+   * @param       {number}      n             offset from current cursor position
+   * @param       {Object}      outputTarget  target element
+   * @param       {number}      d             deadkey
+   * @return      {boolean}                   True if deadkey found selected context matches val
    * Description  Match deadkey at current cursor position
    */
   deadkeyMatch(n: number, outputTarget: OutputTarget, d: number): boolean {
@@ -621,7 +621,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * Function     beep          KB
    * Scope        Public
-   * @param       {Object}      Pelem     element to flash
+   * @param       {Object}      outputTarget  element to flash
    * Description  Flash body as substitute for audible beep; notify embedded device to vibrate
    */
   beep(outputTarget: OutputTarget): void {
@@ -711,10 +711,10 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * Function     indexOutput   KIO
    * Scope        Public
-   * @param       {number}      Pdn     no of character to overwrite (delete)
-   * @param       {string}      Ps      string
-   * @param       {number}      Pn      index
-   * @param       {Object}      Pelem   element to output to
+   * @param       {number}      Pdn           no of character to overwrite (delete)
+   * @param       {string}      Ps            string
+   * @param       {number}      Pn            index
+   * @param       {Object}      outputTarget  element to output to
    * Description  Output a character selected from the string according to the offset in the index array
    */
   indexOutput(Pdn: number, Ps: KeyboardStore, Pn: number, outputTarget: OutputTarget): void {
@@ -750,9 +750,8 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * Function     deleteContext KDC
    * Scope        Public
-   * @param       {number}      dn      number of context entries to overwrite
-   * @param       {Object}      Pelem   element to output to
-   * @param       {string}      s       string to output
+   * @param       {number}      dn            number of context entries to overwrite
+   * @param       {Object}      outputTarget  element to output to
    * Description  Keyboard output
    */
   deleteContext(dn: number, outputTarget: OutputTarget): void {
@@ -796,9 +795,9 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * Function     output        KO
    * Scope        Public
-   * @param       {number}      dn      number of characters to overwrite
-   * @param       {Object}      Pelem   element to output to
-   * @param       {string}      s       string to output
+   * @param       {number}      dn            number of characters to overwrite
+   * @param       {Object}      outputTarget  element to output to
+   * @param       {string}      s             string to output
    * Description  Keyboard output
    */
   output(dn: number, outputTarget: OutputTarget, s:string): void {
@@ -849,9 +848,9 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * Function     deadkeyOutput KDO
    * Scope        Public
-   * @param       {number}      Pdn     no of character to overwrite (delete)
-   * @param       {Object}      Pelem   element to output to
-   * @param       {number}      Pd      deadkey id
+   * @param       {number}      Pdn           no of character to overwrite (delete)
+   * @param       {Object}      outputTarget  element to output to
+   * @param       {number}      Pd            deadkey id
    * Description  Record a deadkey at current cursor position, deleting Pdn characters first
    */
   deadkeyOutput(Pdn: number, outputTarget: OutputTarget, Pd: number): void {
@@ -868,10 +867,10 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * KIFS compares the content of a system store with a string value
    *
-   * @param       {number}      systemId    ID of the system store to test (only TSS_LAYER currently supported)
-   * @param       {string}      strValue    String value to compare to
-   * @param       {Object}      Pelem       Currently active element (may be needed by future tests)
-   * @return      {boolean}                 True if the test succeeds
+   * @param       {number}      systemId      ID of the system store to test (only TSS_LAYER currently supported)
+   * @param       {string}      strValue      String value to compare to
+   * @param       {Object}      outputTarget  Currently active element (may be needed by future tests)
+   * @return      {boolean}                   True if the test succeeds
    */
   ifStore(systemId: number, strValue: string, outputTarget: OutputTarget): boolean {
     var result=true;
@@ -885,11 +884,11 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * KSETS sets the value of a system store to a string
    *
-   * @param       {number}      systemId    ID of the system store to set (only TSS_LAYER currently supported)
-   * @param       {string}      strValue    String to set as the system store content
-   * @param       {Object}      Pelem       Currently active element (may be needed in future tests)
-   * @return      {boolean}                 True if command succeeds
-   *                                        (i.e. for TSS_LAYER, if the layer is successfully selected)
+   * @param       {number}      systemId      ID of the system store to set (only TSS_LAYER currently supported)
+   * @param       {string}      strValue      String to set as the system store content
+   * @param       {Object}      outputTarget  Currently active element (may be needed in future tests)
+   * @return      {boolean}                   True if command succeeds
+   *                                          (i.e. for TSS_LAYER, if the layer is successfully selected)
    *
    * Note that option/variable stores are instead set within keyboard script code, as they only
    * affect keyboard behavior.

From a8d37843e59781b874020e6e7af6f4a0cc87226e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
Date: Wed, 5 Mar 2025 18:25:08 +0100
Subject: [PATCH 074/254] Update web/src/test/manual/web/core/stress.html

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 web/src/test/manual/web/core/stress.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/test/manual/web/core/stress.html b/web/src/test/manual/web/core/stress.html
index 14c1bded17b..fed4dfeaa0d 100644
--- a/web/src/test/manual/web/core/stress.html
+++ b/web/src/test/manual/web/core/stress.html
@@ -55,7 +55,7 @@
 
 <body>
   <h2>KeymanWeb Sample Page - Core Testing</h2>
-  <p>This page is designed to stress-test the loading a KMX keyboard from blob. It will repeatedly load a .kmx using </p>
+  <p>This page is designed to stress-test the loading a KMX keyboard from blob. It will repeatedly load a .kmx using the KM_Core loader.</p>
   <p>Be sure to reference the developer console for additional feedback. </p>
   <button id="stress">Stress Test</button>
   <hr />

From 18aed967ccc8572abc6db22d72cb7357f5ac83f2 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
Date: Wed, 5 Mar 2025 18:27:43 +0100
Subject: [PATCH 075/254] Update web/src/test/manual/web/index.html

---
 web/src/test/manual/web/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/src/test/manual/web/index.html b/web/src/test/manual/web/index.html
index 79df856b26d..04ad2a84fc9 100644
--- a/web/src/test/manual/web/index.html
+++ b/web/src/test/manual/web/index.html
@@ -30,7 +30,6 @@ <h2><a href="./gesture-recognizer/index.html">Stand-alone gesture recognition</a
 
   <h1>Miscellaneous tests for smaller features</h1>
   <h2><a href="./chirality/index.html">Chirality testing/bootstrapping</a></h2>
-  <h2><a href="./core/index.html">KeymanWeb Core Stress Test</a></h2>
   <h2><a href="./options-with-save/index.html">Tests option/variable store functionality</a></h2>
   <h2><a href="./platform/index.html">Platform testing</a></h2>
   <h2><a href="./prediction-ui/index.html">Prediction UI testing</a></h2>

From 676967e95cba7254eba96889472acb2aee976fb7 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Sat, 15 Mar 2025 15:12:00 +0700
Subject: [PATCH 076/254] chore(web): rename KeyboardInterface to
 JSKeyboardInterface in one test

---
 .../headless/engine/main/headless/inputProcessor.tests.js   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
index b73e40b3002..9eebd0dbf21 100644
--- a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
@@ -5,7 +5,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { InputProcessor } from 'keyman/engine/main';
-import { KeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest } from '@keymanapp/recorder-core';
@@ -93,7 +93,7 @@ describe('InputProcessor', function() {
       }
 
       // Load the keyboard.
-      let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
+      let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
       const keyboard = await keyboardLoader.loadKeyboardFromPath(require.resolve('@keymanapp/common-test-resources/keyboards/test_chirality.js'));
       keyboardWithHarness = keyboardLoader.harness;
       keyboardWithHarness.activeKeyboard = keyboard;
@@ -188,7 +188,7 @@ describe('InputProcessor', function() {
 
     before(async function () {
       // Load the keyboard.
-      let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
+      let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
       const keyboard = await keyboardLoader.loadKeyboardFromPath(require.resolve('@keymanapp/common-test-resources/keyboards/test_8568_deadkeys.js'));
       keyboardWithHarness = keyboardLoader.harness;
       keyboardWithHarness.activeKeyboard = keyboard;

From e68acd8b98d1eb88e61efaf55b7e92094239103c Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 3 Apr 2025 12:35:52 +0700
Subject: [PATCH 077/254] chore(linux): cleanup c++ for updated compiler

---
 linux/mcompile/keymap/mc_kmxfile.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/mcompile/keymap/mc_kmxfile.cpp b/linux/mcompile/keymap/mc_kmxfile.cpp
index 674da61fa1d..039ae075f14 100644
--- a/linux/mcompile/keymap/mc_kmxfile.cpp
+++ b/linux/mcompile/keymap/mc_kmxfile.cpp
@@ -346,7 +346,7 @@ LPKMX_KEYBOARD CopyKeyboard(PKMX_BYTE bufp, PKMX_BYTE base) {
  * @return pointer to the keyboard
  */
 LPKMX_KEYBOARD KMX_FixupKeyboard(PKMX_BYTE bufp, PKMX_BYTE base, KMX_DWORD dwFileSize) {
-  UNREFERENCED_PARAMETER(dwFileSize);
+  // UNREFERENCED_PARAMETER(dwFileSize);
 
   KMX_DWORD i, j;
   PCOMP_KEYBOARD ckbp = (PCOMP_KEYBOARD)base;
@@ -369,9 +369,9 @@ LPKMX_KEYBOARD KMX_FixupKeyboard(PKMX_BYTE bufp, PKMX_BYTE base, KMX_DWORD dwFil
   for (gp = kbp->dpGroupArray, cgp = (PCOMP_GROUP)gp, i = 0; i < kbp->cxGroupArray; i++, gp++, cgp++) {
     gp->dpName = KMX_StringOffset(base, cgp->dpName);
     gp->dpKeyArray = (LPKMX_KEY)(base + cgp->dpKeyArray);
-    if (cgp->dpMatch != NULL)
+    if (cgp->dpMatch != 0)
       gp->dpMatch = (PKMX_WCHAR)(base + cgp->dpMatch);
-    if (cgp->dpNoMatch != NULL)
+    if (cgp->dpNoMatch != 0)
       gp->dpNoMatch = (PKMX_WCHAR)(base + cgp->dpNoMatch);
 
     for (kp = gp->dpKeyArray, ckp = (PCOMP_KEY)kp, j = 0; j < gp->cxKeyArray; j++, kp++, ckp++) {

From 181e211de81a8af2c3c31a7b554928cdc2a25642 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 16 Apr 2025 19:06:30 +0200
Subject: [PATCH 078/254] fix(common): export KEYMAN_ROOT so that it is
 available in subprocesses

Without the export we had the case where a web test relied on
`KEYMAN_ROOT` to get the path, but it was undefined. I have no idea why
this suddenly showed up with changes that just renamed a file and a
class, but exporting it fixes it.
---
 resources/build/builder.inc.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/build/builder.inc.sh b/resources/build/builder.inc.sh
index 70d7d07c167..31c5e339ea3 100644
--- a/resources/build/builder.inc.sh
+++ b/resources/build/builder.inc.sh
@@ -25,6 +25,7 @@ function __builder_find_keyman_root() {
     KEYMAN_ROOT="${BASH_SOURCE[0]%/*/*/*}"
     KEYMAN_ROOT="$( cd "$KEYMAN_ROOT" && echo "$PWD" )"
     readonly KEYMAN_ROOT
+    export KEYMAN_ROOT
   fi
 }
 

From 3093ccd9ebaeaf79ad3cf1fdc8169200f8f8d5cc Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 15 Apr 2025 19:06:53 +0200
Subject: [PATCH 079/254] =?UTF-8?q?refactor(web):=20rename=20`KeyboardInte?=
 =?UTF-8?q?rface`=20=E2=86=92=20`KeyboardInterfaceBase`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: #13438
---
 web/src/app/browser/src/contextManager.ts                   | 4 ++--
 web/src/app/browser/src/keyboardInterface.ts                | 4 ++--
 web/src/app/browser/src/keymanEngine.ts                     | 2 +-
 web/src/app/browser/src/test-index.ts                       | 2 +-
 web/src/app/webview/src/keymanEngine.ts                     | 4 ++--
 web/src/engine/main/src/index.ts                            | 2 +-
 .../src/{keyboardInterface.ts => keyboardInterfaceBase.ts}  | 6 +++---
 web/src/engine/main/src/keymanEngineBase.ts                 | 6 +++---
 8 files changed, 15 insertions(+), 15 deletions(-)
 rename web/src/engine/main/src/{keyboardInterface.ts => keyboardInterfaceBase.ts} (94%)

diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index 7f9c08ffc6e..60af19a86c7 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -6,7 +6,7 @@ import { DomEventTracker, LegacyEventEmitter } from 'keyman/engine/events';
 import { DesignIFrame, OutputTargetElementWrapper, nestedInstanceOf } from 'keyman/engine/element-wrappers';
 import {
   ContextManagerBase,
-  type KeyboardInterface,
+  type KeyboardInterfaceBase,
   LegacyAPIEvents
 } from 'keyman/engine/main';
 import { BrowserConfiguration } from './configuration.js';
@@ -344,7 +344,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     this.focusAssistant.restoringFocus = false;
   }
 
-  insertText(kbdInterface: KeyboardInterface<ContextManager>, Ptext: string, PdeadKey: number) {
+  insertText(kbdInterface: KeyboardInterfaceBase<ContextManager>, Ptext: string, PdeadKey: number) {
     // Find the correct output target to manipulate.  The user has likely be interacting with a
     // 'help page' keyboard, like desktop `sil_euro_latin`, and active browser focus on the
     // original context element may have been lost.
diff --git a/web/src/app/browser/src/keyboardInterface.ts b/web/src/app/browser/src/keyboardInterface.ts
index 495c1e90edf..69b1bc74473 100644
--- a/web/src/app/browser/src/keyboardInterface.ts
+++ b/web/src/app/browser/src/keyboardInterface.ts
@@ -1,11 +1,11 @@
 import { type OutputTargetElementWrapper } from 'keyman/engine/element-wrappers';
 import { FloatingOSKView } from 'keyman/engine/osk';
-import { KeyboardInterface as KeyboardInterfaceBase } from 'keyman/engine/main';
+import { KeyboardInterfaceBase } from 'keyman/engine/main';
 
 import ContextManager from './contextManager.js';
 import { KeymanEngine } from './keymanEngine.js';
 
-export default class KeyboardInterface extends KeyboardInterfaceBase<ContextManager> {
+export class KeyboardInterface extends KeyboardInterfaceBase<ContextManager> {
   constructor(
     _jsGlobal: any,
     engine: KeymanEngine,
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 67c146a34e3..e3fa8f1bfa6 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -26,7 +26,7 @@ import { UtilApiEndpoint} from './utilApiEndpoint.js';
 import { UIModule } from './uiModuleInterface.js';
 import { HotkeyManager } from './hotkeyManager.js';
 import { BeepHandler } from './beepHandler.js';
-import KeyboardInterface from './keyboardInterface.js';
+import { KeyboardInterface } from './keyboardInterface.js';
 import { WorkerFactory } from '@keymanapp/lexical-model-layer/web';
 
 export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, ContextManager, HardwareEventKeyboard> {
diff --git a/web/src/app/browser/src/test-index.ts b/web/src/app/browser/src/test-index.ts
index 408b47cba6b..83df5dc8e76 100644
--- a/web/src/app/browser/src/test-index.ts
+++ b/web/src/app/browser/src/test-index.ts
@@ -3,5 +3,5 @@ export { default as ContextManager, KeyboardCookie } from "./contextManager.js";
 export { preprocessKeyboardEvent, default as HardwareEventKeyboard } from './hardwareEventKeyboard.js';
 
 export { KeymanEngine } from './keymanEngine.js';
-export { default as KeyboardInterface } from './keyboardInterface.js';
+export { KeyboardInterface } from './keyboardInterface.js';
 export { UIModule } from './uiModuleInterface.js';
diff --git a/web/src/app/webview/src/keymanEngine.ts b/web/src/app/webview/src/keymanEngine.ts
index 2fce06ed624..5169fee0a9a 100644
--- a/web/src/app/webview/src/keymanEngine.ts
+++ b/web/src/app/webview/src/keymanEngine.ts
@@ -1,6 +1,6 @@
 import { DeviceSpec, DefaultRules } from 'keyman/engine/keyboard';
 import { RuleBehavior } from 'keyman/engine/js-processor';
-import { KeymanEngineBase, KeyboardInterface } from 'keyman/engine/main';
+import { KeymanEngineBase, KeyboardInterfaceBase } from 'keyman/engine/main';
 import { AnchoredOSKView, ViewConfiguration, StaticActivator } from 'keyman/engine/osk';
 import { getAbsoluteX, getAbsoluteY } from 'keyman/engine/dom-utils';
 import { toPrefixedKeyboardId, toUnprefixedKeyboardId } from 'keyman/engine/keyboard-storage';
@@ -35,7 +35,7 @@ export class KeymanEngine extends KeymanEngineBase<WebviewConfiguration, Context
       return {
         // The `engine` parameter cannot be supplied with the constructing instance before calling
         // `super`, hence the 'fun' rigging to supply it _from_ `super` via this closure.
-        keyboardInterface: new KeyboardInterface(window, engine, config.stubNamespacer),
+        keyboardInterface: new KeyboardInterfaceBase(window, engine, config.stubNamespacer),
         defaultOutputRules: new DefaultRules()
       };
     });
diff --git a/web/src/engine/main/src/index.ts b/web/src/engine/main/src/index.ts
index 2a8a8533627..23ba92caabd 100644
--- a/web/src/engine/main/src/index.ts
+++ b/web/src/engine/main/src/index.ts
@@ -1,7 +1,7 @@
 export { EngineConfiguration, InitOptionDefaults, InitOptionSpec } from './engineConfiguration.js';
 export { ContextManagerBase, ContextManagerConfiguration } from './contextManagerBase.js';
 export { default as HardKeyboard, processForMnemonicsAndLegacy } from './hardKeyboard.js';
-export { default as KeyboardInterface } from './keyboardInterface.js';
+export { KeyboardInterfaceBase } from './keyboardInterfaceBase.js';
 export { KeymanEngineBase } from './keymanEngineBase.js';
 export { LegacyAPIEvents } from './legacyAPIEvents.js';
 export { VariableStoreCookieSerializer } from './variableStoreCookieSerializer.js';
diff --git a/web/src/engine/main/src/keyboardInterface.ts b/web/src/engine/main/src/keyboardInterfaceBase.ts
similarity index 94%
rename from web/src/engine/main/src/keyboardInterface.ts
rename to web/src/engine/main/src/keyboardInterfaceBase.ts
index 63e54139c26..98ba74864ea 100644
--- a/web/src/engine/main/src/keyboardInterface.ts
+++ b/web/src/engine/main/src/keyboardInterfaceBase.ts
@@ -1,5 +1,5 @@
 import { KeymanWebKeyboard } from '@keymanapp/common-types';
-import { JSKeyboardInterface as KeyboardInterfaceBase } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface  } from 'keyman/engine/js-processor';
 import { KeyboardStub, RawKeyboardStub, toUnprefixedKeyboardId as unprefixed } from 'keyman/engine/keyboard-storage';
 
 import KeyboardObject = KeymanWebKeyboard.KeyboardObject;
@@ -9,7 +9,7 @@ import { VariableStoreCookieSerializer } from "./variableStoreCookieSerializer.j
 import { KeymanEngineBase } from "./keymanEngineBase.js";
 import { EngineConfiguration } from "./engineConfiguration.js";
 
-export default class KeyboardInterface<ContextManagerType extends ContextManagerBase<any>> extends KeyboardInterfaceBase {
+export class KeyboardInterfaceBase<ContextManagerType extends ContextManagerBase<any>> extends JSKeyboardInterface {
   protected readonly engine: KeymanEngineBase<EngineConfiguration, ContextManagerType, any>;
   private stubNamespacer?: (stub: RawKeyboardStub) => void;
 
@@ -122,5 +122,5 @@ export default class KeyboardInterface<ContextManagerType extends ContextManager
 }
 
 (function() {
-  KeyboardInterface.__publishShorthandAPI();
+  KeyboardInterfaceBase.__publishShorthandAPI();
 }());
\ No newline at end of file
diff --git a/web/src/engine/main/src/keymanEngineBase.ts b/web/src/engine/main/src/keymanEngineBase.ts
index d801c5eb7c2..99d9663ba61 100644
--- a/web/src/engine/main/src/keymanEngineBase.ts
+++ b/web/src/engine/main/src/keymanEngineBase.ts
@@ -9,7 +9,7 @@ import { KeyboardRequisitioner, ModelCache, toUnprefixedKeyboardId as unprefixed
 import { ModelSpec, PredictionContext } from "keyman/engine/interfaces";
 
 import { EngineConfiguration, InitOptionSpec } from "./engineConfiguration.js";
-import KeyboardInterface from "./keyboardInterface.js";
+import { KeyboardInterfaceBase } from "./keyboardInterfaceBase.js";
 import { ContextManagerBase } from "./contextManagerBase.js";
 import HardKeyboardBase from "./hardKeyboard.js";
 import { LegacyAPIEvents } from "./legacyAPIEvents.js";
@@ -42,7 +42,7 @@ export class KeymanEngineBase<
 > implements KeyboardKeymanGlobal {
   readonly config: Configuration;
   contextManager: ContextManager;
-  interface: KeyboardInterface<ContextManager>;
+  interface: KeyboardInterfaceBase<ContextManager>;
   readonly core: InputProcessor;
   keyboardRequisitioner: KeyboardRequisitioner;
   modelCache: ModelCache;
@@ -125,7 +125,7 @@ export class KeymanEngineBase<
 
     const processorConfiguration = processorConfigInitializer(this);
     processorConfiguration.baseLayout = determineBaseLayout();
-    this.interface = processorConfiguration.keyboardInterface as KeyboardInterface<ContextManager>;
+    this.interface = processorConfiguration.keyboardInterface as KeyboardInterfaceBase<ContextManager>;
     this.core = new InputProcessor(config.hostDevice, workerFactory, processorConfiguration);
 
     this.core.languageProcessor.on('statechange', (state) => {

From 2b2e8fc85bc28ee3fa18661583f97cf87b32d731 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 15 May 2025 15:41:08 +0200
Subject: [PATCH 080/254] feat(web): dispose KMXKeyboards on shutdown

---
 .../keyboard-storage/src/keyboardRequisitioner.ts    |  4 ++++
 .../keyboard-storage/src/stubAndKeyboardCache.ts     | 12 +++++++++++-
 web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts |  7 +++++++
 web/src/engine/keyboard/tsconfig.json                |  3 +++
 web/src/engine/main/src/hardKeyboard.ts              |  2 +-
 web/src/engine/main/src/index.ts                     |  2 +-
 web/src/engine/main/src/keymanEngineBase.ts          |  3 ++-
 7 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/web/src/engine/keyboard-storage/src/keyboardRequisitioner.ts b/web/src/engine/keyboard-storage/src/keyboardRequisitioner.ts
index 5ca184b217d..5517857cbcb 100644
--- a/web/src/engine/keyboard-storage/src/keyboardRequisitioner.ts
+++ b/web/src/engine/keyboard-storage/src/keyboardRequisitioner.ts
@@ -115,6 +115,10 @@ export default class KeyboardRequisitioner {
     });
   }
 
+  shutdown(): void{
+    this.cache.shutdown();
+  }
+
   addKeyboardArray(x: (string|RawKeyboardMetadata)[]): Promise<(KeyboardStub | ErrorStub)[]> {
     let completeStubs: KeyboardStub[] = [];
     let incompleteStubs: KeyboardStub[] = [];
diff --git a/web/src/engine/keyboard-storage/src/stubAndKeyboardCache.ts b/web/src/engine/keyboard-storage/src/stubAndKeyboardCache.ts
index d9db65dc0ae..8547431552b 100644
--- a/web/src/engine/keyboard-storage/src/stubAndKeyboardCache.ts
+++ b/web/src/engine/keyboard-storage/src/stubAndKeyboardCache.ts
@@ -1,4 +1,4 @@
-import { type Keyboard, JSKeyboard, KeyboardLoaderBase as KeyboardLoader } from "keyman/engine/keyboard";
+import { type Keyboard, JSKeyboard, KeyboardLoaderBase as KeyboardLoader, KMXKeyboard } from "keyman/engine/keyboard";
 import { EventEmitter } from "eventemitter3";
 
 import KeyboardStub from "./keyboardStub.js";
@@ -52,6 +52,16 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
     this.keyboardLoader = keyboardLoader;
   }
 
+  shutdown(): void {
+    for (const kbdId in this.keyboardTable) {
+      const kbd = this.keyboardTable[kbdId];
+      if (kbd instanceof KMXKeyboard) {
+        (kbd as KMXKeyboard).shutdown();
+      }
+      // TODO-web-core: do we have to do something if instanceof Promise?
+    }
+  }
+
   getKeyboardForStub(stub: KeyboardStub): Keyboard {
     return stub ? this.getKeyboard(stub.KI) : null;
   }
diff --git a/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts b/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts
index 88e3c1ddbc3..80ca7be6389 100644
--- a/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts
+++ b/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts
@@ -8,6 +8,13 @@ export class KMXKeyboard {
   constructor(private _keyboard: km_core_keyboard) {
   }
 
+  shutdown() {
+    if (this._keyboard) {
+      KM_Core.instance.keyboard_dispose(this._keyboard);
+      this._keyboard = null;
+    }
+  }
+
   get isMnemonic(): boolean {
     return false;
   }
diff --git a/web/src/engine/keyboard/tsconfig.json b/web/src/engine/keyboard/tsconfig.json
index 84d96c8591f..3e074f91c71 100644
--- a/web/src/engine/keyboard/tsconfig.json
+++ b/web/src/engine/keyboard/tsconfig.json
@@ -7,6 +7,9 @@
     "tsBuildInfoFile": "../../../build/engine/keyboard/obj/tsconfig.tsbuildinfo",
     "rootDir": "./src/"
   },
+  "references": [
+    { "path": "../core-processor"},
+  ],
   "include": [ "./src/**/*.ts"],
   "exclude": ["./src/keyboards/loaders/**/*.ts"]
 }
diff --git a/web/src/engine/main/src/hardKeyboard.ts b/web/src/engine/main/src/hardKeyboard.ts
index 09806caa21c..6af4f274397 100644
--- a/web/src/engine/main/src/hardKeyboard.ts
+++ b/web/src/engine/main/src/hardKeyboard.ts
@@ -11,7 +11,7 @@ interface EventMap {
   'keyevent': (event: KeyEvent, callback?: (result: RuleBehavior, error?: Error) => void) => void
 }
 
-export default class HardKeyboard extends EventEmitter<EventMap> implements KeyEventSourceInterface<EventMap> { }
+export class HardKeyboard extends EventEmitter<EventMap> implements KeyEventSourceInterface<EventMap> { }
 
 export function processForMnemonicsAndLegacy(s: KeyEvent, activeKeyboard: Keyboard, baseLayout: string): KeyEvent {
   if (!activeKeyboard) {
diff --git a/web/src/engine/main/src/index.ts b/web/src/engine/main/src/index.ts
index 23ba92caabd..876ba65c3a9 100644
--- a/web/src/engine/main/src/index.ts
+++ b/web/src/engine/main/src/index.ts
@@ -1,6 +1,6 @@
 export { EngineConfiguration, InitOptionDefaults, InitOptionSpec } from './engineConfiguration.js';
 export { ContextManagerBase, ContextManagerConfiguration } from './contextManagerBase.js';
-export { default as HardKeyboard, processForMnemonicsAndLegacy } from './hardKeyboard.js';
+export { HardKeyboard, processForMnemonicsAndLegacy } from './hardKeyboard.js';
 export { KeyboardInterfaceBase } from './keyboardInterfaceBase.js';
 export { KeymanEngineBase } from './keymanEngineBase.js';
 export { LegacyAPIEvents } from './legacyAPIEvents.js';
diff --git a/web/src/engine/main/src/keymanEngineBase.ts b/web/src/engine/main/src/keymanEngineBase.ts
index 99d9663ba61..f5fbef02600 100644
--- a/web/src/engine/main/src/keymanEngineBase.ts
+++ b/web/src/engine/main/src/keymanEngineBase.ts
@@ -11,7 +11,7 @@ import { ModelSpec, PredictionContext } from "keyman/engine/interfaces";
 import { EngineConfiguration, InitOptionSpec } from "./engineConfiguration.js";
 import { KeyboardInterfaceBase } from "./keyboardInterfaceBase.js";
 import { ContextManagerBase } from "./contextManagerBase.js";
-import HardKeyboardBase from "./hardKeyboard.js";
+import { HardKeyboard as HardKeyboardBase } from "./hardKeyboard.js";
 import { LegacyAPIEvents } from "./legacyAPIEvents.js";
 import { EventNames, EventListener, LegacyEventEmitter } from "keyman/engine/events";
 import DOMCloudRequester from "keyman/engine/keyboard-storage/dom-requester";
@@ -463,6 +463,7 @@ export class KeymanEngineBase<
   shutdown() {
     this.legacyAPIEvents.shutdown();
     this.osk?.shutdown();
+    this.keyboardRequisitioner?.shutdown();
   }
 
   // API methods

From d98814b9a89672d0edbd46709037156b47f3ccf6 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 15 May 2025 16:00:25 +0200
Subject: [PATCH 081/254] chore(web): add accessor annotations for
 `JSKeyboardProcessor`

Preparation for epic/web-core, clarify which members of
`JSKeyboardProcessor` are private and which will need equivalent
implementations in `CoreKeyboardProcessor`.

Note: some of the publicly accessed members are not immediately obvious,
because they are accessed via interfaces declared in other modules (for
example `baseLayout` is referenced in `KeyboardState` type in
hardwareEventKeyboard.ts).
---
 .../js-processor/src/jsKeyboardProcessor.ts   | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
index bbeb87783ea..666a41a7f6f 100644
--- a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
@@ -37,14 +37,14 @@ interface EventMap {
 }
 
 export class JSKeyboardProcessor extends EventEmitter<EventMap> {
-  public static readonly DEFAULT_OPTIONS: ProcessorInitOptions = {
+  private static readonly DEFAULT_OPTIONS: ProcessorInitOptions = {
     baseLayout: 'us',
     defaultOutputRules: new DefaultRules()
   };
 
   // Tracks the simulated value for supported state keys, allowing the OSK to mirror a physical keyboard for them.
   // Using the exact keyCode name from the Codes definitions will allow for certain optimizations elsewhere in the code.
-  stateKeys = {
+  public stateKeys = {
     "K_CAPS":false,
     "K_NUMLOCK":false,
     "K_SCROLL":false
@@ -53,25 +53,25 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
   // Tracks the most recent modifier state information in order to quickly detect changes
   // in keyboard state not otherwise captured by the hosting page in the browser.
   // Needed for AltGr simulation.
-  modStateFlags: number = 0;
+  public modStateFlags: number = 0;
 
-  keyboardInterface: JSKeyboardInterface;
+  public keyboardInterface: JSKeyboardInterface;
 
   /**
    * Indicates the device (platform) to be used for non-keystroke events,
    * such as those sent to `begin postkeystroke` and `begin newcontext`
    * entry points.
    */
-  contextDevice: DeviceSpec;
+  public contextDevice: DeviceSpec;
 
-  baseLayout: string;
+  public baseLayout: string;
 
-  defaultRules: DefaultRules;
+  public defaultRules: DefaultRules;
 
   // Callbacks for various feedback types
-  beepHandler?: BeepHandler;
-  warningLogger?: LogMessageHandler;
-  errorLogger?: LogMessageHandler;
+  public beepHandler?: BeepHandler;
+  public warningLogger?: LogMessageHandler;
+  public errorLogger?: LogMessageHandler;
 
   constructor(device: DeviceSpec, options?: ProcessorInitOptions) {
     super();
@@ -99,7 +99,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
     this.resetContext();
   }
 
-  get layerStore(): MutableSystemStore {
+  public get layerStore(): MutableSystemStore {
     return this.keyboardInterface.systemStores[SystemStoreIDs.TSS_LAYER] as MutableSystemStore;
   }
 
@@ -128,7 +128,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
    * @param   {boolean} outputTarget  The OutputTarget receiving the KeyEvent
    * @return  {string}
    */
-  defaultRuleBehavior(Lkc: KeyEvent, outputTarget: OutputTargetBase, readonly: boolean): RuleBehavior {
+  private defaultRuleBehavior(Lkc: KeyEvent, outputTarget: OutputTargetBase, readonly: boolean): RuleBehavior {
     let preInput = Mock.from(outputTarget, readonly);
     let ruleBehavior = new RuleBehavior();
 
@@ -198,19 +198,19 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
     return ruleBehavior;
   }
 
-  processNewContextEvent(device: DeviceSpec, outputTarget: OutputTargetBase): RuleBehavior {
+  private processNewContextEvent(device: DeviceSpec, outputTarget: OutputTargetBase): RuleBehavior {
     return this.activeKeyboard ?
       this.keyboardInterface.processNewContextEvent(outputTarget, this.activeKeyboard.constructNullKeyEvent(device, this.stateKeys)) :
       null;
   }
 
-  processPostKeystroke(device: DeviceSpec, outputTarget: OutputTargetBase): RuleBehavior {
+  public processPostKeystroke(device: DeviceSpec, outputTarget: OutputTargetBase): RuleBehavior {
     return this.activeKeyboard ?
       this.keyboardInterface.processPostKeystroke(outputTarget, this.activeKeyboard.constructNullKeyEvent(device, this.stateKeys)) :
       null;
   }
 
-  processKeystroke(keyEvent: KeyEvent, outputTarget: OutputTargetBase): RuleBehavior {
+  public processKeystroke(keyEvent: KeyEvent, outputTarget: OutputTargetBase): RuleBehavior {
     var matchBehavior: RuleBehavior;
 
     // Before keyboard rules apply, check if the left-context is empty.
@@ -267,7 +267,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
    * @return      {boolean}                 Always true
    * Description  Updates the current shift state within KMW, updating the OSK's visualization thereof.
    */
-  _UpdateVKShift(e: KeyEvent): boolean {
+  private _UpdateVKShift(e: KeyEvent): boolean {
     let keyShiftState=0;
 
     const lockNames  = ['CAPS', 'NUM_LOCK', 'SCROLL_LOCK'] as const;
@@ -343,7 +343,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
     }
   }
 
-  getLayerId(modifier: number): string {
+  private getLayerId(modifier: number): string {
     return Layouts.getLayerId(modifier);
   }
 
@@ -354,7 +354,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
    *  @param  {string}                    keyName     key identifier
    *  @return {boolean}                               return true if keyboard layer changed
    */
-  selectLayer(keyEvent: KeyEvent): boolean {
+  public selectLayer(keyEvent: KeyEvent): boolean {
     let keyName = keyEvent.kName;
     var nextLayer = keyEvent.kNextLayer;
     var isChiral = this.activeKeyboard && this.activeKeyboard.isChiral;
@@ -437,7 +437,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
    *
    * @param       {string}      id      layer id (e.g. ctrlshift)
    */
-  updateLayer(keyEvent: KeyEvent, id: string) {
+  private updateLayer(keyEvent: KeyEvent, id: string) {
     let activeLayer = this.layerId;
     var s = activeLayer;
 
@@ -539,7 +539,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
 
   // Returns true if the key event is a modifier press, allowing keyPress to return selectively
   // in those cases.
-  doModifierPress(Levent: KeyEvent, outputTarget: OutputTargetBase, isKeyDown: boolean): boolean {
+  public doModifierPress(Levent: KeyEvent, outputTarget: OutputTargetBase, isKeyDown: boolean): boolean {
     if(!this.activeKeyboard) {
       return false;
     }
@@ -573,7 +573,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
    * @returns  {Object}                 A RuleBehavior object describing the cumulative effects of
    *                                    all matched keyboard rules
    */
-  performNewContextEvent(outputTarget: OutputTargetBase): RuleBehavior {
+  private performNewContextEvent(outputTarget: OutputTargetBase): RuleBehavior {
     const ruleBehavior = this.processNewContextEvent(this.contextDevice, outputTarget);
 
     if(ruleBehavior) {
@@ -582,7 +582,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
     return ruleBehavior;
   }
 
-  resetContext(target?: OutputTargetBase) {
+  public resetContext(target?: OutputTargetBase) {
     this.layerId = 'default';
 
     // Make sure all deadkeys for the context get cleared properly.
@@ -601,7 +601,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
     }
   };
 
-  setNumericLayer(device: DeviceSpec) {
+  public setNumericLayer(device: DeviceSpec) {
     if (this.activeKeyboard) {
       let layout = this.activeKeyboard.layout(device.formFactor);
       if(layout.getLayer('numeric')) {

From d3d880b27b350d5f7fcd723a9d9430bc1d0b77d4 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 15 May 2025 17:02:31 +0200
Subject: [PATCH 082/254] chore(web): split systemStores.ts

Splits systemStores.ts into stores.ts and platformSystemStore.ts under
engine/js-processor, and systemStores.ts under engine/keyboard, in
preparation for web-core use of system stores.
---
 web/src/engine/js-processor/src/index.ts      |   2 +-
 .../js-processor/src/jsKeyboardInterface.ts   |   4 +-
 .../js-processor/src/jsKeyboardProcessor.ts   |   2 +-
 .../js-processor/src/platformSystemStore.ts   |  84 +++++++++
 .../engine/js-processor/src/ruleBehavior.ts   |   2 +-
 web/src/engine/js-processor/src/stores.ts     |  26 +++
 .../engine/js-processor/src/systemStores.ts   | 160 ------------------
 web/src/engine/keyboard/src/index.ts          |   1 +
 web/src/engine/keyboard/src/systemStores.ts   |  69 ++++++++
 .../main/src/headless/inputProcessor.ts       |   3 +-
 web/src/engine/osk/src/views/oskView.ts       |   2 +-
 11 files changed, 188 insertions(+), 167 deletions(-)
 create mode 100644 web/src/engine/js-processor/src/platformSystemStore.ts
 create mode 100644 web/src/engine/js-processor/src/stores.ts
 delete mode 100644 web/src/engine/js-processor/src/systemStores.ts
 create mode 100644 web/src/engine/keyboard/src/systemStores.ts

diff --git a/web/src/engine/js-processor/src/index.ts b/web/src/engine/js-processor/src/index.ts
index 965367af4a9..6bf58045ec4 100644
--- a/web/src/engine/js-processor/src/index.ts
+++ b/web/src/engine/js-processor/src/index.ts
@@ -1,8 +1,8 @@
 export { BeepHandler, JSKeyboardProcessor, LogMessageHandler, ProcessorInitOptions } from "./jsKeyboardProcessor.js";
 export { RuleBehavior } from "./ruleBehavior.js";
 export { JSKeyboardInterface, KeyInformation, StoreNonCharEntry } from "./jsKeyboardInterface.js";
-export * from "./systemStores.js";
 export * from "./deadkeys.js";
+export * from "./stores.js";
 export { OutputTargetBase } from "./outputTargetBase.js";
 export * from "./outputTargetBase.js";
 export { Mock } from "./mock.js";
diff --git a/web/src/engine/js-processor/src/jsKeyboardInterface.ts b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
index dcaea0a8be2..9a45638a599 100644
--- a/web/src/engine/js-processor/src/jsKeyboardInterface.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
@@ -12,7 +12,9 @@ import { type OutputTargetBase }  from './outputTargetBase.js';
 import { type Deadkey } from './deadkeys.js';
 import { Mock } from "./mock.js";
 import { RuleBehavior }  from "./ruleBehavior.js";
-import { ComplexKeyboardStore, type KeyboardStore, KeyboardStoreElement, SystemStoreIDs, SystemStore, MutableSystemStore, PlatformSystemStore, VariableStore, VariableStoreSerializer } from "./systemStores.js";
+import { SystemStoreIDs, SystemStore, MutableSystemStore } from "keyman/engine/keyboard";
+import { PlatformSystemStore } from './platformSystemStore.js';
+import { ComplexKeyboardStore, type KeyboardStore, KeyboardStoreElement, VariableStore, VariableStoreSerializer } from "./stores.js";
 
 //#endregion
 
diff --git a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
index 666a41a7f6f..36771c4858f 100644
--- a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
@@ -17,7 +17,7 @@ import { type OutputTargetBase }  from "./outputTargetBase.js";
 import { RuleBehavior }  from "./ruleBehavior.js";
 import { JSKeyboardInterface }  from './jsKeyboardInterface.js';
 import { DeviceSpec, globalObject } from "@keymanapp/web-utils";
-import { type MutableSystemStore, SystemStoreIDs } from "./systemStores.js";
+import { type MutableSystemStore, SystemStoreIDs } from "keyman/engine/keyboard";
 
 // #endregion
 
diff --git a/web/src/engine/js-processor/src/platformSystemStore.ts b/web/src/engine/js-processor/src/platformSystemStore.ts
new file mode 100644
index 00000000000..aeff16d5ea1
--- /dev/null
+++ b/web/src/engine/js-processor/src/platformSystemStore.ts
@@ -0,0 +1,84 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
+ * &platform system store implementation (.js keyboards)
+ */
+
+
+import { SystemStore, SystemStoreIDs, type KeyboardHarness } from 'keyman/engine/keyboard';
+
+/**
+ * Handles checks against the current platform.
+ */
+export class PlatformSystemStore extends SystemStore {
+  private readonly kbdInterface: KeyboardHarness;
+
+  constructor(keyboardInterface: KeyboardHarness) {
+    super(SystemStoreIDs.TSS_PLATFORM);
+
+    this.kbdInterface = keyboardInterface;
+  }
+
+  matches(value: string) {
+    var i,constraint,constraints=value.split(' ');
+    let device = this.kbdInterface.activeDevice;
+
+    for(i=0; i<constraints.length; i++) {
+      constraint=constraints[i].toLowerCase();
+      switch(constraint) {
+        case 'touch':
+        case 'hardware':
+          if(device.touchable != (constraint == 'touch')) {
+            return false;
+          }
+          break;
+
+        case 'macos':
+        case 'mac':
+          constraint = 'macosx';
+          // fall through
+        case 'macosx':
+        case 'windows':
+        case 'android':
+        case 'ios':
+        case 'linux':
+          if(device.OS != constraint) {
+            return false;
+          }
+          break;
+
+        case 'tablet':
+        case 'phone':
+        case 'desktop':
+          if(device.formFactor != constraint) {
+            return false;
+          }
+          break;
+
+        case 'web':
+          if(device.browser == 'native') {
+            return false; // web matches anything other than 'native'
+          }
+          break;
+
+        case 'native':
+          // This will return true for embedded KeymanWeb
+        case 'chrome':
+        case 'firefox':
+        case 'safari':
+        case 'edge':
+        case 'opera':
+          if(device.browser != constraint) {
+            return false;
+          }
+          break;
+
+        default:
+          return false;
+      }
+    }
+
+    // Everything we checked against was valid and had matches - it's a match!
+    return true;
+  }
+}
diff --git a/web/src/engine/js-processor/src/ruleBehavior.ts b/web/src/engine/js-processor/src/ruleBehavior.ts
index 4cedfe8193a..299969e23a9 100644
--- a/web/src/engine/js-processor/src/ruleBehavior.ts
+++ b/web/src/engine/js-processor/src/ruleBehavior.ts
@@ -2,7 +2,7 @@ import { JSKeyboardProcessor } from "./jsKeyboardProcessor.js";
 import { VariableStoreDictionary } from "keyman/engine/keyboard";
 import { OutputTargetBase, type Transcription } from './outputTargetBase.js';
 import { Mock } from "./mock.js";
-import { type VariableStore } from "./systemStores.js";
+import { type VariableStore } from "./stores.js";
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
 /**
diff --git a/web/src/engine/js-processor/src/stores.ts b/web/src/engine/js-processor/src/stores.ts
new file mode 100644
index 00000000000..9169d04abe0
--- /dev/null
+++ b/web/src/engine/js-processor/src/stores.ts
@@ -0,0 +1,26 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
+ * Definitions for basic stores and variable stores (see kmn reference)
+ */
+
+import { StoreNonCharEntry } from './jsKeyboardInterface.js';
+
+/*
+* Type alias definitions to reflect the parameters of the fullContextMatch() callback (KMW 10+).
+* No constructors or methods since keyboards will not utilize the same backing prototype, and
+* property names are shorthanded to promote minification.
+*/
+type PlainKeyboardStore = string;
+
+export type KeyboardStoreElement = (string | StoreNonCharEntry);
+export type ComplexKeyboardStore = KeyboardStoreElement[];
+
+export type KeyboardStore = PlainKeyboardStore | ComplexKeyboardStore;
+
+export type VariableStore = { [name: string]: string };
+
+export interface VariableStoreSerializer {
+  loadStore(keyboardID: string, storeName: string): VariableStore;
+  saveStore(keyboardID: string, storeName: string, storeMap: VariableStore): void;
+}
diff --git a/web/src/engine/js-processor/src/systemStores.ts b/web/src/engine/js-processor/src/systemStores.ts
deleted file mode 100644
index ea5e654b84c..00000000000
--- a/web/src/engine/js-processor/src/systemStores.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { type KeyboardHarness } from 'keyman/engine/keyboard';
-import { StoreNonCharEntry } from './jsKeyboardInterface.js';
-
-export enum SystemStoreIDs {
-  TSS_LAYER = 33,
-  TSS_PLATFORM = 31,
-  TSS_NEWLAYER = 42,
-  TSS_OLDLAYER = 43
-}
-
-/*
-* Type alias definitions to reflect the parameters of the fullContextMatch() callback (KMW 10+).
-* No constructors or methods since keyboards will not utilize the same backing prototype, and
-* property names are shorthanded to promote minification.
-*/
-type PlainKeyboardStore = string;
-
-export type KeyboardStoreElement = (string | StoreNonCharEntry);
-export type ComplexKeyboardStore = KeyboardStoreElement[];
-
-export type KeyboardStore = PlainKeyboardStore | ComplexKeyboardStore;
-
-export type VariableStore = { [name: string]: string };
-
-export interface VariableStoreSerializer {
-  loadStore(keyboardID: string, storeName: string): VariableStore;
-  saveStore(keyboardID: string, storeName: string, storeMap: VariableStore): void;
-}
-
-/**
- * Defines common behaviors associated with system stores.
- */
-export abstract class SystemStore {
-  public readonly id: number;
-
-  constructor(id: number) {
-    this.id = id;
-  }
-
-  abstract matches(value: string): boolean;
-
-  set(value: string): void {
-    throw new Error("System store with ID " + this.id + " may not be directly set.");
-  }
-}
-
-/**
- * A handler designed to receive feedback whenever a system store's value is changed.
- * @param source    The system store being mutated, before the value change occurs.
- * @param newValue  The new value being set
- * @returns         `false` / `undefined` to allow the change, `true` to block the change.
- */
-export type SystemStoreMutationHandler = (source: MutableSystemStore, newValue: string) => boolean;
-
-export class MutableSystemStore extends SystemStore {
-  private _value: string;
-  handler?: SystemStoreMutationHandler = null;
-
-  constructor(id: number, defaultValue: string) {
-    super(id);
-    this._value = defaultValue;
-  }
-
-  get value() {
-    return this._value;
-  }
-
-  matches(value: string) {
-    return this._value == value;
-  }
-
-  set(value: string) {
-    // Even if things stay the same, we should still signal this.
-    // It's important for tracking if a rule directly set the layer
-    // versus if it passively remained.
-    if(this.handler) {
-      if(this.handler(this, value)) {
-        return;
-      }
-    }
-
-    this._value = value;
-  }
-}
-
-/**
- * Handles checks against the current platform.
- */
-export class PlatformSystemStore extends SystemStore {
-  private readonly kbdInterface: KeyboardHarness;
-
-  constructor(keyboardInterface: KeyboardHarness) {
-    super(SystemStoreIDs.TSS_PLATFORM);
-
-    this.kbdInterface = keyboardInterface;
-  }
-
-  matches(value: string) {
-    var i,constraint,constraints=value.split(' ');
-    let device = this.kbdInterface.activeDevice;
-
-    for(i=0; i<constraints.length; i++) {
-      constraint=constraints[i].toLowerCase();
-      switch(constraint) {
-        case 'touch':
-        case 'hardware':
-          if(device.touchable != (constraint == 'touch')) {
-            return false;
-          }
-          break;
-
-        case 'macos':
-        case 'mac':
-          constraint = 'macosx';
-          // fall through
-        case 'macosx':
-        case 'windows':
-        case 'android':
-        case 'ios':
-        case 'linux':
-          if(device.OS != constraint) {
-            return false;
-          }
-          break;
-
-        case 'tablet':
-        case 'phone':
-        case 'desktop':
-          if(device.formFactor != constraint) {
-            return false;
-          }
-          break;
-
-        case 'web':
-          if(device.browser == 'native') {
-            return false; // web matches anything other than 'native'
-          }
-          break;
-
-        case 'native':
-          // This will return true for embedded KeymanWeb
-        case 'chrome':
-        case 'firefox':
-        case 'safari':
-        case 'edge':
-        case 'opera':
-          if(device.browser != constraint) {
-            return false;
-          }
-          break;
-
-        default:
-          return false;
-      }
-    }
-
-    // Everything we checked against was valid and had matches - it's a match!
-    return true;
-  }
-}
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index d483f0c7021..b60a9a5ecc4 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -29,6 +29,7 @@ export { default as KeyEvent } from "./keyEvent.js";
 export * from "./keyEvent.js";
 export { default as KeyMapping } from "./keyMapping.js";
 export { OutputTarget } from "./outputTarget.js";
+export * from "./systemStores.js";
 
 export * from "@keymanapp/web-utils";
 
diff --git a/web/src/engine/keyboard/src/systemStores.ts b/web/src/engine/keyboard/src/systemStores.ts
new file mode 100644
index 00000000000..f01fb680752
--- /dev/null
+++ b/web/src/engine/keyboard/src/systemStores.ts
@@ -0,0 +1,69 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
+ * Declaration of a 'system store' (see kmn reference)
+ */
+
+export enum SystemStoreIDs {
+  TSS_LAYER = 33,
+  TSS_PLATFORM = 31,
+  TSS_NEWLAYER = 42,
+  TSS_OLDLAYER = 43
+}
+
+/**
+ * Defines common behaviors associated with system stores.
+ */
+export abstract class SystemStore {
+  public readonly id: number;
+
+  constructor(id: number) {
+    this.id = id;
+  }
+
+  abstract matches(value: string): boolean;
+
+  public set(_value: string): void {
+    throw new Error("System store with ID " + this.id + " may not be directly set.");
+  }
+}
+
+/**
+ * A handler designed to receive feedback whenever a system store's value is changed.
+ * @param source    The system store being mutated, before the value change occurs.
+ * @param newValue  The new value being set
+ * @returns         `false` / `undefined` to allow the change, `true` to block the change.
+ */
+export type SystemStoreMutationHandler = (source: MutableSystemStore, newValue: string) => boolean;
+
+export class MutableSystemStore extends SystemStore {
+  private _value: string;
+  public handler?: SystemStoreMutationHandler = null;
+
+  constructor(id: number, defaultValue: string) {
+    super(id);
+    this._value = defaultValue;
+  }
+
+  public get value() {
+    return this._value;
+  }
+
+  public matches(value: string) {
+    return this._value == value;
+  }
+
+  public set(value: string) {
+    // Even if things stay the same, we should still signal this.
+    // It's important for tracking if a rule directly set the layer
+    // versus if it passively remained.
+    if(this.handler) {
+      if(this.handler(this, value)) {
+        return;
+      }
+    }
+
+    this._value = value;
+  }
+}
+
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index 7bf27c9d5e0..3991448a7b4 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -7,7 +7,7 @@ import { globalObject, DeviceSpec } from "@keymanapp/web-utils";
 
 import { KM_Core } from 'keyman/engine/core-processor';
 
-import { Codes, JSKeyboard, KeyboardMinimalInterface, type Keyboard, type KeyEvent, type OutputTarget } from "keyman/engine/keyboard";
+import { Codes, JSKeyboard, KeyboardMinimalInterface, type Keyboard, type KeyEvent, type OutputTarget, SystemStoreIDs } from "keyman/engine/keyboard";
 // TODO-web-core: remove usage of OutputTargetBase
 import {
   type Alternate,
@@ -16,7 +16,6 @@ import {
   Mock,
   RuleBehavior,
   type ProcessorInitOptions,
-  SystemStoreIDs,
   OutputTargetBase
 } from 'keyman/engine/js-processor';
 
diff --git a/web/src/engine/osk/src/views/oskView.ts b/web/src/engine/osk/src/views/oskView.ts
index 68790c527cc..d83426cfba3 100644
--- a/web/src/engine/osk/src/views/oskView.ts
+++ b/web/src/engine/osk/src/views/oskView.ts
@@ -20,7 +20,7 @@ import {
 } from 'keyman/engine/keyboard';
 import { createUnselectableElement, getAbsoluteX, getAbsoluteY, StylesheetManager } from 'keyman/engine/dom-utils';
 import { EventListener, LegacyEventEmitter } from 'keyman/engine/events';
-import { type MutableSystemStore, type SystemStoreMutationHandler } from 'keyman/engine/js-processor';
+import { type MutableSystemStore, type SystemStoreMutationHandler } from 'keyman/engine/keyboard';
 
 import Configuration from '../config/viewConfiguration.js';
 import Activator, { StaticActivator } from './activator.js';

From 4309972a3a6eb0b5ab13879f6117921745549bc9 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 15 May 2025 17:48:55 +0200
Subject: [PATCH 083/254] chore(web): address review comments

---
 web/src/engine/js-processor/src/jsKeyboardProcessor.ts | 4 ++--
 web/src/engine/osk/src/views/oskView.ts                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
index 36771c4858f..90d14349450 100644
--- a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
@@ -10,14 +10,14 @@ import { EventEmitter } from 'eventemitter3';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 import {
   Codes, type JSKeyboard, MinimalKeymanGlobal, KeyEvent, Layouts,
-  DefaultRules, EmulationKeystrokes
+  DefaultRules, EmulationKeystrokes,
+  type MutableSystemStore, SystemStoreIDs,
 } from "keyman/engine/keyboard";
 import { Mock } from "./mock.js";
 import { type OutputTargetBase }  from "./outputTargetBase.js";
 import { RuleBehavior }  from "./ruleBehavior.js";
 import { JSKeyboardInterface }  from './jsKeyboardInterface.js';
 import { DeviceSpec, globalObject } from "@keymanapp/web-utils";
-import { type MutableSystemStore, SystemStoreIDs } from "keyman/engine/keyboard";
 
 // #endregion
 
diff --git a/web/src/engine/osk/src/views/oskView.ts b/web/src/engine/osk/src/views/oskView.ts
index d83426cfba3..969da052979 100644
--- a/web/src/engine/osk/src/views/oskView.ts
+++ b/web/src/engine/osk/src/views/oskView.ts
@@ -16,11 +16,11 @@ import {
   JSKeyboard,
   KeyboardProperties,
   ManagedPromise,
-  type MinimalCodesInterface
+  type MinimalCodesInterface,
+  type MutableSystemStore, type SystemStoreMutationHandler,
 } from 'keyman/engine/keyboard';
 import { createUnselectableElement, getAbsoluteX, getAbsoluteY, StylesheetManager } from 'keyman/engine/dom-utils';
 import { EventListener, LegacyEventEmitter } from 'keyman/engine/events';
-import { type MutableSystemStore, type SystemStoreMutationHandler } from 'keyman/engine/keyboard';
 
 import Configuration from '../config/viewConfiguration.js';
 import Activator, { StaticActivator } from './activator.js';

From 3caf123604ebe18cfaea3e52a407f7eff1bbcc37 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 16 May 2025 17:36:04 +0200
Subject: [PATCH 084/254] chore(web): use const and let

---
 web/src/engine/js-processor/src/platformSystemStore.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/src/engine/js-processor/src/platformSystemStore.ts b/web/src/engine/js-processor/src/platformSystemStore.ts
index aeff16d5ea1..0b81533db3f 100644
--- a/web/src/engine/js-processor/src/platformSystemStore.ts
+++ b/web/src/engine/js-processor/src/platformSystemStore.ts
@@ -20,11 +20,11 @@ export class PlatformSystemStore extends SystemStore {
   }
 
   matches(value: string) {
-    var i,constraint,constraints=value.split(' ');
-    let device = this.kbdInterface.activeDevice;
+    const constraints=value.split(' ');
+    const device = this.kbdInterface.activeDevice;
 
-    for(i=0; i<constraints.length; i++) {
-      constraint=constraints[i].toLowerCase();
+    for(let i=0; i<constraints.length; i++) {
+      let constraint=constraints[i].toLowerCase();
       switch(constraint) {
         case 'touch':
         case 'hardware':

From 8dff16ef0fa1510a49148bdbd6a5ef31b1f7b22a Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 20 May 2025 12:07:49 +0200
Subject: [PATCH 085/254] refactor(web): remove default from `KeyEvent`

Also make exports explicit in `index.ts`.
---
 web/src/engine/keyboard/src/defaultRules.ts           | 2 +-
 web/src/engine/keyboard/src/index.ts                  | 3 +--
 web/src/engine/keyboard/src/keyEvent.ts               | 2 +-
 web/src/engine/keyboard/src/keyMapping.ts             | 2 +-
 web/src/engine/keyboard/src/keyboards/activeLayout.ts | 2 +-
 web/src/engine/keyboard/src/keyboards/jsKeyboard.ts   | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/web/src/engine/keyboard/src/defaultRules.ts b/web/src/engine/keyboard/src/defaultRules.ts
index 74a4542dbc6..a057eda386f 100644
--- a/web/src/engine/keyboard/src/defaultRules.ts
+++ b/web/src/engine/keyboard/src/defaultRules.ts
@@ -6,7 +6,7 @@
 
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 import Codes from './codes.js';
-import type KeyEvent from './keyEvent.js';
+import { type KeyEvent } from './keyEvent.js';
 import { type OutputTarget }  from './outputTarget.js';
 
 export enum EmulationKeystrokes {
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index b60a9a5ecc4..1ff8203dfea 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -25,8 +25,7 @@ export { default as Codes } from "./codes.js";
 export * from "./codes.js";
 export { default as DefaultRules } from "./defaultRules.js";
 export * from "./defaultRules.js";
-export { default as KeyEvent } from "./keyEvent.js";
-export * from "./keyEvent.js";
+export { type KeyDistribution, KeyEventSpec, KeyEvent } from "./keyEvent.js";
 export { default as KeyMapping } from "./keyMapping.js";
 export { OutputTarget } from "./outputTarget.js";
 export * from "./systemStores.js";
diff --git a/web/src/engine/keyboard/src/keyEvent.ts b/web/src/engine/keyboard/src/keyEvent.ts
index 15785817f0b..787e20ea781 100644
--- a/web/src/engine/keyboard/src/keyEvent.ts
+++ b/web/src/engine/keyboard/src/keyEvent.ts
@@ -64,7 +64,7 @@ export interface KeyEventSpec {
  * This class is defined within its own file so that it can be loaded by code outside of KMW without
  * having to actually load the entirety of KMW.
  */
-export default class KeyEvent implements KeyEventSpec {
+export class KeyEvent implements KeyEventSpec {
   Lcode: number;
   Lstates: number;
   LmodifierChange?: boolean;
diff --git a/web/src/engine/keyboard/src/keyMapping.ts b/web/src/engine/keyboard/src/keyMapping.ts
index 663eb5457f7..52b053de6a5 100644
--- a/web/src/engine/keyboard/src/keyMapping.ts
+++ b/web/src/engine/keyboard/src/keyMapping.ts
@@ -3,7 +3,7 @@
    Copyright 2019 SIL International
 ***/
 
-import type KeyEvent from "./keyEvent.js";
+import { KeyEvent } from "./keyEvent.js";
 import { KeyEventSpec } from "./keyEvent.js";
 
 class KeyMap {
diff --git a/web/src/engine/keyboard/src/keyboards/activeLayout.ts b/web/src/engine/keyboard/src/keyboards/activeLayout.ts
index f874d361579..e709dda7dfb 100644
--- a/web/src/engine/keyboard/src/keyboards/activeLayout.ts
+++ b/web/src/engine/keyboard/src/keyboards/activeLayout.ts
@@ -1,5 +1,5 @@
 import Codes from "../codes.js";
-import KeyEvent, { KeyEventSpec } from "../keyEvent.js";
+import { KeyEvent, KeyEventSpec } from "../keyEvent.js";
 import KeyMapping from "../keyMapping.js";
 import { ButtonClasses, Layouts } from "./defaultLayouts.js";
 import type { LayoutKey, LayoutSubKey, LayoutRow, LayoutLayer, LayoutFormFactor, ButtonClass } from "./defaultLayouts.js";
diff --git a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
index d94b50c9b81..cef519406ef 100644
--- a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
+++ b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
@@ -1,7 +1,7 @@
 import Codes from "../codes.js";
 import { Layouts } from "./defaultLayouts.js";
 import { ActiveKey, ActiveLayout, ActiveSubKey } from "./activeLayout.js";
-import KeyEvent from "../keyEvent.js";
+import { KeyEvent } from "../keyEvent.js";
 import { type OutputTarget } from "../outputTarget.js";
 import { KeymanWebKeyboard, ModifierKeyConstants, TouchLayout } from "@keymanapp/common-types";
 

From 229dd0d802796b247736e013ede471722f0b0048 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 22 May 2025 18:35:57 +0200
Subject: [PATCH 086/254] fix(web): fix loading of KMX keyboards in browser

Browsers don't support comparing arrays.

Test-bot: skip
---
 .../engine/keyboard/src/keyboards/keyboardLoaderBase.ts   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
index 64acb6acca3..c8a89d420ff 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
@@ -41,10 +41,16 @@ export abstract class KeyboardLoaderBase {
     return this.loadKeyboardInternal(stub.filename, new StubBasedErrorBuilder(stub));
   }
 
+  private isKMXKeyboard(byteArray: Uint8Array): boolean {
+    // Check if the first 4 bytes are 'KXTS' (0x4b, 0x58, 0x54, 0x53)
+    return byteArray.length >= 4 && byteArray[0] === 0x4b &&
+      byteArray[1] === 0x58 && byteArray[2] === 0x54 && byteArray[3] === 0x53;
+  }
+
   private async loadKeyboardInternal(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
     const byteArray = await this.loadKeyboardBlob(uri, errorBuilder);
 
-    if (byteArray.slice(0, 4) == Uint8Array.from([0x4b, 0x58, 0x54, 0x53])) { // 'KXTS'
+    if (this.isKMXKeyboard(byteArray)) {
       // KMX or LDML (KMX+) keyboard
       const result = KM_Core.instance.keyboard_load_from_blob(uri, byteArray);
       if (result.status == KM_CORE_STATUS.OK) {

From cfacbb6cc5cd1866f5ad38eae634a4ee711e4b7f Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 15 May 2025 18:23:03 +0200
Subject: [PATCH 087/254] =?UTF-8?q?refactor(web):=20rename=20`OutputTarget?=
 =?UTF-8?q?`=20interface=20=E2=86=92=20`OutputTargetInterface`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/app/browser/src/configuration.ts      |  4 +-
 .../app/browser/src/defaultBrowserRules.ts    |  4 +-
 web/src/app/webview/src/contextManager.ts     |  8 ++--
 .../attachment/src/outputTargetForElement.ts  |  6 +--
 .../prediction/languageProcessor.interface.ts | 12 +++---
 .../src/prediction/predictionContext.ts       |  8 ++--
 .../js-processor/src/jsKeyboardInterface.ts   | 40 +++++++++----------
 .../js-processor/src/jsKeyboardProcessor.ts   |  3 +-
 .../js-processor/src/outputTargetBase.ts      |  4 +-
 web/src/engine/keyboard/src/defaultRules.ts   |  4 +-
 web/src/engine/keyboard/src/index.ts          |  2 +-
 .../keyboard/src/keyboards/jsKeyboard.ts      | 12 +++---
 ...tputTarget.ts => outputTargetInterface.ts} |  7 ++--
 web/src/engine/main/src/contextManagerBase.ts | 20 +++++-----
 .../engine/main/src/engineConfiguration.ts    |  4 +-
 .../main/src/headless/inputProcessor.ts       |  8 ++--
 .../main/src/headless/languageProcessor.ts    | 16 ++++----
 .../tools/testing/recorder-core/src/index.ts  |  4 +-
 .../testing/recorder-core/src/nodeProctor.ts  |  6 +--
 .../testing/recorder-core/src/proctor.ts      |  4 +-
 .../tools/testing/recorder/browserProctor.ts  |  4 +-
 21 files changed, 91 insertions(+), 89 deletions(-)
 rename web/src/engine/keyboard/src/{outputTarget.ts => outputTargetInterface.ts} (92%)

diff --git a/web/src/app/browser/src/configuration.ts b/web/src/app/browser/src/configuration.ts
index 4831b74c55b..3799821165a 100644
--- a/web/src/app/browser/src/configuration.ts
+++ b/web/src/app/browser/src/configuration.ts
@@ -1,7 +1,7 @@
 import { EngineConfiguration, InitOptionSpec, InitOptionDefaults } from "keyman/engine/main";
 
 import { OutputTargetElementWrapper as DOMOutputTarget } from 'keyman/engine/element-wrappers';
-import { OutputTarget } from 'keyman/engine/keyboard';
+import { OutputTargetInterface } from 'keyman/engine/keyboard';
 import { isEmptyTransform, RuleBehavior } from 'keyman/engine/js-processor';
 import { AlertHost } from "./utils/alertHost.js";
 import { whenDocumentReady } from "./utils/documentReady.js";
@@ -66,7 +66,7 @@ export class BrowserConfiguration extends EngineConfiguration {
     return baseReport;
   }
 
-  onRuleFinalization(ruleBehavior: RuleBehavior, outputTarget: OutputTarget) {
+  onRuleFinalization(ruleBehavior: RuleBehavior, outputTarget: OutputTargetInterface) {
     // TODO: Patch up to modularized form.  But that doesn't exist yet for some of these...
 
     // If the transform isn't empty, we've changed text - which should produce a 'changed' event in the DOM.
diff --git a/web/src/app/browser/src/defaultBrowserRules.ts b/web/src/app/browser/src/defaultBrowserRules.ts
index 5a0ceca3e97..433cd188bf7 100644
--- a/web/src/app/browser/src/defaultBrowserRules.ts
+++ b/web/src/app/browser/src/defaultBrowserRules.ts
@@ -3,7 +3,7 @@ import {
   Codes,
   DefaultRules,
   type KeyEvent,
-  type OutputTarget
+  type OutputTargetInterface
 } from 'keyman/engine/keyboard';
 
 import ContextManager from './contextManager.js';
@@ -32,7 +32,7 @@ export default class DefaultBrowserRules extends DefaultRules {
   /**
    * applyCommand - used when a RuleBehavior represents a non-text "command" within the Engine.
    */
-  applyCommand(Lkc: KeyEvent, outputTarget: OutputTarget): void {
+  applyCommand(Lkc: KeyEvent, outputTarget: OutputTargetInterface): void {
     const code = this.codeForEvent(Lkc);
 
     const moveToNext = (back: boolean) => {
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index 7c3a53097ee..48ab4ca9272 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -1,5 +1,5 @@
-import { JSKeyboard, Keyboard, OutputTarget } from 'keyman/engine/keyboard';
-// TODO-web-core: remove usage of OutputTargetBase, use OutputTarget instead
+import { JSKeyboard, Keyboard, OutputTargetInterface } from 'keyman/engine/keyboard';
+// TODO-web-core: remove usage of OutputTargetBase, use OutputTargetInterface instead
 import { Mock, Transcription, findCommonSubstringEndIndex, isEmptyTransform, TextTransform, OutputTargetBase } from 'keyman/engine/js-processor';
 import { KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { ContextManagerBase } from 'keyman/engine/main';
@@ -59,7 +59,7 @@ export class ContextHost extends Mock {
     this.savedState = Mock.from(this);
   }
 
-  restoreTo(original: OutputTarget): void {
+  restoreTo(original: OutputTargetInterface): void {
     this.savedState = Mock.from(this);
     // TODO-web-core
     super.restoreTo(original as OutputTargetBase);
@@ -139,7 +139,7 @@ export default class ContextManager extends ContextManagerBase<WebviewConfigurat
     return this._activeKeyboard;
   }
 
-  activateKeyboardForTarget(kbd: {keyboard: JSKeyboard, metadata: KeyboardStub}, target: OutputTarget) {
+  activateKeyboardForTarget(kbd: { keyboard: JSKeyboard, metadata: KeyboardStub }, target: OutputTargetInterface) {
     // `target` is irrelevant for `app/webview`, as it'll only ever use 'global' keyboard settings.
 
     // Clone the object to prevent accidental by-reference changes.
diff --git a/web/src/engine/attachment/src/outputTargetForElement.ts b/web/src/engine/attachment/src/outputTargetForElement.ts
index 8939d7e92e0..7ed98e9fb2b 100644
--- a/web/src/engine/attachment/src/outputTargetForElement.ts
+++ b/web/src/engine/attachment/src/outputTargetForElement.ts
@@ -2,7 +2,7 @@ import { nestedInstanceOf } from "keyman/engine/element-wrappers";
 
 /**
  * Given a DOM event related to an KMW-attached element, this function determines
- * the corresponding OutputTarget.
+ * the corresponding OutputTargetInterface.
  * @param e
  * @returns
  */
@@ -13,7 +13,7 @@ export function eventOutputTarget(e: Event) {
 
 /**
  * Given a DOM event related to an KMW-attached element, this function determines
- * the corresponding OutputTarget.
+ * the corresponding OutputTargetInterface.
  * @param e
  * @returns
  */
@@ -42,7 +42,7 @@ export function outputTargetForElement(Ltarg: HTMLElement) {
     }
   }
 
-  // Step 2:  With the most likely host element determined, obtain the corresponding OutputTarget
+  // Step 2:  With the most likely host element determined, obtain the corresponding OutputTargetInterface
   // instance.
   return Ltarg._kmwAttachment?.interface;
 }
\ No newline at end of file
diff --git a/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts b/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
index eafdac2d39e..d0b71f3842d 100644
--- a/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
+++ b/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
@@ -1,6 +1,6 @@
 import { LexicalModelTypes } from '@keymanapp/common-types';
 import { EventEmitter } from "eventemitter3";
-import { OutputTarget } from "keyman/engine/keyboard";
+import { OutputTargetInterface } from "keyman/engine/keyboard";
 
 export class ReadySuggestions {
   suggestions: LexicalModelTypes.Suggestion[];
@@ -45,10 +45,10 @@ export interface LanguageProcessorEventMap {
   /**
    * Is called synchronously once suggestion application is successful and the context has been updated.
    *
-   * @param outputTarget The `OutputTarget` representation of the context the suggestion was applied to.
+   * @param outputTarget The `OutputTargetInterface` representation of the context the suggestion was applied to.
    * @returns
    */
-  'suggestionapplied': (outputTarget: OutputTarget) => boolean
+  'suggestionapplied': (outputTarget: OutputTargetInterface) => boolean
 }
 
 
@@ -56,7 +56,7 @@ export interface LanguageProcessorSpec extends EventEmitter<LanguageProcessorEve
 
   get state(): StateChangeEnum;
 
-  invalidateContext(outputTarget: OutputTarget, layerId: string): Promise<LexicalModelTypes.Suggestion[]>;
+  invalidateContext(outputTarget: OutputTargetInterface, layerId: string): Promise<LexicalModelTypes.Suggestion[]>;
 
   /**
    *
@@ -66,9 +66,9 @@ export interface LanguageProcessorSpec extends EventEmitter<LanguageProcessorEve
    *                        required because layerid can be changed by PostKeystroke
    * @returns
    */
-  applySuggestion(suggestion: LexicalModelTypes.Suggestion, outputTarget: OutputTarget, getLayerId: () => string): Promise<LexicalModelTypes.Reversion>;
+  applySuggestion(suggestion: LexicalModelTypes.Suggestion, outputTarget: OutputTargetInterface, getLayerId: () => string): Promise<LexicalModelTypes.Reversion>;
 
-  applyReversion(reversion: LexicalModelTypes.Reversion, outputTarget: OutputTarget): Promise<LexicalModelTypes.Suggestion[]>;
+  applyReversion(reversion: LexicalModelTypes.Reversion, outputTarget: OutputTargetInterface): Promise<LexicalModelTypes.Suggestion[]>;
 
   get wordbreaksAfterSuggestions(): boolean;
 
diff --git a/web/src/engine/interfaces/src/prediction/predictionContext.ts b/web/src/engine/interfaces/src/prediction/predictionContext.ts
index 902566eed2c..1efe3b56159 100644
--- a/web/src/engine/interfaces/src/prediction/predictionContext.ts
+++ b/web/src/engine/interfaces/src/prediction/predictionContext.ts
@@ -4,7 +4,7 @@ import Keep = LexicalModelTypes.Keep;
 import Reversion = LexicalModelTypes.Reversion;
 import Suggestion = LexicalModelTypes.Suggestion;
 import { type LanguageProcessorSpec , ReadySuggestions, type InvalidateSourceEnum, StateChangeHandler } from './languageProcessor.interface.js';
-import { type OutputTarget } from "keyman/engine/keyboard";
+import { type OutputTargetInterface } from "keyman/engine/keyboard";
 
 interface PredictionContextEventMap {
   update: (suggestions: Suggestion[]) => void;
@@ -41,13 +41,13 @@ export default class PredictionContext extends EventEmitter<PredictionContextEve
   /**
    * Represents the active context used when requesting and applying predictive-text operations.
    */
-  private _currentTarget: OutputTarget;
+  private _currentTarget: OutputTargetInterface;
 
-  public get currentTarget(): OutputTarget {
+  public get currentTarget(): OutputTargetInterface {
     return this._currentTarget;
   }
 
-  public setCurrentTarget(target: OutputTarget): Promise<Suggestion[]> {
+  public setCurrentTarget(target: OutputTargetInterface): Promise<Suggestion[]> {
     const originalTarget = this._currentTarget;
     this._currentTarget = target;
 
diff --git a/web/src/engine/js-processor/src/jsKeyboardInterface.ts b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
index 147075f0f2c..d15900bc6ca 100644
--- a/web/src/engine/js-processor/src/jsKeyboardInterface.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
@@ -7,7 +7,7 @@
 
 import { type DeviceSpec, KMWString } from "@keymanapp/web-utils";
 import { ModifierKeyConstants } from '@keymanapp/common-types';
-import { Codes, type KeyEvent, KeyMapping, JSKeyboard, KeyboardHarness, KeyboardKeymanGlobal, type OutputTarget, VariableStoreDictionary } from "keyman/engine/keyboard";
+import { Codes, type KeyEvent, KeyMapping, JSKeyboard, KeyboardHarness, KeyboardKeymanGlobal, type OutputTargetInterface, VariableStoreDictionary } from "keyman/engine/keyboard";
 import { type OutputTargetBase }  from './outputTargetBase.js';
 import { type Deadkey } from './deadkeys.js';
 import { Mock } from "./mock.js";
@@ -174,7 +174,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
   cachedContextEx: CachedContextEx = new CachedContextEx();
   ruleContextEx: CachedContextEx;
 
-  activeTargetOutput: OutputTarget;
+  activeTargetOutput: OutputTargetInterface;
   ruleBehavior: RuleBehavior;
 
   systemStores: {[storeID: number]: SystemStore};
@@ -251,7 +251,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *             KC(10,10,Pelem) == "abcdef"  i.e. return as much as possible of the requested string
    */
 
-  context(n: number, ln: number, outputTarget: OutputTarget): string {
+  context(n: number, ln: number, outputTarget: OutputTargetInterface): string {
     const v = this.cachedContext.get(n, ln);
     if(v !== null) {
       return v;
@@ -275,7 +275,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *             KC(3,3,Pelem) == "def"
    *             KC(10,10,Pelem) == "XXXXabcdef"  i.e. return as much as possible of the requested string, where X = \uFFFE
    */
-  private KC_(n: number, ln: number, outputTarget: OutputTarget): string {
+  private KC_(n: number, ln: number, outputTarget: OutputTargetInterface): string {
     let tempContext = '';
 
     // If we have a selection, we have an empty context
@@ -301,7 +301,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *             KN(2,Pelem) == FALSE
    *             KN(4,Pelem) == TRUE
    */
-  nul(n: number, outputTarget: OutputTarget): boolean {
+  nul(n: number, outputTarget: OutputTargetInterface): boolean {
     const cx=this.context(n+1, 1, outputTarget);
 
     // With #31, the result will be a replacement character if context is empty.
@@ -318,7 +318,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @return      {boolean}                   True if selected context matches val
    * Description  Test keyboard context for match
    */
-  contextMatch(n: number, outputTarget: OutputTarget, val: string, ln: number): boolean {
+  contextMatch(n: number, outputTarget: OutputTargetInterface, val: string, ln: number): boolean {
     const cx=this.context(n, ln, outputTarget);
     if(cx === val) {
       return true; // I3318
@@ -616,7 +616,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @return      {boolean}                   True if deadkey found selected context matches val
    * Description  Match deadkey at current cursor position
    */
-  deadkeyMatch(n: number, outputTarget: OutputTarget, d: number): boolean {
+  deadkeyMatch(n: number, outputTarget: OutputTargetInterface, d: number): boolean {
     return outputTarget.hasDeadkeyMatch(n, d);
   }
 
@@ -626,7 +626,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param       {Object}      outputTarget  element to flash
    * Description  Flash body as substitute for audible beep; notify embedded device to vibrate
    */
-  beep(outputTarget: OutputTarget): void {
+  beep(outputTarget: OutputTargetInterface): void {
     this.resetContextCache();
 
     // Denote as part of the matched rule's behavior.
@@ -719,7 +719,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param       {Object}      outputTarget  element to output to
    * Description  Output a character selected from the string according to the offset in the index array
    */
-  indexOutput(Pdn: number, Ps: KeyboardStore, Pn: number, outputTarget: OutputTarget): void {
+  indexOutput(Pdn: number, Ps: KeyboardStore, Pn: number, outputTarget: OutputTargetInterface): void {
     this.resetContextCache();
 
     const assertNever = function(x: never): never {
@@ -756,7 +756,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param       {Object}      outputTarget  element to output to
    * Description  Keyboard output
    */
-  deleteContext(dn: number, outputTarget: OutputTarget): void {
+  deleteContext(dn: number, outputTarget: OutputTargetInterface): void {
     let context: CachedExEntry;
 
     // We want to control exactly which deadkeys get removed.
@@ -802,7 +802,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param       {string}      s             string to output
    * Description  Keyboard output
    */
-  output(dn: number, outputTarget: OutputTarget, s:string): void {
+  output(dn: number, outputTarget: OutputTargetInterface, s:string): void {
     this.resetContextCache();
 
     outputTarget.saveProperties();
@@ -825,11 +825,11 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @alias       KCXO
    * @public
    * @param       {number}        Pdn            number of characters to delete left of cursor
-   * @param       {OutputTarget}  outputTarget   target to output to
+   * @param       {OutputTargetInterface}  outputTarget   target to output to
    * @param       {number}        contextLength  length of current rule context to retrieve
    * @param       {number}        contextOffset  offset from start of current rule context, 1-based
    */
-  contextExOutput(Pdn: number, outputTarget: OutputTarget, contextLength: number, contextOffset: number): void {
+  contextExOutput(Pdn: number, outputTarget: OutputTargetInterface, contextLength: number, contextOffset: number): void {
     this.resetContextCache();
 
     if(Pdn >= 0) {
@@ -851,11 +851,11 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * Function     deadkeyOutput KDO
    * Scope        Public
    * @param       {number}      Pdn           no of character to overwrite (delete)
-   * @param       {Object}      outputTarget  element to output to
+   * @param       {OutputTargetInterface}      outputTarget  element to output to
    * @param       {number}      Pd            deadkey id
    * Description  Record a deadkey at current cursor position, deleting Pdn characters first
    */
-  deadkeyOutput(Pdn: number, outputTarget: OutputTarget, Pd: number): void {
+  deadkeyOutput(Pdn: number, outputTarget: OutputTargetInterface, Pd: number): void {
     this.resetContextCache();
 
     if(Pdn >= 0) {
@@ -871,10 +871,10 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *
    * @param       {number}      systemId      ID of the system store to test (only TSS_LAYER currently supported)
    * @param       {string}      strValue      String value to compare to
-   * @param       {Object}      outputTarget  Currently active element (may be needed by future tests)
+   * @param       {OutputTargetInterface}      outputTarget  Currently active element (may be needed by future tests)
    * @return      {boolean}                   True if the test succeeds
    */
-  ifStore(systemId: number, strValue: string, outputTarget: OutputTarget): boolean {
+  ifStore(systemId: number, strValue: string, outputTarget: OutputTargetInterface): boolean {
     let result=true;
     const store = this.systemStores[systemId];
     if(store) {
@@ -888,14 +888,14 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *
    * @param       {number}      systemId      ID of the system store to set (only TSS_LAYER currently supported)
    * @param       {string}      strValue      String to set as the system store content
-   * @param       {Object}      outputTarget  Currently active element (may be needed in future tests)
+   * @param       {OutputTargetInterface}      outputTarget  Currently active element (may be needed in future tests)
    * @return      {boolean}                   True if command succeeds
    *                                          (i.e. for TSS_LAYER, if the layer is successfully selected)
    *
    * Note that option/variable stores are instead set within keyboard script code, as they only
    * affect keyboard behavior.
    */
-  setStore(systemId: number, strValue: string, outputTarget: OutputTarget): boolean {
+  setStore(systemId: number, strValue: string, outputTarget: OutputTargetInterface): boolean {
     this.resetContextCache();
     // Unique case:  we only allow set(&layer) ops from keyboard rules triggered by touch OSKs.
     if(systemId == SystemStoreIDs.TSS_LAYER && this.activeDevice.touchable) {
@@ -965,7 +965,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
     this.cachedContextEx.reset();
   }
 
-  defaultBackspace(outputTarget: OutputTarget) {
+  defaultBackspace(outputTarget: OutputTargetInterface) {
     if(outputTarget.isSelectionEmpty()) {
       // Delete the character left of the caret
       this.output(1, outputTarget, "");
diff --git a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
index 9c1aa8b55b7..9b238cdd2fb 100644
--- a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
@@ -125,7 +125,8 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
    * where and when appropriate.
    *
    * @param   {object}  Lkc           The pre-analyzed KeyEvent object
-   * @param   {boolean} outputTarget  The OutputTarget receiving the KeyEvent
+   * @param   {OutputTargetInterface} outputTarget  The OutputTarget receiving the KeyEvent
+   * @param   {boolean}  readonly      True if the target is read-only
    * @return  {string}
    */
   private defaultRuleBehavior(Lkc: KeyEvent, outputTarget: OutputTargetBase, readonly: boolean): RuleBehavior {
diff --git a/web/src/engine/js-processor/src/outputTargetBase.ts b/web/src/engine/js-processor/src/outputTargetBase.ts
index 86c4c405abd..181e25c941b 100644
--- a/web/src/engine/js-processor/src/outputTargetBase.ts
+++ b/web/src/engine/js-processor/src/outputTargetBase.ts
@@ -1,7 +1,7 @@
 import { KMWString } from "@keymanapp/web-utils";
 import { findCommonSubstringEndIndex } from "./stringDivergence.js";
 import { Mock } from "./mock.js";
-import { OutputTarget } from 'keyman/engine/keyboard';
+import { OutputTargetInterface } from 'keyman/engine/keyboard';
 
 // Defines deadkey management in a manner attachable to each element interface.
 import { type KeyEvent } from 'keyman/engine/keyboard';
@@ -64,7 +64,7 @@ export class Transcription {
 
 export type Alternate = LexicalModelTypes.ProbabilityMass<LexicalModelTypes.Transform>;
 
-export abstract class OutputTargetBase implements OutputTarget {
+export abstract class OutputTargetBase implements OutputTargetInterface {
   private _dks: DeadkeyTracker;
 
   constructor() {
diff --git a/web/src/engine/keyboard/src/defaultRules.ts b/web/src/engine/keyboard/src/defaultRules.ts
index a057eda386f..8b33b884d4f 100644
--- a/web/src/engine/keyboard/src/defaultRules.ts
+++ b/web/src/engine/keyboard/src/defaultRules.ts
@@ -7,7 +7,7 @@
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 import Codes from './codes.js';
 import { type KeyEvent } from './keyEvent.js';
-import { type OutputTarget }  from './outputTarget.js';
+import { type OutputTargetInterface }  from './outputTargetInterface.js';
 
 export enum EmulationKeystrokes {
   Enter = '\n',
@@ -83,7 +83,7 @@ export default class DefaultRules {
    *
    * Note:  is extended by DOM-aware KeymanWeb code.
    */
-  public applyCommand(Lkc: KeyEvent, outputTarget: OutputTarget): void {
+  public applyCommand(Lkc: KeyEvent, outputTarget: OutputTargetInterface): void {
     // Notes for potential default-handling extensions:
     //
     // switch(code) {
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index 1ff8203dfea..864d01a5c29 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -27,7 +27,7 @@ export { default as DefaultRules } from "./defaultRules.js";
 export * from "./defaultRules.js";
 export { type KeyDistribution, KeyEventSpec, KeyEvent } from "./keyEvent.js";
 export { default as KeyMapping } from "./keyMapping.js";
-export { OutputTarget } from "./outputTarget.js";
+export { OutputTargetInterface } from "./outputTargetInterface.js";
 export * from "./systemStores.js";
 
 export * from "@keymanapp/web-utils";
diff --git a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
index cef519406ef..ffb9799889b 100644
--- a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
+++ b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
@@ -2,7 +2,7 @@ import Codes from "../codes.js";
 import { Layouts } from "./defaultLayouts.js";
 import { ActiveKey, ActiveLayout, ActiveSubKey } from "./activeLayout.js";
 import { KeyEvent } from "../keyEvent.js";
-import { type OutputTarget } from "../outputTarget.js";
+import { type OutputTargetInterface } from "../outputTargetInterface.js";
 import { KeymanWebKeyboard, ModifierKeyConstants, TouchLayout } from "@keymanapp/common-types";
 
 import ComplexKeyboardStore = KeymanWebKeyboard.ComplexKeyboardStore;
@@ -53,7 +53,7 @@ type KmwKeyboardObject = KeyboardObject & {
  */
 export class JSKeyboard {
   public static DEFAULT_SCRIPT_OBJECT: KmwKeyboardObject = {
-    'gs': function(outputTarget: OutputTarget, keystroke: KeyEvent) { return false; }, // no matching rules; rely on defaultRuleOutput entirely
+    'gs': function(outputTarget: OutputTargetInterface, keystroke: KeyEvent) { return false; }, // no matching rules; rely on defaultRuleOutput entirely
     'KI': '', // The currently-existing default keyboard ID; we already have checks that focus against this.
     'KN': '',
     'KV': Layouts.DEFAULT_RAW_SPEC,
@@ -81,21 +81,21 @@ export class JSKeyboard {
   /**
    * Calls the keyboard's `gs` function, which represents the keyboard source's begin Unicode group.
    */
-  process(outputTarget: OutputTarget, keystroke: KeyEvent): boolean {
+  process(outputTarget: OutputTargetInterface, keystroke: KeyEvent): boolean {
     return this.scriptObject['gs'](outputTarget, keystroke);
   }
 
   /**
    * Calls the keyboard's `gn` function, which represents the keyboard source's begin newContext group.
    */
-  processNewContextEvent(outputTarget: OutputTarget, keystroke: KeyEvent): boolean {
+  processNewContextEvent(outputTarget: OutputTargetInterface, keystroke: KeyEvent): boolean {
     return this.scriptObject['gn'] ? this.scriptObject['gn'](outputTarget, keystroke) : false;
   }
 
   /**
    * Calls the keyboard's `gpk` function, which represents the keyboard source's begin postKeystroke group.
    */
-  processPostKeystroke(outputTarget: OutputTarget, keystroke: KeyEvent): boolean {
+  processPostKeystroke(outputTarget: OutputTargetInterface, keystroke: KeyEvent): boolean {
     return this.scriptObject['gpk'] ? this.scriptObject['gpk'](outputTarget, keystroke) : false;
   }
 
@@ -362,7 +362,7 @@ export class JSKeyboard {
    * @param       {number}    _PData        1 or 0
    * Notifies keyboard of keystroke or other event
    */
-  notify(_PCommand: number, _PTarget: OutputTarget, _PData: number) { // I2187
+  notify(_PCommand: number, _PTarget: OutputTargetInterface, _PData: number) { // I2187
     // Good example use case - the Japanese CJK-picker keyboard
     if(typeof(this.scriptObject['KNS']) == 'function') {
       this.scriptObject['KNS'](_PCommand, _PTarget, _PData);
diff --git a/web/src/engine/keyboard/src/outputTarget.ts b/web/src/engine/keyboard/src/outputTargetInterface.ts
similarity index 92%
rename from web/src/engine/keyboard/src/outputTarget.ts
rename to web/src/engine/keyboard/src/outputTargetInterface.ts
index 34faa5667aa..5dac4eb2cdc 100644
--- a/web/src/engine/keyboard/src/outputTarget.ts
+++ b/web/src/engine/keyboard/src/outputTargetInterface.ts
@@ -1,10 +1,11 @@
 /*
  * Keyman is copyright (C) SIL Global. MIT License.
  */
-export interface OutputTarget {
+export interface OutputTargetInterface {
   /**
-   * Signifies that this OutputTarget has no default key processing behaviors.  This should be false
-   * for OutputTargets backed by web elements like HTMLInputElement or HTMLTextAreaElement.
+   * Signifies that this OutputTargetInterface has no default key processing behaviors.
+   * This should be false for OutputTargets backed by web elements like HTMLInputElement
+   * or HTMLTextAreaElement.
    */
   get isSynthetic(): boolean;
 
diff --git a/web/src/engine/main/src/contextManagerBase.ts b/web/src/engine/main/src/contextManagerBase.ts
index 3f2701cb820..8aa7319c836 100644
--- a/web/src/engine/main/src/contextManagerBase.ts
+++ b/web/src/engine/main/src/contextManagerBase.ts
@@ -1,5 +1,5 @@
 import { EventEmitter } from 'eventemitter3';
-import { ManagedPromise, type Keyboard, type OutputTarget } from 'keyman/engine/keyboard';
+import { ManagedPromise, type Keyboard, type OutputTargetInterface } from 'keyman/engine/keyboard';
 import { type JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { StubAndKeyboardCache, type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { PredictionContext } from 'keyman/engine/interfaces';
@@ -7,7 +7,7 @@ import { EngineConfiguration } from './engineConfiguration.js';
 
 interface EventMap {
   // target, then keyboard.
-  'targetchange': (target: OutputTarget) => boolean;
+  'targetchange': (target: OutputTargetInterface) => boolean;
 
   /**
    * This event is raised whenever a keyboard change is requested.
@@ -48,7 +48,7 @@ export interface ContextManagerConfiguration {
    *
    * Does not reset option-stores, variable-stores, etc.
    */
-  readonly resetContext: (outputTarget?: OutputTarget) => void;
+  readonly resetContext: (outputTarget?: OutputTargetInterface) => void;
 
   /**
    * A predictive-state management object that interfaces the predictive-text banner
@@ -64,7 +64,7 @@ export interface ContextManagerConfiguration {
 }
 
 interface PendingActivation {
-  target: OutputTarget,
+  target: OutputTargetInterface,
   keyboard: Promise<Keyboard>,
   stub: KeyboardStub;
 }
@@ -74,11 +74,11 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
 
   abstract initialize(): void;
 
-  abstract get activeTarget(): OutputTarget;
+  abstract get activeTarget(): OutputTargetInterface;
 
   private _predictionContext: PredictionContext;
   protected keyboardCache: StubAndKeyboardCache;
-  private _resetContext: (outputTarget?: OutputTarget) => void;
+  private _resetContext: (outputTarget?: OutputTargetInterface) => void;
 
   private pendingActivations: PendingActivation[] = [];
   protected engineConfig: MainConfig;
@@ -135,7 +135,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
    * attached elements within the app/browser target.  For `app/webview`, this should
    * always return a consistent value - likely, `null`.
    */
-  protected abstract currentKeyboardSrcTarget(): OutputTarget;
+  protected abstract currentKeyboardSrcTarget(): OutputTargetInterface;
 
   /**
    * Ensures that newly activated keyboards are set correctly within managed context, possibly
@@ -143,7 +143,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
    * @param kbd
    * @param target
    */
-  protected abstract activateKeyboardForTarget(kbd: {keyboard: Keyboard, metadata: KeyboardStub}, target: OutputTarget): void;
+  protected abstract activateKeyboardForTarget(kbd: { keyboard: Keyboard, metadata: KeyboardStub }, target: OutputTargetInterface): void;
 
   /**
    * Checks the pending keyboard-activation array for an entry corresponding to the specified
@@ -152,7 +152,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
    *                May be `null`, which corresponds to the global default Keyboard.
    * @returns `true` if pending activation is still valid, `false` otherwise.
    */
-  private findAndPopActivation(target: OutputTarget): PendingActivation {
+  private findAndPopActivation(target: OutputTargetInterface): PendingActivation {
     // Array.findIndex requires Chrome 45+. :(
     let activationIndex;
     for(activationIndex = 0; activationIndex < this.pendingActivations.length; activationIndex++) {
@@ -180,7 +180,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
   protected async deferredKeyboardActivation(
     kbdPromise: Promise<Keyboard>,
     metadata: KeyboardStub,
-    target: OutputTarget
+    target: OutputTargetInterface
   ): Promise<PendingActivation> {
     const activation: PendingActivation = {
       target: target,
diff --git a/web/src/engine/main/src/engineConfiguration.ts b/web/src/engine/main/src/engineConfiguration.ts
index 8e5daa2c0dd..df394e7cb97 100644
--- a/web/src/engine/main/src/engineConfiguration.ts
+++ b/web/src/engine/main/src/engineConfiguration.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from "eventemitter3";
 
-import { DeviceSpec, KeyboardProperties, ManagedPromise, OutputTarget, physicalKeyDeviceAlias, SpacebarText } from "keyman/engine/keyboard";
+import { DeviceSpec, KeyboardProperties, ManagedPromise, OutputTargetInterface, physicalKeyDeviceAlias, SpacebarText } from "keyman/engine/keyboard";
 import { RuleBehavior } from 'keyman/engine/js-processor';
 import { PathConfiguration, PathOptionDefaults, PathOptionSpec } from "keyman/engine/interfaces";
 import { DeviceDetector } from "./headless/deviceDetector.js";
@@ -110,7 +110,7 @@ export class EngineConfiguration extends EventEmitter<EventMap> {
    * @param ruleBehavior  The full effects of keystroke + postkeystroke rules from a processed keystroke.
    * @param outputTarget  The engine's current source for context
    */
-  onRuleFinalization(ruleBehavior: RuleBehavior, outputTarget: OutputTarget) {};
+  onRuleFinalization(ruleBehavior: RuleBehavior, outputTarget: OutputTargetInterface) {};
 }
 
 export interface InitOptionSpec extends PathOptionSpec {
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index fc7961bfee2..fb946bd9c63 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -7,7 +7,7 @@ import { globalObject, DeviceSpec } from "@keymanapp/web-utils";
 
 import { KM_Core } from 'keyman/engine/core-processor';
 
-import { Codes, JSKeyboard, KeyboardMinimalInterface, type Keyboard, type KeyEvent, type OutputTarget, SystemStoreIDs } from "keyman/engine/keyboard";
+import { Codes, JSKeyboard, KeyboardMinimalInterface, type Keyboard, type KeyEvent, type OutputTargetInterface, SystemStoreIDs } from "keyman/engine/keyboard";
 // TODO-web-core: remove usage of OutputTargetBase
 import {
   type Alternate,
@@ -96,7 +96,7 @@ export class InputProcessor {
    * @returns     {Object}                    A RuleBehavior object describing the cumulative effects of
    *                                          all matched keyboard rules.
    */
-  processKeyEvent(keyEvent: KeyEvent, outputTarget: OutputTarget): RuleBehavior {
+  processKeyEvent(keyEvent: KeyEvent, outputTarget: OutputTargetInterface): RuleBehavior {
     const kbdMismatch = keyEvent.srcKeyboard && this.activeKeyboard != keyEvent.srcKeyboard;
     const trueActiveKeyboard = this.activeKeyboard;
 
@@ -150,7 +150,7 @@ export class InputProcessor {
    * @param outputTarget
    * @returns
    */
-  private _processKeyEvent(keyEvent: KeyEvent, outputTarget: OutputTarget): RuleBehavior {
+  private _processKeyEvent(keyEvent: KeyEvent, outputTarget: OutputTargetInterface): RuleBehavior {
     const formFactor = keyEvent.device.formFactor;
     const fromOSK = keyEvent.isSynthetic;
 
@@ -395,7 +395,7 @@ export class InputProcessor {
     return alternates;
   }
 
-  public resetContext(outputTarget?: OutputTarget) {
+  public resetContext(outputTarget?: OutputTargetInterface) {
     // Also handles new-context events, which may modify the layer
     // TODO-web-core
     this.keyboardProcessor.resetContext(outputTarget as OutputTargetBase);
diff --git a/web/src/engine/main/src/headless/languageProcessor.ts b/web/src/engine/main/src/headless/languageProcessor.ts
index 719b11f1de7..19d2229cdf2 100644
--- a/web/src/engine/main/src/headless/languageProcessor.ts
+++ b/web/src/engine/main/src/headless/languageProcessor.ts
@@ -2,7 +2,7 @@ import { EventEmitter } from "eventemitter3";
 import { LMLayer, WorkerFactory } from "@keymanapp/lexical-model-layer/web";
 // TODO-web-core: remove use of OutputTargetBase
 import { Transcription, Mock, OutputTargetBase } from "keyman/engine/js-processor";
-import { OutputTarget } from 'keyman/engine/keyboard';
+import { OutputTargetInterface } from 'keyman/engine/keyboard';
 import { LanguageProcessorEventMap, ModelSpec, StateChangeEnum, ReadySuggestions } from 'keyman/engine/interfaces';
 import ContextWindow from "./contextWindow.js";
 import { TranscriptionCache } from "./transcriptionCache.js";
@@ -127,7 +127,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     });
   }
 
-  public invalidateContext(outputTarget: OutputTarget, layerId: string): Promise<Suggestion[]> {
+  public invalidateContext(outputTarget: OutputTargetInterface, layerId: string): Promise<Suggestion[]> {
     // If there's no active model, there can be no predictions.
     // We'll also be missing important data needed to even properly REQUEST the predictions.
     if(!this.currentModel || !this.configuration) {
@@ -156,7 +156,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     }
   }
 
-  public wordbreak(target: OutputTarget, layerId: string): Promise<string> {
+  public wordbreak(target: OutputTargetInterface, layerId: string): Promise<string> {
     if(!this.isActive) {
       return null;
     }
@@ -192,9 +192,9 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
    *                        required because layerid can be changed by PostKeystroke
    * @returns
    */
-  public applySuggestion(suggestion: Suggestion, outputTarget: OutputTarget, getLayerId: ()=>string): Promise<Reversion> {
+  public applySuggestion(suggestion: Suggestion, outputTarget: OutputTargetInterface, getLayerId: ()=>string): Promise<Reversion> {
     if(!outputTarget) {
-      throw "Accepting suggestions requires a destination OutputTarget instance."
+      throw "Accepting suggestions requires a destination OutputTargetInterface instance."
     }
 
     if(!this.isActive) {
@@ -269,9 +269,9 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     }
   }
 
-  public applyReversion(reversion: Reversion, outputTarget: OutputTarget) {
+  public applyReversion(reversion: Reversion, outputTarget: OutputTargetInterface) {
     if(!outputTarget) {
-      throw "Accepting suggestions requires a destination OutputTarget instance."
+      throw "Accepting suggestions requires a destination OutputTargetInterface instance."
     }
 
     if(!this.isActive) {
@@ -313,7 +313,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     return promise;
   }
 
-  public predictFromTarget(outputTarget: OutputTarget, layerId: string): Promise<Suggestion[]> {
+  public predictFromTarget(outputTarget: OutputTargetInterface, layerId: string): Promise<Suggestion[]> {
     if(!this.isActive || !outputTarget) {
       return null;
     }
diff --git a/web/src/tools/testing/recorder-core/src/index.ts b/web/src/tools/testing/recorder-core/src/index.ts
index 1e7631d6873..60ab11a8431 100644
--- a/web/src/tools/testing/recorder-core/src/index.ts
+++ b/web/src/tools/testing/recorder-core/src/index.ts
@@ -1,5 +1,5 @@
 import { Mock } from "keyman/engine/js-processor";
-import { KeyDistribution, KeyEvent, type OutputTarget } from "keyman/engine/keyboard";
+import { KeyDistribution, KeyEvent, type OutputTargetInterface } from "keyman/engine/keyboard";
 
 import Proctor from "./proctor.js";
 
@@ -217,7 +217,7 @@ export abstract class TestSequence<KeyRecord extends RecordedKeystroke | InputEv
 
   abstract hasOSKInteraction(): boolean;
 
-  async test(proctor: Proctor, target?: OutputTarget): Promise<{success: boolean, result: string}> {
+  async test(proctor: Proctor, target?: OutputTargetInterface): Promise<{success: boolean, result: string}> {
     // Start with an empty OutputTarget and a fresh KeyboardProcessor.
     if(!target) {
       target = new Mock();
diff --git a/web/src/tools/testing/recorder-core/src/nodeProctor.ts b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
index f65089c0635..72980a528f5 100644
--- a/web/src/tools/testing/recorder-core/src/nodeProctor.ts
+++ b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
@@ -8,8 +8,8 @@ import {
   RecordedSyntheticKeystroke
 } from "./index.js";
 
-import { KeyEvent, KeyEventSpec, KeyboardHarness, type OutputTarget } from "keyman/engine/keyboard";
-// TODO-web-core: remove usage of OutputTargetBase, use OutputTarget instead
+import { KeyEvent, KeyEventSpec, KeyboardHarness, type OutputTargetInterface } from "keyman/engine/keyboard";
+// TODO-web-core: remove usage of OutputTargetBase, use OutputTargetInterface instead
 import { Mock, OutputTargetBase } from 'keyman/engine/js-processor';
 import { DeviceSpec } from "@keymanapp/web-utils";
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
@@ -50,7 +50,7 @@ export default class NodeProctor extends Proctor {
     return true;
   }
 
-  async simulateSequence(sequence: TestSequence<any>, target?: OutputTarget): Promise<string> {
+  async simulateSequence(sequence: TestSequence<any>, target?: OutputTargetInterface): Promise<string> {
     // Start with an empty OutputTarget and a fresh KeyboardProcessor.
     if(!target) {
       target = new Mock();
diff --git a/web/src/tools/testing/recorder-core/src/proctor.ts b/web/src/tools/testing/recorder-core/src/proctor.ts
index 0242b911a1c..533648e88cf 100644
--- a/web/src/tools/testing/recorder-core/src/proctor.ts
+++ b/web/src/tools/testing/recorder-core/src/proctor.ts
@@ -1,5 +1,5 @@
 import { type DeviceSpec } from "@keymanapp/web-utils";
-import { type OutputTarget } from "keyman/engine/keyboard";
+import { type OutputTargetInterface } from "keyman/engine/keyboard";
 
 import type { KeyboardTest, TestSet, TestSequence } from "./index.js";
 
@@ -49,5 +49,5 @@ export default abstract class Proctor {
    * Simulates the specified test sequence for use in testing.
    * @param sequence The recorded sequence, generally provided by a test set.
    */
-  abstract simulateSequence(sequence: TestSequence<any>, target?: OutputTarget): Promise<string>;
+  abstract simulateSequence(sequence: TestSequence<any>, target?: OutputTargetInterface): Promise<string>;
 }
\ No newline at end of file
diff --git a/web/src/tools/testing/recorder/browserProctor.ts b/web/src/tools/testing/recorder/browserProctor.ts
index fb6d6a7c040..cc81b89ceac 100644
--- a/web/src/tools/testing/recorder/browserProctor.ts
+++ b/web/src/tools/testing/recorder/browserProctor.ts
@@ -4,7 +4,7 @@
 
 import { type DeviceSpec } from "@keymanapp/web-utils";
 
-import { type OutputTarget } from "keyman/engine/keyboard";
+import { type OutputTargetInterface } from "keyman/engine/keyboard";
 
 import { type KeymanEngine } from 'keyman/app/browser';
 
@@ -81,7 +81,7 @@ export class BrowserProctor extends Proctor {
 
   // Execution of a test sequence depends on the testing environment; this handles
   // the browser-specific aspects.
-  async simulateSequence(sequence: TestSequence<any>, outputTarget?: OutputTarget): Promise<string> {
+  async simulateSequence(sequence: TestSequence<any>, outputTarget?: OutputTargetInterface): Promise<string> {
     const driver = new BrowserDriver(this.target);
 
     // For the version 10.0 spec

From 657585e6050f0ec57a30c66abf0a976aabfd114d Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 20 May 2025 12:06:26 +0200
Subject: [PATCH 088/254] docs(web): update function comment for
 `preprocessKeyboardEvent`

---
 web/src/app/browser/src/hardwareEventKeyboard.ts | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts
index fcb1709d960..008cca5803b 100644
--- a/web/src/app/browser/src/hardwareEventKeyboard.ts
+++ b/web/src/app/browser/src/hardwareEventKeyboard.ts
@@ -38,15 +38,13 @@ export function _GetEventKeyCode(e: KeyboardEvent) {
 // Keeping this as a separate function affords us the opportunity to unit-test the method more simply.
 
 /**
- * Function     _GetKeyEventProperties
- * Scope        Private
- * @param       {Event}       e         Event object
- * @return      {Object.<string,*>}     KMW keyboard event object:
- * Description  Get object with target element, key code, shift state, virtual key state
- *                Lcode=keyCode
- *                Lmodifiers=shiftState
- *                LisVirtualKeyCode e.g. ctrl/alt key
- *                LisVirtualKey     e.g. Virtual key or non-keypress event
+ * Function     preprocessKeyboardEvent
+ * @param       {Event}         e              Event object
+ * @param       {KeyboardState} keyboardState  Keyboard state object
+ * @param       {DeviceSpec}    device         Device object
+ * @return      {KeyEvent}                     KMW keyboard event object:
+ *
+ * Description  Returns the preprocessed KeyEvent object.
  */
 export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: KeyboardState, device: DeviceSpec): KeyEvent {
   if(e.cancelBubble === true) {

From 1b14f5c0bc32d22267253f9d77305d8dca449c43 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 15 May 2025 17:27:05 +0200
Subject: [PATCH 089/254] refactor(web): move `RuleBehavior` to
 `engine/keyboard`

This requires to move some other files around. Also move `finalize`
and `mergeInDefaults` methods to processor and rename them to
`finalizeProcessorAction` and `mergeInOtherProcessorAction` (decided
to directly use the term `ProcessorAction`, to which `RuleBehavior`
will be renamed to in a following PR).

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 web/src/app/browser/src/configuration.ts      |   4 +-
 web/src/app/webview/src/contextManager.ts     |   7 +-
 web/src/app/webview/src/keymanEngine.ts       |   3 +-
 web/src/engine/js-processor/src/index.ts      |   3 +-
 .../js-processor/src/jsKeyboardInterface.ts   |  21 ++-
 .../js-processor/src/jsKeyboardProcessor.ts   |  85 ++++++++++-
 web/src/engine/js-processor/src/mock.ts       |  13 +-
 .../js-processor/src/outputTargetBase.ts      |  53 +------
 .../engine/js-processor/src/ruleBehavior.ts   | 138 ------------------
 web/src/engine/js-processor/src/stores.ts     |   8 +-
 web/src/engine/js-processor/tsconfig.json     |   3 +
 web/src/engine/keyboard/src/index.ts          |   6 +-
 .../keyboard/src/keyboards/ruleBehavior.ts    |  69 +++++++++
 .../keyboard/src/keyboards/textTransform.ts   |  23 +++
 .../keyboard/src/keyboards/transcription.ts   |  35 +++++
 .../src/{systemStores.ts => systemStore.ts}   |   2 +
 web/src/engine/keyboard/src/variableStore.ts  |  12 ++
 .../engine/main/src/engineConfiguration.ts    |   6 +-
 web/src/engine/main/src/hardKeyboardBase.ts   |   3 +-
 .../main/src/headless/inputProcessor.ts       |  24 +--
 .../main/src/headless/languageProcessor.ts    |  10 +-
 .../main/src/headless/transcriptionCache.ts   |   2 +-
 web/src/engine/main/src/keymanEngineBase.ts   |  15 +-
 .../main/src/variableStoreCookieSerializer.ts |   2 +-
 .../osk/src/views/keyEventSource.interface.ts |   3 +-
 25 files changed, 303 insertions(+), 247 deletions(-)
 delete mode 100644 web/src/engine/js-processor/src/ruleBehavior.ts
 create mode 100644 web/src/engine/keyboard/src/keyboards/ruleBehavior.ts
 create mode 100644 web/src/engine/keyboard/src/keyboards/textTransform.ts
 create mode 100644 web/src/engine/keyboard/src/keyboards/transcription.ts
 rename web/src/engine/keyboard/src/{systemStores.ts => systemStore.ts} (96%)
 create mode 100644 web/src/engine/keyboard/src/variableStore.ts

diff --git a/web/src/app/browser/src/configuration.ts b/web/src/app/browser/src/configuration.ts
index 3799821165a..632d206cb73 100644
--- a/web/src/app/browser/src/configuration.ts
+++ b/web/src/app/browser/src/configuration.ts
@@ -1,8 +1,8 @@
 import { EngineConfiguration, InitOptionSpec, InitOptionDefaults } from "keyman/engine/main";
 
 import { OutputTargetElementWrapper as DOMOutputTarget } from 'keyman/engine/element-wrappers';
-import { OutputTargetInterface } from 'keyman/engine/keyboard';
-import { isEmptyTransform, RuleBehavior } from 'keyman/engine/js-processor';
+import { OutputTargetInterface, RuleBehavior } from 'keyman/engine/keyboard';
+import { isEmptyTransform } from 'keyman/engine/js-processor';
 import { AlertHost } from "./utils/alertHost.js";
 import { whenDocumentReady } from "./utils/documentReady.js";
 
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index 48ab4ca9272..b2c52de00e3 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -1,6 +1,6 @@
-import { JSKeyboard, Keyboard, OutputTargetInterface } from 'keyman/engine/keyboard';
+import { JSKeyboard, Keyboard, OutputTargetInterface, Transcription, TextTransform } from 'keyman/engine/keyboard';
 // TODO-web-core: remove usage of OutputTargetBase, use OutputTargetInterface instead
-import { Mock, Transcription, findCommonSubstringEndIndex, isEmptyTransform, TextTransform, OutputTargetBase } from 'keyman/engine/js-processor';
+import { Mock, findCommonSubstringEndIndex, isEmptyTransform, OutputTargetBase } from 'keyman/engine/js-processor';
 import { KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { ContextManagerBase } from 'keyman/engine/main';
 import { WebviewConfiguration } from './configuration.js';
@@ -31,7 +31,8 @@ export class ContextHost extends Mock {
       let transform: TextTransform = null;
 
       if(transcription) {
-        const preInput = transcription.preInput;
+        //TODO-web-core: shouldn't need cast in the future?
+        const preInput = transcription.preInput as Mock;
         // If our saved state matches the `preInput` from the incoming transcription, just reuse its transform.
         // Will generally not match during multitap operations, though.
         //
diff --git a/web/src/app/webview/src/keymanEngine.ts b/web/src/app/webview/src/keymanEngine.ts
index ba5076dbe64..4b1c8137c8b 100644
--- a/web/src/app/webview/src/keymanEngine.ts
+++ b/web/src/app/webview/src/keymanEngine.ts
@@ -1,5 +1,4 @@
-import { DeviceSpec, DefaultRules } from 'keyman/engine/keyboard';
-import { RuleBehavior } from 'keyman/engine/js-processor';
+import { DeviceSpec, DefaultRules, RuleBehavior } from 'keyman/engine/keyboard';
 import { KeymanEngineBase, KeyboardInterfaceBase } from 'keyman/engine/main';
 import { AnchoredOSKView, ViewConfiguration, StaticActivator } from 'keyman/engine/osk';
 import { getAbsoluteX, getAbsoluteY } from 'keyman/engine/dom-utils';
diff --git a/web/src/engine/js-processor/src/index.ts b/web/src/engine/js-processor/src/index.ts
index 6bf58045ec4..8968212c2f0 100644
--- a/web/src/engine/js-processor/src/index.ts
+++ b/web/src/engine/js-processor/src/index.ts
@@ -1,8 +1,7 @@
 export { BeepHandler, JSKeyboardProcessor, LogMessageHandler, ProcessorInitOptions } from "./jsKeyboardProcessor.js";
-export { RuleBehavior } from "./ruleBehavior.js";
 export { JSKeyboardInterface, KeyInformation, StoreNonCharEntry } from "./jsKeyboardInterface.js";
 export * from "./deadkeys.js";
-export * from "./stores.js";
+export { type ComplexKeyboardStore } from "./stores.js";
 export { OutputTargetBase } from "./outputTargetBase.js";
 export * from "./outputTargetBase.js";
 export { Mock } from "./mock.js";
diff --git a/web/src/engine/js-processor/src/jsKeyboardInterface.ts b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
index d15900bc6ca..7ccd608c5c6 100644
--- a/web/src/engine/js-processor/src/jsKeyboardInterface.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
@@ -7,14 +7,27 @@
 
 import { type DeviceSpec, KMWString } from "@keymanapp/web-utils";
 import { ModifierKeyConstants } from '@keymanapp/common-types';
-import { Codes, type KeyEvent, KeyMapping, JSKeyboard, KeyboardHarness, KeyboardKeymanGlobal, type OutputTargetInterface, VariableStoreDictionary } from "keyman/engine/keyboard";
+import {
+  Codes,
+  JSKeyboard,
+  KeyboardHarness,
+  KeyboardKeymanGlobal,
+  KeyMapping,
+  MutableSystemStore,
+  SystemStore,
+  SystemStoreIDs,
+  type KeyEvent,
+  type OutputTargetInterface,
+  RuleBehavior,
+  VariableStore,
+  VariableStoreDictionary,
+  VariableStoreSerializer,
+} from "keyman/engine/keyboard";
 import { type OutputTargetBase }  from './outputTargetBase.js';
 import { type Deadkey } from './deadkeys.js';
 import { Mock } from "./mock.js";
-import { RuleBehavior }  from "./ruleBehavior.js";
-import { SystemStoreIDs, SystemStore, MutableSystemStore } from "keyman/engine/keyboard";
 import { PlatformSystemStore } from './platformSystemStore.js';
-import { ComplexKeyboardStore, type KeyboardStore, KeyboardStoreElement, VariableStore, VariableStoreSerializer } from "./stores.js";
+import { ComplexKeyboardStore, type KeyboardStore, KeyboardStoreElement } from "./stores.js";
 
 //#endregion
 
diff --git a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
index 9b238cdd2fb..5ab213341f7 100644
--- a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
@@ -10,12 +10,11 @@ import { EventEmitter } from 'eventemitter3';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 import {
   Codes, type JSKeyboard, MinimalKeymanGlobal, KeyEvent, Layouts,
-  DefaultRules, EmulationKeystrokes,
-  type MutableSystemStore, SystemStoreIDs,
+  DefaultRules, EmulationKeystrokes, type MutableSystemStore,
+  OutputTargetInterface, RuleBehavior, SystemStoreIDs
 } from "keyman/engine/keyboard";
 import { Mock } from "./mock.js";
 import { type OutputTargetBase }  from "./outputTargetBase.js";
-import { RuleBehavior }  from "./ruleBehavior.js";
 import { JSKeyboardInterface }  from './jsKeyboardInterface.js';
 import { DeviceSpec, globalObject, KMWString } from "@keymanapp/web-utils";
 
@@ -23,7 +22,7 @@ import { DeviceSpec, globalObject, KMWString } from "@keymanapp/web-utils";
 
 // Also relies on @keymanapp/web-utils, which is included via tsconfig.json.
 
-export type BeepHandler = (outputTarget: OutputTargetBase) => void;
+export type BeepHandler = (outputTarget: OutputTargetInterface) => void;
 export type LogMessageHandler = (str: string) => void;
 
 export interface ProcessorInitOptions {
@@ -250,7 +249,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
         if(!matchBehavior) {
           matchBehavior = defaultBehavior;
         } else {
-          matchBehavior.mergeInDefaults(defaultBehavior);
+          this.mergeInOtherProcessorAction(matchBehavior, defaultBehavior);
         }
         matchBehavior.triggerKeyDefault = false; // We've triggered it successfully.
       } // If null, we must rely on something else (like the browser, in DOM-aware code) to fulfill the default.
@@ -577,8 +576,8 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
   private performNewContextEvent(outputTarget: OutputTargetBase): RuleBehavior {
     const ruleBehavior = this.processNewContextEvent(this.contextDevice, outputTarget);
 
-    if(ruleBehavior) {
-      ruleBehavior.finalize(this, outputTarget, true);
+    if (ruleBehavior) {
+      this.finalizeProcessorAction(ruleBehavior, outputTarget);
     }
     return ruleBehavior;
   }
@@ -610,4 +609,76 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
       }
     }
   };
+
+  public finalizeProcessorAction(data: RuleBehavior, outputTarget: OutputTargetInterface): void {
+    if (!data.transcription) {
+      throw "Cannot finalize a RuleBehavior with no transcription.";
+    }
+
+    if (this.beepHandler && data.beep) {
+      this.beepHandler(outputTarget);
+    }
+
+    for (const storeID in data.setStore) {
+      const sysStore = this.keyboardInterface.systemStores[storeID];
+      if (sysStore) {
+        try {
+          sysStore.set(data.setStore[storeID]);
+        } catch (error) {
+          if (this.errorLogger) {
+            this.errorLogger("Rule attempted to perform illegal operation - 'platform' may not be changed.");
+          }
+        }
+      } else if (this.warningLogger) {
+        this.warningLogger("Unknown store affected by keyboard rule: " + storeID);
+      }
+    }
+
+    this.keyboardInterface.applyVariableStores(data.variableStores);
+
+    if (this.keyboardInterface.variableStoreSerializer) {
+      for (const storeID in data.saveStore) {
+        this.keyboardInterface.variableStoreSerializer.saveStore(this.activeKeyboard.id, storeID, data.saveStore[storeID]);
+      }
+    }
+
+    if (data.triggersDefaultCommand) {
+      const keyEvent = data.transcription.keystroke;
+      this.defaultRules.applyCommand(keyEvent, outputTarget);
+    }
+
+    if (this.warningLogger && data.warningLog) {
+      this.warningLogger(data.warningLog);
+    } else if (this.errorLogger && data.errorLog) {
+      this.errorLogger(data.errorLog);
+    }
+  }
+
+  /**
+   * Merges default-related behaviors from another RuleBehavior into this one.  Assumes that the current instance
+   * "came first" chronologically.  Both RuleBehaviors must be sourced from the same keystroke.
+   *
+   * Intended use:  merging rule-based behavior with default key behavior during scenarios like those described
+   * at https://github.com/keymanapp/keyman/pull/4350#issuecomment-768753852.
+   *
+   * This function does not attempt a "complete" merge for two fully-constructed RuleBehaviors!  Things
+   * WILL break for unintended uses.
+   * @param other
+   */
+  private mergeInOtherProcessorAction(first: RuleBehavior, other: RuleBehavior): void {
+    const keystroke = first.transcription.keystroke;
+    const keyFromOther = other.transcription.keystroke;
+    if (keystroke.Lcode != keyFromOther.Lcode || keystroke.Lmodifiers != keyFromOther.Lmodifiers) {
+      throw "RuleBehavior default-merge not supported unless keystrokes are identical!";
+    }
+
+    first.triggersDefaultCommand = first.triggersDefaultCommand || other.triggersDefaultCommand;
+
+    const mergingMock = Mock.from(first.transcription.preInput, false);
+    mergingMock.apply(first.transcription.transform);
+    mergingMock.apply(other.transcription.transform);
+
+    first.transcription = mergingMock.buildTranscriptionFrom(first.transcription.preInput, keystroke, false, first.transcription.alternates);
+  }
+
 }
diff --git a/web/src/engine/js-processor/src/mock.ts b/web/src/engine/js-processor/src/mock.ts
index df7dc6b52b0..fb8cc607c70 100644
--- a/web/src/engine/js-processor/src/mock.ts
+++ b/web/src/engine/js-processor/src/mock.ts
@@ -1,3 +1,4 @@
+import { OutputTargetInterface } from 'keyman/engine/keyboard';
 import { OutputTargetBase } from './outputTargetBase.js';
 import { KMWString } from '@keymanapp/web-utils';
 
@@ -25,10 +26,18 @@ export class Mock extends OutputTargetBase {
     this.selForward = this.selEnd >= this.selStart;
   }
 
+  static assertIsOutputTargetBase(outputTarget: OutputTargetInterface): asserts outputTarget is OutputTargetBase {
+    if (!(outputTarget instanceof OutputTargetBase)) {
+      throw new TypeError("outputTarget is not a OutputTargetBase");
+    }
+  }
+
   // Clones the state of an existing EditableElement, creating a Mock version of its state.
-  static from(outputTarget: OutputTargetBase, readonly?: boolean) {
+  static from(outputTarget: OutputTargetInterface, readonly?: boolean): Mock {
     let clone: Mock;
 
+    this.assertIsOutputTargetBase(outputTarget);
+
     if (outputTarget instanceof Mock) {
       // Avoids the need to run expensive kmwstring.ts `length()`
       // calculations when deep-copying Mock instances.
@@ -56,7 +65,7 @@ export class Mock extends OutputTargetBase {
     }
 
     // Also duplicate deadkey state!  (Needed for fat-finger ops.)
-    clone.setDeadkeys(outputTarget.deadkeys());
+    clone.setDeadkeys((outputTarget as OutputTargetBase).deadkeys());
 
     return clone;
   }
diff --git a/web/src/engine/js-processor/src/outputTargetBase.ts b/web/src/engine/js-processor/src/outputTargetBase.ts
index 181e25c941b..eca7c6766a9 100644
--- a/web/src/engine/js-processor/src/outputTargetBase.ts
+++ b/web/src/engine/js-processor/src/outputTargetBase.ts
@@ -1,7 +1,7 @@
 import { KMWString } from "@keymanapp/web-utils";
+import { Alternate, OutputTargetInterface, TextTransform, Transcription } from 'keyman/engine/keyboard';
 import { findCommonSubstringEndIndex } from "./stringDivergence.js";
 import { Mock } from "./mock.js";
-import { OutputTargetInterface } from 'keyman/engine/keyboard';
 
 // Defines deadkey management in a manner attachable to each element interface.
 import { type KeyEvent } from 'keyman/engine/keyboard';
@@ -17,53 +17,6 @@ export function isEmptyTransform(transform: LexicalModelTypes.Transform) {
   return transform.insert === '' && transform.deleteLeft === 0 && (transform.deleteRight ?? 0) === 0;
 }
 
-export class TextTransform implements LexicalModelTypes.Transform {
-  readonly insert: string;
-  readonly deleteLeft: number;
-  readonly deleteRight: number;
-  readonly erasedSelection: boolean;
-  id: number;
-
-  constructor(insert: string, deleteLeft: number, deleteRight: number, erasedSelection: boolean) {
-    this.insert = insert;
-    this.deleteLeft = deleteLeft;
-    this.deleteRight = deleteRight;
-    this.erasedSelection = erasedSelection;
-  }
-
-  public static readonly nil = new TextTransform('', 0, 0, false);
-}
-
-export class Transcription {
-  readonly token: number;
-  readonly keystroke: KeyEvent;
-  readonly transform: TextTransform;
-  alternates: Alternate[]; // constructed after the rest of the transcription.
-  readonly preInput: Mock;
-
-  private static tokenSeed: number = 0;
-
-  constructor(keystroke: KeyEvent, transform: TextTransform, preInput: Mock, alternates?: Alternate[]/*, removedDks: Deadkey[], insertedDks: Deadkey[]*/) {
-    const token = this.token = Transcription.tokenSeed++;
-
-    this.keystroke = keystroke;
-    this.transform = transform;
-    this.alternates = alternates;
-    this.preInput = preInput;
-
-    this.transform.id = this.token;
-
-    // Assign the ID to each alternate, as well.
-    if(alternates) {
-      alternates.forEach(function(alt) {
-        alt.sample.id = token;
-      });
-    }
-  }
-}
-
-export type Alternate = LexicalModelTypes.ProbabilityMass<LexicalModelTypes.Transform>;
-
 export abstract class OutputTargetBase implements OutputTargetInterface {
   private _dks: DeadkeyTracker;
 
@@ -122,7 +75,7 @@ export abstract class OutputTargetBase implements OutputTargetInterface {
    * As such, it assumes that the caret is immediately after any inserted text.
    * @param from An output target (preferably a Mock) representing the prior state of the input/output system.
    */
-  buildTransformFrom(original: OutputTargetBase): TextTransform {
+  buildTransformFrom(original: OutputTargetInterface): TextTransform {
     const toLeft = this.getTextBeforeCaret();
     const fromLeft = original.getTextBeforeCaret();
 
@@ -143,7 +96,7 @@ export abstract class OutputTargetBase implements OutputTargetInterface {
     return new TextTransform(insertedText, deletedLeft, deletedRight, original.getSelectedText() && !this.getSelectedText());
   }
 
-  buildTranscriptionFrom(original: OutputTargetBase, keyEvent: KeyEvent, readonly: boolean, alternates?: Alternate[]): Transcription {
+  buildTranscriptionFrom(original: OutputTargetInterface, keyEvent: KeyEvent, readonly: boolean, alternates?: Alternate[]): Transcription {
     const transform = this.buildTransformFrom(original);
 
     // If we ever decide to re-add deadkey tracking, this is the place for it.
diff --git a/web/src/engine/js-processor/src/ruleBehavior.ts b/web/src/engine/js-processor/src/ruleBehavior.ts
deleted file mode 100644
index 8b63200c294..00000000000
--- a/web/src/engine/js-processor/src/ruleBehavior.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import { JSKeyboardProcessor } from "./jsKeyboardProcessor.js";
-import { VariableStoreDictionary } from "keyman/engine/keyboard";
-import { OutputTargetBase, type Transcription } from './outputTargetBase.js';
-import { Mock } from "./mock.js";
-import { type VariableStore } from "./stores.js";
-import { LexicalModelTypes } from '@keymanapp/common-types';
-
-/**
- * Represents the commands and state changes that result from a matched keyboard rule.
- */
-export class RuleBehavior {
-  /**
-   * The before-and-after Transform from matching a keyboard rule.  May be `null`
-   * if no keyboard rules were matched for the keystroke.
-   */
-  transcription: Transcription = null;
-
-  /**
-   * Indicates whether or not a BEEP command was issued by the matched keyboard rule.
-   */
-  beep?: boolean;
-
-  /**
-   * A set of changed store values triggered by the matched keyboard rule.
-   */
-  setStore: {[id: number]: string} = {};
-
-  /**
-   * A set of variable stores with save requests triggered by the matched keyboard rule
-   */
-  saveStore: {[name: string]: VariableStore} = {};
-
-  /**
-   * A set of variable stores with possible changes to be applied during finalization.
-   */
-    variableStores: VariableStoreDictionary = {};
-
-  /**
-   * Denotes a non-output default behavior; this should be evaluated later, against the true keystroke.
-   */
-  triggersDefaultCommand: boolean = false;
-
-  /**
-   * Denotes error log messages generated when attempting to generate this behavior.
-   */
-  errorLog?: string;
-
-  /**
-   * Denotes warning log messages generated when attempting to generate this behavior.
-   */
-  warningLog?: string;
-
-  /**
-   * If predictive text is active, contains a Promise returning predictive Suggestions.
-   */
-  predictionPromise?: Promise<LexicalModelTypes.Suggestion[]>;
-
-  /**
-   * In reference to https://github.com/keymanapp/keyman/pull/4350#issuecomment-768753852:
-   *
-   * If the final group processed is a context and keystroke group (using keys),
-   * and there is no nomatch rule, and the keystroke is not matched in the group,
-   * the keystroke's default behavior should trigger, regardless of whether or not any
-   * rules in prior groups matched.
-   */
-  triggerKeyDefault?: boolean;
-
-  finalize(processor: JSKeyboardProcessor, outputTarget: OutputTargetBase, readonly: boolean) {
-    if(!this.transcription) {
-      throw "Cannot finalize a RuleBehavior with no transcription.";
-    }
-
-    if(processor.beepHandler && this.beep) {
-      processor.beepHandler(outputTarget);
-    }
-
-    for(const storeID in this.setStore) {
-      const sysStore = processor.keyboardInterface.systemStores[storeID];
-      if(sysStore) {
-        try {
-          sysStore.set(this.setStore[storeID]);
-        } catch (error) {
-          if(processor.errorLogger) {
-            processor.errorLogger("Rule attempted to perform illegal operation - 'platform' may not be changed.");
-          }
-        }
-      } else if(processor.warningLogger) {
-        processor.warningLogger("Unknown store affected by keyboard rule: " + storeID);
-      }
-    }
-
-    processor.keyboardInterface.applyVariableStores(this.variableStores);
-
-    if(processor.keyboardInterface.variableStoreSerializer) {
-      for(const storeID in this.saveStore) {
-        processor.keyboardInterface.variableStoreSerializer.saveStore(processor.activeKeyboard.id, storeID, this.saveStore[storeID]);
-      }
-    }
-
-    if(this.triggersDefaultCommand) {
-      const keyEvent = this.transcription.keystroke;
-      processor.defaultRules.applyCommand(keyEvent, outputTarget);
-    }
-
-    if(processor.warningLogger && this.warningLog) {
-      processor.warningLogger(this.warningLog);
-    } else if(processor.errorLogger && this.errorLog) {
-      processor.errorLogger(this.errorLog);
-    }
-  }
-
-  /**
-   * Merges default-related behaviors from another RuleBehavior into this one.  Assumes that the current instance
-   * "came first" chronologically.  Both RuleBehaviors must be sourced from the same keystroke.
-   *
-   * Intended use:  merging rule-based behavior with default key behavior during scenarios like those described
-   * at https://github.com/keymanapp/keyman/pull/4350#issuecomment-768753852.
-   *
-   * This function does not attempt a "complete" merge for two fully-constructed RuleBehaviors!  Things
-   * WILL break for unintended uses.
-   * @param other
-   */
-  mergeInDefaults(other: RuleBehavior) {
-    const keystroke = this.transcription.keystroke;
-    const keyFromOther = other.transcription.keystroke;
-    if(keystroke.Lcode != keyFromOther.Lcode || keystroke.Lmodifiers != keyFromOther.Lmodifiers) {
-      throw "RuleBehavior default-merge not supported unless keystrokes are identical!";
-    }
-
-    this.triggersDefaultCommand = this.triggersDefaultCommand || other.triggersDefaultCommand;
-
-    const mergingMock = Mock.from(this.transcription.preInput, false);
-    mergingMock.apply(this.transcription.transform);
-    mergingMock.apply(other.transcription.transform);
-
-    this.transcription = mergingMock.buildTranscriptionFrom(this.transcription.preInput, keystroke, false, this.transcription.alternates);
-  }
-}
\ No newline at end of file
diff --git a/web/src/engine/js-processor/src/stores.ts b/web/src/engine/js-processor/src/stores.ts
index 9169d04abe0..86291d8f3e3 100644
--- a/web/src/engine/js-processor/src/stores.ts
+++ b/web/src/engine/js-processor/src/stores.ts
@@ -1,7 +1,7 @@
 /*
  * Keyman is copyright (C) SIL Global. MIT License.
  *
- * Definitions for basic stores and variable stores (see kmn reference)
+ * Definitions for basic stores (see kmn reference)
  */
 
 import { StoreNonCharEntry } from './jsKeyboardInterface.js';
@@ -18,9 +18,3 @@ export type ComplexKeyboardStore = KeyboardStoreElement[];
 
 export type KeyboardStore = PlainKeyboardStore | ComplexKeyboardStore;
 
-export type VariableStore = { [name: string]: string };
-
-export interface VariableStoreSerializer {
-  loadStore(keyboardID: string, storeName: string): VariableStore;
-  saveStore(keyboardID: string, storeName: string, storeMap: VariableStore): void;
-}
diff --git a/web/src/engine/js-processor/tsconfig.json b/web/src/engine/js-processor/tsconfig.json
index a57467139bd..f0e38f7bc0c 100644
--- a/web/src/engine/js-processor/tsconfig.json
+++ b/web/src/engine/js-processor/tsconfig.json
@@ -9,5 +9,8 @@
     "rootDir": "./src"
   },
 
+  "references": [
+    { "path": "../keyboard"},
+  ],
   "include": [ "**/*.ts" ],
 }
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index 864d01a5c29..13e09069f86 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -18,8 +18,11 @@ export {
   MetadataObj as RawKeyboardMetadata,
   LanguageAPIPropertySpec
 } from "./keyboards/keyboardProperties.js";
+export { RuleBehavior } from "./keyboards/ruleBehavior.js";
 export { default as SpacebarText } from "./keyboards/spacebarText.js";
 export { default as StateKeyMap } from "./keyboards/stateKeyMap.js";
+export { type Alternate, TextTransform } from "./keyboards/textTransform.js";
+export { Transcription } from "./keyboards/transcription.js";
 
 export { default as Codes } from "./codes.js";
 export * from "./codes.js";
@@ -28,7 +31,8 @@ export * from "./defaultRules.js";
 export { type KeyDistribution, KeyEventSpec, KeyEvent } from "./keyEvent.js";
 export { default as KeyMapping } from "./keyMapping.js";
 export { OutputTargetInterface } from "./outputTargetInterface.js";
-export * from "./systemStores.js";
+export { type SystemStoreMutationHandler, MutableSystemStore, SystemStore, SystemStoreIDs, type SystemStoreDictionary } from "./systemStore.js";
+export { type VariableStore, VariableStoreSerializer } from "./variableStore.js";
 
 export * from "@keymanapp/web-utils";
 
diff --git a/web/src/engine/keyboard/src/keyboards/ruleBehavior.ts b/web/src/engine/keyboard/src/keyboards/ruleBehavior.ts
new file mode 100644
index 00000000000..85e8e47b841
--- /dev/null
+++ b/web/src/engine/keyboard/src/keyboards/ruleBehavior.ts
@@ -0,0 +1,69 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import { LexicalModelTypes } from '@keymanapp/common-types';
+import { Transcription } from './transcription.js';
+import { VariableStore } from '../variableStore.js';
+import { VariableStoreDictionary } from './jsKeyboard.js';
+import { SystemStoreDictionary } from '../systemStore.js';
+
+/**
+ * Represents the commands and state changes that result from a matched keyboard rule.
+ */
+export class RuleBehavior {
+  /**
+   * The before-and-after Transform from matching a keyboard rule.  May be `null`
+   * if no keyboard rules were matched for the keystroke.
+   */
+  transcription: Transcription = null;
+
+  /**
+   * Indicates whether or not a BEEP command was issued by the matched keyboard rule.
+   */
+  beep?: boolean;
+
+  /**
+   * A set of changed store values triggered by the matched keyboard rule.
+   */
+  setStore: SystemStoreDictionary = {};
+
+  /**
+   * A set of variable stores with save requests triggered by the matched keyboard rule
+   */
+  saveStore: {[name: string]: VariableStore} = {};
+
+  /**
+   * A set of variable stores with possible changes to be applied during finalization.
+   */
+  variableStores: VariableStoreDictionary = {};
+
+  /**
+   * Denotes a non-output default behavior; this should be evaluated later, against the true keystroke.
+   */
+  triggersDefaultCommand: boolean = false;
+
+  /**
+   * Denotes error log messages generated when attempting to generate this behavior.
+   */
+  errorLog?: string;
+
+  /**
+   * Denotes warning log messages generated when attempting to generate this behavior.
+   */
+  warningLog?: string;
+
+  /**
+   * If predictive text is active, contains a Promise returning predictive Suggestions.
+   */
+  predictionPromise?: Promise<LexicalModelTypes.Suggestion[]>;
+
+  /**
+   * In reference to https://github.com/keymanapp/keyman/pull/4350#issuecomment-768753852:
+   *
+   * If the final group processed is a context and keystroke group (using keys),
+   * and there is no nomatch rule, and the keystroke is not matched in the group,
+   * the keystroke's default behavior should trigger, regardless of whether or not any
+   * rules in prior groups matched.
+   */
+  triggerKeyDefault?: boolean;
+}
\ No newline at end of file
diff --git a/web/src/engine/keyboard/src/keyboards/textTransform.ts b/web/src/engine/keyboard/src/keyboards/textTransform.ts
new file mode 100644
index 00000000000..182c3518030
--- /dev/null
+++ b/web/src/engine/keyboard/src/keyboards/textTransform.ts
@@ -0,0 +1,23 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import { LexicalModelTypes } from '@keymanapp/common-types';
+
+export type Alternate = LexicalModelTypes.ProbabilityMass<LexicalModelTypes.Transform>;
+
+export class TextTransform implements LexicalModelTypes.Transform {
+  readonly insert: string;
+  readonly deleteLeft: number;
+  readonly deleteRight: number;
+  readonly erasedSelection: boolean;
+  id: number;
+
+  constructor(insert: string, deleteLeft: number, deleteRight: number, erasedSelection: boolean) {
+    this.insert = insert;
+    this.deleteLeft = deleteLeft;
+    this.deleteRight = deleteRight;
+    this.erasedSelection = erasedSelection;
+  }
+
+  public static readonly nil = new TextTransform('', 0, 0, false);
+}
diff --git a/web/src/engine/keyboard/src/keyboards/transcription.ts b/web/src/engine/keyboard/src/keyboards/transcription.ts
new file mode 100644
index 00000000000..8263e0c8044
--- /dev/null
+++ b/web/src/engine/keyboard/src/keyboards/transcription.ts
@@ -0,0 +1,35 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import { OutputTargetInterface } from '../outputTargetInterface.js';
+import { KeyEvent } from '../keyEvent.js';
+import { Alternate, TextTransform } from './textTransform.js';
+
+export class Transcription {
+  readonly token: number;
+  readonly keystroke: KeyEvent;
+  readonly transform: TextTransform;
+  alternates: Alternate[]; // constructed after the rest of the transcription.
+  readonly preInput: OutputTargetInterface;
+
+  private static tokenSeed: number = 0;
+
+  constructor(keystroke: KeyEvent, transform: TextTransform, preInput: OutputTargetInterface, alternates?: Alternate[]) {
+    const token = this.token = Transcription.tokenSeed++;
+
+    this.keystroke = keystroke;
+    this.transform = transform;
+    this.alternates = alternates;
+    this.preInput = preInput;
+
+    this.transform.id = this.token;
+
+    // Assign the ID to each alternate, as well.
+    if (alternates) {
+      alternates.forEach(function (alt) {
+        alt.sample.id = token;
+      });
+    }
+  }
+}
+
diff --git a/web/src/engine/keyboard/src/systemStores.ts b/web/src/engine/keyboard/src/systemStore.ts
similarity index 96%
rename from web/src/engine/keyboard/src/systemStores.ts
rename to web/src/engine/keyboard/src/systemStore.ts
index f01fb680752..f0e4b7d7f86 100644
--- a/web/src/engine/keyboard/src/systemStores.ts
+++ b/web/src/engine/keyboard/src/systemStore.ts
@@ -11,6 +11,8 @@ export enum SystemStoreIDs {
   TSS_OLDLAYER = 43
 }
 
+export type SystemStoreDictionary = { [id: number]: string };
+
 /**
  * Defines common behaviors associated with system stores.
  */
diff --git a/web/src/engine/keyboard/src/variableStore.ts b/web/src/engine/keyboard/src/variableStore.ts
new file mode 100644
index 00000000000..c057b4d6f9e
--- /dev/null
+++ b/web/src/engine/keyboard/src/variableStore.ts
@@ -0,0 +1,12 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
+ * Definitions for variable stores (see kmn reference)
+ */
+
+export type VariableStore = { [name: string]: string; };
+
+export interface VariableStoreSerializer {
+  loadStore(keyboardID: string, storeName: string): VariableStore;
+  saveStore(keyboardID: string, storeName: string, storeMap: VariableStore): void;
+}
diff --git a/web/src/engine/main/src/engineConfiguration.ts b/web/src/engine/main/src/engineConfiguration.ts
index df394e7cb97..11f477502f8 100644
--- a/web/src/engine/main/src/engineConfiguration.ts
+++ b/web/src/engine/main/src/engineConfiguration.ts
@@ -1,7 +1,9 @@
 import { EventEmitter } from "eventemitter3";
 
-import { DeviceSpec, KeyboardProperties, ManagedPromise, OutputTargetInterface, physicalKeyDeviceAlias, SpacebarText } from "keyman/engine/keyboard";
-import { RuleBehavior } from 'keyman/engine/js-processor';
+import {
+  DeviceSpec, KeyboardProperties, ManagedPromise, OutputTargetInterface,
+  RuleBehavior, physicalKeyDeviceAlias, SpacebarText
+} from "keyman/engine/keyboard";
 import { PathConfiguration, PathOptionDefaults, PathOptionSpec } from "keyman/engine/interfaces";
 import { DeviceDetector } from "./headless/deviceDetector.js";
 import { KeyboardStub } from "keyman/engine/keyboard-storage";
diff --git a/web/src/engine/main/src/hardKeyboardBase.ts b/web/src/engine/main/src/hardKeyboardBase.ts
index feb5a8645af..20edc07b9b1 100644
--- a/web/src/engine/main/src/hardKeyboardBase.ts
+++ b/web/src/engine/main/src/hardKeyboardBase.ts
@@ -1,6 +1,5 @@
 import { EventEmitter } from "eventemitter3";
-import { JSKeyboard, Keyboard, KeyMapping, KeyEvent, Codes } from "keyman/engine/keyboard";
-import { type RuleBehavior } from 'keyman/engine/js-processor';
+import { JSKeyboard, Keyboard, KeyMapping, KeyEvent, Codes, type RuleBehavior } from "keyman/engine/keyboard";
 import { KeyEventSourceInterface } from 'keyman/engine/osk';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index fb946bd9c63..a005b76e89a 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -7,14 +7,22 @@ import { globalObject, DeviceSpec } from "@keymanapp/web-utils";
 
 import { KM_Core } from 'keyman/engine/core-processor';
 
-import { Codes, JSKeyboard, KeyboardMinimalInterface, type Keyboard, type KeyEvent, type OutputTargetInterface, SystemStoreIDs } from "keyman/engine/keyboard";
-// TODO-web-core: remove usage of OutputTargetBase
 import {
   type Alternate,
+  Codes,
+  JSKeyboard,
+  KeyboardMinimalInterface,
+  type Keyboard,
+  type KeyEvent,
+  type OutputTargetInterface,
+  RuleBehavior,
+  SystemStoreIDs
+} from "keyman/engine/keyboard";
+// TODO-web-core: remove usage of OutputTargetBase
+import {
   isEmptyTransform,
   JSKeyboardProcessor,
   Mock,
-  RuleBehavior,
   type ProcessorInitOptions,
   OutputTargetBase
 } from 'keyman/engine/js-processor';
@@ -115,10 +123,10 @@ export class InputProcessor {
           // to revert it.  If not, we assume it's a layer-change multitap, in which case
           // no such reset is needed.
           // TODO-web-core
-          if(!isEmptyTransform(transcription.transform) || !transcription.preInput.isEqual(Mock.from(outputTarget as OutputTargetBase))) {
+          if(!isEmptyTransform(transcription.transform) || !(transcription.preInput as Mock).isEqual(Mock.from(outputTarget))) {
             // Restores full context, including deadkeys in their exact pre-keystroke state.
             // TODO-web-core
-            (outputTarget as OutputTargetBase).restoreTo(transcription.preInput);
+            (outputTarget as OutputTargetBase).restoreTo(transcription.preInput as Mock);
           }
           /*
             else:
@@ -238,8 +246,7 @@ export class InputProcessor {
 
       // Now that we've done all the keystroke processing needed, ensure any extra effects triggered
       // by the actual keystroke occur.
-      // TODO-web-core
-      ruleBehavior.finalize(this.keyboardProcessor, outputTarget as OutputTargetBase, false);
+      this.keyboardProcessor.finalizeProcessorAction(ruleBehavior, outputTarget);
 
       // -- All keystroke (and 'alternate') processing is now complete.  Time to finalize everything! --
 
@@ -273,8 +280,7 @@ export class InputProcessor {
     // TODO-web-core
     const postRuleBehavior = this.keyboardProcessor.processPostKeystroke(this.contextDevice, outputTarget as OutputTargetBase);
     if (postRuleBehavior) {
-      // TODO-web-core
-      postRuleBehavior.finalize(this.keyboardProcessor, outputTarget as OutputTargetBase, true);
+      this.keyboardProcessor.finalizeProcessorAction(postRuleBehavior, outputTarget);
     }
 
     // Yes, even for ruleBehavior.triggersDefaultCommand.  Those tend to change the context.
diff --git a/web/src/engine/main/src/headless/languageProcessor.ts b/web/src/engine/main/src/headless/languageProcessor.ts
index 19d2229cdf2..f3029adf640 100644
--- a/web/src/engine/main/src/headless/languageProcessor.ts
+++ b/web/src/engine/main/src/headless/languageProcessor.ts
@@ -1,8 +1,8 @@
 import { EventEmitter } from "eventemitter3";
 import { LMLayer, WorkerFactory } from "@keymanapp/lexical-model-layer/web";
 // TODO-web-core: remove use of OutputTargetBase
-import { Transcription, Mock, OutputTargetBase } from "keyman/engine/js-processor";
-import { OutputTargetInterface } from 'keyman/engine/keyboard';
+import { Mock, OutputTargetBase } from "keyman/engine/js-processor";
+import { Transcription, OutputTargetInterface } from 'keyman/engine/keyboard';
 import { LanguageProcessorEventMap, ModelSpec, StateChangeEnum, ReadySuggestions } from 'keyman/engine/interfaces';
 import ContextWindow from "./contextWindow.js";
 import { TranscriptionCache } from "./transcriptionCache.js";
@@ -240,7 +240,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
 
       // Builds the reversion option according to the loaded lexical model's known
       // syntactic properties.
-      const suggestionContext = new ContextWindow(original.preInput, this.configuration, getLayerId());
+      const suggestionContext = new ContextWindow(original.preInput as Mock, this.configuration, getLayerId());
 
       // We must accept the Suggestion from its original context, which was before
       // `original.transform` was applied.
@@ -305,7 +305,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     (outputTarget as OutputTargetBase).apply(transform);
 
     // The reason we need to preserve the additive-inverse 'transformId' property on Reversions.
-    const promise = this.currentPromise = this.lmEngine.revertSuggestion(reversion, new ContextWindow(original.preInput, this.configuration, null))
+    const promise = this.currentPromise = this.lmEngine.revertSuggestion(reversion, new ContextWindow(original.preInput as Mock, this.configuration, null))
     // If the "current Promise" is as set above, clear it.
     // If another one has been triggered since... don't.
     promise.then(() => this.currentPromise = (this.currentPromise == promise) ? null : this.currentPromise);
@@ -333,7 +333,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
       return null;
     }
 
-    const context = new ContextWindow(transcription.preInput, this.configuration, layerId);
+    const context = new ContextWindow(transcription.preInput as Mock, this.configuration, layerId);
     this.recordTranscription(transcription);
 
     if(resetContext) {
diff --git a/web/src/engine/main/src/headless/transcriptionCache.ts b/web/src/engine/main/src/headless/transcriptionCache.ts
index 9ecb13b317e..a8fd0d4eb58 100644
--- a/web/src/engine/main/src/headless/transcriptionCache.ts
+++ b/web/src/engine/main/src/headless/transcriptionCache.ts
@@ -1,4 +1,4 @@
-import { Transcription } from "keyman/engine/js-processor";
+import { Transcription } from "keyman/engine/keyboard";
 
 const TRANSCRIPTION_BUFFER_SIZE = 10;
 
diff --git a/web/src/engine/main/src/keymanEngineBase.ts b/web/src/engine/main/src/keymanEngineBase.ts
index 7cfd7168631..e414ad32709 100644
--- a/web/src/engine/main/src/keymanEngineBase.ts
+++ b/web/src/engine/main/src/keymanEngineBase.ts
@@ -1,6 +1,6 @@
-import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal } from "keyman/engine/keyboard";
+import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, RuleBehavior } from "keyman/engine/keyboard";
 // TODO-web-core: remove usage of OutputTargetBase
-import { OutputTargetBase, ProcessorInitOptions, RuleBehavior } from 'keyman/engine/js-processor';
+import { OutputTargetBase, ProcessorInitOptions } from 'keyman/engine/js-processor';
 import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard/dom-keyboard-loader";
 import { WorkerFactory } from "@keymanapp/lexical-model-layer/web"
 import { InputProcessor } from './headless/inputProcessor.js';
@@ -279,11 +279,12 @@ export class KeymanEngineBase<
       keyboardProcessor.oldLayerStore.set('');
       // Call the keyboard's entry point.
       // TODO-web-core
-      keyboardProcessor.processPostKeystroke(keyboardProcessor.contextDevice, predictionContext.currentTarget as OutputTargetBase)
-        // If we have a RuleBehavior as a result, run it on the target. This should
-        // only change system store and variable store values.
-        // TODO-web-core
-        ?.finalize(keyboardProcessor, predictionContext.currentTarget as OutputTargetBase, true);
+      const data = keyboardProcessor.processPostKeystroke(keyboardProcessor.contextDevice, predictionContext.currentTarget as OutputTargetBase)
+      // If we have a RuleBehavior as a result, run it on the target. This should
+      // only change system store and variable store values.
+      if (data) {
+        keyboardProcessor.finalizeProcessorAction(data, predictionContext.currentTarget);
+      }
     });
 
     // #region Event handler wiring
diff --git a/web/src/engine/main/src/variableStoreCookieSerializer.ts b/web/src/engine/main/src/variableStoreCookieSerializer.ts
index 62c250329aa..de7da7e7029 100644
--- a/web/src/engine/main/src/variableStoreCookieSerializer.ts
+++ b/web/src/engine/main/src/variableStoreCookieSerializer.ts
@@ -1,4 +1,4 @@
-import { VariableStore, VariableStoreSerializer } from 'keyman/engine/js-processor';
+import { VariableStore, VariableStoreSerializer } from 'keyman/engine/keyboard';
 import { CookieSerializer } from "keyman/engine/dom-utils";
 
 // While there's little reason we couldn't store all of a keyboard's store values within
diff --git a/web/src/engine/osk/src/views/keyEventSource.interface.ts b/web/src/engine/osk/src/views/keyEventSource.interface.ts
index 827a0b9af8f..af8e029b7c8 100644
--- a/web/src/engine/osk/src/views/keyEventSource.interface.ts
+++ b/web/src/engine/osk/src/views/keyEventSource.interface.ts
@@ -1,6 +1,5 @@
 import { EventEmitter } from "eventemitter3";
-import { type KeyEvent } from 'keyman/engine/keyboard';
-import { type RuleBehavior } from 'keyman/engine/js-processor';
+import { type KeyEvent, type RuleBehavior } from 'keyman/engine/keyboard';
 
 export type KeyEventResultCallback = (result: RuleBehavior, error?: Error) => void;
 export type KeyEventHandler = (event: KeyEvent, callback?: KeyEventResultCallback) => void;

From ff28ebc55ac9da14769d4053ec30f22b422fb930 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 20 May 2025 12:41:56 +0200
Subject: [PATCH 090/254] refactor(web): move `VariableStoreDictionary` to
 `variableStore.ts`

---
 web/src/engine/keyboard/src/index.ts                  | 4 ++--
 web/src/engine/keyboard/src/keyboards/jsKeyboard.ts   | 5 +----
 web/src/engine/keyboard/src/keyboards/ruleBehavior.ts | 3 +--
 web/src/engine/keyboard/src/variableStore.ts          | 4 ++++
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index 13e09069f86..1a5823ebb9c 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -1,6 +1,6 @@
 export { ActiveKeyBase, ActiveKey, ActiveSubKey, ActiveRow, ActiveLayer, ActiveLayout } from "./keyboards/activeLayout.js";
 export { ButtonClass, ButtonClasses, LayoutLayer, LayoutFormFactor, LayoutRow, LayoutKey, LayoutSubKey, Layouts } from "./keyboards/defaultLayouts.js";
-export { JSKeyboard, LayoutState, VariableStoreDictionary } from "./keyboards/jsKeyboard.js";
+export { JSKeyboard, LayoutState } from "./keyboards/jsKeyboard.js";
 export { KeyboardMinimalInterface } from './keyboards/keyboardMinimalInterface.js';
 export { KMXKeyboard } from './keyboards/kmxKeyboard.js';
 export { KeyboardHarness, KeyboardKeymanGlobal, MinimalCodesInterface, MinimalKeymanGlobal } from "./keyboards/keyboardHarness.js";
@@ -32,7 +32,7 @@ export { type KeyDistribution, KeyEventSpec, KeyEvent } from "./keyEvent.js";
 export { default as KeyMapping } from "./keyMapping.js";
 export { OutputTargetInterface } from "./outputTargetInterface.js";
 export { type SystemStoreMutationHandler, MutableSystemStore, SystemStore, SystemStoreIDs, type SystemStoreDictionary } from "./systemStore.js";
-export { type VariableStore, VariableStoreSerializer } from "./variableStore.js";
+export { type VariableStore, VariableStoreSerializer, VariableStoreDictionary } from "./variableStore.js";
 
 export * from "@keymanapp/web-utils";
 
diff --git a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
index ffb9799889b..8ed946bb3a1 100644
--- a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
+++ b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
@@ -4,6 +4,7 @@ import { ActiveKey, ActiveLayout, ActiveSubKey } from "./activeLayout.js";
 import { KeyEvent } from "../keyEvent.js";
 import { type OutputTargetInterface } from "../outputTargetInterface.js";
 import { KeymanWebKeyboard, ModifierKeyConstants, TouchLayout } from "@keymanapp/common-types";
+import { VariableStoreDictionary } from "../variableStore.js";
 
 import ComplexKeyboardStore = KeymanWebKeyboard.ComplexKeyboardStore;
 import KeyboardObject = KeymanWebKeyboard.KeyboardObject;
@@ -30,10 +31,6 @@ export enum LayoutState {
   POLYFILLED = 1
 }
 
-export interface VariableStoreDictionary {
-  [name: string]: string;
-};
-
 type KmwKeyboardObject = KeyboardObject & {
   /**
    * Used internally by Keyman Engine for Web to hold preprocessed stores.
diff --git a/web/src/engine/keyboard/src/keyboards/ruleBehavior.ts b/web/src/engine/keyboard/src/keyboards/ruleBehavior.ts
index 85e8e47b841..f0975b5ed18 100644
--- a/web/src/engine/keyboard/src/keyboards/ruleBehavior.ts
+++ b/web/src/engine/keyboard/src/keyboards/ruleBehavior.ts
@@ -3,8 +3,7 @@
  */
 import { LexicalModelTypes } from '@keymanapp/common-types';
 import { Transcription } from './transcription.js';
-import { VariableStore } from '../variableStore.js';
-import { VariableStoreDictionary } from './jsKeyboard.js';
+import { VariableStore, VariableStoreDictionary } from '../variableStore.js';
 import { SystemStoreDictionary } from '../systemStore.js';
 
 /**
diff --git a/web/src/engine/keyboard/src/variableStore.ts b/web/src/engine/keyboard/src/variableStore.ts
index c057b4d6f9e..29de6ececa4 100644
--- a/web/src/engine/keyboard/src/variableStore.ts
+++ b/web/src/engine/keyboard/src/variableStore.ts
@@ -4,6 +4,10 @@
  * Definitions for variable stores (see kmn reference)
  */
 
+export interface VariableStoreDictionary {
+  [name: string]: string;
+};
+
 export type VariableStore = { [name: string]: string; };
 
 export interface VariableStoreSerializer {

From 998236a783a72b9ebcfa74c01c8736b8a210124d Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 20 May 2025 15:26:32 +0200
Subject: [PATCH 091/254] =?UTF-8?q?refactor(web):=20rename=20`RuleBehavior?=
 =?UTF-8?q?`=20=E2=86=92=20`ProcessorAction`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/app/browser/src/configuration.ts      |  4 +--
 .../app/browser/src/defaultBrowserRules.ts    |  2 +-
 web/src/app/webview/src/keymanEngine.ts       |  4 +--
 .../js-processor/src/jsKeyboardInterface.ts   | 22 ++++++-------
 .../js-processor/src/jsKeyboardProcessor.ts   | 32 +++++++++----------
 web/src/engine/keyboard/src/defaultRules.ts   |  2 +-
 web/src/engine/keyboard/src/index.ts          |  2 +-
 .../{ruleBehavior.ts => processorAction.ts}   |  2 +-
 .../engine/main/src/engineConfiguration.ts    |  4 +--
 web/src/engine/main/src/hardKeyboardBase.ts   |  4 +--
 .../main/src/headless/inputProcessor.ts       | 24 +++++++-------
 web/src/engine/main/src/keymanEngineBase.ts   |  6 ++--
 .../osk/src/views/keyEventSource.interface.ts |  4 +--
 13 files changed, 56 insertions(+), 56 deletions(-)
 rename web/src/engine/keyboard/src/keyboards/{ruleBehavior.ts => processorAction.ts} (98%)

diff --git a/web/src/app/browser/src/configuration.ts b/web/src/app/browser/src/configuration.ts
index 632d206cb73..0b01bbe130d 100644
--- a/web/src/app/browser/src/configuration.ts
+++ b/web/src/app/browser/src/configuration.ts
@@ -1,7 +1,7 @@
 import { EngineConfiguration, InitOptionSpec, InitOptionDefaults } from "keyman/engine/main";
 
 import { OutputTargetElementWrapper as DOMOutputTarget } from 'keyman/engine/element-wrappers';
-import { OutputTargetInterface, RuleBehavior } from 'keyman/engine/keyboard';
+import { OutputTargetInterface, ProcessorAction } from 'keyman/engine/keyboard';
 import { isEmptyTransform } from 'keyman/engine/js-processor';
 import { AlertHost } from "./utils/alertHost.js";
 import { whenDocumentReady } from "./utils/documentReady.js";
@@ -66,7 +66,7 @@ export class BrowserConfiguration extends EngineConfiguration {
     return baseReport;
   }
 
-  onRuleFinalization(ruleBehavior: RuleBehavior, outputTarget: OutputTargetInterface) {
+  onRuleFinalization(ruleBehavior: ProcessorAction, outputTarget: OutputTargetInterface) {
     // TODO: Patch up to modularized form.  But that doesn't exist yet for some of these...
 
     // If the transform isn't empty, we've changed text - which should produce a 'changed' event in the DOM.
diff --git a/web/src/app/browser/src/defaultBrowserRules.ts b/web/src/app/browser/src/defaultBrowserRules.ts
index 433cd188bf7..ec87f459d4c 100644
--- a/web/src/app/browser/src/defaultBrowserRules.ts
+++ b/web/src/app/browser/src/defaultBrowserRules.ts
@@ -30,7 +30,7 @@ export default class DefaultBrowserRules extends DefaultRules {
   }
 
   /**
-   * applyCommand - used when a RuleBehavior represents a non-text "command" within the Engine.
+   * applyCommand - used when a ProcessorAction represents a non-text "command" within the Engine.
    */
   applyCommand(Lkc: KeyEvent, outputTarget: OutputTargetInterface): void {
     const code = this.codeForEvent(Lkc);
diff --git a/web/src/app/webview/src/keymanEngine.ts b/web/src/app/webview/src/keymanEngine.ts
index 4b1c8137c8b..52b34be4fe6 100644
--- a/web/src/app/webview/src/keymanEngine.ts
+++ b/web/src/app/webview/src/keymanEngine.ts
@@ -1,4 +1,4 @@
-import { DeviceSpec, DefaultRules, RuleBehavior } from 'keyman/engine/keyboard';
+import { DeviceSpec, DefaultRules, ProcessorAction } from 'keyman/engine/keyboard';
 import { KeymanEngineBase, KeyboardInterfaceBase } from 'keyman/engine/main';
 import { AnchoredOSKView, ViewConfiguration, StaticActivator } from 'keyman/engine/osk';
 import { getAbsoluteX, getAbsoluteY } from 'keyman/engine/dom-utils';
@@ -17,7 +17,7 @@ export class KeymanEngine extends KeymanEngineBase<WebviewConfiguration, Context
   constructor(workerFactory: WorkerFactory, sourceUri: string) {
     const config = new WebviewConfiguration(sourceUri);  // currently set to perform device auto-detect.
 
-    config.onRuleFinalization = (ruleBehavior: RuleBehavior) => {
+    config.onRuleFinalization = (ruleBehavior: ProcessorAction) => {
       (this.context as ContextHost).updateHost(ruleBehavior.transcription);
     }
 
diff --git a/web/src/engine/js-processor/src/jsKeyboardInterface.ts b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
index 7ccd608c5c6..b365ecf4bc4 100644
--- a/web/src/engine/js-processor/src/jsKeyboardInterface.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
@@ -18,7 +18,7 @@ import {
   SystemStoreIDs,
   type KeyEvent,
   type OutputTargetInterface,
-  RuleBehavior,
+  ProcessorAction,
   VariableStore,
   VariableStoreDictionary,
   VariableStoreSerializer,
@@ -188,7 +188,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
   ruleContextEx: CachedContextEx;
 
   activeTargetOutput: OutputTargetInterface;
-  ruleBehavior: RuleBehavior;
+  ruleBehavior: ProcessorAction;
 
   systemStores: {[storeID: number]: SystemStore};
 
@@ -994,9 +994,9 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param       {Object}        outputTarget   The target receiving input
    * @param       {Object}        keystroke      The input keystroke (with its properties) to be mapped by the keyboard.
    * Description  Calls the keyboard's `begin newContext` group
-   * @returns     {RuleBehavior}  Record of commands and state changes that result from executing `begin NewContext`
+   * @returns     {ProcessorAction}  Record of commands and state changes that result from executing `begin NewContext`
    */
-  processNewContextEvent(outputTarget: OutputTargetBase, keystroke: KeyEvent): RuleBehavior {
+  processNewContextEvent(outputTarget: OutputTargetBase, keystroke: KeyEvent): ProcessorAction {
     if(!this.activeKeyboard) {
       throw "No active keyboard for keystroke processing!";
     }
@@ -1009,9 +1009,9 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param       {Object}        outputTarget   The target receiving input
    * @param       {Object}        keystroke      The input keystroke with relevant properties to be mapped by the keyboard.
    * Description  Calls the keyboard's `begin postKeystroke` group
-   * @returns     {RuleBehavior}  Record of commands and state changes that result from executing `begin PostKeystroke`
+   * @returns     {ProcessorAction}  Record of commands and state changes that result from executing `begin PostKeystroke`
    */
-  processPostKeystroke(outputTarget: OutputTargetBase, keystroke: KeyEvent): RuleBehavior {
+  processPostKeystroke(outputTarget: OutputTargetBase, keystroke: KeyEvent): ProcessorAction {
     if(!this.activeKeyboard) {
       throw "No active keyboard for keystroke processing!";
     }
@@ -1024,16 +1024,16 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param       {Object}        outputTarget   The target receiving input
    * @param       {Object}        keystroke   The input keystroke (with its properties) to be mapped by the keyboard.
    * Description  Encapsulates calls to keyboard input processing.
-   * @returns     {RuleBehavior}  Record of commands and state changes that result from executing `begin Unicode`
+   * @returns     {ProcessorAction}  Record of commands and state changes that result from executing `begin Unicode`
    */
-  processKeystroke(outputTarget: OutputTargetBase, keystroke: KeyEvent): RuleBehavior {
+  processKeystroke(outputTarget: OutputTargetBase, keystroke: KeyEvent): ProcessorAction {
     if(!this.activeKeyboard) {
       throw "No active keyboard for keystroke processing!";
     }
     return this.process(this.activeKeyboard.process.bind(this.activeKeyboard), outputTarget, keystroke, false);
   }
 
-  private process(callee: (outputTarget: OutputTargetBase, keystroke: KeyEvent) => boolean, outputTarget: OutputTargetBase, keystroke: KeyEvent, readonly: boolean): RuleBehavior {
+  private process(callee: (outputTarget: OutputTargetBase, keystroke: KeyEvent) => boolean, outputTarget: OutputTargetBase, keystroke: KeyEvent, readonly: boolean): ProcessorAction {
     // Clear internal state tracking data from prior keystrokes.
     if(!outputTarget) {
       throw "No target specified for keyboard output!";
@@ -1055,7 +1055,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
     const cachedVariableStores = this.activeKeyboard.variableStores;
 
     // Establishes the results object, allowing corresponding commands to set values here as appropriate.
-    this.ruleBehavior = new RuleBehavior();
+    this.ruleBehavior = new ProcessorAction();
 
     // Ensure the settings are in place so that KIFS/ifState activates and deactivates
     // the appropriate rule(s) for the modeled device.
@@ -1069,7 +1069,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
     // Finalize the rule's results.
     this.ruleBehavior.transcription = outputTarget.buildTranscriptionFrom(preInput, keystroke, readonly);
 
-    // We always backup the changes to variable stores to the RuleBehavior, to
+    // We always backup the changes to variable stores to the ProcessorAction, to
     // be applied during finalization, then restore them to the cached initial
     // values to avoid side-effects with predictive text mocks.
     this.ruleBehavior.variableStores = this.activeKeyboard.variableStores;
diff --git a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
index 5ab213341f7..28543d3165a 100644
--- a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
@@ -11,7 +11,7 @@ import { ModifierKeyConstants } from '@keymanapp/common-types';
 import {
   Codes, type JSKeyboard, MinimalKeymanGlobal, KeyEvent, Layouts,
   DefaultRules, EmulationKeystrokes, type MutableSystemStore,
-  OutputTargetInterface, RuleBehavior, SystemStoreIDs
+  OutputTargetInterface, ProcessorAction, SystemStoreIDs
 } from "keyman/engine/keyboard";
 import { Mock } from "./mock.js";
 import { type OutputTargetBase }  from "./outputTargetBase.js";
@@ -120,7 +120,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
   }
 
   /**
-   * Get the default RuleBehavior for the specified key, attempting to mimic standard browser defaults
+   * Get the default ProcessorAction for the specified key, attempting to mimic standard browser defaults
    * where and when appropriate.
    *
    * @param   {object}  Lkc           The pre-analyzed KeyEvent object
@@ -128,9 +128,9 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
    * @param   {boolean}  readonly      True if the target is read-only
    * @return  {string}
    */
-  private defaultRuleBehavior(Lkc: KeyEvent, outputTarget: OutputTargetBase, readonly: boolean): RuleBehavior {
+  private defaultRuleBehavior(Lkc: KeyEvent, outputTarget: OutputTargetBase, readonly: boolean): ProcessorAction {
     const preInput = Mock.from(outputTarget, readonly);
-    const ruleBehavior = new RuleBehavior();
+    const ruleBehavior = new ProcessorAction();
 
     let matched = false;
     let char = '';
@@ -182,7 +182,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
           this.keyboardInterface.output(0, outputTarget, char);
         }
       } else {
-        // No match, no default RuleBehavior.
+        // No match, no default ProcessorAction.
         return null;
       }
     }
@@ -198,20 +198,20 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
     return ruleBehavior;
   }
 
-  private processNewContextEvent(device: DeviceSpec, outputTarget: OutputTargetBase): RuleBehavior {
+  private processNewContextEvent(device: DeviceSpec, outputTarget: OutputTargetBase): ProcessorAction {
     return this.activeKeyboard ?
       this.keyboardInterface.processNewContextEvent(outputTarget, this.activeKeyboard.constructNullKeyEvent(device, this.stateKeys)) :
       null;
   }
 
-  public processPostKeystroke(device: DeviceSpec, outputTarget: OutputTargetBase): RuleBehavior {
+  public processPostKeystroke(device: DeviceSpec, outputTarget: OutputTargetBase): ProcessorAction {
     return this.activeKeyboard ?
       this.keyboardInterface.processPostKeystroke(outputTarget, this.activeKeyboard.constructNullKeyEvent(device, this.stateKeys)) :
       null;
   }
 
-  public processKeystroke(keyEvent: KeyEvent, outputTarget: OutputTargetBase): RuleBehavior {
-    let matchBehavior: RuleBehavior;
+  public processKeystroke(keyEvent: KeyEvent, outputTarget: OutputTargetBase): ProcessorAction {
+    let matchBehavior: ProcessorAction;
 
     // Before keyboard rules apply, check if the left-context is empty.
     const nothingDeletable = KMWString.length(outputTarget.getTextBeforeCaret()) == 0 && outputTarget.isSelectionEmpty();
@@ -570,10 +570,10 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
    * e.g. by focus change, selection change, keyboard change, etc.
    *
    * @param    {Object}   outputTarget  The OutputTarget that has focus
-   * @returns  {Object}                 A RuleBehavior object describing the cumulative effects of
+   * @returns  {Object}                 A ProcessorAction object describing the cumulative effects of
    *                                    all matched keyboard rules
    */
-  private performNewContextEvent(outputTarget: OutputTargetBase): RuleBehavior {
+  private performNewContextEvent(outputTarget: OutputTargetBase): ProcessorAction {
     const ruleBehavior = this.processNewContextEvent(this.contextDevice, outputTarget);
 
     if (ruleBehavior) {
@@ -610,9 +610,9 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
     }
   };
 
-  public finalizeProcessorAction(data: RuleBehavior, outputTarget: OutputTargetInterface): void {
+  public finalizeProcessorAction(data: ProcessorAction, outputTarget: OutputTargetInterface): void {
     if (!data.transcription) {
-      throw "Cannot finalize a RuleBehavior with no transcription.";
+      throw "Cannot finalize a ProcessorAction with no transcription.";
     }
 
     if (this.beepHandler && data.beep) {
@@ -655,7 +655,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
   }
 
   /**
-   * Merges default-related behaviors from another RuleBehavior into this one.  Assumes that the current instance
+   * Merges default-related behaviors from another ProcessorAction into this one.  Assumes that the current instance
    * "came first" chronologically.  Both RuleBehaviors must be sourced from the same keystroke.
    *
    * Intended use:  merging rule-based behavior with default key behavior during scenarios like those described
@@ -665,11 +665,11 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
    * WILL break for unintended uses.
    * @param other
    */
-  private mergeInOtherProcessorAction(first: RuleBehavior, other: RuleBehavior): void {
+  private mergeInOtherProcessorAction(first: ProcessorAction, other: ProcessorAction): void {
     const keystroke = first.transcription.keystroke;
     const keyFromOther = other.transcription.keystroke;
     if (keystroke.Lcode != keyFromOther.Lcode || keystroke.Lmodifiers != keyFromOther.Lmodifiers) {
-      throw "RuleBehavior default-merge not supported unless keystrokes are identical!";
+      throw "ProcessorAction default-merge not supported unless keystrokes are identical!";
     }
 
     first.triggersDefaultCommand = first.triggersDefaultCommand || other.triggersDefaultCommand;
diff --git a/web/src/engine/keyboard/src/defaultRules.ts b/web/src/engine/keyboard/src/defaultRules.ts
index 8b33b884d4f..970c8052242 100644
--- a/web/src/engine/keyboard/src/defaultRules.ts
+++ b/web/src/engine/keyboard/src/defaultRules.ts
@@ -77,7 +77,7 @@ export default class DefaultRules {
   }
 
   /**
-   * Used when a RuleBehavior represents a non-text "command" within the Engine.  This will generally
+   * Used when a ProcessorAction represents a non-text "command" within the Engine.  This will generally
    * trigger events that require context reset - often by moving the caret or by moving what OutputTarget
    * the caret is in.  However, we let those events perform the actual context reset.
    *
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index 1a5823ebb9c..6d4fcdae557 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -18,7 +18,7 @@ export {
   MetadataObj as RawKeyboardMetadata,
   LanguageAPIPropertySpec
 } from "./keyboards/keyboardProperties.js";
-export { RuleBehavior } from "./keyboards/ruleBehavior.js";
+export { ProcessorAction as ProcessorAction } from "./keyboards/processorAction.js";
 export { default as SpacebarText } from "./keyboards/spacebarText.js";
 export { default as StateKeyMap } from "./keyboards/stateKeyMap.js";
 export { type Alternate, TextTransform } from "./keyboards/textTransform.js";
diff --git a/web/src/engine/keyboard/src/keyboards/ruleBehavior.ts b/web/src/engine/keyboard/src/keyboards/processorAction.ts
similarity index 98%
rename from web/src/engine/keyboard/src/keyboards/ruleBehavior.ts
rename to web/src/engine/keyboard/src/keyboards/processorAction.ts
index f0975b5ed18..e6bb3be5dad 100644
--- a/web/src/engine/keyboard/src/keyboards/ruleBehavior.ts
+++ b/web/src/engine/keyboard/src/keyboards/processorAction.ts
@@ -9,7 +9,7 @@ import { SystemStoreDictionary } from '../systemStore.js';
 /**
  * Represents the commands and state changes that result from a matched keyboard rule.
  */
-export class RuleBehavior {
+export class ProcessorAction {
   /**
    * The before-and-after Transform from matching a keyboard rule.  May be `null`
    * if no keyboard rules were matched for the keystroke.
diff --git a/web/src/engine/main/src/engineConfiguration.ts b/web/src/engine/main/src/engineConfiguration.ts
index 11f477502f8..db4a0c99fd5 100644
--- a/web/src/engine/main/src/engineConfiguration.ts
+++ b/web/src/engine/main/src/engineConfiguration.ts
@@ -2,7 +2,7 @@ import { EventEmitter } from "eventemitter3";
 
 import {
   DeviceSpec, KeyboardProperties, ManagedPromise, OutputTargetInterface,
-  RuleBehavior, physicalKeyDeviceAlias, SpacebarText
+  ProcessorAction, physicalKeyDeviceAlias, SpacebarText
 } from "keyman/engine/keyboard";
 import { PathConfiguration, PathOptionDefaults, PathOptionSpec } from "keyman/engine/interfaces";
 import { DeviceDetector } from "./headless/deviceDetector.js";
@@ -112,7 +112,7 @@ export class EngineConfiguration extends EventEmitter<EventMap> {
    * @param ruleBehavior  The full effects of keystroke + postkeystroke rules from a processed keystroke.
    * @param outputTarget  The engine's current source for context
    */
-  onRuleFinalization(ruleBehavior: RuleBehavior, outputTarget: OutputTargetInterface) {};
+  onRuleFinalization(ruleBehavior: ProcessorAction, outputTarget: OutputTargetInterface) {};
 }
 
 export interface InitOptionSpec extends PathOptionSpec {
diff --git a/web/src/engine/main/src/hardKeyboardBase.ts b/web/src/engine/main/src/hardKeyboardBase.ts
index 20edc07b9b1..7c6a2c3dfc7 100644
--- a/web/src/engine/main/src/hardKeyboardBase.ts
+++ b/web/src/engine/main/src/hardKeyboardBase.ts
@@ -1,5 +1,5 @@
 import { EventEmitter } from "eventemitter3";
-import { JSKeyboard, Keyboard, KeyMapping, KeyEvent, Codes, type RuleBehavior } from "keyman/engine/keyboard";
+import { JSKeyboard, Keyboard, KeyMapping, KeyEvent, Codes, type ProcessorAction } from "keyman/engine/keyboard";
 import { KeyEventSourceInterface } from 'keyman/engine/osk';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
@@ -7,7 +7,7 @@ interface EventMap {
   /**
    * Designed to pass key events off to any consuming modules/libraries.
    */
-  'keyevent': (event: KeyEvent, callback?: (result: RuleBehavior, error?: Error) => void) => void
+  'keyevent': (event: KeyEvent, callback?: (result: ProcessorAction, error?: Error) => void) => void
 }
 
 export class HardKeyboardBase extends EventEmitter<EventMap> implements KeyEventSourceInterface<EventMap> { }
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index a005b76e89a..90ce1787b2e 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -15,7 +15,7 @@ import {
   type Keyboard,
   type KeyEvent,
   type OutputTargetInterface,
-  RuleBehavior,
+  ProcessorAction,
   SystemStoreIDs
 } from "keyman/engine/keyboard";
 // TODO-web-core: remove usage of OutputTargetBase
@@ -101,10 +101,10 @@ export class InputProcessor {
    *
    * @param       {Object}      keyEvent      The abstracted KeyEvent to use for keystroke processing
    * @param       {Object}      outputTarget  The OutputTarget receiving the KeyEvent
-   * @returns     {Object}                    A RuleBehavior object describing the cumulative effects of
+   * @returns     {Object}                    A ProcessorAction object describing the cumulative effects of
    *                                          all matched keyboard rules.
    */
-  processKeyEvent(keyEvent: KeyEvent, outputTarget: OutputTargetInterface): RuleBehavior {
+  processKeyEvent(keyEvent: KeyEvent, outputTarget: OutputTargetInterface): ProcessorAction {
     const kbdMismatch = keyEvent.srcKeyboard && this.activeKeyboard != keyEvent.srcKeyboard;
     const trueActiveKeyboard = this.activeKeyboard;
 
@@ -138,7 +138,7 @@ export class InputProcessor {
         } else {
           console.warn('The base context for the multitap could not be found!\n\n' + this.contextCache.buildLog());
           // would be lovely to report a desire for gesture debug output
-          // maybe add something to RuleBehavior?
+          // maybe add something to ProcessorAction?
         }
       }
 
@@ -158,7 +158,7 @@ export class InputProcessor {
    * @param outputTarget
    * @returns
    */
-  private _processKeyEvent(keyEvent: KeyEvent, outputTarget: OutputTargetInterface): RuleBehavior {
+  private _processKeyEvent(keyEvent: KeyEvent, outputTarget: OutputTargetInterface): ProcessorAction {
     const formFactor = keyEvent.device.formFactor;
     const fromOSK = keyEvent.isSynthetic;
 
@@ -168,7 +168,7 @@ export class InputProcessor {
       // If it's a desktop OSK style and this triggers a layer change,
       // a modifier key was clicked.  No output expected, so it's safe to instantly exit.
       if(this.keyboardProcessor.selectLayer(keyEvent)) {
-        return new RuleBehavior();
+        return new ProcessorAction();
       }
     }
 
@@ -179,7 +179,7 @@ export class InputProcessor {
       // If run on a desktop platform, we know that modifier & state key presses may not
       // produce output, so we may make an immediate return safely.
       if(!fromOSK) {
-        return new RuleBehavior();
+        return new ProcessorAction();
       }
     }
 
@@ -191,10 +191,10 @@ export class InputProcessor {
 
       // Can the suggestion UI revert a recent suggestion?  If so, do that and swallow the backspace.
       if((keyEvent.kName == "K_BKSP" || keyEvent.Lcode == Codes.keyCodes["K_BKSP"]) && this.languageProcessor.tryRevertSuggestion()) {
-        return new RuleBehavior();
+        return new ProcessorAction();
         // Can the suggestion UI accept an existing suggestion?  If so, do that and swallow the space character.
       } else if((keyEvent.kName == "K_SPACE" || keyEvent.Lcode == Codes.keyCodes["K_SPACE"]) && this.languageProcessor.tryAcceptSuggestion('space')) {
-        return new RuleBehavior();
+        return new ProcessorAction();
       }
     }
 
@@ -255,8 +255,8 @@ export class InputProcessor {
         ruleBehavior.transcription.alternates = alternates;
       }
     } else {
-      // We need a dummy RuleBehavior for keys which have no output (e.g. Shift)
-      ruleBehavior = new RuleBehavior();
+      // We need a dummy ProcessorAction for keys which have no output (e.g. Shift)
+      ruleBehavior = new ProcessorAction();
       // TODO-web-core
       ruleBehavior.transcription = (outputTarget as OutputTargetBase).buildTranscriptionFrom(outputTarget as OutputTargetBase, null, false);
       ruleBehavior.triggersDefaultCommand = true;
@@ -295,7 +295,7 @@ export class InputProcessor {
     return keepRuleBehavior ? ruleBehavior : null;
   }
 
-  private buildAlternates(ruleBehavior: RuleBehavior, keyEvent: KeyEvent, preInputMock: Mock): Alternate[] {
+  private buildAlternates(ruleBehavior: ProcessorAction, keyEvent: KeyEvent, preInputMock: Mock): Alternate[] {
     let alternates: Alternate[];
 
     // If we're performing a 'default command', it's not a standard 'typing' event - don't do fat-finger stuff.
diff --git a/web/src/engine/main/src/keymanEngineBase.ts b/web/src/engine/main/src/keymanEngineBase.ts
index e414ad32709..37acf96f2aa 100644
--- a/web/src/engine/main/src/keymanEngineBase.ts
+++ b/web/src/engine/main/src/keymanEngineBase.ts
@@ -1,4 +1,4 @@
-import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, RuleBehavior } from "keyman/engine/keyboard";
+import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction } from "keyman/engine/keyboard";
 // TODO-web-core: remove usage of OutputTargetBase
 import { OutputTargetBase, ProcessorInitOptions } from 'keyman/engine/js-processor';
 import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard/dom-keyboard-loader";
@@ -33,7 +33,7 @@ function determineBaseLayout(): string {
   }
 }
 
-export type KeyEventFullResultCallback = (result: RuleBehavior, error?: Error) => void;
+export type KeyEventFullResultCallback = (result: ProcessorAction, error?: Error) => void;
 export type KeyEventFullHandler = (event: KeyEvent, callback?: KeyEventFullResultCallback) => void;
 
 export class KeymanEngineBase<
@@ -280,7 +280,7 @@ export class KeymanEngineBase<
       // Call the keyboard's entry point.
       // TODO-web-core
       const data = keyboardProcessor.processPostKeystroke(keyboardProcessor.contextDevice, predictionContext.currentTarget as OutputTargetBase)
-      // If we have a RuleBehavior as a result, run it on the target. This should
+      // If we have a ProcessorAction as a result, run it on the target. This should
       // only change system store and variable store values.
       if (data) {
         keyboardProcessor.finalizeProcessorAction(data, predictionContext.currentTarget);
diff --git a/web/src/engine/osk/src/views/keyEventSource.interface.ts b/web/src/engine/osk/src/views/keyEventSource.interface.ts
index af8e029b7c8..a8327c2ad38 100644
--- a/web/src/engine/osk/src/views/keyEventSource.interface.ts
+++ b/web/src/engine/osk/src/views/keyEventSource.interface.ts
@@ -1,7 +1,7 @@
 import { EventEmitter } from "eventemitter3";
-import { type KeyEvent, type RuleBehavior } from 'keyman/engine/keyboard';
+import { type KeyEvent, type ProcessorAction } from 'keyman/engine/keyboard';
 
-export type KeyEventResultCallback = (result: RuleBehavior, error?: Error) => void;
+export type KeyEventResultCallback = (result: ProcessorAction, error?: Error) => void;
 export type KeyEventHandler = (event: KeyEvent, callback?: KeyEventResultCallback) => void;
 
 interface EventMap {

From d0112eac3697bd198fa3651e0aa38db4c60662f1 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 21 May 2025 10:10:06 +0200
Subject: [PATCH 092/254] =?UTF-8?q?docs(web):=20rename=20`RuleBehavior`=20?=
 =?UTF-8?q?=E2=86=92=20`ProcessorAction`=20in=20docs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/docs/internal/context-state-management.md |  4 ++--
 web/docs/internal/keystroke-lifecycle.md      | 12 ++++++------
 web/docs/internal/keystroke-processing.md     | 15 +++++++--------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/web/docs/internal/context-state-management.md b/web/docs/internal/context-state-management.md
index 4c049a90921..910129ac0b9 100644
--- a/web/docs/internal/context-state-management.md
+++ b/web/docs/internal/context-state-management.md
@@ -65,8 +65,8 @@ A cache of recent context-state transitions is stored at `keyman.core.contextCac
 
 For JS-keyboard keystroke processing, a `Mock` clone of the context is generated before any actual keyboard rule checks are applied.  This provides a clear "before" state (eventually saved at `Transcription.preInput`) useful for determining the scope of the keystroke's changes once processing is completed via `buildTranscriptionFrom`.
 
-Once keystroke processing is completed by a JS-keyboard, the JS-processor constructs a `RuleBehavior` object describing all primary and side effects of the keystroke.  Defined at [web/src/engine/js-processor/src/ruleBehavior.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/js-processor/src/ruleBehavior.ts), all of its fields aside from `transcription` are specific to JS-keyboard side effects, some of which do need special handling and support outside of the keystroke processor.  None of these side effects apply for common-case keystrokes and so have default handling in place within the engine for cases where they are not needed.
+Once keystroke processing is completed by a JS-keyboard, the JS-processor constructs a `ProcessorAction` object describing all primary and side effects of the keystroke.  Defined at [web/src/engine/keyboard/src/keyboards/processorAction.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/keyboard/src/keyboards/processorAction.ts), all of its fields aside from `transcription` are specific to JS-keyboard side effects, some of which do need special handling and support outside of the keystroke processor.  None of these side effects apply for common-case keystrokes and so have default handling in place within the engine for cases where they are not needed.
 
 ---
 
-In case referenced classes/files have moved:  this doc was last updated in 18.0-beta, based upon commit d1e45a0df49f81597887577a8c83af36d4a85283
\ No newline at end of file
+In case referenced classes/files have moved:  this doc was last updated in 19.0-alpha, based upon PR #14001.
diff --git a/web/docs/internal/keystroke-lifecycle.md b/web/docs/internal/keystroke-lifecycle.md
index c2e401b0088..9940ac6d8e3 100644
--- a/web/docs/internal/keystroke-lifecycle.md
+++ b/web/docs/internal/keystroke-lifecycle.md
@@ -212,13 +212,13 @@ host cleanly, as it may have special implications for the site or host app.
 
 With that out of the way, the JS keyboard's main group is then provided with the
 `KeyEvent` object in order to evaluate the keyboard's rules against the
-keystroke.  This involves constructing a `RuleBehavior` object to track any and
+keystroke.  This involves constructing a `ProcessorAction` object to track any and
 all needed side-effects for the keystroke.  Such changes are generally not
 applied to the engine at large at this time in order to prevent unwanted side
 effects that may arise to and from predictive text operations that follow
 shortly afterward.
 
-The `KeyboardInterface` class defines the internal API used by keyboards for
+The `JSKeyboardInterface` class defines the internal API used by keyboards for
 their evaluation of keyboard rules.
 
 Once the keyboard's script returns control to the main engine, the engine then
@@ -233,7 +233,7 @@ keyboard rules that is applied.  (A keyboard's source must _explicitly_ specify
 to not emit anything for such keys if such an outcome is desired.)  This occurs
 regardless of the keystroke's source, as such effects are necessary to
 incorporate for predictive-text operations.  If no such rule exists, the
-processor will add a note to the `RuleBehavior` object that default processing
+processor will add a note to the `ProcessorAction` object that default processing
 could not be provided and is thus needed from the engine's host.
 
 ### KMX keyboards & KMX+ (LDML) keyboards
@@ -263,12 +263,12 @@ detected.
 ### Keystroke post-processing
 
 At this stage, the side-effects desired for the original keystroke, as saved to
-its `RuleBehavior`, are then applied.  Note that this includes changes to the
+its `ProcessorAction`, are then applied.  Note that this includes changes to the
 `&layer` store - this update will also trigger an event that updates the state
 of the OSK to match the desired layer.
 
 Once that is done, the engine will then save data relevant to the original
-context state, the `KeyEvent`, and the `RuleBehavior` to the "context cache"
+context state, the `KeyEvent`, and the `ProcessorAction` to the "context cache"
 supporting multitap context reversion.  These effects include layer-change
 effects that result from JS keyboard rules, which modify the KMN-style keyboard
 stores `&oldlayer` and `&newlayer` in preparation for `begin PostKeystroke`
@@ -298,4 +298,4 @@ whether or not native handling for the keystroke should be triggered - such as
 for TAB and ENTER keys, which may have semantic command-like functionality
 depending on the state of the Web engine's host - be that a web page or an
 Android/iOS app utilizing the keyboard.  ENTER keys are often used to submit
-forms, and this helps ensure we trigger such functionality when appropriate.
\ No newline at end of file
+forms, and this helps ensure we trigger such functionality when appropriate.
diff --git a/web/docs/internal/keystroke-processing.md b/web/docs/internal/keystroke-processing.md
index 8606d18cba0..0945615c09a 100644
--- a/web/docs/internal/keystroke-processing.md
+++ b/web/docs/internal/keystroke-processing.md
@@ -19,9 +19,9 @@ When `true`, the keystroke processor will need to simulate the results of "stand
 
 On-screen keyboard modules and hardware-keyboard event interception modules will produce instances of `KeyEvent` as noted above.  Once this is completed, both module types will _signal_ the keystroke event by raising an event with ID `keyevent` and provide the `KeyEvent` instance as its first parameter.  The main module of the engine will then forward that `KeyEvent` object to the input processing pipeline via `InputProcessor.processKeyEvent` (see below).
 
-## Output:  RuleBehavior
+## Output:  ProcessorAction
 
-Once keystroke processing is completed, the outward-facing components of the engine expect to receive a `RuleBehavior` object describing all primary and side effects of the keystroke.  Defined at [web/src/engine/js-processor/src/ruleBehavior.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/js-processor/src/ruleBehavior.ts), all of its fields aside from `transcription` are specific to existing JS-keyboard side effects.  (Certain Keyman language features can make permanent side-effect changes to state that should only be persisted for the "true" keystroke - not for any predictive-text 'alternative' keys.)
+Once keystroke processing is completed, the outward-facing components of the engine expect to receive a `ProcessorAction` object describing all primary and side effects of the keystroke.  Defined at [web/src/engine/keyboard/src/keyboards/processorAction.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/keyboard/src/keyboards/processorAction.ts), all of its fields aside from `transcription` are specific to existing JS-keyboard side effects.  (Certain Keyman language features can make permanent side-effect changes to state that should only be persisted for the "true" keystroke - not for any predictive-text 'alternative' keys.)
 
 See also:  [context-state-management.md](context-state-management.md#js-keyboard-keystroke-processing)
 
@@ -31,7 +31,7 @@ See also:  [context-state-management.md](context-state-management.md#js-keyboard
 
 The "first stop" for incoming keystrokes is the `InputProcessor`, found at [web/src/engine/main/src/headless/inputProcessor.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/main/src/headless/.inputProcessor.ts), through its `processKeyEvent` method.  This class manages higher-level functionality triggered by keystroke events while deferring actual interpretation of the incoming keystroke further down the line.  Of particular note is that it also handles control-flows that require restoration of previously-occuring contexts.
 
-This class is the connection point for generating prediction requests and receiving corresponding suggestions.  In order to facilitate higher-quality predictive-text when enabled, the `InputProcessor` will _also_ generate and trigger processing for nearby keys.  This process allows transforms, reorders, and KMN keyboard rules to take effect and be used as alternative context roots for predictions.  These are generally run against `Mock`-based clones of the true context source and are additionally prevented from triggering long-term side-effects, such as changes to KMN-keyboard variable stores, by only calling `RuleBehavior.finalize` for the true input keystroke's result object.
+This class is the connection point for generating prediction requests and receiving corresponding suggestions.  In order to facilitate higher-quality predictive-text when enabled, the `InputProcessor` will _also_ generate and trigger processing for nearby keys.  This process allows transforms, reorders, and KMN keyboard rules to take effect and be used as alternative context roots for predictions.  These are generally run against `Mock`-based clones of the true context source and are additionally prevented from triggering long-term side-effects, such as changes to KMN-keyboard variable stores, by only calling `KeyboardProcessor.finalizeProcessorAction` for the true input keystroke's result object.
 
 Keys generated by OSK multitap need special handling here as well; they should always be applied to the context state as it existed at the time of the initial tap.  To facilitate this, the `InputProcessor` will directly rewind the active context-source to match the corresponding context state before requesting that the `KeyEvent` be processed.
 
@@ -64,18 +64,17 @@ The method linked above is the primary entrypoint for rule processing of individ
 
 #### JS-keyboard interfacing
 
-Certain Keyman language features can make permanent side-effect changes to state.  In order to prevent these from taking place for every keystroke, the method that interfaces with JS keyboards - `KeyboardInterface.process` - saves the context state (as a `Mock`) and current variable store values, then prepares a fresh `RuleBehavior` instance, before passing control off to the keyboard's backing script.  (Note that `KeyboardInterface` itself primarily consists of keyboard-script API called by JS-keyboard script.)
-- `epic/web-core` note:  renamed to `JSKeyboardInterface`.
+Certain Keyman language features can make permanent side-effect changes to state.  In order to prevent these from taking place for every keystroke, the method that interfaces with JS keyboards - `JSKeyboardInterface.process` - saves the context state (as a `Mock`) and current variable store values, then prepares a fresh `ProcessorAction` instance, before passing control off to the keyboard's backing script.  (Note that `JSKeyboardInterface` itself primarily consists of keyboard-script API called by JS-keyboard script.)
 
-A few of the keyboard-script API methods will mark `RuleBehavior` properties directly when called, but the bulk of its data will be set once the keyboard-script returns control to Keyman Engine for Web.  At this time, variable store values will also be reverted to prevent possible cross-contamination effects when predictive text is active - they're reapplied later if `RuleBehavior.finalize` is leveraged on the resulting instance.  Components documented in [context-state-management.md](./context-state-management.md) are then leveraged to determine the total change to context caused by the keystroke.
+A few of the keyboard-script API methods will mark `ProcessorAction` properties directly when called, but the bulk of its data will be set once the keyboard-script returns control to Keyman Engine for Web.  At this time, variable store values will also be reverted to prevent possible cross-contamination effects when predictive text is active - they're reapplied later if `KeyboardProcessor.finalizeProcessorAction` is leveraged on the resulting instance.  Components documented in [context-state-management.md](./context-state-management.md) are then leveraged to determine the total change to context caused by the keystroke.
 
 Note that for JS-keyboards, in 18.0 and before the true keystroke is processed against the _true_ context state, not a cloned copy, and thus its changes are applied immediately.
 
 #### Keystroke-default emulation
 
-Note that browser-default keystroke processing is defined within the `DefaultRules` class found at [web/src/engine/keyboard/src/defaultRules.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/keyboard/src/defaultRules.ts).  It currently produces a (possibly `null`) string output rather than a `RuleBehavior`, but the latter can be easily constructed based on the returned string and the existing context state.
+Note that browser-default keystroke processing is defined within the `DefaultRules` class found at [web/src/engine/keyboard/src/defaultRules.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/keyboard/src/defaultRules.ts).  It currently produces a (possibly `null`) string output rather than a `ProcessorAction`, but the latter can be easily constructed based on the returned string and the existing context state.
 - For `epic/web-core`, it may be wise to spin the `DefaultRules` component off as its own processor, serving as a backup for _all_ keystroke processing variants.
 
 ----
 
-In case referenced classes/files have moved:  this doc was last updated in 18.0-beta, based upon commit d1e45a0df49f81597887577a8c83af36d4a85283
\ No newline at end of file
+In case referenced classes/files have moved:  this doc was last updated in 19.0-alpha, based upon PR #14001.

From b4163b2ab818b52948eb5355a59cfbb77f5c86bc Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 21 May 2025 15:16:39 +0200
Subject: [PATCH 093/254] refactor(web): make `StateKeyMap` a named export

---
 web/src/engine/keyboard/src/index.ts                 | 2 +-
 web/src/engine/keyboard/src/keyboards/jsKeyboard.ts  | 2 +-
 web/src/engine/keyboard/src/keyboards/stateKeyMap.ts | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index 6d4fcdae557..9a8ac72e920 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -20,7 +20,7 @@ export {
 } from "./keyboards/keyboardProperties.js";
 export { ProcessorAction as ProcessorAction } from "./keyboards/processorAction.js";
 export { default as SpacebarText } from "./keyboards/spacebarText.js";
-export { default as StateKeyMap } from "./keyboards/stateKeyMap.js";
+export { StateKeyMap } from "./keyboards/stateKeyMap.js";
 export { type Alternate, TextTransform } from "./keyboards/textTransform.js";
 export { Transcription } from "./keyboards/transcription.js";
 
diff --git a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
index 8ed946bb3a1..fbbf153df37 100644
--- a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
+++ b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
@@ -13,7 +13,7 @@ import LayoutSpec = KeymanWebKeyboard.LayoutSpec;
 type TouchLayoutSpec = TouchLayout.TouchLayoutPlatform & { isDefault?: boolean};
 
 import { Version, DeviceSpec } from "@keymanapp/web-utils";
-import StateKeyMap from "./stateKeyMap.js";
+import { StateKeyMap } from "./stateKeyMap.js";
 
 /**
  * Stores preprocessed properties of a keyboard for quick retrieval later.
diff --git a/web/src/engine/keyboard/src/keyboards/stateKeyMap.ts b/web/src/engine/keyboard/src/keyboards/stateKeyMap.ts
index e82ff417c4e..a8123f744db 100644
--- a/web/src/engine/keyboard/src/keyboards/stateKeyMap.ts
+++ b/web/src/engine/keyboard/src/keyboards/stateKeyMap.ts
@@ -2,8 +2,8 @@
  * Provided by keyman/engine/keyboard's `KeyboardProcessor` class and utilized by the OSK
  * to provide state feedback on any corresponding keys visible in the OSK.
  */
-export default interface StateKeyMap {
+export interface StateKeyMap {
   K_CAPS: boolean,
   K_NUMLOCK: boolean,
   K_SCROLL: boolean
-}
\ No newline at end of file
+}

From b356e52f320124e499e39bce52cc446e171b7d48 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 21 May 2025 15:26:55 +0200
Subject: [PATCH 094/254] refactor(web): make `Codes` a named export

---
 web/src/engine/keyboard/src/codes.ts                     | 4 +---
 web/src/engine/keyboard/src/defaultRules.ts              | 2 +-
 web/src/engine/keyboard/src/index.ts                     | 3 +--
 web/src/engine/keyboard/src/keyEvent.ts                  | 2 +-
 web/src/engine/keyboard/src/keyboards/activeLayout.ts    | 2 +-
 web/src/engine/keyboard/src/keyboards/defaultLayouts.ts  | 2 +-
 web/src/engine/keyboard/src/keyboards/jsKeyboard.ts      | 2 +-
 web/src/engine/keyboard/src/keyboards/keyboardHarness.ts | 2 +-
 8 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/web/src/engine/keyboard/src/codes.ts b/web/src/engine/keyboard/src/codes.ts
index c94d5b7152c..76c18ae5a1e 100644
--- a/web/src/engine/keyboard/src/codes.ts
+++ b/web/src/engine/keyboard/src/codes.ts
@@ -6,7 +6,7 @@
 
 import { ModifierKeyConstants, USVirtualKeyCodes } from '@keymanapp/common-types';
 
-const Codes = {
+export const Codes = {
   modifierCodes: {
     // Debug-mode keyboards compiled before Keyman 18.0 referenced the `ModifierKeyConstants`
     // constants via the names established below.  We must continue to support them, as they're
@@ -143,5 +143,3 @@ const Codes = {
     return modifier;
   }
 }
-
-export default Codes;
diff --git a/web/src/engine/keyboard/src/defaultRules.ts b/web/src/engine/keyboard/src/defaultRules.ts
index 970c8052242..98279ee94fd 100644
--- a/web/src/engine/keyboard/src/defaultRules.ts
+++ b/web/src/engine/keyboard/src/defaultRules.ts
@@ -5,7 +5,7 @@
  */
 
 import { ModifierKeyConstants } from '@keymanapp/common-types';
-import Codes from './codes.js';
+import { Codes } from './codes.js';
 import { type KeyEvent } from './keyEvent.js';
 import { type OutputTargetInterface }  from './outputTargetInterface.js';
 
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index 9a8ac72e920..03987bceafb 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -24,8 +24,7 @@ export { StateKeyMap } from "./keyboards/stateKeyMap.js";
 export { type Alternate, TextTransform } from "./keyboards/textTransform.js";
 export { Transcription } from "./keyboards/transcription.js";
 
-export { default as Codes } from "./codes.js";
-export * from "./codes.js";
+export { Codes } from "./codes.js";
 export { default as DefaultRules } from "./defaultRules.js";
 export * from "./defaultRules.js";
 export { type KeyDistribution, KeyEventSpec, KeyEvent } from "./keyEvent.js";
diff --git a/web/src/engine/keyboard/src/keyEvent.ts b/web/src/engine/keyboard/src/keyEvent.ts
index 787e20ea781..8c25c964baf 100644
--- a/web/src/engine/keyboard/src/keyEvent.ts
+++ b/web/src/engine/keyboard/src/keyEvent.ts
@@ -9,7 +9,7 @@
 import { type JSKeyboard } from "./keyboards/jsKeyboard.js";
 import { type DeviceSpec } from "@keymanapp/web-utils";
 
-import Codes from './codes.js';
+import { Codes } from './codes.js';
 import DefaultRules from "./defaultRules.js";
 import { ActiveKeyBase } from './keyboards/activeLayout.js';
 
diff --git a/web/src/engine/keyboard/src/keyboards/activeLayout.ts b/web/src/engine/keyboard/src/keyboards/activeLayout.ts
index e709dda7dfb..44b77670d91 100644
--- a/web/src/engine/keyboard/src/keyboards/activeLayout.ts
+++ b/web/src/engine/keyboard/src/keyboards/activeLayout.ts
@@ -1,4 +1,4 @@
-import Codes from "../codes.js";
+import { Codes } from "../codes.js";
 import { KeyEvent, KeyEventSpec } from "../keyEvent.js";
 import KeyMapping from "../keyMapping.js";
 import { ButtonClasses, Layouts } from "./defaultLayouts.js";
diff --git a/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts b/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts
index 722c222a470..4231d1d5e82 100644
--- a/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts
+++ b/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts
@@ -19,7 +19,7 @@ import ButtonClasses = TouchLayout.TouchLayoutKeySp;
 
 export { ButtonClasses };
 
-import Codes from "../codes.js";
+import { Codes } from "../codes.js";
 import { type JSKeyboard } from "./jsKeyboard.js";
 
 // The following types provide type definitions for the full JSON format we use for visual keyboard definitions.
diff --git a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
index fbbf153df37..3bdcb0ed2fb 100644
--- a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
+++ b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
@@ -1,4 +1,4 @@
-import Codes from "../codes.js";
+import { Codes } from "../codes.js";
 import { Layouts } from "./defaultLayouts.js";
 import { ActiveKey, ActiveLayout, ActiveSubKey } from "./activeLayout.js";
 import { KeyEvent } from "../keyEvent.js";
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts b/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts
index c38e335e422..117b348e9ee 100644
--- a/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts
+++ b/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts
@@ -1,5 +1,5 @@
 import { JSKeyboard } from "./jsKeyboard.js";
-import Codes from "../codes.js";
+import { Codes } from "../codes.js";
 import { DeviceSpec } from '@keymanapp/web-utils';
 
 /**

From 8ef3754b210209ea51dea8683a19e07f3e2d56b0 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 6 Jun 2025 10:22:56 +0200
Subject: [PATCH 095/254] docs(web): update function comment

Addresses code review comment.
---
 web/src/engine/js-processor/src/jsKeyboardProcessor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
index 9b238cdd2fb..6e4d801e876 100644
--- a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
@@ -125,7 +125,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
    * where and when appropriate.
    *
    * @param   {object}  Lkc           The pre-analyzed KeyEvent object
-   * @param   {OutputTargetInterface} outputTarget  The OutputTarget receiving the KeyEvent
+   * @param   {OutputTargetBase} outputTarget  The output target receiving the KeyEvent
    * @param   {boolean}  readonly      True if the target is read-only
    * @return  {string}
    */

From 9ca009dca138834e87ff13f965800d21d00b0438 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 6 Jun 2025 11:26:16 +0200
Subject: [PATCH 096/254] docs(web): improve function header

Addresses code review comments.
---
 .../app/browser/src/hardwareEventKeyboard.ts  | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts
index 008cca5803b..fde312baef1 100644
--- a/web/src/app/browser/src/hardwareEventKeyboard.ts
+++ b/web/src/app/browser/src/hardwareEventKeyboard.ts
@@ -38,13 +38,23 @@ export function _GetEventKeyCode(e: KeyboardEvent) {
 // Keeping this as a separate function affords us the opportunity to unit-test the method more simply.
 
 /**
- * Function     preprocessKeyboardEvent
- * @param       {Event}         e              Event object
- * @param       {KeyboardState} keyboardState  Keyboard state object
- * @param       {DeviceSpec}    device         Device object
- * @return      {KeyEvent}                     KMW keyboard event object:
+ * Translate a browser KeyboardEvent into a KeymanWeb KeyEvent
  *
- * Description  Returns the preprocessed KeyEvent object.
+ * The function calculates the true state of the keyboard's modifiers, taking
+ * into account chiral modifiers where applicable.
+ * Special handling is included for AltGr emulation and browser quirks, particularly
+ * for Firefox, which may use different key codes for certain keys. The code remaps
+ * these as needed for consistency. It adds the OS meta key if pressed, ensuring
+ * that system shortcuts can bypass Keyman processing. Adjustments are made for
+ * mnemonic and legacy keyboards, before finally returning a KeyEvent object
+ * with the computed key code, modifiers and state.
+ *
+ * @param  {KeyboardEvent}  e              Event object
+ * @param  {KeyboardState}  keyboardState  Keyboard state object
+ * @param  {DeviceSpec}     device         Device object
+ * @return {KeyEvent}                      KeymanWeb KeyEvent object, or null
+ *                                         for duplicate/spurious events or if
+ *                                         there is no key code.
  */
 export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: KeyboardState, device: DeviceSpec): KeyEvent {
   if(e.cancelBubble === true) {
@@ -58,7 +68,6 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar
 
   // Stage 1 - track the true state of the keyboard's modifiers.
   const prevModState = keyboardState.modStateFlags;
-  let curModState = 0x0000;
   let ctrlEvent = false, altEvent = false;
 
   const keyCodes = Codes.keyCodes;
@@ -95,17 +104,18 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar
    * `e.location != 0` if true matches condition 1 and matches condition 2 if false.
    */
 
+  let curModState = 0x0000;
   curModState |= (e.getModifierState("Shift") ? 0x10 : 0);
 
   if(e.getModifierState("Control")) {
     curModState |= ((e.location != 0 && ctrlEvent) ?
       (e.location == 1 ? ModifierKeyConstants.LCTRLFLAG : ModifierKeyConstants.RCTRLFLAG) : // Condition 1
-      prevModState & 0x0003);                                                       // Condition 2
+      prevModState & 0x0003 /* LCTRLFLAG | RCTRLFLAG */);                                   // Condition 2
   }
   if(e.getModifierState("Alt")) {
     curModState |= ((e.location != 0 && altEvent) ?
       (e.location == 1 ? ModifierKeyConstants.LALTFLAG : ModifierKeyConstants.RALTFLAG) :   // Condition 1
-      prevModState & 0x000C);                                                       // Condition 2
+      prevModState & 0x000C /* LALTFLAG | RALTFLAG */);                                     // Condition 2
   }
 
   // Stage 2 - detect state key information.  It can be looked up per keypress with no issue.
@@ -120,7 +130,7 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar
   curModState |= Lstates;
 
   // Stage 3 - Set our modifier state tracking variable and perform basic AltGr-related management.
-  const LmodifierChange = keyboardState.modStateFlags != curModState;
+  const LmodifierChanged = keyboardState.modStateFlags != curModState;
 
   // KeyboardState update:  save our known modifier/state analysis bits.
   // Note:  `keyboardState` is typically the full-fledged KeyboardProcessor instance.  As a result,
@@ -138,8 +148,8 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar
     curModState &= ~ModifierKeyConstants.LCTRLFLAG;
   }
 
-  const modifierBitmasks = Codes.modifierBitmasks;
   // Stage 4 - map the modifier set to the appropriate keystroke's modifiers.
+  const modifierBitmasks = Codes.modifierBitmasks;
   const activeKeyboard = keyboardState.activeKeyboard;
   let Lmodifiers: number;
   if(activeKeyboard && activeKeyboard.isChiral) {
@@ -185,7 +195,7 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar
     Lcode: Lcode,
     Lmodifiers: Lmodifiers,
     Lstates: Lstates,
-    LmodifierChange: LmodifierChange,
+    LmodifierChange: LmodifierChanged,
     // This is based on a KeyboardEvent, so it's not considered 'synthetic' within web-core.
     isSynthetic: false
   });

From edd890121732ebb81c28ba5108d37780931dde39 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 28 Aug 2025 14:37:52 +0200
Subject: [PATCH 097/254] chore(resources): rename call to
 _builder_full_not_a_builder_script

---
 resources/build/builder-full.inc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/build/builder-full.inc.sh b/resources/build/builder-full.inc.sh
index a313e944842..ca4d7c38ac7 100644
--- a/resources/build/builder-full.inc.sh
+++ b/resources/build/builder-full.inc.sh
@@ -25,7 +25,7 @@ function __builder_full_not_a_builder_script() {
   fi
 }
 
-trap _builder_full_not_a_builder_script exit
+trap __builder_full_not_a_builder_script exit
 
 # This will also import /resources/builder.inc.sh
 . "${BASH_SOURCE[0]%/*}/builder-basic.inc.sh"

From f7bc0e13f7a58fe74c958282963ac4480910a833 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 28 Aug 2025 15:37:36 +0200
Subject: [PATCH 098/254] chore(web): update build to use new builder function
 names

---
 web/src/engine/core-processor/build.sh    | 10 +++++-----
 web/src/tools/testing/test-utils/build.sh |  9 +++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/web/src/engine/core-processor/build.sh b/web/src/engine/core-processor/build.sh
index 09568da5c20..c468df044a8 100755
--- a/web/src/engine/core-processor/build.sh
+++ b/web/src/engine/core-processor/build.sh
@@ -3,13 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/core-processor
-
-. "${KEYMAN_ROOT}/web/common.inc.sh"
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/web/common.inc.sh"
 
 # ################################ Main script ################################
 
@@ -36,7 +36,7 @@ do_clean() {
 }
 
 do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
 
   mkdir -p "src/import/core/"
   # we don't need this file for release builds, but it's nice to have
diff --git a/web/src/tools/testing/test-utils/build.sh b/web/src/tools/testing/test-utils/build.sh
index 72248fa3048..d31795b07ef 100755
--- a/web/src/tools/testing/test-utils/build.sh
+++ b/web/src/tools/testing/test-utils/build.sh
@@ -5,12 +5,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=tools/testing/test-utils
-. "${KEYMAN_ROOT}/web/common.inc.sh"
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/web/common.inc.sh"
 
 ################################ Main script ################################
 
@@ -29,6 +30,6 @@ do_build ( ) {
   compile "${SUBPROJECT_NAME}"
 }
 
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action clean      rm -rf "../../../../build/${SUBPROJECT_NAME}/"
 builder_run_action build      do_build
\ No newline at end of file

From aa875feafe6ddec64124ef3cd542c4483596e965 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 12 Sep 2025 17:31:21 +0200
Subject: [PATCH 099/254] chore(web): use renamed type

---
 web/src/test/auto/headless/engine/osk/visualKeyboard.tests.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/test/auto/headless/engine/osk/visualKeyboard.tests.ts b/web/src/test/auto/headless/engine/osk/visualKeyboard.tests.ts
index 991c4be98b6..bbd7c7d93ca 100644
--- a/web/src/test/auto/headless/engine/osk/visualKeyboard.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/visualKeyboard.tests.ts
@@ -7,7 +7,7 @@ import sinon from 'sinon';
 import { JSDOM } from 'jsdom';
 
 import { VisualKeyboard } from 'keyman/engine/osk';
-import { ActiveLayout, Keyboard, KeyboardProperties } from 'keyman/engine/keyboard';
+import { ActiveLayout, JSKeyboard, KeyboardProperties } from 'keyman/engine/keyboard';
 import { StylesheetManager } from 'keyman/engine/dom-utils';
 import { DeviceSpec } from "@keymanapp/web-utils";
 
@@ -23,7 +23,7 @@ describe('VisualKeyboard', () => {
     const mockDevice = { browser: DeviceSpec.Browser.Chrome, formFactor: DeviceSpec.FormFactor.Desktop, OS: DeviceSpec.OperatingSystem.Windows, touchable: false };
     const mockLayout = sinon.createStubInstance(ActiveLayout) as any;
 
-    const keyboard = sinon.createStubInstance(Keyboard) as any;
+    const keyboard = sinon.createStubInstance(JSKeyboard) as any;
     keyboard.layout.returns(mockLayout);
     sinon.stub(keyboard, 'isRTL').get(() => false);
     sinon.stub(keyboard, 'id').get(() => 'test');

From 3b9605b7e9e107735bbeead7d1e703b0e3404440 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 29 Sep 2025 17:27:30 +0200
Subject: [PATCH 100/254] chore(web): disable DOM tests for webkit on Windows

Webkit on Windows doesn't support WASM, so several tests fail. This change
disables the webkit tests when running on Windows.

Fixes: #14859
Test-bot: skip
---
 .../dom/cases/core-processor/basic.tests.ts   |  5 ++++-
 .../test/auto/dom/web-test-runner.config.mjs  | 20 +++++++++++++------
 .../integrated/web-test-runner.config.mjs     | 20 +++++++++++++------
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/web/src/test/auto/dom/cases/core-processor/basic.tests.ts b/web/src/test/auto/dom/cases/core-processor/basic.tests.ts
index ddf3bb1b74f..a8ce6e57972 100644
--- a/web/src/test/auto/dom/cases/core-processor/basic.tests.ts
+++ b/web/src/test/auto/dom/cases/core-processor/basic.tests.ts
@@ -5,6 +5,8 @@ const coreurl = '/build/engine/core-processor/obj/import/core';
 
 // Test the CoreProcessor interface.
 describe('CoreProcessor', function () {
+  this.timeout(5000); // increased timeout for async loading
+
   async function loadKeyboardBlob(uri: string) {
     const response = await fetch(uri);
     if (!response.ok) {
@@ -16,7 +18,8 @@ describe('CoreProcessor', function () {
   }
 
   it('can initialize without errors', async function () {
-    assert.isOk(await KM_Core.createCoreProcessor(coreurl));
+    const km_core = await KM_Core.createCoreProcessor(coreurl);
+    assert.isNotNull(km_core);
   });
 
   it('can call temp function', async function () {
diff --git a/web/src/test/auto/dom/web-test-runner.config.mjs b/web/src/test/auto/dom/web-test-runner.config.mjs
index 48a3a4f9f3b..6ac9d46c852 100644
--- a/web/src/test/auto/dom/web-test-runner.config.mjs
+++ b/web/src/test/auto/dom/web-test-runner.config.mjs
@@ -1,5 +1,5 @@
 // @ts-check
-import { devices, playwrightLauncher } from '@web/test-runner-playwright';
+import { /*devices,*/ playwrightLauncher } from '@web/test-runner-playwright';
 import { defaultReporter, summaryReporter } from '@web/test-runner';
 import { LauncherWrapper, sessionStabilityReporter } from '@keymanapp/common-test-resources/test-runner-stability-reporter.mjs';
 import named from '@keymanapp/common-test-resources/test-runner-rename-browser.mjs'
@@ -7,14 +7,17 @@ import { importMapsPlugin } from '@web/dev-server-import-maps';
 import { dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
 import { esbuildPlugin } from '@web/dev-server-esbuild';
+import { platform } from 'node:process';
 
 const dir = dirname(fileURLToPath(import.meta.url));
 const KEYMAN_ROOT = resolve(dir, '../../../../../');
 
-/** @type {import('@web/test-runner').TestRunnerConfig} */
-export default {
-  // debug: true,
-  browsers: [
+const allBrowsers = platform === 'win32'
+  ? [
+    new LauncherWrapper(playwrightLauncher({ product: 'chromium' })),
+    new LauncherWrapper(playwrightLauncher({ product: 'firefox' })),
+    // no testing on webkit on Windows, see #14858
+  ] : [
     new LauncherWrapper(playwrightLauncher({ product: 'chromium' })),
     new LauncherWrapper(playwrightLauncher({ product: 'firefox' })),
     new LauncherWrapper(playwrightLauncher({ product: 'webkit', concurrency: 1 })),
@@ -28,7 +31,12 @@ export default {
     //     return browser.newContext({ ...devices['Pixel 4'] })
     //   }
     // })), 'Android Phone (emulated)'),
-  ],
+  ];
+
+/** @type {import('@web/test-runner').TestRunnerConfig} */
+export default {
+  // debug: true,
+  browsers: allBrowsers,
   concurrency: 10,
   nodeResolve: true,
   // Top-level, implicit 'default' group
diff --git a/web/src/test/auto/integrated/web-test-runner.config.mjs b/web/src/test/auto/integrated/web-test-runner.config.mjs
index 72ebce8f996..ea8ce9b68f5 100644
--- a/web/src/test/auto/integrated/web-test-runner.config.mjs
+++ b/web/src/test/auto/integrated/web-test-runner.config.mjs
@@ -1,26 +1,34 @@
 // @ts-check
-import { devices, playwrightLauncher } from '@web/test-runner-playwright';
+import { /*devices,*/ playwrightLauncher } from '@web/test-runner-playwright';
 import { defaultReporter, summaryReporter } from '@web/test-runner';
 import { esbuildPlugin } from '@web/dev-server-esbuild';
 import { importMapsPlugin } from '@web/dev-server-import-maps';
 import { dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
 import { LauncherWrapper, sessionStabilityReporter } from '@keymanapp/common-test-resources/test-runner-stability-reporter.mjs';
+import { platform } from 'node:process';
 
 const dir = dirname(fileURLToPath(import.meta.url));
 const KEYMAN_ROOT = resolve(dir, '../../../../../');
 
-/** @type {import('@web/test-runner').TestRunnerConfig} */
-export default {
-  browsers: [
+const allBrowsers = platform === 'win32'
+  ? [
+    new LauncherWrapper(playwrightLauncher({ product: 'chromium' })),
+    new LauncherWrapper(playwrightLauncher({ product: 'firefox' })),
+    // no testing on webkit on Windows, see #14858
+  ] : [
     new LauncherWrapper(playwrightLauncher({ product: 'chromium' })),
     new LauncherWrapper(playwrightLauncher({ product: 'firefox' })),
     // Setting it higher makes things faster... but Webkit experiences stability
     // issues for some of the tests if this is set higher than 1.  Notably,
     // engine.tests.mjs, events.tests.mjs, and text_selection.tests.mjs.  All the
     // text-simulation ones.
-    new LauncherWrapper(playwrightLauncher({ product: 'webkit', concurrency: 1}))
-  ],
+    new LauncherWrapper(playwrightLauncher({ product: 'webkit', concurrency: 1 })),
+  ];
+
+/** @type {import('@web/test-runner').TestRunnerConfig} */
+export default {
+  browsers: allBrowsers,
   concurrency: 10,
   nodeResolve: true,
   files: [

From 3e659c676dbba0b53e45ec623be805b0fc3ca8e2 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 30 Oct 2025 16:31:45 +0100
Subject: [PATCH 101/254] chore(windows): upgrade VC++ projects to v143
 (VS2022)

Test-bot: skip
Build-bot: skip release:developer,windows
---
 .../delphi/ext/tds2dbg/tds2dbg.vcxproj        | 236 ++---
 developer/src/kmanalyze/kmanalyze.vcxproj     | 418 ++++----
 developer/src/kmdecomp/kmdecomp.vcxproj       | 340 +++----
 .../src/samples/imsample/imsample.vcxproj     | 530 +++++-----
 .../src/engine/keyman32/keyman-engine.vcxproj | 802 +++++++--------
 windows/src/engine/keyman32/keyman32.vcxproj  | 930 +++++++++---------
 .../engine/keyman32/keyman32.vcxproj.filters  | 534 +++++-----
 .../keyman-engine-tests.vcxproj               | 320 +++---
 .../src/engine/keymanx64/keymanx64.vcxproj    | 304 +++---
 .../src/engine/kmrefresh/kmrefresh.vcxproj    | 312 +++---
 windows/src/engine/kmtip/kmtip.vcxproj        | 862 ++++++++--------
 windows/src/engine/mcompile/mcompile.vcxproj  | 266 ++---
 windows/src/engine/testhost/testhost.vcxproj  | 342 +++----
 windows/src/support/etl2log/etl2log.vcxproj   | 362 +++----
 windows/src/support/texteditor/Editor.vcxproj | 348 +++----
 .../shared-data/cpp/cppshareddata.vcxproj     | 350 +++----
 16 files changed, 3631 insertions(+), 3625 deletions(-)

diff --git a/common/windows/delphi/ext/tds2dbg/tds2dbg.vcxproj b/common/windows/delphi/ext/tds2dbg/tds2dbg.vcxproj
index 8d57ae5c662..5183081136e 100644
--- a/common/windows/delphi/ext/tds2dbg/tds2dbg.vcxproj
+++ b/common/windows/delphi/ext/tds2dbg/tds2dbg.vcxproj
@@ -1,119 +1,119 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{40BFECE3-7FC0-4649-A3DC-E017FF84C75B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="fileutils.cpp" />
-    <ClCompile Include="log.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="tds2dbg.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="fileutils.h" />
-    <ClInclude Include="log.h" />
-    <ClInclude Include="tds2dbg.h" />
-    <ClInclude Include="tdscvstructs.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="tds2dbg.bin" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{40BFECE3-7FC0-4649-A3DC-E017FF84C75B}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="fileutils.cpp" />
+    <ClCompile Include="log.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="tds2dbg.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="fileutils.h" />
+    <ClInclude Include="log.h" />
+    <ClInclude Include="tds2dbg.h" />
+    <ClInclude Include="tdscvstructs.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="tds2dbg.bin" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/developer/src/kmanalyze/kmanalyze.vcxproj b/developer/src/kmanalyze/kmanalyze.vcxproj
index 20fd857a352..da59aaf8338 100644
--- a/developer/src/kmanalyze/kmanalyze.vcxproj
+++ b/developer/src/kmanalyze/kmanalyze.vcxproj
@@ -1,210 +1,210 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{4EAE6DFD-E18A-493D-A00F-4846A2593F56}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>kmanalyze</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\vkeys.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\keymansentry.h" />
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\vkeys.cpp" />
-    <ClCompile Include="kmanalyze.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{4EAE6DFD-E18A-493D-A00F-4846A2593F56}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>kmanalyze</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\vkeys.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\keymansentry.h" />
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\vkeys.cpp" />
+    <ClCompile Include="kmanalyze.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="version.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/developer/src/kmdecomp/kmdecomp.vcxproj b/developer/src/kmdecomp/kmdecomp.vcxproj
index 223ae72199e..36cea5f3ff5 100644
--- a/developer/src/kmdecomp/kmdecomp.vcxproj
+++ b/developer/src/kmdecomp/kmdecomp.vcxproj
@@ -1,171 +1,171 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{963D608A-6689-469C-AE42-F56696DD42CC}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <IncludePath>$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IncludePath>$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <TypeLibraryName>.\Debug/kmdecomp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0c09</Culture>
-    </ResourceCompile>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/kmdecomp.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <TypeLibraryName>.\Release/kmdecomp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0c09</Culture>
-    </ResourceCompile>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release/kmdecomp.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\common\windows\cpp\src\vkeys.cpp" />
-    <ClCompile Include="kmdecomp.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="savekeyboard.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="version.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\common\windows\cpp\include\vkeys.h" />
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{963D608A-6689-469C-AE42-F56696DD42CC}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <IncludePath>$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IncludePath>$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/kmdecomp.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0c09</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/kmdecomp.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/kmdecomp.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0c09</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/kmdecomp.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\common\windows\cpp\src\vkeys.cpp" />
+    <ClCompile Include="kmdecomp.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="savekeyboard.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="version.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\common\windows\cpp\include\vkeys.h" />
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/developer/src/samples/imsample/imsample.vcxproj b/developer/src/samples/imsample/imsample.vcxproj
index 9abee9aeff3..93413dbe8f2 100644
--- a/developer/src/samples/imsample/imsample.vcxproj
+++ b/developer/src/samples/imsample/imsample.vcxproj
@@ -1,266 +1,266 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <SccProjectName />
-    <SccLocalPath />
-    <ProjectGuid>{0C9DB8F9-B788-8782-A97D-4F8294AA0B4E}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>imsample</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>$(ProjectName).x64</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>$(ProjectName).x64</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>Disabled</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <MinimalRebuild>true</MinimalRebuild>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0c09</Culture>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\IMSample.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <ImportLibrary>.\IMSample.lib</ImportLibrary>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <Optimization>Disabled</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0c09</Culture>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\IMSample.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>MaxSpeed</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0c09</Culture>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\IMSample.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>MaxSpeed</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0c09</Culture>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\IMSample.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="imlib.cpp" />
-    <ClCompile Include="imsample.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="imlib.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="imsample.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <SccProjectName />
+    <SccLocalPath />
+    <ProjectGuid>{0C9DB8F9-B788-8782-A97D-4F8294AA0B4E}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>imsample</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>$(ProjectName).x64</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>$(ProjectName).x64</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>Disabled</Optimization>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <WarningLevel>Level3</WarningLevel>
+      <MinimalRebuild>true</MinimalRebuild>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Midl>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+      <TargetEnvironment>Win32</TargetEnvironment>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0c09</Culture>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\IMSample.bsc</OutputFile>
+    </Bscmake>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <LinkDLL>true</LinkDLL>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <ImportLibrary>.\IMSample.lib</ImportLibrary>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <Optimization>Disabled</Optimization>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Midl>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0c09</Culture>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\IMSample.bsc</OutputFile>
+    </Bscmake>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <LinkDLL>true</LinkDLL>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <StringPooling>true</StringPooling>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>MaxSpeed</Optimization>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Midl>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+      <TargetEnvironment>Win32</TargetEnvironment>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0c09</Culture>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\IMSample.bsc</OutputFile>
+    </Bscmake>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <LinkDLL>true</LinkDLL>
+      <SubSystem>Windows</SubSystem>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <StringPooling>true</StringPooling>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>MaxSpeed</Optimization>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>.\IMSample.pch</PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Midl>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TypeLibraryName>.\IMSample.tlb</TypeLibraryName>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0c09</Culture>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\IMSample.bsc</OutputFile>
+    </Bscmake>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <LinkDLL>true</LinkDLL>
+      <SubSystem>Windows</SubSystem>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>.\imsample.def</ModuleDefinitionFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="imlib.cpp" />
+    <ClCompile Include="imsample.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="imlib.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="imsample.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="version.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/keyman32/keyman-engine.vcxproj b/windows/src/engine/keyman32/keyman-engine.vcxproj
index f958f9a7971..e268b10e229 100644
--- a/windows/src/engine/keyman32/keyman-engine.vcxproj
+++ b/windows/src/engine/keyman32/keyman-engine.vcxproj
@@ -1,402 +1,402 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A7069186-5AE7-4504-8926-861B7A34BA9E}</ProjectGuid>
-    <RootNamespace>Keyman32</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(ProjectDir)..\..\..\..\core\include;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>./</AssemblerListingLocation>
-      <ObjectFileName>./</ObjectFileName>
-      <ProgramDataBaseFileName>./</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>keymancore.lib;libicuuc.a;libicuin.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>./Keyman32.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>./Keyman32.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>./Keyman32.map</MapFileName>
-      <MapExports>false</MapExports>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <BaseAddress>0x1c100000</BaseAddress>
-      <ImportLibrary>./Keyman32.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACUIAccess>true</UACUIAccess>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./Keyman32.bsc</OutputFile>
-    </Bscmake>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-    </Manifest>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>./</AssemblerListingLocation>
-      <ObjectFileName>./</ObjectFileName>
-      <ProgramDataBaseFileName>./</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>keymancore.lib;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>./Keyman32.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>./Keyman32.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>./Keyman32.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <BaseAddress>0x1C100000</BaseAddress>
-      <ImportLibrary>./Keyman32.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACUIAccess>true</UACUIAccess>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./Keyman32.bsc</OutputFile>
-    </Bscmake>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-    </Manifest>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
-    <ClCompile Include="appcontext.cpp" />
-    <ClCompile Include="appint\aiTIP.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="appint\aiWin2000Unicode.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="appint\appint.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="calldll.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="capsstate.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="CoreEnvironment.cpp" />
-    <ClCompile Include="DebugEventTrace.cpp" />
-    <ClCompile Include="glossary.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="hookutils.cpp" />
-    <ClCompile Include="hotkeys.cpp" />
-    <ClCompile Include="K32_DBG.CPP">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="k32_globals.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="K32_LOAD.CPP">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="k32_lowlevelkeyboardhook.cpp" />
-    <ClCompile Include="k32_tsf.cpp" />
-    <ClCompile Include="keybd_shift.cpp" />
-    <ClCompile Include="keyboardoptions.cpp" />
-    <ClCompile Include="KEYMAN32.CPP">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="keystate.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="kmhook_callwndproc.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="kmhook_getmessage.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="kmhook_keyboard.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="kmprocess.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="kmprocessactions.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="preservedkeymap.cpp" />
-    <ClCompile Include="security.cpp" />
-    <ClCompile Include="selectkeyboard.cpp" />
-    <ClCompile Include="serialkeyeventclient.cpp" />
-    <ClCompile Include="serialkeyeventserver.cpp" />
-    <ClCompile Include="SharedBuffers.cpp" />
-    <ClCompile Include="syskbd.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="syskbdnt.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="syskbdnt64.cpp" />
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\unicode.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="versioninfo.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="VKScanCodes.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="keyman-debug-etw.man">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc %(FullPath)</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling keyman-debug-etw</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc %(FullPath)</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compiling keyman-debug-etw</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
-      <SubType>Designer</SubType>
-    </CustomBuild>
-    <None Include="KEYMAN32.DEF" />
-    <None Include="..\..\..\..\common\resources\bitmaps\arrow.bmp" />
-    <None Include="..\..\..\..\common\resources\bitmaps\mask.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="keyman-debug-etw.rc" />
-    <ResourceCompile Include="KEYMAN32.RC">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="appcontext.h" />
-    <ClInclude Include="keymanengine.h" />
-    <ClInclude Include="addins.h" />
-    <ClInclude Include="appint\aiTIP.h" />
-    <ClInclude Include="appint\aiWin2000Unicode.h" />
-    <ClInclude Include="appint\appint.h" />
-    <ClInclude Include="calldll.h" />
-    <ClInclude Include="capsstate.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h" />
-    <ClInclude Include="globals.h" />
-    <ClInclude Include="kmprocessactions.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="hotkeys.h" />
-    <ClInclude Include="k32_tsf.h" />
-    <ClInclude Include="KBD.H" />
-    <ClInclude Include="keyboardoptions.h" />
-    <ClInclude Include="keyman64.h" />
-    <ClInclude Include="keymancontrol.h" />
-    <ClInclude Include="keyman-debug-etw.h" />
-    <ClInclude Include="keyeventsenderthread.h" />
-    <ClInclude Include="keystate.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h" />
-    <ClInclude Include="security.h" />
-    <ClInclude Include="serialkeyeventclient.h" />
-    <ClInclude Include="serialkeyeventcommon.h" />
-    <ClInclude Include="serialkeyeventserver.h" />
-    <ClInclude Include="SharedBuffers.h" />
-    <ClInclude Include="syskbd.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\unicode.h" />
-    <ClInclude Include="vkscancodes.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A7069186-5AE7-4504-8926-861B7A34BA9E}</ProjectGuid>
+    <RootNamespace>Keyman32</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(ProjectDir)..\..\..\..\core\include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <AssemblerListingLocation>./</AssemblerListingLocation>
+      <ObjectFileName>./</ObjectFileName>
+      <ProgramDataBaseFileName>./</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>keymancore.lib;libicuuc.a;libicuin.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>./Keyman32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>./Keyman32.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>./Keyman32.map</MapFileName>
+      <MapExports>false</MapExports>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <BaseAddress>0x1c100000</BaseAddress>
+      <ImportLibrary>./Keyman32.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <UACUIAccess>true</UACUIAccess>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./Keyman32.bsc</OutputFile>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <AssemblerListingLocation>./</AssemblerListingLocation>
+      <ObjectFileName>./</ObjectFileName>
+      <ProgramDataBaseFileName>./</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>keymancore.lib;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>./Keyman32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>./Keyman32.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>./Keyman32.map</MapFileName>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x1C100000</BaseAddress>
+      <ImportLibrary>./Keyman32.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <UACUIAccess>true</UACUIAccess>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./Keyman32.bsc</OutputFile>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
+    <ClCompile Include="appcontext.cpp" />
+    <ClCompile Include="appint\aiTIP.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="appint\aiWin2000Unicode.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="appint\appint.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="calldll.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="capsstate.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="CoreEnvironment.cpp" />
+    <ClCompile Include="DebugEventTrace.cpp" />
+    <ClCompile Include="glossary.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="hookutils.cpp" />
+    <ClCompile Include="hotkeys.cpp" />
+    <ClCompile Include="K32_DBG.CPP">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="k32_globals.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="K32_LOAD.CPP">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="k32_lowlevelkeyboardhook.cpp" />
+    <ClCompile Include="k32_tsf.cpp" />
+    <ClCompile Include="keybd_shift.cpp" />
+    <ClCompile Include="keyboardoptions.cpp" />
+    <ClCompile Include="KEYMAN32.CPP">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="keystate.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="kmhook_callwndproc.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="kmhook_getmessage.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="kmhook_keyboard.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="kmprocess.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="kmprocessactions.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="preservedkeymap.cpp" />
+    <ClCompile Include="security.cpp" />
+    <ClCompile Include="selectkeyboard.cpp" />
+    <ClCompile Include="serialkeyeventclient.cpp" />
+    <ClCompile Include="serialkeyeventserver.cpp" />
+    <ClCompile Include="SharedBuffers.cpp" />
+    <ClCompile Include="syskbd.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="syskbdnt.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="syskbdnt64.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\unicode.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="versioninfo.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="VKScanCodes.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="keyman-debug-etw.man">
+      <FileType>Document</FileType>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc %(FullPath)</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling keyman-debug-etw</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc %(FullPath)</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compiling keyman-debug-etw</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
+      <SubType>Designer</SubType>
+    </CustomBuild>
+    <None Include="KEYMAN32.DEF" />
+    <None Include="..\..\..\..\common\resources\bitmaps\arrow.bmp" />
+    <None Include="..\..\..\..\common\resources\bitmaps\mask.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="keyman-debug-etw.rc" />
+    <ResourceCompile Include="KEYMAN32.RC">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="appcontext.h" />
+    <ClInclude Include="keymanengine.h" />
+    <ClInclude Include="addins.h" />
+    <ClInclude Include="appint\aiTIP.h" />
+    <ClInclude Include="appint\aiWin2000Unicode.h" />
+    <ClInclude Include="appint\appint.h" />
+    <ClInclude Include="calldll.h" />
+    <ClInclude Include="capsstate.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h" />
+    <ClInclude Include="globals.h" />
+    <ClInclude Include="kmprocessactions.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="hotkeys.h" />
+    <ClInclude Include="k32_tsf.h" />
+    <ClInclude Include="KBD.H" />
+    <ClInclude Include="keyboardoptions.h" />
+    <ClInclude Include="keyman64.h" />
+    <ClInclude Include="keymancontrol.h" />
+    <ClInclude Include="keyman-debug-etw.h" />
+    <ClInclude Include="keyeventsenderthread.h" />
+    <ClInclude Include="keystate.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h" />
+    <ClInclude Include="security.h" />
+    <ClInclude Include="serialkeyeventclient.h" />
+    <ClInclude Include="serialkeyeventcommon.h" />
+    <ClInclude Include="serialkeyeventserver.h" />
+    <ClInclude Include="SharedBuffers.h" />
+    <ClInclude Include="syskbd.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\unicode.h" />
+    <ClInclude Include="vkscancodes.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/keyman32/keyman32.vcxproj b/windows/src/engine/keyman32/keyman32.vcxproj
index 71ae7ec5018..ba15db6516c 100644
--- a/windows/src/engine/keyman32/keyman32.vcxproj
+++ b/windows/src/engine/keyman32/keyman32.vcxproj
@@ -1,466 +1,466 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{BD5564FB-35A5-4A3C-B96A-4A6578E2B593}</ProjectGuid>
-    <RootNamespace>Keyman32</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>keyman32</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(IncludePath)</IncludePath>
-    <TargetName>keyman32</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x64\$(Configuration);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
-    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\include;$(IncludePath)</IncludePath>
-    <TargetName>keyman64</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(IncludePath)</IncludePath>
-    <TargetName>keyman32</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x64\$(Configuration);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
-    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\include;$(IncludePath)</IncludePath>
-    <TargetName>keyman64</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapExports>false</MapExports>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <BaseAddress>0x1c100000</BaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACUIAccess>true</UACUIAccess>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <ImportLibrary>..\..\..\lib\keyman32.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./Keyman32.bsc</OutputFile>
-    </Bscmake>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-    </Manifest>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>keyman64.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapExports>false</MapExports>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <BaseAddress>0x1c100000</BaseAddress>
-      <UACUIAccess>true</UACUIAccess>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <ImportLibrary>..\..\..\lib\keyman64.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./Keyman64.bsc</OutputFile>
-    </Bscmake>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-    </Manifest>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <BaseAddress>0x1C100000</BaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACUIAccess>true</UACUIAccess>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <ImportLibrary>..\..\..\lib\keyman32.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./Keyman32.bsc</OutputFile>
-    </Bscmake>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-    </Manifest>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>keyman64.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <BaseAddress>0x1C100000</BaseAddress>
-      <UACUIAccess>true</UACUIAccess>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <ImportLibrary>..\..\..\lib\keyman64.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./Keyman32.bsc</OutputFile>
-    </Bscmake>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-    </Manifest>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\global\cpp\kmtip_guids.cpp" />
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
-    <ClCompile Include="appcontext.cpp" />
-    <ClCompile Include="appint\aiTIP.cpp" />
-    <ClCompile Include="appint\aiWin2000Unicode.cpp" />
-    <ClCompile Include="appint\appint.cpp" />
-    <ClCompile Include="calldll.cpp" />
-    <ClCompile Include="capsstate.cpp" />
-    <ClCompile Include="CoreEnvironment.cpp" />
-    <ClCompile Include="DebugEventTrace.cpp" />
-    <ClCompile Include="glossary.cpp" />
-    <ClCompile Include="hookutils.cpp" />
-    <ClCompile Include="hotkeys.cpp" />
-    <ClCompile Include="K32_DBG.CPP" />
-    <ClCompile Include="k32_globals.cpp" />
-    <ClCompile Include="K32_load.cpp" />
-    <ClCompile Include="k32_lowlevelkeyboardhook.cpp" />
-    <ClCompile Include="k32_tsf.cpp" />
-    <ClCompile Include="k32_visualkeyboardinterface.cpp" />
-    <ClCompile Include="keybd_shift.cpp" />
-    <ClCompile Include="keyboardoptions.cpp" />
-    <ClCompile Include="keyman32.cpp" />
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp" />
-    <ClCompile Include="keystate.cpp" />
-    <ClCompile Include="kmhook_callwndproc.cpp" />
-    <ClCompile Include="kmhook_getmessage.cpp" />
-    <ClCompile Include="kmhook_keyboard.cpp" />
-    <ClCompile Include="kmprocess.cpp" />
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp" />
-    <ClCompile Include="kmprocessactions.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="preservedkeymap.cpp" />
-    <ClCompile Include="security.cpp" />
-    <ClCompile Include="selectkeyboard.cpp" />
-    <ClCompile Include="serialkeyeventclient.cpp" />
-    <ClCompile Include="serialkeyeventserver.cpp" />
-    <ClCompile Include="SharedBuffers.cpp" />
-    <ClCompile Include="syskbd.cpp" />
-    <ClCompile Include="syskbdnt.cpp" />
-    <ClCompile Include="syskbdnt64.cpp" />
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\unicode.cpp" />
-    <ClCompile Include="versioninfo.cpp" />
-    <ClCompile Include="VKScanCodes.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="keyman-debug-etw.man">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc %(FullPath)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc %(FullPath)</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling keyman-debug-etw</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compiling keyman-debug-etw</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc %(FullPath)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc %(FullPath)</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compiling keyman-debug-etw</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compiling keyman-debug-etw</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
-      <SubType>Designer</SubType>
-    </CustomBuild>
-    <None Include="KEYMAN32.DEF">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\..\..\..\common\resources\bitmaps\arrow.bmp" />
-    <None Include="..\..\..\..\common\resources\bitmaps\mask.bmp" />
-    <None Include="keyman64.def">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="keyman-debug-etw.rc" />
-    <ResourceCompile Include="KEYMAN32.RC">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ResourceCompile>
-    <ResourceCompile Include="keyman64.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="appcontext.h" />
-    <ClInclude Include="keymanengine.h" />
-    <ClInclude Include="..\..\..\include\kmtip_guids.h" />
-    <ClInclude Include="appint\aiTIP.h" />
-    <ClInclude Include="appint\aiWin2000Unicode.h" />
-    <ClInclude Include="appint\appint.h" />
-    <ClInclude Include="calldll.h" />
-    <ClInclude Include="capsstate.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h" />
-    <ClInclude Include="globals.h" />
-    <ClInclude Include="kmprocessactions.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="hotkeys.h" />
-    <ClInclude Include="k32_tsf.h" />
-    <ClInclude Include="k32_visualkeyboardinterface.h" />
-    <ClInclude Include="KBD.H" />
-    <ClInclude Include="keyboardoptions.h" />
-    <ClInclude Include="keyman64.h" />
-    <ClInclude Include="keymancontrol.h" />
-    <ClInclude Include="keyman-debug-etw.h" />
-    <ClInclude Include="keyeventsenderthread.h" />
-    <ClInclude Include="keystate.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h" />
-    <ClInclude Include="security.h" />
-    <ClInclude Include="serialkeyeventclient.h" />
-    <ClInclude Include="serialkeyeventcommon.h" />
-    <ClInclude Include="serialkeyeventserver.h" />
-    <ClInclude Include="SharedBuffers.h" />
-    <ClInclude Include="syskbd.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\unicode.h" />
-    <ClInclude Include="vkscancodes.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BD5564FB-35A5-4A3C-B96A-4A6578E2B593}</ProjectGuid>
+    <RootNamespace>Keyman32</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>keyman32</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(IncludePath)</IncludePath>
+    <TargetName>keyman32</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x64\$(Configuration);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
+    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\include;$(IncludePath)</IncludePath>
+    <TargetName>keyman64</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x86\$(Configuration);$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\include;$(IncludePath)</IncludePath>
+    <TargetName>keyman32</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LibraryPath>$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\x64\$(Configuration);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
+    <IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\x64\$(Configuration)\include;$(IncludePath)</IncludePath>
+    <TargetName>keyman64</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapExports>false</MapExports>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <BaseAddress>0x1c100000</BaseAddress>
+      <TargetMachine>MachineX86</TargetMachine>
+      <UACUIAccess>true</UACUIAccess>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <ImportLibrary>..\..\..\lib\keyman32.lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./Keyman32.bsc</OutputFile>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>keyman64.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapExports>false</MapExports>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <BaseAddress>0x1c100000</BaseAddress>
+      <UACUIAccess>true</UACUIAccess>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <ImportLibrary>..\..\..\lib\keyman64.lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./Keyman64.bsc</OutputFile>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>keyman32.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x1C100000</BaseAddress>
+      <TargetMachine>MachineX86</TargetMachine>
+      <UACUIAccess>true</UACUIAccess>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <ImportLibrary>..\..\..\lib\keyman32.lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./Keyman32.bsc</OutputFile>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>./Keyman32.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/verbose:lib /section:.SHARDATA,rws %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>libicuuc.a;libicuin.a;libkeymancore.a;psapi.lib;rpcrt4.lib;version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>keyman64.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x1C100000</BaseAddress>
+      <UACUIAccess>true</UACUIAccess>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <ImportLibrary>..\..\..\lib\keyman64.lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./Keyman32.bsc</OutputFile>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\global\cpp\kmtip_guids.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
+    <ClCompile Include="appcontext.cpp" />
+    <ClCompile Include="appint\aiTIP.cpp" />
+    <ClCompile Include="appint\aiWin2000Unicode.cpp" />
+    <ClCompile Include="appint\appint.cpp" />
+    <ClCompile Include="calldll.cpp" />
+    <ClCompile Include="capsstate.cpp" />
+    <ClCompile Include="CoreEnvironment.cpp" />
+    <ClCompile Include="DebugEventTrace.cpp" />
+    <ClCompile Include="glossary.cpp" />
+    <ClCompile Include="hookutils.cpp" />
+    <ClCompile Include="hotkeys.cpp" />
+    <ClCompile Include="K32_DBG.CPP" />
+    <ClCompile Include="k32_globals.cpp" />
+    <ClCompile Include="K32_load.cpp" />
+    <ClCompile Include="k32_lowlevelkeyboardhook.cpp" />
+    <ClCompile Include="k32_tsf.cpp" />
+    <ClCompile Include="k32_visualkeyboardinterface.cpp" />
+    <ClCompile Include="keybd_shift.cpp" />
+    <ClCompile Include="keyboardoptions.cpp" />
+    <ClCompile Include="keyman32.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp" />
+    <ClCompile Include="keystate.cpp" />
+    <ClCompile Include="kmhook_callwndproc.cpp" />
+    <ClCompile Include="kmhook_getmessage.cpp" />
+    <ClCompile Include="kmhook_keyboard.cpp" />
+    <ClCompile Include="kmprocess.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp" />
+    <ClCompile Include="kmprocessactions.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="preservedkeymap.cpp" />
+    <ClCompile Include="security.cpp" />
+    <ClCompile Include="selectkeyboard.cpp" />
+    <ClCompile Include="serialkeyeventclient.cpp" />
+    <ClCompile Include="serialkeyeventserver.cpp" />
+    <ClCompile Include="SharedBuffers.cpp" />
+    <ClCompile Include="syskbd.cpp" />
+    <ClCompile Include="syskbdnt.cpp" />
+    <ClCompile Include="syskbdnt64.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\unicode.cpp" />
+    <ClCompile Include="versioninfo.cpp" />
+    <ClCompile Include="VKScanCodes.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="keyman-debug-etw.man">
+      <FileType>Document</FileType>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc %(FullPath)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc %(FullPath)</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling keyman-debug-etw</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compiling keyman-debug-etw</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc %(FullPath)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc %(FullPath)</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compiling keyman-debug-etw</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compiling keyman-debug-etw</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).rc;%(Filename.h);MSG00001.bin</Outputs>
+      <SubType>Designer</SubType>
+    </CustomBuild>
+    <None Include="KEYMAN32.DEF">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\..\..\..\common\resources\bitmaps\arrow.bmp" />
+    <None Include="..\..\..\..\common\resources\bitmaps\mask.bmp" />
+    <None Include="keyman64.def">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="keyman-debug-etw.rc" />
+    <ResourceCompile Include="KEYMAN32.RC">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ResourceCompile>
+    <ResourceCompile Include="keyman64.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="appcontext.h" />
+    <ClInclude Include="keymanengine.h" />
+    <ClInclude Include="..\..\..\include\kmtip_guids.h" />
+    <ClInclude Include="appint\aiTIP.h" />
+    <ClInclude Include="appint\aiWin2000Unicode.h" />
+    <ClInclude Include="appint\appint.h" />
+    <ClInclude Include="calldll.h" />
+    <ClInclude Include="capsstate.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h" />
+    <ClInclude Include="globals.h" />
+    <ClInclude Include="kmprocessactions.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="hotkeys.h" />
+    <ClInclude Include="k32_tsf.h" />
+    <ClInclude Include="k32_visualkeyboardinterface.h" />
+    <ClInclude Include="KBD.H" />
+    <ClInclude Include="keyboardoptions.h" />
+    <ClInclude Include="keyman64.h" />
+    <ClInclude Include="keymancontrol.h" />
+    <ClInclude Include="keyman-debug-etw.h" />
+    <ClInclude Include="keyeventsenderthread.h" />
+    <ClInclude Include="keystate.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h" />
+    <ClInclude Include="security.h" />
+    <ClInclude Include="serialkeyeventclient.h" />
+    <ClInclude Include="serialkeyeventcommon.h" />
+    <ClInclude Include="serialkeyeventserver.h" />
+    <ClInclude Include="SharedBuffers.h" />
+    <ClInclude Include="syskbd.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\unicode.h" />
+    <ClInclude Include="vkscancodes.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/keyman32/keyman32.vcxproj.filters b/windows/src/engine/keyman32/keyman32.vcxproj.filters
index 5627c72b04a..cffae6a908e 100644
--- a/windows/src/engine/keyman32/keyman32.vcxproj.filters
+++ b/windows/src/engine/keyman32/keyman32.vcxproj.filters
@@ -1,265 +1,271 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{2dc5904b-4033-47e6-88ac-ebe442c06c2e}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{27baf0f2-3926-4720-b5f9-045e47cd975c}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{088a2b68-c9db-41f4-9f45-37fdf758931e}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="appint\aiTIP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="appint\aiWin2000Unicode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="appint\appint.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="calldll.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="capsstate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="glossary.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="hotkeys.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="K32_DBG.CPP">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="k32_globals.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="K32_LOAD.CPP">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="keybd_shift.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="keyboardoptions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="KEYMAN32.CPP">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="keystate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="kmhook_callwndproc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="kmhook_getmessage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="kmhook_keyboard.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="kmprocess.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="selectkeyboard.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="syskbd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="syskbdnt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="syskbdnt64.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\unicode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="versioninfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="VKScanCodes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="preservedkeymap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="k32_tsf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="hookutils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="k32_lowlevelkeyboardhook.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="security.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="serialkeyeventclient.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="serialkeyeventserver.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SharedBuffers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DebugEventTrace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="kmprocessactions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\global\cpp\kmtip_guids.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CoreEnvironment.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="appcontext.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="KEYMAN32.DEF">
-      <Filter>Source Files</Filter>
-    </None>
-    <None Include="..\..\..\..\common\resources\bitmaps\arrow.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="..\..\..\..\common\resources\bitmaps\mask.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="keyman64.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="KEYMAN32.RC">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="keyman-debug-etw.rc">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="keyman64.rc">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="appint\aiTIP.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="appint\aiWin2000Unicode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="appint\appint.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="calldll.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="capsstate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="globals.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="hotkeys.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="KBD.H">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keyboardoptions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keyman64.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keymancontrol.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keystate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="syskbd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\unicode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vkscancodes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="k32_tsf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keyman-debug-etw.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keyeventsenderthread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="security.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="serialkeyeventclient.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="serialkeyeventcommon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SharedBuffers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="serialkeyeventserver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keymanengine.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="kmprocessactions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\kmtip_guids.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="appcontext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="keyman-debug-etw.man" />
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{2dc5904b-4033-47e6-88ac-ebe442c06c2e}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{27baf0f2-3926-4720-b5f9-045e47cd975c}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{088a2b68-c9db-41f4-9f45-37fdf758931e}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="appint\aiTIP.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="appint\aiWin2000Unicode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="appint\appint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="calldll.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="capsstate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="glossary.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="hotkeys.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="K32_DBG.CPP">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="k32_globals.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="K32_LOAD.CPP">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="keybd_shift.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="keyboardoptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="KEYMAN32.CPP">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="keystate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="kmhook_callwndproc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="kmhook_getmessage.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="kmhook_keyboard.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="kmprocess.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="selectkeyboard.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="syskbd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="syskbdnt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="syskbdnt64.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\unicode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="versioninfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="VKScanCodes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="preservedkeymap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="k32_tsf.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="hookutils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="k32_lowlevelkeyboardhook.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="security.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="serialkeyeventclient.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="serialkeyeventserver.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SharedBuffers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DebugEventTrace.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="kmprocessactions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\global\cpp\kmtip_guids.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CoreEnvironment.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="appcontext.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="k32_visualkeyboardinterface.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="KEYMAN32.DEF">
+      <Filter>Source Files</Filter>
+    </None>
+    <None Include="..\..\..\..\common\resources\bitmaps\arrow.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\..\..\..\common\resources\bitmaps\mask.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="keyman64.def">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="KEYMAN32.RC">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="keyman-debug-etw.rc">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="keyman64.rc">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="appint\aiTIP.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="appint\aiWin2000Unicode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="appint\appint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="calldll.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="capsstate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="globals.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="hotkeys.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="KBD.H">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keyboardoptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keyman64.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keymancontrol.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keystate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="syskbd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\unicode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vkscancodes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="k32_tsf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keyman-debug-etw.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keyeventsenderthread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="security.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="pch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="serialkeyeventclient.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="serialkeyeventcommon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SharedBuffers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="serialkeyeventserver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keymanengine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="kmprocessactions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\kmtip_guids.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="appcontext.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="k32_visualkeyboardinterface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="keyman-debug-etw.man" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/keyman32/tests/keyman-engine-tests/keyman-engine-tests.vcxproj b/windows/src/engine/keyman32/tests/keyman-engine-tests/keyman-engine-tests.vcxproj
index 48afed6fdd8..5bf2365a59b 100644
--- a/windows/src/engine/keyman32/tests/keyman-engine-tests/keyman-engine-tests.vcxproj
+++ b/windows/src/engine/keyman32/tests/keyman-engine-tests/keyman-engine-tests.vcxproj
@@ -1,160 +1,160 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{46399ed7-79a1-4e7e-bd96-4b1aeec838ae}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <ProjectName>keyman-engine-tests</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Label="Shared" />
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\include;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LibraryPath>$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\kmtip\bin\Win32\$(Configuration);$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(LibraryPath)</LibraryPath>
-    <Microsoft-googletest-v140-windesktop-msvcstl-static-rt-static-Disable-gtest_main>true</Microsoft-googletest-v140-windesktop-msvcstl-static-rt-static-Disable-gtest_main>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\global\cpp\kmtip_guids.cpp" />
-    <ClCompile Include="appinttests.cpp" />
-    <ClCompile Include="gtest_main.cpp" />
-    <ClCompile Include="keyboardoptionstests.cpp" />
-    <ClCompile Include="kmprocessactionstests.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\keyman-engine.vcxproj">
-      <Project>{a7069186-5ae7-4504-8926-861b7a34ba9e}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemDefinitionGroup />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets" Condition="Exists('..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" />
-  </ImportGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>version.lib;psapi.lib;imm32.lib;libkeymancore.a;libicuuc.a;libicuin.a;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <ProjectReference>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets'))" />
-  </Target>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{46399ed7-79a1-4e7e-bd96-4b1aeec838ae}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <ProjectName>keyman-engine-tests</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="Shared" />
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\include;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LibraryPath>$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\src;$(ProjectDir)..\..\..\..\kmtip\bin\Win32\$(Configuration);$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(LibraryPath)</LibraryPath>
+    <Microsoft-googletest-v140-windesktop-msvcstl-static-rt-static-Disable-gtest_main>true</Microsoft-googletest-v140-windesktop-msvcstl-static-rt-static-Disable-gtest_main>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x86\$(Configuration)\include;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\x86\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>$(ProjectDir)..\..\..\..\..\..\common\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\include;$(ProjectDir)..\..\..\..\..\..\core\include;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\..\..\core\build\x64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\global\inc;$(ProjectDir)..\..;$(IncludePath)</IncludePath>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\global\cpp\kmtip_guids.cpp" />
+    <ClCompile Include="appinttests.cpp" />
+    <ClCompile Include="gtest_main.cpp" />
+    <ClCompile Include="keyboardoptionstests.cpp" />
+    <ClCompile Include="kmprocessactionstests.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\keyman-engine.vcxproj">
+      <Project>{a7069186-5ae7-4504-8926-861b7a34ba9e}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemDefinitionGroup />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets" Condition="Exists('..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" />
+  </ImportGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>version.lib;psapi.lib;imm32.lib;libkeymancore.a;libicuuc.a;libicuin.a;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ProjectReference>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/windows/src/engine/keymanx64/keymanx64.vcxproj b/windows/src/engine/keymanx64/keymanx64.vcxproj
index 82b3bcb59f1..2fd59555603 100644
--- a/windows/src/engine/keymanx64/keymanx64.vcxproj
+++ b/windows/src/engine/keymanx64/keymanx64.vcxproj
@@ -1,153 +1,153 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A34650EA-D6E8-4229-8091-6BF1443565B5}</ProjectGuid>
-    <RootNamespace>keymanx64</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.metagen;*.bi</ExtensionsToDeleteOnClean>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'">*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.metagen;*.bi</ExtensionsToDeleteOnClean>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\global\inc;..\..\..\..\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.x64.lib;keyman64.lib;libcmtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-      <OutputManifestFile>
-      </OutputManifestFile>
-    </Manifest>
-    <ManifestResourceCompile>
-      <ResourceOutputFileName>
-      </ResourceOutputFileName>
-    </ManifestResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\global\inc;..\..\..\..\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.x64.lib;keyman64.lib;libcmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACUIAccess>true</UACUIAccess>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <AdditionalManifestFiles>
-      </AdditionalManifestFiles>
-    </Manifest>
-    <ManifestResourceCompile>
-      <ResourceOutputFileName>
-      </ResourceOutputFileName>
-    </ManifestResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp" />
-    <ClCompile Include="keymanx64.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\keymansentry.h" />
-    <ClInclude Include="keymanx64.h" />
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="keymanx64.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A34650EA-D6E8-4229-8091-6BF1443565B5}</ProjectGuid>
+    <RootNamespace>keymanx64</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.metagen;*.bi</ExtensionsToDeleteOnClean>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'">*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.metagen;*.bi</ExtensionsToDeleteOnClean>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\global\inc;..\..\..\..\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.x64.lib;keyman64.lib;libcmtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+      <OutputManifestFile>
+      </OutputManifestFile>
+    </Manifest>
+    <ManifestResourceCompile>
+      <ResourceOutputFileName>
+      </ResourceOutputFileName>
+    </ManifestResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\global\inc;..\..\..\..\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.x64.lib;keyman64.lib;libcmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+      <UACUIAccess>true</UACUIAccess>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>
+      </AdditionalManifestFiles>
+    </Manifest>
+    <ManifestResourceCompile>
+      <ResourceOutputFileName>
+      </ResourceOutputFileName>
+    </ManifestResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp" />
+    <ClCompile Include="keymanx64.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\keymansentry.h" />
+    <ClInclude Include="keymanx64.h" />
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="keymanx64.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/kmrefresh/kmrefresh.vcxproj b/windows/src/engine/kmrefresh/kmrefresh.vcxproj
index a978cb947ed..0b252895f7f 100644
--- a/windows/src/engine/kmrefresh/kmrefresh.vcxproj
+++ b/windows/src/engine/kmrefresh/kmrefresh.vcxproj
@@ -1,157 +1,157 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{A3B8F75F-E63E-434E-8A2A-034AD9B66571}</ProjectGuid>
-    <RootNamespace>kmrefresh</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>$(ProjectName).x64</TargetName>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>$(ProjectName).x86</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>$(ProjectName).x86</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>$(ProjectName).x64</TargetName>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="kmrefresh.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{A3B8F75F-E63E-434E-8A2A-034AD9B66571}</ProjectGuid>
+    <RootNamespace>kmrefresh</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <TargetName>$(ProjectName).x64</TargetName>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <TargetName>$(ProjectName).x86</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <TargetName>$(ProjectName).x86</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <TargetName>$(ProjectName).x64</TargetName>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="kmrefresh.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="version.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/kmtip/kmtip.vcxproj b/windows/src/engine/kmtip/kmtip.vcxproj
index f3fb74116fb..173853f507b 100644
--- a/windows/src/engine/kmtip/kmtip.vcxproj
+++ b/windows/src/engine/kmtip/kmtip.vcxproj
@@ -1,432 +1,432 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{93391ECB-E2F1-4D23-B85E-6FDEB7ACF9B4}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.dll</TargetExt>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.dll</TargetExt>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">kmtip64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">kmtip64</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerOutput>All</AssemblerOutput>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0c09</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\..\lib\keyman32.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\kmtip.def</ModuleDefinitionFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <BaseAddress>0x4C100000</BaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./kmtip.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerOutput>All</AssemblerOutput>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0c09</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\..\lib\keyman64.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\kmtip64.def</ModuleDefinitionFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <BaseAddress>0x4C100000</BaseAddress>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./kmtip.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0c09</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\..\lib\keyman32.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\kmtip.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <BaseAddress>0x4C100000</BaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./kmtip.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0c09</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\..\lib\keyman64.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\kmtip64.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <BaseAddress>0x4C100000</BaseAddress>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>./kmtip.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\common\windows\cpp\src\vkeys.cpp" />
-    <ClCompile Include="..\..\global\cpp\kmtip_guids.cpp" />
-    <ClCompile Include="debug.cpp" />
-    <ClCompile Include="keyman32interface.cpp" />
-    <ClCompile Include="keys.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="kmkey.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="kmtip.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="register.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="registryw.cpp" />
-    <ClCompile Include="tmgrsink.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="inserttext.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="dllmain.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="globals.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="server.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="kmtip.def">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="kmtip64.def">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="kmtip.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\vkeys.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h" />
-    <ClInclude Include="..\..\..\include\kmtip_guids.h" />
-    <ClInclude Include="editsess.h" />
-    <ClInclude Include="globals.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\keynames.h" />
-    <ClInclude Include="kmtip.h" />
-    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h" />
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{93391ECB-E2F1-4D23-B85E-6FDEB7ACF9B4}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.dll</TargetExt>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.dll</TargetExt>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">kmtip64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">kmtip64</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerOutput>All</AssemblerOutput>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0c09</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\lib\keyman32.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>.\kmtip.def</ModuleDefinitionFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <BaseAddress>0x4C100000</BaseAddress>
+      <TargetMachine>MachineX86</TargetMachine>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./kmtip.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerOutput>All</AssemblerOutput>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0c09</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\lib\keyman64.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>.\kmtip64.def</ModuleDefinitionFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <BaseAddress>0x4C100000</BaseAddress>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./kmtip.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0c09</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\lib\keyman32.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>.\kmtip.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <BaseAddress>0x4C100000</BaseAddress>
+      <TargetMachine>MachineX86</TargetMachine>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./kmtip.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>./kmtip.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\;..\..\global\inc;..\..\resellers;C:\Program Files\Microsoft Platform SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;KMTIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0c09</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\lib\keyman64.lib;version.lib;wintrust.lib;crypt32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>.\kmtip64.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <BaseAddress>0x4C100000</BaseAddress>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>./kmtip.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\common\windows\cpp\src\vkeys.cpp" />
+    <ClCompile Include="..\..\global\cpp\kmtip_guids.cpp" />
+    <ClCompile Include="debug.cpp" />
+    <ClCompile Include="keyman32interface.cpp" />
+    <ClCompile Include="keys.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="kmkey.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="kmtip.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="register.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="registryw.cpp" />
+    <ClCompile Include="tmgrsink.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="inserttext.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keynames.cpp">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\registry.cpp">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="dllmain.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="globals.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="server.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="kmtip.def">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="kmtip64.def">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="kmtip.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\vkeys.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h" />
+    <ClInclude Include="..\..\..\include\kmtip_guids.h" />
+    <ClInclude Include="editsess.h" />
+    <ClInclude Include="globals.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\keynames.h" />
+    <ClInclude Include="kmtip.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\registry.h" />
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/mcompile/mcompile.vcxproj b/windows/src/engine/mcompile/mcompile.vcxproj
index e9c426a330d..99f60fa722a 100644
--- a/windows/src/engine/mcompile/mcompile.vcxproj
+++ b/windows/src/engine/mcompile/mcompile.vcxproj
@@ -1,134 +1,134 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5C22DDDA-CEAD-45F1-96B0-1473111156AA}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>mtop</RootNamespace>
-    <ProjectName>mcompile</ProjectName>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <GenerateManifest>false</GenerateManifest>
-    <ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.metagen;*.bi</ExtensionsToDeleteOnClean>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <GenerateManifest>false</GenerateManifest>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>..\..\..\..\common\windows\delphi\ext\sentry;..\..\global\inc</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>..\..\..\..\common\windows\delphi\ext\sentry;..\..\global\inc</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\engine\keyman32\KBD.H" />
-    <ClInclude Include="mc_kmxfile.h" />
-    <ClInclude Include="mcompile.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="mc_syskbd.h" />
-    <ClInclude Include="targetver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\global\cpp\VKScanCodes.cpp" />
-    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
-    <ClCompile Include="mc_import_rules.cpp" />
-    <ClCompile Include="mc_kmxfile.cpp" />
-    <ClCompile Include="mcompile.cpp" />
-    <ClCompile Include="mc_savekeyboard.cpp" />
-    <ClCompile Include="mc_unicode.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="mc_syskbd.cpp" />
-    <ClCompile Include="mc_syskbdnt32.cpp" />
-    <ClCompile Include="mc_syskbdnt64.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="mcompile.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5C22DDDA-CEAD-45F1-96B0-1473111156AA}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>mtop</RootNamespace>
+    <ProjectName>mcompile</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <GenerateManifest>false</GenerateManifest>
+    <ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.metagen;*.bi</ExtensionsToDeleteOnClean>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <GenerateManifest>false</GenerateManifest>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\common\windows\delphi\ext\sentry;..\..\global\inc</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\common\windows\delphi\ext\sentry;..\..\global\inc</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\engine\keyman32\KBD.H" />
+    <ClInclude Include="mc_kmxfile.h" />
+    <ClInclude Include="mcompile.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="mc_syskbd.h" />
+    <ClInclude Include="targetver.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\global\cpp\VKScanCodes.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
+    <ClCompile Include="mc_import_rules.cpp" />
+    <ClCompile Include="mc_kmxfile.cpp" />
+    <ClCompile Include="mcompile.cpp" />
+    <ClCompile Include="mc_savekeyboard.cpp" />
+    <ClCompile Include="mc_unicode.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ClCompile Include="mc_syskbd.cpp" />
+    <ClCompile Include="mc_syskbdnt32.cpp" />
+    <ClCompile Include="mc_syskbdnt64.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="mcompile.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/engine/testhost/testhost.vcxproj b/windows/src/engine/testhost/testhost.vcxproj
index 8b965e942c5..e9d06a87a6f 100644
--- a/windows/src/engine/testhost/testhost.vcxproj
+++ b/windows/src/engine/testhost/testhost.vcxproj
@@ -1,172 +1,172 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{12818da3-0472-49a5-96fc-a4808a1a77fa}</ProjectGuid>
-    <RootNamespace>testhost</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="framework.h" />
-    <ClInclude Include="Resource.h" />
-    <ClInclude Include="targetver.h" />
-    <ClInclude Include="testhost.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="testhost.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="testhost.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="small.ico" />
-    <Image Include="testhost.ico" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{12818da3-0472-49a5-96fc-a4808a1a77fa}</ProjectGuid>
+    <RootNamespace>testhost</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="framework.h" />
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="targetver.h" />
+    <ClInclude Include="testhost.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="testhost.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="testhost.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="small.ico" />
+    <Image Include="testhost.ico" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/support/etl2log/etl2log.vcxproj b/windows/src/support/etl2log/etl2log.vcxproj
index d8e0372cb26..839d6f28868 100644
--- a/windows/src/support/etl2log/etl2log.vcxproj
+++ b/windows/src/support/etl2log/etl2log.vcxproj
@@ -1,182 +1,182 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{8754791A-42D7-4E93-84F1-97DEF9D644EB}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>etl2log</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="etl2log.cpp" />
-    <ClCompile Include="load.cpp" />
-    <ClCompile Include="logging.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="logging.h" />
-    <ClInclude Include="stdafx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{8754791A-42D7-4E93-84F1-97DEF9D644EB}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>etl2log</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>tdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="etl2log.cpp" />
+    <ClCompile Include="load.cpp" />
+    <ClCompile Include="logging.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="logging.h" />
+    <ClInclude Include="stdafx.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="version.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/support/texteditor/Editor.vcxproj b/windows/src/support/texteditor/Editor.vcxproj
index 4b01793829a..30879810b34 100644
--- a/windows/src/support/texteditor/Editor.vcxproj
+++ b/windows/src/support/texteditor/Editor.vcxproj
@@ -1,175 +1,175 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{6804767e-857f-48cc-b843-22bf357a668c}</ProjectGuid>
-    <RootNamespace>Editor</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <TargetName>$(ProjectName)32</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(ProjectName)32</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <TargetName>$(ProjectName)64</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(ProjectName)64</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="Editor.h" />
-    <ClInclude Include="framework.h" />
-    <ClInclude Include="FontSelect.h" />
-    <ClInclude Include="Resource.h" />
-    <ClInclude Include="targetver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Editor.cpp" />
-    <ClCompile Include="FontSelect.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Editor.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="Editor.ico" />
-    <Image Include="small.ico" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{6804767e-857f-48cc-b843-22bf357a668c}</ProjectGuid>
+    <RootNamespace>Editor</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)32</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)32</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)64</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)64</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="Editor.h" />
+    <ClInclude Include="framework.h" />
+    <ClInclude Include="FontSelect.h" />
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="targetver.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Editor.cpp" />
+    <ClCompile Include="FontSelect.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Editor.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="Editor.ico" />
+    <Image Include="small.ico" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/src/test/unit-tests/shared-data/cpp/cppshareddata.vcxproj b/windows/src/test/unit-tests/shared-data/cpp/cppshareddata.vcxproj
index 77f601a5c59..8c76a595a8c 100644
--- a/windows/src/test/unit-tests/shared-data/cpp/cppshareddata.vcxproj
+++ b/windows/src/test/unit-tests/shared-data/cpp/cppshareddata.vcxproj
@@ -1,176 +1,176 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{748219AC-3BDE-40FC-8E93-7516C4BCE81D}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>cppshareddata</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>false</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>false</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>false</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>false</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="cppshareddata.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{748219AC-3BDE-40FC-8E93-7516C4BCE81D}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>cppshareddata</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>false</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>false</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>false</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>false</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="cppshareddata.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file

From 2dc87f2e373ec35ceb4deaa057f15fac5ebac347 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 4 Nov 2025 10:06:42 +0100
Subject: [PATCH 102/254] refactor(web): move `isEmptyTransform` to
 @keymanapp/web-utils

---
 web/src/app/browser/src/configuration.ts               |  2 +-
 web/src/app/webview/src/contextManager.ts              |  4 ++--
 web/src/engine/common/web-utils/build.sh               |  1 +
 web/src/engine/common/web-utils/package.json           |  3 +++
 web/src/engine/common/web-utils/src/index.ts           |  2 ++
 .../engine/common/web-utils/src/isEmptyTransform.ts    | 10 ++++++++++
 web/src/engine/js-processor/src/outputTargetBase.ts    |  9 ---------
 web/src/engine/main/src/headless/inputProcessor.ts     |  3 +--
 web/src/engine/osk/src/visualKeyboard.ts               |  2 +-
 9 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 web/src/engine/common/web-utils/src/isEmptyTransform.ts

diff --git a/web/src/app/browser/src/configuration.ts b/web/src/app/browser/src/configuration.ts
index 0b01bbe130d..f76184dbd30 100644
--- a/web/src/app/browser/src/configuration.ts
+++ b/web/src/app/browser/src/configuration.ts
@@ -2,7 +2,7 @@ import { EngineConfiguration, InitOptionSpec, InitOptionDefaults } from "keyman/
 
 import { OutputTargetElementWrapper as DOMOutputTarget } from 'keyman/engine/element-wrappers';
 import { OutputTargetInterface, ProcessorAction } from 'keyman/engine/keyboard';
-import { isEmptyTransform } from 'keyman/engine/js-processor';
+import { isEmptyTransform } from '@keymanapp/web-utils';
 import { AlertHost } from "./utils/alertHost.js";
 import { whenDocumentReady } from "./utils/documentReady.js";
 
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index b2c52de00e3..bb8253587cb 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -1,11 +1,11 @@
 import { JSKeyboard, Keyboard, OutputTargetInterface, Transcription, TextTransform } from 'keyman/engine/keyboard';
 // TODO-web-core: remove usage of OutputTargetBase, use OutputTargetInterface instead
-import { Mock, findCommonSubstringEndIndex, isEmptyTransform, OutputTargetBase } from 'keyman/engine/js-processor';
+import { Mock, findCommonSubstringEndIndex, OutputTargetBase } from 'keyman/engine/js-processor';
 import { KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { ContextManagerBase } from 'keyman/engine/main';
 import { WebviewConfiguration } from './configuration.js';
 import { LexicalModelTypes } from '@keymanapp/common-types';
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString, isEmptyTransform } from '@keymanapp/web-utils';
 
 export type OnInsertTextFunc = (deleteLeft: number, text: string, deleteRight: number) => void;
 
diff --git a/web/src/engine/common/web-utils/build.sh b/web/src/engine/common/web-utils/build.sh
index 23d38cb9520..69b08cb2754 100755
--- a/web/src/engine/common/web-utils/build.sh
+++ b/web/src/engine/common/web-utils/build.sh
@@ -22,6 +22,7 @@ BUNDLE_CMD="node ${KEYMAN_ROOT}/web/src/tools/es-bundling/build/common-bundle.mj
 builder_describe \
   "Compiles the web-oriented utility function module." \
   "@/common/web/keyman-version" \
+  "@/common/web/types" \
   "@/web/src/tools/es-bundling" \
   clean configure build test
 
diff --git a/web/src/engine/common/web-utils/package.json b/web/src/engine/common/web-utils/package.json
index 557878d43e4..1df1836f75b 100644
--- a/web/src/engine/common/web-utils/package.json
+++ b/web/src/engine/common/web-utils/package.json
@@ -29,6 +29,9 @@
     "c8": "^7.12.0",
     "typescript": "^5.4.5"
   },
+  "dependencies": {
+    "@keymanapp/common-types": "*"
+  },
   "type": "module",
   "paths": {
     "@keymanapp/keyman-version": "*"
diff --git a/web/src/engine/common/web-utils/src/index.ts b/web/src/engine/common/web-utils/src/index.ts
index 30f48215900..343e1486e67 100644
--- a/web/src/engine/common/web-utils/src/index.ts
+++ b/web/src/engine/common/web-utils/src/index.ts
@@ -23,6 +23,8 @@ export { default as TimeoutPromise, timedPromise } from "./timeoutPromise.js";
 
 export { default as PriorityQueue, QueueComparator } from "./priority-queue.js"
 
+export { isEmptyTransform } from './isEmptyTransform.js';
+
 // // Uncomment the following line and run the bundled output to verify successful
 // // esbuild bundling of this submodule:
 // console.log(Version.CURRENT.toString());
diff --git a/web/src/engine/common/web-utils/src/isEmptyTransform.ts b/web/src/engine/common/web-utils/src/isEmptyTransform.ts
new file mode 100644
index 00000000000..db48d1d7c5e
--- /dev/null
+++ b/web/src/engine/common/web-utils/src/isEmptyTransform.ts
@@ -0,0 +1,10 @@
+import { LexicalModelTypes } from '@keymanapp/common-types';
+
+// Also relies on string-extensions provided by the web-utils package.
+
+export function isEmptyTransform(transform: LexicalModelTypes.Transform) {
+  if (!transform) {
+    return true;
+  }
+  return transform.insert === '' && transform.deleteLeft === 0 && (transform.deleteRight ?? 0) === 0;
+}
diff --git a/web/src/engine/js-processor/src/outputTargetBase.ts b/web/src/engine/js-processor/src/outputTargetBase.ts
index eca7c6766a9..a5ed2c22273 100644
--- a/web/src/engine/js-processor/src/outputTargetBase.ts
+++ b/web/src/engine/js-processor/src/outputTargetBase.ts
@@ -8,15 +8,6 @@ import { type KeyEvent } from 'keyman/engine/keyboard';
 import { Deadkey, DeadkeyTracker } from "./deadkeys.js";
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
-// Also relies on string-extensions provided by the web-utils package.
-
-export function isEmptyTransform(transform: LexicalModelTypes.Transform) {
-  if(!transform) {
-    return true;
-  }
-  return transform.insert === '' && transform.deleteLeft === 0 && (transform.deleteRight ?? 0) === 0;
-}
-
 export abstract class OutputTargetBase implements OutputTargetInterface {
   private _dks: DeadkeyTracker;
 
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index 90ce1787b2e..70a0f8105fe 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -3,7 +3,7 @@
 import ContextWindow from "./contextWindow.js";
 import { LanguageProcessor }  from "./languageProcessor.js";
 import type { ModelSpec, PathConfiguration }  from "keyman/engine/interfaces";
-import { globalObject, DeviceSpec } from "@keymanapp/web-utils";
+import { globalObject, DeviceSpec, isEmptyTransform } from "@keymanapp/web-utils";
 
 import { KM_Core } from 'keyman/engine/core-processor';
 
@@ -20,7 +20,6 @@ import {
 } from "keyman/engine/keyboard";
 // TODO-web-core: remove usage of OutputTargetBase
 import {
-  isEmptyTransform,
   JSKeyboardProcessor,
   Mock,
   type ProcessorInitOptions,
diff --git a/web/src/engine/osk/src/visualKeyboard.ts b/web/src/engine/osk/src/visualKeyboard.ts
index 6985edf1927..124fedfcfcb 100644
--- a/web/src/engine/osk/src/visualKeyboard.ts
+++ b/web/src/engine/osk/src/visualKeyboard.ts
@@ -15,7 +15,7 @@ import {
   timedPromise,
   ActiveKeyBase
 } from 'keyman/engine/keyboard';
-import { isEmptyTransform } from 'keyman/engine/js-processor';
+import { isEmptyTransform } from '@keymanapp/web-utils';
 
 import { buildCorrectiveLayout } from './correctionLayout.js';
 import { distributionFromDistanceMaps, keyTouchDistances } from './corrections.js';

From 71ed528fc829566ff439cd4c0b38d3b9de061bd0 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 4 Nov 2025 10:34:56 +0100
Subject: [PATCH 103/254] refactor(web): move files from js-processor to
 keyboard

This change moves
- deadkeys.ts
- mock.ts
- outputTargetBase.ts
- stringDivergence.ts

OutputTarget is the same regardless of whether it's a JS or KMX keyboard.
---
 web/src/app/webview/src/contextManager.ts     |  3 +-
 .../src/outputTargetElementWrapper.ts         |  2 +-
 web/src/engine/js-processor/src/index.ts      |  5 --
 .../js-processor/src/jsKeyboardInterface.ts   |  8 ++--
 .../js-processor/src/jsKeyboardProcessor.ts   |  4 +-
 .../src/deadkeys.ts                           |  0
 web/src/engine/keyboard/src/index.ts          |  5 ++
 .../{js-processor => keyboard}/src/mock.ts    |  0
 .../src/outputTargetBase.ts                   |  0
 .../src/stringDivergence.ts                   |  0
 .../engine/main/src/headless/contextWindow.ts |  2 +-
 .../main/src/headless/inputProcessor.ts       | 10 ++--
 .../main/src/headless/languageProcessor.ts    |  3 +-
 web/src/engine/main/src/keymanEngineBase.ts   |  4 +-
 .../element_interfaces.tests.ts               |  3 +-
 .../element-wrappers/target_mocks.tests.ts    |  3 +-
 .../cases/keyboard/domKeyboardLoader.tests.ts |  4 +-
 .../prediction/predictionContext.tests.js     |  3 +-
 .../js-processor/bundled-module.tests.js      | 47 ++++++++++---------
 .../js-processor/engine/context.tests.js      |  8 ++--
 .../engine/notany_context.tests.js            |  4 +-
 .../engine/js-processor/kbdInterface.tests.ts |  4 +-
 .../non-positional-rules.tests.js             |  4 +-
 .../specialized-backspace.tests.js            |  4 +-
 .../js-processor/transcriptions.tests.js      |  2 +-
 .../engine/keyboard/keyboard-loading.tests.js |  4 +-
 .../keyboard/keyboardLoaderBase.tests.ts      |  4 +-
 .../{js-processor => keyboard}/mocks.tests.js |  2 +-
 .../main/headless/inputProcessor.tests.js     |  4 +-
 .../main/headless/languageProcessor.tests.js  |  2 +-
 .../tools/testing/recorder-core/src/index.ts  |  3 +-
 .../testing/recorder-core/src/nodeProctor.ts  |  4 +-
 32 files changed, 73 insertions(+), 82 deletions(-)
 rename web/src/engine/{js-processor => keyboard}/src/deadkeys.ts (100%)
 rename web/src/engine/{js-processor => keyboard}/src/mock.ts (100%)
 rename web/src/engine/{js-processor => keyboard}/src/outputTargetBase.ts (100%)
 rename web/src/engine/{js-processor => keyboard}/src/stringDivergence.ts (100%)
 rename web/src/test/auto/headless/engine/{js-processor => keyboard}/mocks.tests.js (98%)

diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index bb8253587cb..41623cecd57 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -1,6 +1,5 @@
-import { JSKeyboard, Keyboard, OutputTargetInterface, Transcription, TextTransform } from 'keyman/engine/keyboard';
+import { JSKeyboard, Keyboard, OutputTargetInterface, Transcription, TextTransform, Mock, findCommonSubstringEndIndex, OutputTargetBase } from 'keyman/engine/keyboard';
 // TODO-web-core: remove usage of OutputTargetBase, use OutputTargetInterface instead
-import { Mock, findCommonSubstringEndIndex, OutputTargetBase } from 'keyman/engine/js-processor';
 import { KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { ContextManagerBase } from 'keyman/engine/main';
 import { WebviewConfiguration } from './configuration.js';
diff --git a/web/src/engine/element-wrappers/src/outputTargetElementWrapper.ts b/web/src/engine/element-wrappers/src/outputTargetElementWrapper.ts
index 4fd4771a60f..59104f41e28 100644
--- a/web/src/engine/element-wrappers/src/outputTargetElementWrapper.ts
+++ b/web/src/engine/element-wrappers/src/outputTargetElementWrapper.ts
@@ -1,4 +1,4 @@
-import { OutputTargetBase } from "keyman/engine/js-processor";
+import { OutputTargetBase } from "keyman/engine/keyboard";
 import { EventEmitter } from 'eventemitter3';
 
 export abstract class OutputTargetElementWrapper<EventMap extends EventEmitter.ValidEventTypes> extends OutputTargetBase {
diff --git a/web/src/engine/js-processor/src/index.ts b/web/src/engine/js-processor/src/index.ts
index 8968212c2f0..67443d44bf3 100644
--- a/web/src/engine/js-processor/src/index.ts
+++ b/web/src/engine/js-processor/src/index.ts
@@ -1,8 +1,3 @@
 export { BeepHandler, JSKeyboardProcessor, LogMessageHandler, ProcessorInitOptions } from "./jsKeyboardProcessor.js";
 export { JSKeyboardInterface, KeyInformation, StoreNonCharEntry } from "./jsKeyboardInterface.js";
-export * from "./deadkeys.js";
 export { type ComplexKeyboardStore } from "./stores.js";
-export { OutputTargetBase } from "./outputTargetBase.js";
-export * from "./outputTargetBase.js";
-export { Mock } from "./mock.js";
-export * from "./stringDivergence.js";
diff --git a/web/src/engine/js-processor/src/jsKeyboardInterface.ts b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
index b365ecf4bc4..8eeeee6d87f 100644
--- a/web/src/engine/js-processor/src/jsKeyboardInterface.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
@@ -13,19 +13,19 @@ import {
   KeyboardHarness,
   KeyboardKeymanGlobal,
   KeyMapping,
+  Mock,
   MutableSystemStore,
+  ProcessorAction,
   SystemStore,
   SystemStoreIDs,
+  type Deadkey,
   type KeyEvent,
+  type OutputTargetBase,
   type OutputTargetInterface,
-  ProcessorAction,
   VariableStore,
   VariableStoreDictionary,
   VariableStoreSerializer,
 } from "keyman/engine/keyboard";
-import { type OutputTargetBase }  from './outputTargetBase.js';
-import { type Deadkey } from './deadkeys.js';
-import { Mock } from "./mock.js";
 import { PlatformSystemStore } from './platformSystemStore.js';
 import { ComplexKeyboardStore, type KeyboardStore, KeyboardStoreElement } from "./stores.js";
 
diff --git a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
index a3cac3aec95..8650114c47e 100644
--- a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
@@ -11,10 +11,8 @@ import { ModifierKeyConstants } from '@keymanapp/common-types';
 import {
   Codes, type JSKeyboard, MinimalKeymanGlobal, KeyEvent, Layouts,
   DefaultRules, EmulationKeystrokes, type MutableSystemStore,
-  OutputTargetInterface, ProcessorAction, SystemStoreIDs
+  OutputTargetInterface, ProcessorAction, SystemStoreIDs, Mock, type OutputTargetBase
 } from "keyman/engine/keyboard";
-import { Mock } from "./mock.js";
-import { type OutputTargetBase }  from "./outputTargetBase.js";
 import { JSKeyboardInterface }  from './jsKeyboardInterface.js';
 import { DeviceSpec, globalObject, KMWString } from "@keymanapp/web-utils";
 
diff --git a/web/src/engine/js-processor/src/deadkeys.ts b/web/src/engine/keyboard/src/deadkeys.ts
similarity index 100%
rename from web/src/engine/js-processor/src/deadkeys.ts
rename to web/src/engine/keyboard/src/deadkeys.ts
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index 03987bceafb..2c43192690d 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -33,6 +33,11 @@ export { OutputTargetInterface } from "./outputTargetInterface.js";
 export { type SystemStoreMutationHandler, MutableSystemStore, SystemStore, SystemStoreIDs, type SystemStoreDictionary } from "./systemStore.js";
 export { type VariableStore, VariableStoreSerializer, VariableStoreDictionary } from "./variableStore.js";
 
+export { Mock } from "./mock.js";
+export { OutputTargetBase } from "./outputTargetBase.js";
+export { findCommonSubstringEndIndex } from "./stringDivergence.js";
+export { Deadkey } from "./deadkeys.js";
+
 export * from "@keymanapp/web-utils";
 
 // At the top level, there should be no default export.
diff --git a/web/src/engine/js-processor/src/mock.ts b/web/src/engine/keyboard/src/mock.ts
similarity index 100%
rename from web/src/engine/js-processor/src/mock.ts
rename to web/src/engine/keyboard/src/mock.ts
diff --git a/web/src/engine/js-processor/src/outputTargetBase.ts b/web/src/engine/keyboard/src/outputTargetBase.ts
similarity index 100%
rename from web/src/engine/js-processor/src/outputTargetBase.ts
rename to web/src/engine/keyboard/src/outputTargetBase.ts
diff --git a/web/src/engine/js-processor/src/stringDivergence.ts b/web/src/engine/keyboard/src/stringDivergence.ts
similarity index 100%
rename from web/src/engine/js-processor/src/stringDivergence.ts
rename to web/src/engine/keyboard/src/stringDivergence.ts
diff --git a/web/src/engine/main/src/headless/contextWindow.ts b/web/src/engine/main/src/headless/contextWindow.ts
index 4829263c7a3..964fea5e20a 100644
--- a/web/src/engine/main/src/headless/contextWindow.ts
+++ b/web/src/engine/main/src/headless/contextWindow.ts
@@ -1,5 +1,5 @@
 import { LexicalModelTypes } from '@keymanapp/common-types';
-import { Mock } from "keyman/engine/js-processor";
+import { Mock } from "keyman/engine/keyboard";
 import { KMWString } from '@keymanapp/web-utils';
 
 export default class ContextWindow implements LexicalModelTypes.Context {
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index 70a0f8105fe..2fd151e0ee0 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -8,22 +8,22 @@ import { globalObject, DeviceSpec, isEmptyTransform } from "@keymanapp/web-utils
 import { KM_Core } from 'keyman/engine/core-processor';
 
 import {
-  type Alternate,
   Codes,
   JSKeyboard,
   KeyboardMinimalInterface,
+  Mock,
+  OutputTargetBase,
+  ProcessorAction,
+  SystemStoreIDs,
+  type Alternate,
   type Keyboard,
   type KeyEvent,
   type OutputTargetInterface,
-  ProcessorAction,
-  SystemStoreIDs
 } from "keyman/engine/keyboard";
 // TODO-web-core: remove usage of OutputTargetBase
 import {
   JSKeyboardProcessor,
-  Mock,
   type ProcessorInitOptions,
-  OutputTargetBase
 } from 'keyman/engine/js-processor';
 
 import { TranscriptionCache } from "./transcriptionCache.js";
diff --git a/web/src/engine/main/src/headless/languageProcessor.ts b/web/src/engine/main/src/headless/languageProcessor.ts
index f3029adf640..0751da27897 100644
--- a/web/src/engine/main/src/headless/languageProcessor.ts
+++ b/web/src/engine/main/src/headless/languageProcessor.ts
@@ -1,8 +1,7 @@
 import { EventEmitter } from "eventemitter3";
 import { LMLayer, WorkerFactory } from "@keymanapp/lexical-model-layer/web";
 // TODO-web-core: remove use of OutputTargetBase
-import { Mock, OutputTargetBase } from "keyman/engine/js-processor";
-import { Transcription, OutputTargetInterface } from 'keyman/engine/keyboard';
+import { Transcription, OutputTargetInterface, Mock, OutputTargetBase } from 'keyman/engine/keyboard';
 import { LanguageProcessorEventMap, ModelSpec, StateChangeEnum, ReadySuggestions } from 'keyman/engine/interfaces';
 import ContextWindow from "./contextWindow.js";
 import { TranscriptionCache } from "./transcriptionCache.js";
diff --git a/web/src/engine/main/src/keymanEngineBase.ts b/web/src/engine/main/src/keymanEngineBase.ts
index 37acf96f2aa..3c88582daaf 100644
--- a/web/src/engine/main/src/keymanEngineBase.ts
+++ b/web/src/engine/main/src/keymanEngineBase.ts
@@ -1,6 +1,6 @@
-import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction } from "keyman/engine/keyboard";
+import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction, OutputTargetBase } from "keyman/engine/keyboard";
 // TODO-web-core: remove usage of OutputTargetBase
-import { OutputTargetBase, ProcessorInitOptions } from 'keyman/engine/js-processor';
+import { ProcessorInitOptions } from 'keyman/engine/js-processor';
 import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard/dom-keyboard-loader";
 import { WorkerFactory } from "@keymanapp/lexical-model-layer/web"
 import { InputProcessor } from './headless/inputProcessor.js';
diff --git a/web/src/test/auto/dom/cases/element-wrappers/element_interfaces.tests.ts b/web/src/test/auto/dom/cases/element-wrappers/element_interfaces.tests.ts
index 47c82d37d9d..99997f14d4a 100644
--- a/web/src/test/auto/dom/cases/element-wrappers/element_interfaces.tests.ts
+++ b/web/src/test/auto/dom/cases/element-wrappers/element_interfaces.tests.ts
@@ -1,7 +1,6 @@
 import { assert } from 'chai';
 
-import { KMWString } from 'keyman/engine/keyboard';
-import { Mock } from 'keyman/engine/js-processor';
+import { KMWString, Mock } from 'keyman/engine/keyboard';
 import * as wrappers from 'keyman/engine/element-wrappers';
 
 import { DynamicElements } from '../../test_utils.js';
diff --git a/web/src/test/auto/dom/cases/element-wrappers/target_mocks.tests.ts b/web/src/test/auto/dom/cases/element-wrappers/target_mocks.tests.ts
index 8e13bd94954..5dc46da4226 100644
--- a/web/src/test/auto/dom/cases/element-wrappers/target_mocks.tests.ts
+++ b/web/src/test/auto/dom/cases/element-wrappers/target_mocks.tests.ts
@@ -1,7 +1,6 @@
 import { assert } from 'chai';
 
-import { KMWString } from 'keyman/engine/keyboard';
-import { Mock } from 'keyman/engine/js-processor';
+import { KMWString, Mock } from 'keyman/engine/keyboard';
 import { Input } from 'keyman/engine/element-wrappers';
 
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
diff --git a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
index 38db889f61d..8cc5493d4eb 100644
--- a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
+++ b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
@@ -1,8 +1,8 @@
 import { assert } from 'chai';
 
 import { DOMKeyboardLoader } from 'keyman/engine/keyboard/dom-keyboard-loader';
-import { KeyboardHarness, JSKeyboard, MinimalKeymanGlobal, DeviceSpec, KeyboardKeymanGlobal, KeyboardDownloadError, KeyboardScriptError, Keyboard } from 'keyman/engine/keyboard';
-import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { KeyboardHarness, JSKeyboard, MinimalKeymanGlobal, DeviceSpec, KeyboardKeymanGlobal, KeyboardDownloadError, KeyboardScriptError, Keyboard, Mock } from 'keyman/engine/keyboard';
+import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { assertThrowsAsync } from 'keyman/tools/testing/test-utils';
 
 declare let window: typeof globalThis;
diff --git a/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js b/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
index 6ec7a0bbd9c..96b8d98a262 100644
--- a/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
+++ b/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
@@ -4,8 +4,7 @@ import sinon from 'sinon';
 import { LanguageProcessor, TranscriptionCache } from 'keyman/engine/main';
 import { PredictionContext } from 'keyman/engine/interfaces';
 import { Worker as LMWorker } from "@keymanapp/lexical-model-layer/node";
-import { DeviceSpec } from 'keyman/engine/keyboard';
-import { Mock } from 'keyman/engine/js-processor';
+import { DeviceSpec, Mock } from 'keyman/engine/keyboard';
 
 function compileDummyModel(suggestionSets) {
   return `
diff --git a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
index 8b7c4d9588f..0eceada34ef 100644
--- a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
@@ -1,7 +1,7 @@
 import { assert } from "chai";
-import * as Package from "keyman/engine/js-processor";
-import * as Package2 from "keyman/engine/keyboard";
-const KMWString = Package2.KMWString;
+import * as JSProcessorPackage from "keyman/engine/js-processor";
+import * as KeyboardPackage from "keyman/engine/keyboard";
+const KMWString = KeyboardPackage.KMWString;
 
 // A few small tests to ensure that the ES Module bundle was successfully constructed and is usable.
 
@@ -17,14 +17,31 @@ let u = toSupplementaryPairString;
 describe('Bundled ES Module for js-processor', function() {
   describe('JSKeyboardProcessor', function () {
     it('should initialize without errors', function () {
-      let kp = new Package.JSKeyboardProcessor();
+      let kp = new JSProcessorPackage.JSKeyboardProcessor();
       assert.isNotNull(kp);
     });
   });
 
+});
+
+describe('Bundled ES Module for keyboard', function () {
+  describe('Keyboard', function () {
+    it('should initialize without errors', function () {
+      let kp = new KeyboardPackage.JSKeyboard();
+      assert.isNotNull(kp);
+    });
+  });
+
+  describe("Imported `utils`", function () {
+    it("should include `utils` package's Version class", () => {
+      let v16 = new KeyboardPackage.Version([16, 1]);
+      assert.equal(v16.toString(), "16.1");
+    });
+  });
+
   describe('Mock', () => {
     it('basic functionality test', () => {
-      let target = new Package.Mock("aple", 2);  // ap | le
+      let target = new KeyboardPackage.Mock("aple", 2);  // ap | le
       target.insertTextBeforeCaret('p');
       assert.equal(target.getText(), "apple");
     });
@@ -32,28 +49,12 @@ describe('Bundled ES Module for js-processor', function() {
     it('smp test', () => {
       KMWString.enableSupplementaryPlane(true); // Declared & defined in web-utils.
       try {
-        let target = new Package.Mock(u(0x1d5ba)+u(0x1d5c9)+u(0x1d5c5)+u(0x1d5be), 2);  // ap | le
+        let target = new KeyboardPackage.Mock(u(0x1d5ba) + u(0x1d5c9) + u(0x1d5c5) + u(0x1d5be), 2);  // ap | le
         target.insertTextBeforeCaret(u(0x1d5c9));
-        assert.equal(target.getText(), u(0x1d5ba)+u(0x1d5c9)+u(0x1d5c9)+u(0x1d5c5)+u(0x1d5be));
+        assert.equal(target.getText(), u(0x1d5ba) + u(0x1d5c9) + u(0x1d5c9) + u(0x1d5c5) + u(0x1d5be));
       } finally {
         KMWString.enableSupplementaryPlane(false);
       }
     });
   });
 });
-
-describe('Bundled ES Module for keyboard', function () {
-  describe('Keyboard', function () {
-    it('should initialize without errors', function () {
-      let kp = new Package2.JSKeyboard();
-      assert.isNotNull(kp);
-    });
-  });
-
-  describe("Imported `utils`", function () {
-    it("should include `utils` package's Version class", () => {
-      let v16 = new Package2.Version([16, 1]);
-      assert.equal(v16.toString(), "16.1");
-    });
-  });
-});
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
index 4469194a6dd..813f699b1e3 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
@@ -3,8 +3,8 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { JSKeyboardInterface, JSKeyboardProcessor, Mock } from 'keyman/engine/js-processor';
+import { MinimalKeymanGlobal, Mock } from 'keyman/engine/keyboard';
+import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
 import { NodeProctor, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
@@ -882,7 +882,7 @@ var NUL_TEST_2 = {
 /* Keyman language equivalent:
  *
  * nul nul any(abc) context(3) > 'success'
- * 
+ *
  * This one may... "stretch" what's actually allowed by Keyman language rules,
  * but we wish to ensure that the actual context management is capable of
  * handling this.
@@ -925,7 +925,7 @@ var NUL_TEST_3 = {
 /* Keyman language equivalent:
  *
  * nul nul dk(1) any(abc) > 'success'
- * 
+ *
  * This may also "stretch" what's actually allowed by Keyman language rules,
  * but we wish to ensure that the actual context management is capable of
  * handling this.
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
index 8264de4efea..840de72cb09 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
@@ -3,8 +3,8 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { MinimalKeymanGlobal, Mock } from 'keyman/engine/keyboard';
+import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { NodeProctor, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
 
diff --git a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
index b8a68dd55c2..d3f75964c55 100644
--- a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
+++ b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
@@ -3,8 +3,8 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { DeviceSpec, JSKeyboard, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { DeviceSpec, JSKeyboard, MinimalKeymanGlobal, Mock } from 'keyman/engine/keyboard';
+import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
 describe('Headless keyboard loading', function () {
diff --git a/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js b/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
index 1d320e0b936..a041880bb07 100644
--- a/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
@@ -4,8 +4,8 @@ import { ModifierKeyConstants } from '@keymanapp/common-types';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { Codes, KeyEvent, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { Codes, KeyEvent, MinimalKeymanGlobal, Mock } from 'keyman/engine/keyboard';
+import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
 // Compare and contrast the unit tests here with those for app/browser key-event unit testing
diff --git a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
index 0d573ad3703..a1a2d1b2290 100644
--- a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
@@ -5,8 +5,8 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { KMWString } from '@keymanapp/web-utils';
-import { Codes, KeyEvent, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { JSKeyboardInterface, JSKeyboardProcessor, Mock } from 'keyman/engine/js-processor';
+import { Codes, KeyEvent, MinimalKeymanGlobal, Mock } from 'keyman/engine/keyboard';
+import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
diff --git a/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js b/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js
index d21cc54c442..8f81f0d3628 100644
--- a/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { Mock, findCommonSubstringEndIndex } from 'keyman/engine/js-processor';
+import { Mock, findCommonSubstringEndIndex } from 'keyman/engine/keyboard';
 import { KMWString } from '@keymanapp/web-utils';
 
 // A unicode-coding like alias for use in constructing non-BMP strings.
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js b/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
index f319b207316..e789f6bf518 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
@@ -3,8 +3,8 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { KeyboardHarness, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { KeyboardHarness, MinimalKeymanGlobal, Mock } from 'keyman/engine/keyboard';
+import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
 describe('Headless keyboard loading', function() {
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
index 76d5fdc1b1c..232293fbc29 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
@@ -3,8 +3,8 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { KeyboardHarness, MinimalKeymanGlobal, KeyboardDownloadError, DeviceSpec, InvalidKeyboardError, JSKeyboard } from 'keyman/engine/keyboard';
-import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { KeyboardHarness, MinimalKeymanGlobal, KeyboardDownloadError, DeviceSpec, InvalidKeyboardError, JSKeyboard, Mock } from 'keyman/engine/keyboard';
+import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { assertThrowsAsync, assertThrows } from 'keyman/tools/testing/test-utils';
 
diff --git a/web/src/test/auto/headless/engine/js-processor/mocks.tests.js b/web/src/test/auto/headless/engine/keyboard/mocks.tests.js
similarity index 98%
rename from web/src/test/auto/headless/engine/js-processor/mocks.tests.js
rename to web/src/test/auto/headless/engine/keyboard/mocks.tests.js
index bad81bfcca4..b02f259886f 100644
--- a/web/src/test/auto/headless/engine/js-processor/mocks.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard/mocks.tests.js
@@ -1,5 +1,5 @@
 import { assert } from 'chai';
-import { Mock } from 'keyman/engine/js-processor';
+import { Mock } from 'keyman/engine/keyboard';
 
 describe('Mocks', function() {
   describe('app|les', () => {
diff --git a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
index eafd740ced3..d5b8eb1d867 100644
--- a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
@@ -5,8 +5,8 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { InputProcessor } from 'keyman/engine/main';
-import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
-import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
+import { JSKeyboardInterface } from 'keyman/engine/js-processor';
+import { MinimalKeymanGlobal, Mock } from 'keyman/engine/keyboard';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest } from '@keymanapp/recorder-core';
 
diff --git a/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
index 5707fb31f77..4fc2b0d9bd3 100644
--- a/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
@@ -2,7 +2,7 @@ import { assert } from 'chai';
 
 import { LanguageProcessor, TranscriptionCache } from 'keyman/engine/main';
 import { SourcemappedWorker as LMWorker } from "@keymanapp/lexical-model-layer/node";
-import { Mock } from 'keyman/engine/js-processor';
+import { Mock } from 'keyman/engine/keyboard';
 
 /*
  * Unit tests for the Dummy prediction model.
diff --git a/web/src/tools/testing/recorder-core/src/index.ts b/web/src/tools/testing/recorder-core/src/index.ts
index 60ab11a8431..131621fc1d1 100644
--- a/web/src/tools/testing/recorder-core/src/index.ts
+++ b/web/src/tools/testing/recorder-core/src/index.ts
@@ -1,5 +1,4 @@
-import { Mock } from "keyman/engine/js-processor";
-import { KeyDistribution, KeyEvent, type OutputTargetInterface } from "keyman/engine/keyboard";
+import { KeyDistribution, KeyEvent, type OutputTargetInterface, Mock } from "keyman/engine/keyboard";
 
 import Proctor from "./proctor.js";
 
diff --git a/web/src/tools/testing/recorder-core/src/nodeProctor.ts b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
index 72980a528f5..52882e95a6e 100644
--- a/web/src/tools/testing/recorder-core/src/nodeProctor.ts
+++ b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
@@ -8,9 +8,7 @@ import {
   RecordedSyntheticKeystroke
 } from "./index.js";
 
-import { KeyEvent, KeyEventSpec, KeyboardHarness, type OutputTargetInterface } from "keyman/engine/keyboard";
-// TODO-web-core: remove usage of OutputTargetBase, use OutputTargetInterface instead
-import { Mock, OutputTargetBase } from 'keyman/engine/js-processor';
+import { KeyEvent, KeyEventSpec, KeyboardHarness, type OutputTargetInterface, Mock, OutputTargetBase } from "keyman/engine/keyboard";
 import { DeviceSpec } from "@keymanapp/web-utils";
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 

From dce103bed2bac029ff456338aef63160b9bf3187 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 4 Nov 2025 10:58:12 +0100
Subject: [PATCH 104/254] =?UTF-8?q?refactor(web):=20rename=20`OutputTarget?=
 =?UTF-8?q?Interface`=20=E2=86=92=20`OutputTargetBase`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/app/browser/src/configuration.ts      |   4 +-
 .../app/browser/src/defaultBrowserRules.ts    |   4 +-
 web/src/app/webview/src/contextManager.ts     |   7 +-
 .../attachment/src/outputTargetForElement.ts  |   6 +-
 .../prediction/languageProcessor.interface.ts |  12 +-
 .../src/prediction/predictionContext.ts       |   8 +-
 .../js-processor/src/jsKeyboardInterface.ts   |  39 +++----
 .../js-processor/src/jsKeyboardProcessor.ts   |   6 +-
 web/src/engine/keyboard/src/defaultRules.ts   |   4 +-
 web/src/engine/keyboard/src/index.ts          |   1 -
 .../keyboard/src/keyboards/jsKeyboard.ts      |  12 +-
 .../keyboard/src/keyboards/transcription.ts   |   6 +-
 web/src/engine/keyboard/src/mock.ts           |   5 +-
 .../engine/keyboard/src/outputTargetBase.ts   |   9 +-
 .../keyboard/src/outputTargetInterface.ts     | 108 ------------------
 web/src/engine/main/src/contextManagerBase.ts |  20 ++--
 .../engine/main/src/engineConfiguration.ts    |   4 +-
 .../main/src/headless/inputProcessor.ts       |   8 +-
 .../main/src/headless/languageProcessor.ts    |  17 ++-
 web/src/engine/main/src/keymanEngineBase.ts   |   1 -
 .../tools/testing/recorder-core/src/index.ts  |   4 +-
 .../testing/recorder-core/src/nodeProctor.ts  |   4 +-
 .../testing/recorder-core/src/proctor.ts      |   4 +-
 .../tools/testing/recorder/browserProctor.ts  |   4 +-
 24 files changed, 91 insertions(+), 206 deletions(-)
 delete mode 100644 web/src/engine/keyboard/src/outputTargetInterface.ts

diff --git a/web/src/app/browser/src/configuration.ts b/web/src/app/browser/src/configuration.ts
index f76184dbd30..faa24c577cb 100644
--- a/web/src/app/browser/src/configuration.ts
+++ b/web/src/app/browser/src/configuration.ts
@@ -1,7 +1,7 @@
 import { EngineConfiguration, InitOptionSpec, InitOptionDefaults } from "keyman/engine/main";
 
 import { OutputTargetElementWrapper as DOMOutputTarget } from 'keyman/engine/element-wrappers';
-import { OutputTargetInterface, ProcessorAction } from 'keyman/engine/keyboard';
+import { OutputTargetBase, ProcessorAction } from 'keyman/engine/keyboard';
 import { isEmptyTransform } from '@keymanapp/web-utils';
 import { AlertHost } from "./utils/alertHost.js";
 import { whenDocumentReady } from "./utils/documentReady.js";
@@ -66,7 +66,7 @@ export class BrowserConfiguration extends EngineConfiguration {
     return baseReport;
   }
 
-  onRuleFinalization(ruleBehavior: ProcessorAction, outputTarget: OutputTargetInterface) {
+  onRuleFinalization(ruleBehavior: ProcessorAction, outputTarget: OutputTargetBase) {
     // TODO: Patch up to modularized form.  But that doesn't exist yet for some of these...
 
     // If the transform isn't empty, we've changed text - which should produce a 'changed' event in the DOM.
diff --git a/web/src/app/browser/src/defaultBrowserRules.ts b/web/src/app/browser/src/defaultBrowserRules.ts
index ec87f459d4c..fd068e90c10 100644
--- a/web/src/app/browser/src/defaultBrowserRules.ts
+++ b/web/src/app/browser/src/defaultBrowserRules.ts
@@ -3,7 +3,7 @@ import {
   Codes,
   DefaultRules,
   type KeyEvent,
-  type OutputTargetInterface
+  type OutputTargetBase
 } from 'keyman/engine/keyboard';
 
 import ContextManager from './contextManager.js';
@@ -32,7 +32,7 @@ export default class DefaultBrowserRules extends DefaultRules {
   /**
    * applyCommand - used when a ProcessorAction represents a non-text "command" within the Engine.
    */
-  applyCommand(Lkc: KeyEvent, outputTarget: OutputTargetInterface): void {
+  applyCommand(Lkc: KeyEvent, outputTarget: OutputTargetBase): void {
     const code = this.codeForEvent(Lkc);
 
     const moveToNext = (back: boolean) => {
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index 41623cecd57..1c5e14094a4 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -1,5 +1,4 @@
-import { JSKeyboard, Keyboard, OutputTargetInterface, Transcription, TextTransform, Mock, findCommonSubstringEndIndex, OutputTargetBase } from 'keyman/engine/keyboard';
-// TODO-web-core: remove usage of OutputTargetBase, use OutputTargetInterface instead
+import { JSKeyboard, Keyboard, OutputTargetBase, Transcription, TextTransform, Mock, findCommonSubstringEndIndex } from 'keyman/engine/keyboard';
 import { KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { ContextManagerBase } from 'keyman/engine/main';
 import { WebviewConfiguration } from './configuration.js';
@@ -59,7 +58,7 @@ export class ContextHost extends Mock {
     this.savedState = Mock.from(this);
   }
 
-  restoreTo(original: OutputTargetInterface): void {
+  restoreTo(original: OutputTargetBase): void {
     this.savedState = Mock.from(this);
     // TODO-web-core
     super.restoreTo(original as OutputTargetBase);
@@ -139,7 +138,7 @@ export default class ContextManager extends ContextManagerBase<WebviewConfigurat
     return this._activeKeyboard;
   }
 
-  activateKeyboardForTarget(kbd: { keyboard: JSKeyboard, metadata: KeyboardStub }, target: OutputTargetInterface) {
+  activateKeyboardForTarget(kbd: { keyboard: JSKeyboard, metadata: KeyboardStub }, target: OutputTargetBase) {
     // `target` is irrelevant for `app/webview`, as it'll only ever use 'global' keyboard settings.
 
     // Clone the object to prevent accidental by-reference changes.
diff --git a/web/src/engine/attachment/src/outputTargetForElement.ts b/web/src/engine/attachment/src/outputTargetForElement.ts
index 7ed98e9fb2b..89ce3866797 100644
--- a/web/src/engine/attachment/src/outputTargetForElement.ts
+++ b/web/src/engine/attachment/src/outputTargetForElement.ts
@@ -2,7 +2,7 @@ import { nestedInstanceOf } from "keyman/engine/element-wrappers";
 
 /**
  * Given a DOM event related to an KMW-attached element, this function determines
- * the corresponding OutputTargetInterface.
+ * the corresponding OutputTargetBase.
  * @param e
  * @returns
  */
@@ -13,7 +13,7 @@ export function eventOutputTarget(e: Event) {
 
 /**
  * Given a DOM event related to an KMW-attached element, this function determines
- * the corresponding OutputTargetInterface.
+ * the corresponding OutputTargetBase.
  * @param e
  * @returns
  */
@@ -42,7 +42,7 @@ export function outputTargetForElement(Ltarg: HTMLElement) {
     }
   }
 
-  // Step 2:  With the most likely host element determined, obtain the corresponding OutputTargetInterface
+  // Step 2:  With the most likely host element determined, obtain the corresponding OutputTargetBase
   // instance.
   return Ltarg._kmwAttachment?.interface;
 }
\ No newline at end of file
diff --git a/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts b/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
index d0b71f3842d..5d9745726b1 100644
--- a/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
+++ b/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
@@ -1,6 +1,6 @@
 import { LexicalModelTypes } from '@keymanapp/common-types';
 import { EventEmitter } from "eventemitter3";
-import { OutputTargetInterface } from "keyman/engine/keyboard";
+import { OutputTargetBase } from "keyman/engine/keyboard";
 
 export class ReadySuggestions {
   suggestions: LexicalModelTypes.Suggestion[];
@@ -45,10 +45,10 @@ export interface LanguageProcessorEventMap {
   /**
    * Is called synchronously once suggestion application is successful and the context has been updated.
    *
-   * @param outputTarget The `OutputTargetInterface` representation of the context the suggestion was applied to.
+   * @param outputTarget The `OutputTargetBase` representation of the context the suggestion was applied to.
    * @returns
    */
-  'suggestionapplied': (outputTarget: OutputTargetInterface) => boolean
+  'suggestionapplied': (outputTarget: OutputTargetBase) => boolean
 }
 
 
@@ -56,7 +56,7 @@ export interface LanguageProcessorSpec extends EventEmitter<LanguageProcessorEve
 
   get state(): StateChangeEnum;
 
-  invalidateContext(outputTarget: OutputTargetInterface, layerId: string): Promise<LexicalModelTypes.Suggestion[]>;
+  invalidateContext(outputTarget: OutputTargetBase, layerId: string): Promise<LexicalModelTypes.Suggestion[]>;
 
   /**
    *
@@ -66,9 +66,9 @@ export interface LanguageProcessorSpec extends EventEmitter<LanguageProcessorEve
    *                        required because layerid can be changed by PostKeystroke
    * @returns
    */
-  applySuggestion(suggestion: LexicalModelTypes.Suggestion, outputTarget: OutputTargetInterface, getLayerId: () => string): Promise<LexicalModelTypes.Reversion>;
+  applySuggestion(suggestion: LexicalModelTypes.Suggestion, outputTarget: OutputTargetBase, getLayerId: () => string): Promise<LexicalModelTypes.Reversion>;
 
-  applyReversion(reversion: LexicalModelTypes.Reversion, outputTarget: OutputTargetInterface): Promise<LexicalModelTypes.Suggestion[]>;
+  applyReversion(reversion: LexicalModelTypes.Reversion, outputTarget: OutputTargetBase): Promise<LexicalModelTypes.Suggestion[]>;
 
   get wordbreaksAfterSuggestions(): boolean;
 
diff --git a/web/src/engine/interfaces/src/prediction/predictionContext.ts b/web/src/engine/interfaces/src/prediction/predictionContext.ts
index 1efe3b56159..ae2d097aa42 100644
--- a/web/src/engine/interfaces/src/prediction/predictionContext.ts
+++ b/web/src/engine/interfaces/src/prediction/predictionContext.ts
@@ -4,7 +4,7 @@ import Keep = LexicalModelTypes.Keep;
 import Reversion = LexicalModelTypes.Reversion;
 import Suggestion = LexicalModelTypes.Suggestion;
 import { type LanguageProcessorSpec , ReadySuggestions, type InvalidateSourceEnum, StateChangeHandler } from './languageProcessor.interface.js';
-import { type OutputTargetInterface } from "keyman/engine/keyboard";
+import { type OutputTargetBase } from "keyman/engine/keyboard";
 
 interface PredictionContextEventMap {
   update: (suggestions: Suggestion[]) => void;
@@ -41,13 +41,13 @@ export default class PredictionContext extends EventEmitter<PredictionContextEve
   /**
    * Represents the active context used when requesting and applying predictive-text operations.
    */
-  private _currentTarget: OutputTargetInterface;
+  private _currentTarget: OutputTargetBase;
 
-  public get currentTarget(): OutputTargetInterface {
+  public get currentTarget(): OutputTargetBase {
     return this._currentTarget;
   }
 
-  public setCurrentTarget(target: OutputTargetInterface): Promise<Suggestion[]> {
+  public setCurrentTarget(target: OutputTargetBase): Promise<Suggestion[]> {
     const originalTarget = this._currentTarget;
     this._currentTarget = target;
 
diff --git a/web/src/engine/js-processor/src/jsKeyboardInterface.ts b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
index 8eeeee6d87f..1bfa90ef603 100644
--- a/web/src/engine/js-processor/src/jsKeyboardInterface.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
@@ -21,7 +21,6 @@ import {
   type Deadkey,
   type KeyEvent,
   type OutputTargetBase,
-  type OutputTargetInterface,
   VariableStore,
   VariableStoreDictionary,
   VariableStoreSerializer,
@@ -187,7 +186,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
   cachedContextEx: CachedContextEx = new CachedContextEx();
   ruleContextEx: CachedContextEx;
 
-  activeTargetOutput: OutputTargetInterface;
+  activeTargetOutput: OutputTargetBase;
   ruleBehavior: ProcessorAction;
 
   systemStores: {[storeID: number]: SystemStore};
@@ -264,7 +263,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *             KC(10,10,Pelem) == "abcdef"  i.e. return as much as possible of the requested string
    */
 
-  context(n: number, ln: number, outputTarget: OutputTargetInterface): string {
+  context(n: number, ln: number, outputTarget: OutputTargetBase): string {
     const v = this.cachedContext.get(n, ln);
     if(v !== null) {
       return v;
@@ -288,7 +287,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *             KC(3,3,Pelem) == "def"
    *             KC(10,10,Pelem) == "XXXXabcdef"  i.e. return as much as possible of the requested string, where X = \uFFFE
    */
-  private KC_(n: number, ln: number, outputTarget: OutputTargetInterface): string {
+  private KC_(n: number, ln: number, outputTarget: OutputTargetBase): string {
     let tempContext = '';
 
     // If we have a selection, we have an empty context
@@ -314,7 +313,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *             KN(2,Pelem) == FALSE
    *             KN(4,Pelem) == TRUE
    */
-  nul(n: number, outputTarget: OutputTargetInterface): boolean {
+  nul(n: number, outputTarget: OutputTargetBase): boolean {
     const cx=this.context(n+1, 1, outputTarget);
 
     // With #31, the result will be a replacement character if context is empty.
@@ -331,7 +330,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @return      {boolean}                   True if selected context matches val
    * Description  Test keyboard context for match
    */
-  contextMatch(n: number, outputTarget: OutputTargetInterface, val: string, ln: number): boolean {
+  contextMatch(n: number, outputTarget: OutputTargetBase, val: string, ln: number): boolean {
     const cx=this.context(n, ln, outputTarget);
     if(cx === val) {
       return true; // I3318
@@ -629,7 +628,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @return      {boolean}                   True if deadkey found selected context matches val
    * Description  Match deadkey at current cursor position
    */
-  deadkeyMatch(n: number, outputTarget: OutputTargetInterface, d: number): boolean {
+  deadkeyMatch(n: number, outputTarget: OutputTargetBase, d: number): boolean {
     return outputTarget.hasDeadkeyMatch(n, d);
   }
 
@@ -639,7 +638,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param       {Object}      outputTarget  element to flash
    * Description  Flash body as substitute for audible beep; notify embedded device to vibrate
    */
-  beep(outputTarget: OutputTargetInterface): void {
+  beep(outputTarget: OutputTargetBase): void {
     this.resetContextCache();
 
     // Denote as part of the matched rule's behavior.
@@ -732,7 +731,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param       {Object}      outputTarget  element to output to
    * Description  Output a character selected from the string according to the offset in the index array
    */
-  indexOutput(Pdn: number, Ps: KeyboardStore, Pn: number, outputTarget: OutputTargetInterface): void {
+  indexOutput(Pdn: number, Ps: KeyboardStore, Pn: number, outputTarget: OutputTargetBase): void {
     this.resetContextCache();
 
     const assertNever = function(x: never): never {
@@ -769,7 +768,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param       {Object}      outputTarget  element to output to
    * Description  Keyboard output
    */
-  deleteContext(dn: number, outputTarget: OutputTargetInterface): void {
+  deleteContext(dn: number, outputTarget: OutputTargetBase): void {
     let context: CachedExEntry;
 
     // We want to control exactly which deadkeys get removed.
@@ -815,7 +814,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param       {string}      s             string to output
    * Description  Keyboard output
    */
-  output(dn: number, outputTarget: OutputTargetInterface, s:string): void {
+  output(dn: number, outputTarget: OutputTargetBase, s:string): void {
     this.resetContextCache();
 
     outputTarget.saveProperties();
@@ -838,11 +837,11 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @alias       KCXO
    * @public
    * @param       {number}        Pdn            number of characters to delete left of cursor
-   * @param       {OutputTargetInterface}  outputTarget   target to output to
+   * @param       {OutputTargetBase}  outputTarget   target to output to
    * @param       {number}        contextLength  length of current rule context to retrieve
    * @param       {number}        contextOffset  offset from start of current rule context, 1-based
    */
-  contextExOutput(Pdn: number, outputTarget: OutputTargetInterface, contextLength: number, contextOffset: number): void {
+  contextExOutput(Pdn: number, outputTarget: OutputTargetBase, contextLength: number, contextOffset: number): void {
     this.resetContextCache();
 
     if(Pdn >= 0) {
@@ -864,11 +863,11 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * Function     deadkeyOutput KDO
    * Scope        Public
    * @param       {number}      Pdn           no of character to overwrite (delete)
-   * @param       {OutputTargetInterface}      outputTarget  element to output to
+   * @param       {OutputTargetBase}      outputTarget  element to output to
    * @param       {number}      Pd            deadkey id
    * Description  Record a deadkey at current cursor position, deleting Pdn characters first
    */
-  deadkeyOutput(Pdn: number, outputTarget: OutputTargetInterface, Pd: number): void {
+  deadkeyOutput(Pdn: number, outputTarget: OutputTargetBase, Pd: number): void {
     this.resetContextCache();
 
     if(Pdn >= 0) {
@@ -884,10 +883,10 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *
    * @param       {number}      systemId      ID of the system store to test (only TSS_LAYER currently supported)
    * @param       {string}      strValue      String value to compare to
-   * @param       {OutputTargetInterface}      outputTarget  Currently active element (may be needed by future tests)
+   * @param       {OutputTargetBase}      outputTarget  Currently active element (may be needed by future tests)
    * @return      {boolean}                   True if the test succeeds
    */
-  ifStore(systemId: number, strValue: string, outputTarget: OutputTargetInterface): boolean {
+  ifStore(systemId: number, strValue: string, outputTarget: OutputTargetBase): boolean {
     let result=true;
     const store = this.systemStores[systemId];
     if(store) {
@@ -901,14 +900,14 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *
    * @param       {number}      systemId      ID of the system store to set (only TSS_LAYER currently supported)
    * @param       {string}      strValue      String to set as the system store content
-   * @param       {OutputTargetInterface}      outputTarget  Currently active element (may be needed in future tests)
+   * @param       {OutputTargetBase}      outputTarget  Currently active element (may be needed in future tests)
    * @return      {boolean}                   True if command succeeds
    *                                          (i.e. for TSS_LAYER, if the layer is successfully selected)
    *
    * Note that option/variable stores are instead set within keyboard script code, as they only
    * affect keyboard behavior.
    */
-  setStore(systemId: number, strValue: string, outputTarget: OutputTargetInterface): boolean {
+  setStore(systemId: number, strValue: string, outputTarget: OutputTargetBase): boolean {
     this.resetContextCache();
     // Unique case:  we only allow set(&layer) ops from keyboard rules triggered by touch OSKs.
     if(systemId == SystemStoreIDs.TSS_LAYER && this.activeDevice.touchable) {
@@ -978,7 +977,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
     this.cachedContextEx.reset();
   }
 
-  defaultBackspace(outputTarget: OutputTargetInterface) {
+  defaultBackspace(outputTarget: OutputTargetBase) {
     if(outputTarget.isSelectionEmpty()) {
       // Delete the character left of the caret
       this.output(1, outputTarget, "");
diff --git a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
index 8650114c47e..52510cda650 100644
--- a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
@@ -11,7 +11,7 @@ import { ModifierKeyConstants } from '@keymanapp/common-types';
 import {
   Codes, type JSKeyboard, MinimalKeymanGlobal, KeyEvent, Layouts,
   DefaultRules, EmulationKeystrokes, type MutableSystemStore,
-  OutputTargetInterface, ProcessorAction, SystemStoreIDs, Mock, type OutputTargetBase
+  OutputTargetBase, ProcessorAction, SystemStoreIDs, Mock
 } from "keyman/engine/keyboard";
 import { JSKeyboardInterface }  from './jsKeyboardInterface.js';
 import { DeviceSpec, globalObject, KMWString } from "@keymanapp/web-utils";
@@ -20,7 +20,7 @@ import { DeviceSpec, globalObject, KMWString } from "@keymanapp/web-utils";
 
 // Also relies on @keymanapp/web-utils, which is included via tsconfig.json.
 
-export type BeepHandler = (outputTarget: OutputTargetInterface) => void;
+export type BeepHandler = (outputTarget: OutputTargetBase) => void;
 export type LogMessageHandler = (str: string) => void;
 
 export interface ProcessorInitOptions {
@@ -608,7 +608,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
     }
   };
 
-  public finalizeProcessorAction(data: ProcessorAction, outputTarget: OutputTargetInterface): void {
+  public finalizeProcessorAction(data: ProcessorAction, outputTarget: OutputTargetBase): void {
     if (!data.transcription) {
       throw "Cannot finalize a ProcessorAction with no transcription.";
     }
diff --git a/web/src/engine/keyboard/src/defaultRules.ts b/web/src/engine/keyboard/src/defaultRules.ts
index 98279ee94fd..1c32056e144 100644
--- a/web/src/engine/keyboard/src/defaultRules.ts
+++ b/web/src/engine/keyboard/src/defaultRules.ts
@@ -7,7 +7,7 @@
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 import { Codes } from './codes.js';
 import { type KeyEvent } from './keyEvent.js';
-import { type OutputTargetInterface }  from './outputTargetInterface.js';
+import { type OutputTargetBase }  from './outputTargetBase.js';
 
 export enum EmulationKeystrokes {
   Enter = '\n',
@@ -83,7 +83,7 @@ export default class DefaultRules {
    *
    * Note:  is extended by DOM-aware KeymanWeb code.
    */
-  public applyCommand(Lkc: KeyEvent, outputTarget: OutputTargetInterface): void {
+  public applyCommand(Lkc: KeyEvent, outputTarget: OutputTargetBase): void {
     // Notes for potential default-handling extensions:
     //
     // switch(code) {
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index 2c43192690d..eaf175c31b1 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -29,7 +29,6 @@ export { default as DefaultRules } from "./defaultRules.js";
 export * from "./defaultRules.js";
 export { type KeyDistribution, KeyEventSpec, KeyEvent } from "./keyEvent.js";
 export { default as KeyMapping } from "./keyMapping.js";
-export { OutputTargetInterface } from "./outputTargetInterface.js";
 export { type SystemStoreMutationHandler, MutableSystemStore, SystemStore, SystemStoreIDs, type SystemStoreDictionary } from "./systemStore.js";
 export { type VariableStore, VariableStoreSerializer, VariableStoreDictionary } from "./variableStore.js";
 
diff --git a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
index 3bdcb0ed2fb..22400dc01b7 100644
--- a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
+++ b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
@@ -2,7 +2,7 @@ import { Codes } from "../codes.js";
 import { Layouts } from "./defaultLayouts.js";
 import { ActiveKey, ActiveLayout, ActiveSubKey } from "./activeLayout.js";
 import { KeyEvent } from "../keyEvent.js";
-import { type OutputTargetInterface } from "../outputTargetInterface.js";
+import { type OutputTargetBase } from "../outputTargetBase.js";
 import { KeymanWebKeyboard, ModifierKeyConstants, TouchLayout } from "@keymanapp/common-types";
 import { VariableStoreDictionary } from "../variableStore.js";
 
@@ -50,7 +50,7 @@ type KmwKeyboardObject = KeyboardObject & {
  */
 export class JSKeyboard {
   public static DEFAULT_SCRIPT_OBJECT: KmwKeyboardObject = {
-    'gs': function(outputTarget: OutputTargetInterface, keystroke: KeyEvent) { return false; }, // no matching rules; rely on defaultRuleOutput entirely
+    'gs': function(outputTarget: OutputTargetBase, keystroke: KeyEvent) { return false; }, // no matching rules; rely on defaultRuleOutput entirely
     'KI': '', // The currently-existing default keyboard ID; we already have checks that focus against this.
     'KN': '',
     'KV': Layouts.DEFAULT_RAW_SPEC,
@@ -78,21 +78,21 @@ export class JSKeyboard {
   /**
    * Calls the keyboard's `gs` function, which represents the keyboard source's begin Unicode group.
    */
-  process(outputTarget: OutputTargetInterface, keystroke: KeyEvent): boolean {
+  process(outputTarget: OutputTargetBase, keystroke: KeyEvent): boolean {
     return this.scriptObject['gs'](outputTarget, keystroke);
   }
 
   /**
    * Calls the keyboard's `gn` function, which represents the keyboard source's begin newContext group.
    */
-  processNewContextEvent(outputTarget: OutputTargetInterface, keystroke: KeyEvent): boolean {
+  processNewContextEvent(outputTarget: OutputTargetBase, keystroke: KeyEvent): boolean {
     return this.scriptObject['gn'] ? this.scriptObject['gn'](outputTarget, keystroke) : false;
   }
 
   /**
    * Calls the keyboard's `gpk` function, which represents the keyboard source's begin postKeystroke group.
    */
-  processPostKeystroke(outputTarget: OutputTargetInterface, keystroke: KeyEvent): boolean {
+  processPostKeystroke(outputTarget: OutputTargetBase, keystroke: KeyEvent): boolean {
     return this.scriptObject['gpk'] ? this.scriptObject['gpk'](outputTarget, keystroke) : false;
   }
 
@@ -359,7 +359,7 @@ export class JSKeyboard {
    * @param       {number}    _PData        1 or 0
    * Notifies keyboard of keystroke or other event
    */
-  notify(_PCommand: number, _PTarget: OutputTargetInterface, _PData: number) { // I2187
+  notify(_PCommand: number, _PTarget: OutputTargetBase, _PData: number) { // I2187
     // Good example use case - the Japanese CJK-picker keyboard
     if(typeof(this.scriptObject['KNS']) == 'function') {
       this.scriptObject['KNS'](_PCommand, _PTarget, _PData);
diff --git a/web/src/engine/keyboard/src/keyboards/transcription.ts b/web/src/engine/keyboard/src/keyboards/transcription.ts
index 8263e0c8044..a0c8b759a29 100644
--- a/web/src/engine/keyboard/src/keyboards/transcription.ts
+++ b/web/src/engine/keyboard/src/keyboards/transcription.ts
@@ -1,7 +1,7 @@
 /*
  * Keyman is copyright (C) SIL Global. MIT License.
  */
-import { OutputTargetInterface } from '../outputTargetInterface.js';
+import { OutputTargetBase } from '../outputTargetBase.js';
 import { KeyEvent } from '../keyEvent.js';
 import { Alternate, TextTransform } from './textTransform.js';
 
@@ -10,11 +10,11 @@ export class Transcription {
   readonly keystroke: KeyEvent;
   readonly transform: TextTransform;
   alternates: Alternate[]; // constructed after the rest of the transcription.
-  readonly preInput: OutputTargetInterface;
+  readonly preInput: OutputTargetBase;
 
   private static tokenSeed: number = 0;
 
-  constructor(keystroke: KeyEvent, transform: TextTransform, preInput: OutputTargetInterface, alternates?: Alternate[]) {
+  constructor(keystroke: KeyEvent, transform: TextTransform, preInput: OutputTargetBase, alternates?: Alternate[]) {
     const token = this.token = Transcription.tokenSeed++;
 
     this.keystroke = keystroke;
diff --git a/web/src/engine/keyboard/src/mock.ts b/web/src/engine/keyboard/src/mock.ts
index fb8cc607c70..8d042dc0710 100644
--- a/web/src/engine/keyboard/src/mock.ts
+++ b/web/src/engine/keyboard/src/mock.ts
@@ -1,4 +1,3 @@
-import { OutputTargetInterface } from 'keyman/engine/keyboard';
 import { OutputTargetBase } from './outputTargetBase.js';
 import { KMWString } from '@keymanapp/web-utils';
 
@@ -26,14 +25,14 @@ export class Mock extends OutputTargetBase {
     this.selForward = this.selEnd >= this.selStart;
   }
 
-  static assertIsOutputTargetBase(outputTarget: OutputTargetInterface): asserts outputTarget is OutputTargetBase {
+  static assertIsOutputTargetBase(outputTarget: OutputTargetBase): asserts outputTarget is OutputTargetBase {
     if (!(outputTarget instanceof OutputTargetBase)) {
       throw new TypeError("outputTarget is not a OutputTargetBase");
     }
   }
 
   // Clones the state of an existing EditableElement, creating a Mock version of its state.
-  static from(outputTarget: OutputTargetInterface, readonly?: boolean): Mock {
+  static from(outputTarget: OutputTargetBase, readonly?: boolean): Mock {
     let clone: Mock;
 
     this.assertIsOutputTargetBase(outputTarget);
diff --git a/web/src/engine/keyboard/src/outputTargetBase.ts b/web/src/engine/keyboard/src/outputTargetBase.ts
index a5ed2c22273..cf82e107021 100644
--- a/web/src/engine/keyboard/src/outputTargetBase.ts
+++ b/web/src/engine/keyboard/src/outputTargetBase.ts
@@ -1,5 +1,6 @@
 import { KMWString } from "@keymanapp/web-utils";
-import { Alternate, OutputTargetInterface, TextTransform, Transcription } from 'keyman/engine/keyboard';
+import { Alternate, TextTransform } from "./keyboards/textTransform.js";
+import { Transcription } from "./keyboards/transcription.js";
 import { findCommonSubstringEndIndex } from "./stringDivergence.js";
 import { Mock } from "./mock.js";
 
@@ -8,7 +9,7 @@ import { type KeyEvent } from 'keyman/engine/keyboard';
 import { Deadkey, DeadkeyTracker } from "./deadkeys.js";
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
-export abstract class OutputTargetBase implements OutputTargetInterface {
+export abstract class OutputTargetBase {
   private _dks: DeadkeyTracker;
 
   constructor() {
@@ -66,7 +67,7 @@ export abstract class OutputTargetBase implements OutputTargetInterface {
    * As such, it assumes that the caret is immediately after any inserted text.
    * @param from An output target (preferably a Mock) representing the prior state of the input/output system.
    */
-  buildTransformFrom(original: OutputTargetInterface): TextTransform {
+  buildTransformFrom(original: OutputTargetBase): TextTransform {
     const toLeft = this.getTextBeforeCaret();
     const fromLeft = original.getTextBeforeCaret();
 
@@ -87,7 +88,7 @@ export abstract class OutputTargetBase implements OutputTargetInterface {
     return new TextTransform(insertedText, deletedLeft, deletedRight, original.getSelectedText() && !this.getSelectedText());
   }
 
-  buildTranscriptionFrom(original: OutputTargetInterface, keyEvent: KeyEvent, readonly: boolean, alternates?: Alternate[]): Transcription {
+  buildTranscriptionFrom(original: OutputTargetBase, keyEvent: KeyEvent, readonly: boolean, alternates?: Alternate[]): Transcription {
     const transform = this.buildTransformFrom(original);
 
     // If we ever decide to re-add deadkey tracking, this is the place for it.
diff --git a/web/src/engine/keyboard/src/outputTargetInterface.ts b/web/src/engine/keyboard/src/outputTargetInterface.ts
deleted file mode 100644
index 5dac4eb2cdc..00000000000
--- a/web/src/engine/keyboard/src/outputTargetInterface.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Keyman is copyright (C) SIL Global. MIT License.
- */
-export interface OutputTargetInterface {
-  /**
-   * Signifies that this OutputTargetInterface has no default key processing behaviors.
-   * This should be false for OutputTargets backed by web elements like HTMLInputElement
-   * or HTMLTextAreaElement.
-   */
-  get isSynthetic(): boolean;
-
-  resetContext(): void;
-
-  hasDeadkeyMatch(n: number, d: number): boolean;
-
-  insertDeadkeyBeforeCaret(d: number): void;
-
-  /**
-   * Clears any selected text within the wrapper's element(s).
-   * Silently does nothing if no such text exists.
-   */
-  clearSelection(): void;
-
-  /**
-   * Clears any cached selection-related state values.
-   */
-  invalidateSelection(): void;
-
-  /**
-   * Indicates whether or not the underlying element has its own selection (input, textarea)
-   * or is part of (or possesses) the DOM's active selection. Don't confuse with isSelectionEmpty().
-   *
-   * TODO: rename to supportsOwnSelection
-   */
-  hasSelection(): boolean;
-
-  /**
-   * Returns true if there is no current selection -- that is, the selection range is empty
-   */
-  isSelectionEmpty(): boolean;
-
-  /**
-   * Returns an index corresponding to the caret's position for use with deadkeys.
-   */
-  getDeadkeyCaret(): number;
-
-  /**
-   * Relative to the caret, gets the current context within the wrapper's element.
-   */
-  getTextBeforeCaret(): string;
-
-  /**
-   * Gets the element's-currently selected text.
-   */
-  getSelectedText(): string;
-
-  /**
-   * Relative to the caret (and/or active selection), gets the element's text after the caret,
-   * excluding any actively selected text that would be immediately replaced upon text entry.
-   */
-  getTextAfterCaret(): string;
-
-  /**
-   * Gets the element's full text, including any text that is actively selected.
-   */
-  getText(): string;
-
-  /**
-   * Performs context deletions (from the left of the caret) as needed by the KeymanWeb engine and
-   * corrects the location of any affected deadkeys.
-   *
-   * Does not delete deadkeys (b/c KMW 1 & 2 behavior maintenance).
-   * @param dn The number of characters to delete.  If negative, context will be left unchanged.
-   */
-  deleteCharsBeforeCaret(dn: number): void;
-
-  /**
-   * Inserts text immediately before the caret's current position, moving the caret after the
-   * newly inserted text in the process along with any affected deadkeys.
-   *
-   * @param s Text to insert before the caret's current position.
-   */
-  insertTextBeforeCaret(s: string): void;
-
-  /**
-   * Allows element-specific handling for ENTER key inputs.  Conceptually, this should usually
-   * correspond to `insertTextBeforeCaret('\n'), but actual implementation will vary greatly among
-   * elements.
-   */
-  handleNewlineAtCaret(): void;
-
-  /**
-   * Saves element-specific state properties prone to mutation, enabling restoration after
-   * text-output operations.
-   */
-  saveProperties(): void;
-
-  /**
-   * Restores previously-saved element-specific state properties.  Designed for use after text-output
-   * ops to facilitate more-seamless web-dev and user interactions.
-   */
-  restoreProperties(): void;
-
-  /**
-   * Generates a synthetic event on the underlying element, signalling that its value has changed.
-   */
-  doInputEvent(): void;
-}
diff --git a/web/src/engine/main/src/contextManagerBase.ts b/web/src/engine/main/src/contextManagerBase.ts
index 8aa7319c836..979fcfc7ede 100644
--- a/web/src/engine/main/src/contextManagerBase.ts
+++ b/web/src/engine/main/src/contextManagerBase.ts
@@ -1,5 +1,5 @@
 import { EventEmitter } from 'eventemitter3';
-import { ManagedPromise, type Keyboard, type OutputTargetInterface } from 'keyman/engine/keyboard';
+import { ManagedPromise, type Keyboard, type OutputTargetBase } from 'keyman/engine/keyboard';
 import { type JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { StubAndKeyboardCache, type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { PredictionContext } from 'keyman/engine/interfaces';
@@ -7,7 +7,7 @@ import { EngineConfiguration } from './engineConfiguration.js';
 
 interface EventMap {
   // target, then keyboard.
-  'targetchange': (target: OutputTargetInterface) => boolean;
+  'targetchange': (target: OutputTargetBase) => boolean;
 
   /**
    * This event is raised whenever a keyboard change is requested.
@@ -48,7 +48,7 @@ export interface ContextManagerConfiguration {
    *
    * Does not reset option-stores, variable-stores, etc.
    */
-  readonly resetContext: (outputTarget?: OutputTargetInterface) => void;
+  readonly resetContext: (outputTarget?: OutputTargetBase) => void;
 
   /**
    * A predictive-state management object that interfaces the predictive-text banner
@@ -64,7 +64,7 @@ export interface ContextManagerConfiguration {
 }
 
 interface PendingActivation {
-  target: OutputTargetInterface,
+  target: OutputTargetBase,
   keyboard: Promise<Keyboard>,
   stub: KeyboardStub;
 }
@@ -74,11 +74,11 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
 
   abstract initialize(): void;
 
-  abstract get activeTarget(): OutputTargetInterface;
+  abstract get activeTarget(): OutputTargetBase;
 
   private _predictionContext: PredictionContext;
   protected keyboardCache: StubAndKeyboardCache;
-  private _resetContext: (outputTarget?: OutputTargetInterface) => void;
+  private _resetContext: (outputTarget?: OutputTargetBase) => void;
 
   private pendingActivations: PendingActivation[] = [];
   protected engineConfig: MainConfig;
@@ -135,7 +135,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
    * attached elements within the app/browser target.  For `app/webview`, this should
    * always return a consistent value - likely, `null`.
    */
-  protected abstract currentKeyboardSrcTarget(): OutputTargetInterface;
+  protected abstract currentKeyboardSrcTarget(): OutputTargetBase;
 
   /**
    * Ensures that newly activated keyboards are set correctly within managed context, possibly
@@ -143,7 +143,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
    * @param kbd
    * @param target
    */
-  protected abstract activateKeyboardForTarget(kbd: { keyboard: Keyboard, metadata: KeyboardStub }, target: OutputTargetInterface): void;
+  protected abstract activateKeyboardForTarget(kbd: { keyboard: Keyboard, metadata: KeyboardStub }, target: OutputTargetBase): void;
 
   /**
    * Checks the pending keyboard-activation array for an entry corresponding to the specified
@@ -152,7 +152,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
    *                May be `null`, which corresponds to the global default Keyboard.
    * @returns `true` if pending activation is still valid, `false` otherwise.
    */
-  private findAndPopActivation(target: OutputTargetInterface): PendingActivation {
+  private findAndPopActivation(target: OutputTargetBase): PendingActivation {
     // Array.findIndex requires Chrome 45+. :(
     let activationIndex;
     for(activationIndex = 0; activationIndex < this.pendingActivations.length; activationIndex++) {
@@ -180,7 +180,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
   protected async deferredKeyboardActivation(
     kbdPromise: Promise<Keyboard>,
     metadata: KeyboardStub,
-    target: OutputTargetInterface
+    target: OutputTargetBase
   ): Promise<PendingActivation> {
     const activation: PendingActivation = {
       target: target,
diff --git a/web/src/engine/main/src/engineConfiguration.ts b/web/src/engine/main/src/engineConfiguration.ts
index db4a0c99fd5..4c172aa00a7 100644
--- a/web/src/engine/main/src/engineConfiguration.ts
+++ b/web/src/engine/main/src/engineConfiguration.ts
@@ -1,7 +1,7 @@
 import { EventEmitter } from "eventemitter3";
 
 import {
-  DeviceSpec, KeyboardProperties, ManagedPromise, OutputTargetInterface,
+  DeviceSpec, KeyboardProperties, ManagedPromise, OutputTargetBase,
   ProcessorAction, physicalKeyDeviceAlias, SpacebarText
 } from "keyman/engine/keyboard";
 import { PathConfiguration, PathOptionDefaults, PathOptionSpec } from "keyman/engine/interfaces";
@@ -112,7 +112,7 @@ export class EngineConfiguration extends EventEmitter<EventMap> {
    * @param ruleBehavior  The full effects of keystroke + postkeystroke rules from a processed keystroke.
    * @param outputTarget  The engine's current source for context
    */
-  onRuleFinalization(ruleBehavior: ProcessorAction, outputTarget: OutputTargetInterface) {};
+  onRuleFinalization(ruleBehavior: ProcessorAction, outputTarget: OutputTargetBase) {};
 }
 
 export interface InitOptionSpec extends PathOptionSpec {
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index 2fd151e0ee0..76c90f919ee 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -18,9 +18,7 @@ import {
   type Alternate,
   type Keyboard,
   type KeyEvent,
-  type OutputTargetInterface,
 } from "keyman/engine/keyboard";
-// TODO-web-core: remove usage of OutputTargetBase
 import {
   JSKeyboardProcessor,
   type ProcessorInitOptions,
@@ -103,7 +101,7 @@ export class InputProcessor {
    * @returns     {Object}                    A ProcessorAction object describing the cumulative effects of
    *                                          all matched keyboard rules.
    */
-  processKeyEvent(keyEvent: KeyEvent, outputTarget: OutputTargetInterface): ProcessorAction {
+  processKeyEvent(keyEvent: KeyEvent, outputTarget: OutputTargetBase): ProcessorAction {
     const kbdMismatch = keyEvent.srcKeyboard && this.activeKeyboard != keyEvent.srcKeyboard;
     const trueActiveKeyboard = this.activeKeyboard;
 
@@ -157,7 +155,7 @@ export class InputProcessor {
    * @param outputTarget
    * @returns
    */
-  private _processKeyEvent(keyEvent: KeyEvent, outputTarget: OutputTargetInterface): ProcessorAction {
+  private _processKeyEvent(keyEvent: KeyEvent, outputTarget: OutputTargetBase): ProcessorAction {
     const formFactor = keyEvent.device.formFactor;
     const fromOSK = keyEvent.isSynthetic;
 
@@ -400,7 +398,7 @@ export class InputProcessor {
     return alternates;
   }
 
-  public resetContext(outputTarget?: OutputTargetInterface) {
+  public resetContext(outputTarget?: OutputTargetBase) {
     // Also handles new-context events, which may modify the layer
     // TODO-web-core
     this.keyboardProcessor.resetContext(outputTarget as OutputTargetBase);
diff --git a/web/src/engine/main/src/headless/languageProcessor.ts b/web/src/engine/main/src/headless/languageProcessor.ts
index 0751da27897..913562ef727 100644
--- a/web/src/engine/main/src/headless/languageProcessor.ts
+++ b/web/src/engine/main/src/headless/languageProcessor.ts
@@ -1,7 +1,6 @@
 import { EventEmitter } from "eventemitter3";
 import { LMLayer, WorkerFactory } from "@keymanapp/lexical-model-layer/web";
-// TODO-web-core: remove use of OutputTargetBase
-import { Transcription, OutputTargetInterface, Mock, OutputTargetBase } from 'keyman/engine/keyboard';
+import { Transcription, OutputTargetBase, Mock } from 'keyman/engine/keyboard';
 import { LanguageProcessorEventMap, ModelSpec, StateChangeEnum, ReadySuggestions } from 'keyman/engine/interfaces';
 import ContextWindow from "./contextWindow.js";
 import { TranscriptionCache } from "./transcriptionCache.js";
@@ -126,7 +125,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     });
   }
 
-  public invalidateContext(outputTarget: OutputTargetInterface, layerId: string): Promise<Suggestion[]> {
+  public invalidateContext(outputTarget: OutputTargetBase, layerId: string): Promise<Suggestion[]> {
     // If there's no active model, there can be no predictions.
     // We'll also be missing important data needed to even properly REQUEST the predictions.
     if(!this.currentModel || !this.configuration) {
@@ -155,7 +154,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     }
   }
 
-  public wordbreak(target: OutputTargetInterface, layerId: string): Promise<string> {
+  public wordbreak(target: OutputTargetBase, layerId: string): Promise<string> {
     if(!this.isActive) {
       return null;
     }
@@ -191,9 +190,9 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
    *                        required because layerid can be changed by PostKeystroke
    * @returns
    */
-  public applySuggestion(suggestion: Suggestion, outputTarget: OutputTargetInterface, getLayerId: ()=>string): Promise<Reversion> {
+  public applySuggestion(suggestion: Suggestion, outputTarget: OutputTargetBase, getLayerId: ()=>string): Promise<Reversion> {
     if(!outputTarget) {
-      throw "Accepting suggestions requires a destination OutputTargetInterface instance."
+      throw "Accepting suggestions requires a destination OutputTargetBase instance."
     }
 
     if(!this.isActive) {
@@ -268,9 +267,9 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     }
   }
 
-  public applyReversion(reversion: Reversion, outputTarget: OutputTargetInterface) {
+  public applyReversion(reversion: Reversion, outputTarget: OutputTargetBase) {
     if(!outputTarget) {
-      throw "Accepting suggestions requires a destination OutputTargetInterface instance."
+      throw "Accepting suggestions requires a destination OutputTargetBase instance."
     }
 
     if(!this.isActive) {
@@ -312,7 +311,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     return promise;
   }
 
-  public predictFromTarget(outputTarget: OutputTargetInterface, layerId: string): Promise<Suggestion[]> {
+  public predictFromTarget(outputTarget: OutputTargetBase, layerId: string): Promise<Suggestion[]> {
     if(!this.isActive || !outputTarget) {
       return null;
     }
diff --git a/web/src/engine/main/src/keymanEngineBase.ts b/web/src/engine/main/src/keymanEngineBase.ts
index 3c88582daaf..25fcca58450 100644
--- a/web/src/engine/main/src/keymanEngineBase.ts
+++ b/web/src/engine/main/src/keymanEngineBase.ts
@@ -1,5 +1,4 @@
 import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction, OutputTargetBase } from "keyman/engine/keyboard";
-// TODO-web-core: remove usage of OutputTargetBase
 import { ProcessorInitOptions } from 'keyman/engine/js-processor';
 import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard/dom-keyboard-loader";
 import { WorkerFactory } from "@keymanapp/lexical-model-layer/web"
diff --git a/web/src/tools/testing/recorder-core/src/index.ts b/web/src/tools/testing/recorder-core/src/index.ts
index 131621fc1d1..07e94d33b68 100644
--- a/web/src/tools/testing/recorder-core/src/index.ts
+++ b/web/src/tools/testing/recorder-core/src/index.ts
@@ -1,4 +1,4 @@
-import { KeyDistribution, KeyEvent, type OutputTargetInterface, Mock } from "keyman/engine/keyboard";
+import { KeyDistribution, KeyEvent, type OutputTargetBase, Mock } from "keyman/engine/keyboard";
 
 import Proctor from "./proctor.js";
 
@@ -216,7 +216,7 @@ export abstract class TestSequence<KeyRecord extends RecordedKeystroke | InputEv
 
   abstract hasOSKInteraction(): boolean;
 
-  async test(proctor: Proctor, target?: OutputTargetInterface): Promise<{success: boolean, result: string}> {
+  async test(proctor: Proctor, target?: OutputTargetBase): Promise<{success: boolean, result: string}> {
     // Start with an empty OutputTarget and a fresh KeyboardProcessor.
     if(!target) {
       target = new Mock();
diff --git a/web/src/tools/testing/recorder-core/src/nodeProctor.ts b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
index 52882e95a6e..f70828ea8f7 100644
--- a/web/src/tools/testing/recorder-core/src/nodeProctor.ts
+++ b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
@@ -8,7 +8,7 @@ import {
   RecordedSyntheticKeystroke
 } from "./index.js";
 
-import { KeyEvent, KeyEventSpec, KeyboardHarness, type OutputTargetInterface, Mock, OutputTargetBase } from "keyman/engine/keyboard";
+import { KeyEvent, KeyEventSpec, KeyboardHarness, Mock, OutputTargetBase } from "keyman/engine/keyboard";
 import { DeviceSpec } from "@keymanapp/web-utils";
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 
@@ -48,7 +48,7 @@ export default class NodeProctor extends Proctor {
     return true;
   }
 
-  async simulateSequence(sequence: TestSequence<any>, target?: OutputTargetInterface): Promise<string> {
+  async simulateSequence(sequence: TestSequence<any>, target?: OutputTargetBase): Promise<string> {
     // Start with an empty OutputTarget and a fresh KeyboardProcessor.
     if(!target) {
       target = new Mock();
diff --git a/web/src/tools/testing/recorder-core/src/proctor.ts b/web/src/tools/testing/recorder-core/src/proctor.ts
index 533648e88cf..db1f36110ea 100644
--- a/web/src/tools/testing/recorder-core/src/proctor.ts
+++ b/web/src/tools/testing/recorder-core/src/proctor.ts
@@ -1,5 +1,5 @@
 import { type DeviceSpec } from "@keymanapp/web-utils";
-import { type OutputTargetInterface } from "keyman/engine/keyboard";
+import { type OutputTargetBase } from "keyman/engine/keyboard";
 
 import type { KeyboardTest, TestSet, TestSequence } from "./index.js";
 
@@ -49,5 +49,5 @@ export default abstract class Proctor {
    * Simulates the specified test sequence for use in testing.
    * @param sequence The recorded sequence, generally provided by a test set.
    */
-  abstract simulateSequence(sequence: TestSequence<any>, target?: OutputTargetInterface): Promise<string>;
+  abstract simulateSequence(sequence: TestSequence<any>, target?: OutputTargetBase): Promise<string>;
 }
\ No newline at end of file
diff --git a/web/src/tools/testing/recorder/browserProctor.ts b/web/src/tools/testing/recorder/browserProctor.ts
index cc81b89ceac..822f8024598 100644
--- a/web/src/tools/testing/recorder/browserProctor.ts
+++ b/web/src/tools/testing/recorder/browserProctor.ts
@@ -4,7 +4,7 @@
 
 import { type DeviceSpec } from "@keymanapp/web-utils";
 
-import { type OutputTargetInterface } from "keyman/engine/keyboard";
+import { type OutputTargetBase } from "keyman/engine/keyboard";
 
 import { type KeymanEngine } from 'keyman/app/browser';
 
@@ -81,7 +81,7 @@ export class BrowserProctor extends Proctor {
 
   // Execution of a test sequence depends on the testing environment; this handles
   // the browser-specific aspects.
-  async simulateSequence(sequence: TestSequence<any>, outputTarget?: OutputTargetInterface): Promise<string> {
+  async simulateSequence(sequence: TestSequence<any>, outputTarget?: OutputTargetBase): Promise<string> {
     const driver = new BrowserDriver(this.target);
 
     // For the version 10.0 spec

From c9fa02f21c48b6f53f5e21cf049dc34b9b4feb0e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 4 Nov 2025 11:08:41 +0100
Subject: [PATCH 105/254] =?UTF-8?q?refactor(web):=20rename=20`OutputTarget?=
 =?UTF-8?q?Base`=20=E2=86=92=20`TextStore`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/web/types/package.json                 |   1 -
 common/web/types/src/keyboard-object.ts       |  14 +-
 .../reference/interface/contextExOutput.md    |   8 +-
 web/docs/internal/context-state-management.md | 179 ++++++++++++++----
 web/src/app/browser/src/beepHandler.ts        |  10 +-
 web/src/app/browser/src/configuration.ts      |   8 +-
 .../app/browser/src/context/focusAssistant.ts |  12 +-
 web/src/app/browser/src/contextManager.ts     |  22 +--
 .../app/browser/src/defaultBrowserRules.ts    |   6 +-
 .../app/browser/src/hardwareEventKeyboard.ts  |   4 +-
 web/src/app/webview/src/contextManager.ts     |   8 +-
 .../attachment/src/outputTargetForElement.ts  |   6 +-
 web/src/engine/element-wrappers/build.sh      |   2 +-
 .../src/outputTargetElementWrapper.ts         |   4 +-
 .../prediction/languageProcessor.interface.ts |  14 +-
 .../src/prediction/predictionContext.ts       |   8 +-
 .../js-processor/src/jsKeyboardInterface.ts   | 172 ++++++++---------
 .../js-processor/src/jsKeyboardProcessor.ts   |  64 +++----
 web/src/engine/keyboard/src/defaultRules.ts   |   8 +-
 web/src/engine/keyboard/src/index.ts          |   4 +-
 .../keyboard/src/keyboards/jsKeyboard.ts      |  18 +-
 .../keyboard/src/keyboards/transcription.ts   |   6 +-
 web/src/engine/keyboard/src/mock.ts           |  28 +--
 .../src/{outputTargetBase.ts => textStore.ts} |  22 +--
 web/src/engine/main/src/contextManagerBase.ts |  36 ++--
 .../engine/main/src/engineConfiguration.ts    |   6 +-
 .../main/src/headless/inputProcessor.ts       |  40 ++--
 .../main/src/headless/languageProcessor.ts    |  44 ++---
 .../engine/main/src/keyboardInterfaceBase.ts  |   2 +-
 web/src/engine/main/src/keymanEngineBase.ts   |  16 +-
 .../attachment/outputTargetForElement.def.ts  |   2 +-
 .../dom/cases/browser/contextManager.tests.ts |  32 ++--
 .../element-wrappers/target_mocks.tests.ts    |  10 +-
 .../manual/web/osk/scratchspace/index.html    |   4 +-
 .../tools/testing/recorder-core/src/index.ts  |   6 +-
 .../testing/recorder-core/src/nodeProctor.ts  |   8 +-
 .../testing/recorder-core/src/proctor.ts      |   4 +-
 .../tools/testing/recorder/browserProctor.ts  |   4 +-
 web/src/tools/testing/recorder/scribe.ts      |   2 +-
 39 files changed, 469 insertions(+), 375 deletions(-)
 rename web/src/engine/keyboard/src/{outputTargetBase.ts => textStore.ts} (92%)

diff --git a/common/web/types/package.json b/common/web/types/package.json
index 7823f0fa876..d29766e5675 100644
--- a/common/web/types/package.json
+++ b/common/web/types/package.json
@@ -78,7 +78,6 @@
       "src/schemas/*",
       "tests/",
       "src/keyboard-object.ts",
-      "src/outputTarget.interface.ts",
       "src/*.d.ts",
       "src/main.ts",
       "src/schema-validators.ts",
diff --git a/common/web/types/src/keyboard-object.ts b/common/web/types/src/keyboard-object.ts
index afd0029af0d..96992e203e3 100644
--- a/common/web/types/src/keyboard-object.ts
+++ b/common/web/types/src/keyboard-object.ts
@@ -8,7 +8,7 @@ export type ComplexKeyboardStore = (string | { t: 'd', d: number } | { ['t']: 'b
 // A stub for KeyEvent which is properly defined in KeymanWeb
 type KeyEventStub = {};
 
-// A stub for OutputTarget which is properly defined in KeymanWeb
+// A stub for TextStore which is properly defined in KeymanWeb
 type OutputTargetStub = {};
 
 export interface EncodedVisualKeyboard {
@@ -43,31 +43,31 @@ export type KeyboardObject = {
    * group-start:  the function triggering processing for the keyboard's
    * "Unicode" start group, corresponding to `begin Unicode > use(_____)` in
    * Keyman keyboard language.
-   * @param outputTarget  The context to which the keystroke applies
+   * @param textStore  The context to which the keystroke applies
    * @param keystroke     The full, pre-processed keystroke triggering
    * keyboard-rule application.
    */
-  gs(outputTarget: OutputTargetStub, keystroke: KeyEventStub): boolean;
+  gs(textStore: OutputTargetStub, keystroke: KeyEventStub): boolean;
 
   /**
    * group-newcontext:  the function triggering processing for the keyboard's
    * "NewContext" start group, corresponding to `begin NewContext > use(_____)`
    * in Keyman keyboard language.
-   * @param outputTarget  The new context to be used with future keystrokes
+   * @param textStore  The new context to be used with future keystrokes
    * @param keystroke     A 'null' `KeyEvent` providing current modifier + state information.
    */
-  gn?(outputTarget: OutputTargetStub, keystroke: KeyEventStub): boolean;
+  gn?(textStore: OutputTargetStub, keystroke: KeyEventStub): boolean;
 
   /**
    * group-postkeystroke:  the function triggering processing for the keyboard's
    * "PostKeystroke" start group, corresponding to `begin PostKeystroke >
    * use(_____)` in Keyman keyboard language.
-   * @param outputTarget  The context altered by a recent keystroke.  As a
+   * @param textStore  The context altered by a recent keystroke.  As a
    * precondition, all changes due to `gs` / `begin Unicode` should already be
    * applied.
    * @param keystroke     A 'null' `KeyEvent` providing current modifier + state information.
    */
-  gpk?(outputTarget: OutputTargetStub, keystroke: KeyEventStub): boolean;
+  gpk?(textStore: OutputTargetStub, keystroke: KeyEventStub): boolean;
 
   /**
    * Keyboard ID:  the uniquely-identifying name for this keyboard.  Includes the standard
diff --git a/web/docs/engine/reference/interface/contextExOutput.md b/web/docs/engine/reference/interface/contextExOutput.md
index 35a1801088a..73a1a97c8a0 100644
--- a/web/docs/engine/reference/interface/contextExOutput.md
+++ b/web/docs/engine/reference/interface/contextExOutput.md
@@ -11,13 +11,13 @@ gap between desktop and web core functionality for `context(n)` matching on `not
 ## Syntax
 
 ```js
-  keyman.interface.contextExOutput(dn, outputTarget, contextLength, contextOffset);
+  keyman.interface.contextExOutput(dn, textStore, contextLength, contextOffset);
 ```
 
 or
 
 ```js
-  KeymanWeb.KCXO(dn, outputTarget, contextLength, contextOffset); // Shorthand
+  KeymanWeb.KCXO(dn, textStore, contextLength, contextOffset); // Shorthand
 ```
 
 ## Parameters
@@ -26,8 +26,8 @@ or
 : Type: `number`
 : number of characters to delete left of cursor
 
-`outputTarget`
-: Type: `OutputTarget`
+`textStore`
+: Type: `TextStore`
 : target to output to
 
 `contextLength`
diff --git a/web/docs/internal/context-state-management.md b/web/docs/internal/context-state-management.md
index 910129ac0b9..4d776defbf5 100644
--- a/web/docs/internal/context-state-management.md
+++ b/web/docs/internal/context-state-management.md
@@ -1,72 +1,167 @@
 # Context State Management
 
-## The `OutputTarget` Abstraction
-
-The `OutputTarget` abstraction and its associated types and classes exist to facilitate handling different types of context sources within Keyman Engine for Web through a common interface.  In essence, any implementing type is valid within the engine as a "target" for "output" from any existing keyboard supported by the engine.  Through 18.0, only JS-based keyboards were supported due to lack of implementation of alternate keystroke-processing engines.
-
-At the most basic level, the abstraction is defined at [web/src/engine/keyboard/outputTarget.interface.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/keyboard/src/outputTarget.interface.ts).  The methods defined therein support properties and methods for fetching, setting, and manipulating deadkey markers, text-selection, and text within whatever context source it represents.  JS-keyboard keystroke processing directly uses these methods during operation.
-- `epic/web-core` note:  moved to `outputTarget.ts` in the same folder, dropping the `.interface` component.
-
-The base implementation for this type may be found at [web/src/engine/js-processor/src/outputTarget.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/js-processor/src/outputTarget.ts).  This implementation provides common support for deadkey tracking, matching, and handling - the same strategy is used regardless of context-source type.  A few additional methods are provided to assist with comparison and contrast between two different context states and restoration of a prior context state.
-- `epic/web-core` note:  renamed `OutputTargetBase`, moved to `outputTargetBase.ts` in the same folder
+## The `TextStore` Abstraction
+
+The `TextStore` abstraction and its associated types and classes exist
+to facilitate handling different types of context sources within Keyman
+Engine for Web through a common interface.  In essence, any implementing
+type is valid within the engine as a "target" for "output" from any
+existing keyboard supported by the engine.  Through 18.0, only JS-based
+keyboards were supported due to lack of implementation of alternate
+keystroke-processing engines.
+
+The base implmentation may be found at
+[web/src/engine/keyboard/textStore.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/keyboard/src/textStore.ts).
+The methods defined therein support properties and methods for fetching,
+setting, and manipulating deadkey markers, text-selection, and text
+within whatever context source it represents.  JS-keyboard keystroke
+processing directly uses these methods during operation.
+
+Since the context sources are the same for all keyboard processors, the
+all use the same base implementation, although not all funcitonality is
+needed by all keyboard processors (e.g. deadkey tracking functionality
+is only needed by the JS-keyboard processor). This implementation
+provides common support for deadkey tracking, matching, and handling -
+the same strategy is used regardless of context-source type.  A few
+additional methods are provided to assist with comparison and contrast
+between two different context states and restoration of a prior context
+state.
+
+- note:  previously called `OutputTarget`
 
 ### Deadkey management
 
-Specifics for the implementation of JS-keyboard deadkeys can be found here:  https://github.com/keymanapp/keyman/blob/b4df4ab80862bc90da42bcdbd333df0a14da01ca/web/src/engine/js-processor/src/deadkeys.ts#L2-L6
-- `epic/web-core` note:  unaltered.
+Specifics for the implementation of JS-keyboard deadkeys can be found
+here: [web/src/engine/keyboard/src/deadkeys.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/keyboard/src/deadkeys.ts)
 
-`ordinal`:  if two deadkeys are in the same "virtual" position, this field resolves which came first.
-`matched`: used during keyboard-rule processing.
+`ordinal`:  if two deadkeys are in the same "virtual" position, this
+field resolves which came first. `matched`: used during keyboard-rule
+processing.
 
-Note that we do NOT actually insert the deadkeys into the raw text-context!  Web's pattern here is different than that of Keyman Core.
+Note that we do NOT actually insert the deadkeys into the raw
+text-context!  Web's pattern here is different than that of Keyman Core.
 
 ## Manipulating context-states
 
-Initially used to support predictive-text, the `Transform` type aims to encapsulate the minimal information necessary to transition from one context-state to another.  It is both selection-agnostic and deadkey-agnostic.  `Transform`s are used both by predictive-text and by the webview-embedded build of the engine in order to succinctly communicate the data needed to update context upon receiving keystrokes.
-- `Transform`'s specification may be found at [common/web/types/src/lexical-model-types.ts](https://github.com/keymanapp/keyman/blob/master/common/web/types/src/lexical-model-types.ts).
+Initially used to support predictive-text, the `Transform` type aims to
+encapsulate the minimal information necessary to transition from one
+context-state to another.  It is both selection-agnostic and
+deadkey-agnostic.  `Transform`s are used both by predictive-text and by
+the webview-embedded build of the engine in order to succinctly
+communicate the data needed to update context upon receiving keystrokes.
 
-`Transform`s consist of three values:
-- `deleteLeft` - the number of codepoints prior to the caret/selection that should be deleted
-- `insert` - the text to insert at the caret and/or replace currently-selected text
-- `deleteRight` - the number of codepoints _after_ the caret/selection that should be deleted
-  - Note that `deleteRight` does not currently see actual use due to iOS platform limitations.
+- `Transform`'s specification may be found at
+  [common/web/types/src/lexical-model-types.ts](https://github.com/keymanapp/keyman/blob/master/common/web/types/src/lexical-model-types.ts).
 
-This type may then be used as an argument to `OutputTarget.apply()` (defined on `OutputTarget` (`epic/web-core`: `OutputTargetBase`)) to update any context source accordingly.
+`Transform`s consist of three values:
 
-It is possible to determine the `Transform` needed to transition from one `OutputTarget` to another using `OutputTarget.buildTransformFrom` (defined on `OutputTarget` (`epic/web-core`: `OutputTargetBase`)).
+- `deleteLeft` - the number of codepoints prior to the caret/selection
+  that should be deleted
+- `insert` - the text to insert at the caret and/or replace
+  currently-selected text
+- `deleteRight` - the number of codepoints _after_ the caret/selection
+  that should be deleted
+  - Note that `deleteRight` does not currently see actual use due to iOS
+    platform limitations.
 
-### The `Mock` - representing context-state
+This type may then be used as an argument to `TextStore.apply()`
+(defined on `TextStore`) to update any context source accordingly.
 
-The comparison and contrast methods mentioned above for `OutputTarget` are of particular use for predictive text, which usually operates with a headless implementation of the type, termed a `Mock`.  This class may be found in [web/src/engine/js-processor/src/mock.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/js-processor/src/mock.ts).  It is a fully-featured implementation of the `OutputTarget` interface.
-- `epic/web-core` note:  unaltered.
+It is possible to determine the `Transform` needed to transition from
+one `TextStore` to another using `TextStore.buildTransformFrom`
+(defined on `TextStore`).
 
-It is possible to make a `Mock`-based clone of any `OutputTarget`-derived type - a feature leveraged significantly within the inner workings of Keyman Engine for Web.  As JS keyboards can have side effects beyond text-manipulation, predictive text generally operates by first _cloning_ the "true" context source.   `Mock`s are also used when saving context states within the engine for later reference and/or reuse - a feature also utilized significantly for multitap support.
+### The `Mock` - representing context-state
 
-`Mock`s can also easily be constructed from scratch for a simple string.  Optionally, caret position or selection data may be specified at construction time as well. `epic/web-core`: in theory, this should make them easy to utilize for integration with Keyman Core.
+The comparison and contrast methods mentioned above for `TextStore`
+are of particular use for predictive text, which usually operates with a
+headless implementation of the type, termed a `Mock`.  This class may be
+found in
+[web/src/engine/js-processor/src/mock.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/js-processor/src/mock.ts).
+It is a fully-featured implementation of the `TextStore` interface.
+
+It is possible to make a `Mock`-based clone of any
+`TextStore`-derived type - a feature leveraged significantly within
+the inner workings of Keyman Engine for Web.  As JS keyboards can have
+side effects beyond text-manipulation, predictive text generally
+operates by first _cloning_ the "true" context source.   `Mock`s are
+also used when saving context states within the engine for later
+reference and/or reuse - a feature also utilized significantly for
+multitap support.
+
+`Mock`s can also easily be constructed from scratch for a simple string.
+Optionally, caret position or selection data may be specified at
+construction time as well. `epic/web-core`: in theory, this should make
+them easy to utilize for integration with Keyman Core.
 
 ### The `Transcription` - representing context-state transitions
 
-The `Transcription` class (defined within [web/src/engine/js-processor/src/outputTarget.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/js-processor/src/outputTarget.ts)) is the type within the engine that most closely matches a sense of transition in context state.   These are generally constructed by comparing two `OutputTarget` instances to each other via `OutputTarget.buildTranscriptionFrom`, with the base instance corresponding to the "new" state and the first parameter matching the original state before transition.
-- `epic/web-core` note:  moved to `outputTargetBase.ts` in the same folder; the method is on `OutputTargetBase`.
-
-`Transcription`s are granted unique identifiers and are used within the engine for preservation of recent context states. These identifiers are currently generated within the class's constructor and are internally set.  When predictive-text generates new suggestions or a multitap needs to revert to a prior context, both will use the `Transcription`'s unique identifier in order to find the corresponding context state and leverage it as needed for their operations.
+The `Transcription` class (defined in
+[web/src/engine/js-processor/src/transcription.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/js-processor/src/transcription.ts))
+is the type within the engine that most closely matches a sense of
+transition in context state.   These are generally constructed by
+comparing two `TextStore` instances to each other via
+`TextStore.buildTranscriptionFrom`, with the base instance
+corresponding to the "new" state and the first parameter matching the
+original state before transition.
+
+`Transcription`s are granted unique identifiers and are used within the
+engine for preservation of recent context states. These identifiers are
+currently generated within the class's constructor and are internally
+set.  When predictive-text generates new suggestions or a multitap needs
+to revert to a prior context, both will use the `Transcription`'s unique
+identifier in order to find the corresponding context state and leverage
+it as needed for their operations.
 
 Important fields:
-- `keystroke` - the keystroke that triggered the context change corresponding to this `Transcription`
-- `transform` - the direct effects of the keystroke
-    - This uses a specialized variant that also notes if the transition destroyed previously-existing selected text.
-- `preInput` - the state of the context immediately before the keystroke was processed
 
-Note that the transition metadata does not include deadkeys generated by its triggering `keystroke`.  The decision was made long ago to forgo directly recording deadkey changes when recording `Transcriptions`, as any operation that restores an old context also seeks to apply deadkey-destroying operations immediately afterward.  Should we ever need to do so, PR #1611 contains code that was originally designed for actively detecting and recording deadkey transition data in `Transcription`s.
+- `keystroke` - the keystroke that triggered the context change
+  corresponding to this `Transcription`
+- `transform` - the direct effects of the keystroke
 
-A cache of recent context-state transitions is stored at `keyman.core.contextCache`, with `keyman.core` being an instance of `InputProcessor` ([web/src/engine/main/src/headless/inputProcessor.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/main/src/headless/inputProcessor.ts)), the component responsible for linking keystroke processing with predictive-text support and restoration of context-state for multitap-generated keystrokes.
+    - This uses a specialized variant that also notes if the transition
+      destroyed previously-existing selected text.
+
+- `preInput` - the state of the context immediately before the keystroke
+  was processed
+
+Note that the transition metadata does not include deadkeys generated by
+its triggering `keystroke`.  The decision was made long ago to forgo
+directly recording deadkey changes when recording `Transcriptions`, as
+any operation that restores an old context also seeks to apply
+deadkey-destroying operations immediately afterward.  Should we ever
+need to do so, PR #1611 contains code that was originally designed for
+actively detecting and recording deadkey transition data in
+`Transcription`s.
+
+A cache of recent context-state transitions is stored at
+`keyman.core.contextCache`, with `keyman.core` being an instance of
+`InputProcessor`
+([web/src/engine/main/src/headless/inputProcessor.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/main/src/headless/inputProcessor.ts)),
+the component responsible for linking keystroke processing with
+predictive-text support and restoration of context-state for
+multitap-generated keystrokes.
 
 ### JS-keyboard keystroke processing
 
-For JS-keyboard keystroke processing, a `Mock` clone of the context is generated before any actual keyboard rule checks are applied.  This provides a clear "before" state (eventually saved at `Transcription.preInput`) useful for determining the scope of the keystroke's changes once processing is completed via `buildTranscriptionFrom`.
-
-Once keystroke processing is completed by a JS-keyboard, the JS-processor constructs a `ProcessorAction` object describing all primary and side effects of the keystroke.  Defined at [web/src/engine/keyboard/src/keyboards/processorAction.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/keyboard/src/keyboards/processorAction.ts), all of its fields aside from `transcription` are specific to JS-keyboard side effects, some of which do need special handling and support outside of the keystroke processor.  None of these side effects apply for common-case keystrokes and so have default handling in place within the engine for cases where they are not needed.
+For JS-keyboard keystroke processing, a `Mock` clone of the context is
+generated before any actual keyboard rule checks are applied.  This
+provides a clear "before" state (eventually saved at
+`Transcription.preInput`) useful for determining the scope of the
+keystroke's changes once processing is completed via
+`buildTranscriptionFrom`.
+
+Once keystroke processing is completed by a JS-keyboard, the
+JS-processor constructs a `ProcessorAction` object describing all
+primary and side effects of the keystroke.  Defined at
+[web/src/engine/keyboard/src/keyboards/processorAction.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/keyboard/src/keyboards/processorAction.ts),
+all of its fields aside from `transcription` are specific to JS-keyboard
+side effects, some of which do need special handling and support outside
+of the keystroke processor.  None of these side effects apply for
+common-case keystrokes and so have default handling in place within the
+engine for cases where they are not needed.
 
 ---
 
-In case referenced classes/files have moved:  this doc was last updated in 19.0-alpha, based upon PR #14001.
+In case referenced classes/files have moved:  this doc was last updated
+in 19.0-alpha, based upon PR #14001.
diff --git a/web/src/app/browser/src/beepHandler.ts b/web/src/app/browser/src/beepHandler.ts
index 9d1896b10a9..05fb6516bbe 100644
--- a/web/src/app/browser/src/beepHandler.ts
+++ b/web/src/app/browser/src/beepHandler.ts
@@ -33,15 +33,15 @@ export class BeepHandler {
    * @param       {Object}      Pelem     element to flash
    * Description  Flash body as substitute for audible beep; notify embedded device to vibrate
    */
-  beep(outputTarget: OutputTargetElementWrapper<any>) {
-    if (!(outputTarget instanceof OutputTargetElementWrapper)) {
+  beep(textStore: OutputTargetElementWrapper<any>) {
+    if (!(textStore instanceof OutputTargetElementWrapper)) {
       return;
     }
 
     // All code after this point is DOM-based, triggered by the beep.
-    let Pelem: HTMLElement = outputTarget.getElement();
-    if(outputTarget instanceof DesignIFrame) {
-      Pelem = outputTarget.docRoot; // I1446 - beep sometimes fails to flash when using OSK and rich control
+    let Pelem: HTMLElement = textStore.getElement();
+    if(textStore instanceof DesignIFrame) {
+      Pelem = textStore.docRoot; // I1446 - beep sometimes fails to flash when using OSK and rich control
     }
 
     if(!Pelem) {
diff --git a/web/src/app/browser/src/configuration.ts b/web/src/app/browser/src/configuration.ts
index faa24c577cb..60f033a3589 100644
--- a/web/src/app/browser/src/configuration.ts
+++ b/web/src/app/browser/src/configuration.ts
@@ -1,7 +1,7 @@
 import { EngineConfiguration, InitOptionSpec, InitOptionDefaults } from "keyman/engine/main";
 
 import { OutputTargetElementWrapper as DOMOutputTarget } from 'keyman/engine/element-wrappers';
-import { OutputTargetBase, ProcessorAction } from 'keyman/engine/keyboard';
+import { TextStore, ProcessorAction } from 'keyman/engine/keyboard';
 import { isEmptyTransform } from '@keymanapp/web-utils';
 import { AlertHost } from "./utils/alertHost.js";
 import { whenDocumentReady } from "./utils/documentReady.js";
@@ -66,14 +66,14 @@ export class BrowserConfiguration extends EngineConfiguration {
     return baseReport;
   }
 
-  onRuleFinalization(ruleBehavior: ProcessorAction, outputTarget: OutputTargetBase) {
+  onRuleFinalization(ruleBehavior: ProcessorAction, textStore: TextStore) {
     // TODO: Patch up to modularized form.  But that doesn't exist yet for some of these...
 
     // If the transform isn't empty, we've changed text - which should produce a 'changed' event in the DOM.
     const ruleTransform = ruleBehavior.transcription.transform;
     if(!isEmptyTransform(ruleTransform)) {
-      if(outputTarget instanceof DOMOutputTarget) {
-        outputTarget.changed = true;
+      if(textStore instanceof DOMOutputTarget) {
+        textStore.changed = true;
       }
     }
   }
diff --git a/web/src/app/browser/src/context/focusAssistant.ts b/web/src/app/browser/src/context/focusAssistant.ts
index 6a7519eefb8..ee67fde2833 100644
--- a/web/src/app/browser/src/context/focusAssistant.ts
+++ b/web/src/app/browser/src/context/focusAssistant.ts
@@ -13,7 +13,7 @@ export class FocusStateAPIObject {
   activated: boolean;
 
   /**
-   * Indicates that KMW is actively maintaining focus on the currently active OutputTarget control
+   * Indicates that KMW is actively maintaining focus on the currently active TextStore control
    * while some UI element (the OSK, a keyboard-change UI) is the current focus of user-interaction.
    */
   activationPending: boolean;
@@ -35,7 +35,7 @@ interface EventMap {
 // Formerly handled under "UIManager".
 /**
  * This class provides fields and methods useful for assisting context management.  Control focus (and
- * thus, activation of the corresponding OutputTarget) should not be lost to non-context components of
+ * thus, activation of the corresponding TextStore) should not be lost to non-context components of
  * KMW, such as the OSK or a keyboard selector.
  */
 export class FocusAssistant extends EventEmitter<EventMap> {
@@ -57,16 +57,16 @@ export class FocusAssistant extends EventEmitter<EventMap> {
    * Long-term idea here: about all of the relevant OSK events that would interact with this have "enter" and
    * "leave" variants - we could take a stack of `Promise`s.  On a `Promise` fulfillment, remove it from the
    * stack.  When the last one is removed, the focus-maintenance state would end, allowing further events
-   * to deactivate the active OutputTarget.
+   * to deactivate the active TextStore.
    */
 
   /**
-   * Indicates that KMW is actively maintaining focus on the currently active OutputTarget control, rather
+   * Indicates that KMW is actively maintaining focus on the currently active TextStore control, rather
    * than losing focus while some UI element (the OSK, a keyboard-change UI) is the most direct recipient
    * of browser focus due to user-interaction - generally, with non-context engine components.
    *
-   * While the flag is active, the context-management system should not deactivate an OutputTarget upon
-   * its element's loss of focus within the page unless setting a different OutputTarget as active.
+   * While the flag is active, the context-management system should not deactivate an TextStore upon
+   * its element's loss of focus within the page unless setting a different TextStore as active.
    *
    * TODO: (potential) Future enhancement - this should not be possible to set if there is no currently-active
    * context target to maintain.
diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index 3826f78bb47..fb7e5ef92cf 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -350,13 +350,13 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     // original context element may have been lost.
     this.restoreLastActiveTarget();
 
-    let outputTarget = this.activeTarget;
+    let textStore = this.activeTarget;
 
-    if(outputTarget == null && this.mostRecentTarget) {
-      outputTarget = this.activeTarget;
+    if(textStore == null && this.mostRecentTarget) {
+      textStore = this.activeTarget;
     }
 
-    if(outputTarget != null) {
+    if(textStore != null) {
       return super.insertText(kbdInterface, Ptext, PdeadKey);
     }
     return false;
@@ -614,16 +614,16 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
    *                      The return value indicates whether (true) or not (false) the calling event handler
    *                      should be terminated immediately after the call.
    */
-  _CommonFocusHelper(outputTarget: OutputTargetElementWrapper<any>): boolean {
+  _CommonFocusHelper(textStore: OutputTargetElementWrapper<any>): boolean {
     const focusAssistant = this.focusAssistant;
 
     const activeKeyboard = this.activeKeyboard?.keyboard;
     if(!focusAssistant.restoringFocus) {
-      outputTarget?.deadkeys().clear();
-      activeKeyboard?.notify(0, outputTarget, 1);  // I2187
+      textStore?.deadkeys().clear();
+      activeKeyboard?.notify(0, textStore, 1);  // I2187
     }
 
-    if(!focusAssistant.restoringFocus && this.mostRecentTarget != outputTarget) {
+    if(!focusAssistant.restoringFocus && this.mostRecentTarget != textStore) {
       focusAssistant.maintainingFocus = false;
     }
     focusAssistant.restoringFocus = false;
@@ -642,7 +642,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
    * Respond to KeymanWeb-aware input element receiving focus
    */
   _ControlFocus = (e: FocusEvent): boolean => {
-    // Step 1: determine the corresponding OutputTarget instance.
+    // Step 1: determine the corresponding TextStore instance.
     const target = eventOutputTarget(e);
     if(!target) {
       // Probably should also make a warning or error?
@@ -654,7 +654,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     //   // But... the following should already have been done during attachment...
     //   // attachmentEngine._AttachToIframe(Ltarg as HTMLIFrameElement);
     //   target.docRoot
-    //   Ltarg=Ltarg.contentWindow.document.body; // And we only care about Ltarg b/c of finding the OutputTarget.
+    //   Ltarg=Ltarg.contentWindow.document.body; // And we only care about Ltarg b/c of finding the TextStore.
     // }
 
     // Step 2:  Make the newly-focused control the active control, and thus the active context.
@@ -685,7 +685,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
       return true;
     }
 
-    // Step 1: determine the corresponding OutputTarget instance.
+    // Step 1: determine the corresponding TextStore instance.
     const target = eventOutputTarget(e);
     if (target == null) {
       return true;
diff --git a/web/src/app/browser/src/defaultBrowserRules.ts b/web/src/app/browser/src/defaultBrowserRules.ts
index fd068e90c10..f85baac16de 100644
--- a/web/src/app/browser/src/defaultBrowserRules.ts
+++ b/web/src/app/browser/src/defaultBrowserRules.ts
@@ -3,7 +3,7 @@ import {
   Codes,
   DefaultRules,
   type KeyEvent,
-  type OutputTargetBase
+  type TextStore
 } from 'keyman/engine/keyboard';
 
 import ContextManager from './contextManager.js';
@@ -32,7 +32,7 @@ export default class DefaultBrowserRules extends DefaultRules {
   /**
    * applyCommand - used when a ProcessorAction represents a non-text "command" within the Engine.
    */
-  applyCommand(Lkc: KeyEvent, outputTarget: OutputTargetBase): void {
+  applyCommand(Lkc: KeyEvent, textStore: TextStore): void {
     const code = this.codeForEvent(Lkc);
 
     const moveToNext = (back: boolean) => {
@@ -56,6 +56,6 @@ export default class DefaultBrowserRules extends DefaultRules {
         break;
     }
 
-    super.applyCommand(Lkc, outputTarget);
+    super.applyCommand(Lkc, textStore);
   }
 }
\ No newline at end of file
diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts
index fde312baef1..c25497aae3c 100644
--- a/web/src/app/browser/src/hardwareEventKeyboard.ts
+++ b/web/src/app/browser/src/hardwareEventKeyboard.ts
@@ -399,8 +399,8 @@ export default class HardwareEventKeyboard extends HardKeyboardBase {
       return true;
     }
 
-    const outputTarget = eventOutputTarget(e);
-    return this.processor.doModifierPress(Levent, outputTarget, false);
+    const textStore = eventOutputTarget(e);
+    return this.processor.doModifierPress(Levent, textStore, false);
   }
 
   private keyPress(e: KeyboardEvent): boolean {
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index 1c5e14094a4..63d28cf850c 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -1,4 +1,4 @@
-import { JSKeyboard, Keyboard, OutputTargetBase, Transcription, TextTransform, Mock, findCommonSubstringEndIndex } from 'keyman/engine/keyboard';
+import { JSKeyboard, Keyboard, TextStore, Transcription, TextTransform, Mock, findCommonSubstringEndIndex } from 'keyman/engine/keyboard';
 import { KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { ContextManagerBase } from 'keyman/engine/main';
 import { WebviewConfiguration } from './configuration.js';
@@ -58,10 +58,10 @@ export class ContextHost extends Mock {
     this.savedState = Mock.from(this);
   }
 
-  restoreTo(original: OutputTargetBase): void {
+  restoreTo(original: TextStore): void {
     this.savedState = Mock.from(this);
     // TODO-web-core
-    super.restoreTo(original as OutputTargetBase);
+    super.restoreTo(original as TextStore);
   }
 
   updateContext(text: string, selStart: number, selEnd: number): boolean {
@@ -138,7 +138,7 @@ export default class ContextManager extends ContextManagerBase<WebviewConfigurat
     return this._activeKeyboard;
   }
 
-  activateKeyboardForTarget(kbd: { keyboard: JSKeyboard, metadata: KeyboardStub }, target: OutputTargetBase) {
+  activateKeyboardForTarget(kbd: { keyboard: JSKeyboard, metadata: KeyboardStub }, target: TextStore) {
     // `target` is irrelevant for `app/webview`, as it'll only ever use 'global' keyboard settings.
 
     // Clone the object to prevent accidental by-reference changes.
diff --git a/web/src/engine/attachment/src/outputTargetForElement.ts b/web/src/engine/attachment/src/outputTargetForElement.ts
index 89ce3866797..2dee5327c97 100644
--- a/web/src/engine/attachment/src/outputTargetForElement.ts
+++ b/web/src/engine/attachment/src/outputTargetForElement.ts
@@ -2,7 +2,7 @@ import { nestedInstanceOf } from "keyman/engine/element-wrappers";
 
 /**
  * Given a DOM event related to an KMW-attached element, this function determines
- * the corresponding OutputTargetBase.
+ * the corresponding TextStore.
  * @param e
  * @returns
  */
@@ -13,7 +13,7 @@ export function eventOutputTarget(e: Event) {
 
 /**
  * Given a DOM event related to an KMW-attached element, this function determines
- * the corresponding OutputTargetBase.
+ * the corresponding TextStore.
  * @param e
  * @returns
  */
@@ -42,7 +42,7 @@ export function outputTargetForElement(Ltarg: HTMLElement) {
     }
   }
 
-  // Step 2:  With the most likely host element determined, obtain the corresponding OutputTargetBase
+  // Step 2:  With the most likely host element determined, obtain the corresponding TextStore
   // instance.
   return Ltarg._kmwAttachment?.interface;
 }
\ No newline at end of file
diff --git a/web/src/engine/element-wrappers/build.sh b/web/src/engine/element-wrappers/build.sh
index 055c93b00ec..3e653280dd2 100755
--- a/web/src/engine/element-wrappers/build.sh
+++ b/web/src/engine/element-wrappers/build.sh
@@ -13,7 +13,7 @@ SUBPROJECT_NAME=engine/element-wrappers
 
 # ################################ Main script ################################
 
-builder_describe "Builds DOM-based OutputTarget subclasses used by the Keyman Engine for Web (KMW)." \
+builder_describe "Builds DOM-based TextStore subclasses used by the Keyman Engine for Web (KMW)." \
   "@/web/src/engine/js-processor" \
   "clean" \
   "configure" \
diff --git a/web/src/engine/element-wrappers/src/outputTargetElementWrapper.ts b/web/src/engine/element-wrappers/src/outputTargetElementWrapper.ts
index 59104f41e28..316704d51d6 100644
--- a/web/src/engine/element-wrappers/src/outputTargetElementWrapper.ts
+++ b/web/src/engine/element-wrappers/src/outputTargetElementWrapper.ts
@@ -1,7 +1,7 @@
-import { OutputTargetBase } from "keyman/engine/keyboard";
+import { TextStore } from "keyman/engine/keyboard";
 import { EventEmitter } from 'eventemitter3';
 
-export abstract class OutputTargetElementWrapper<EventMap extends EventEmitter.ValidEventTypes> extends OutputTargetBase {
+export abstract class OutputTargetElementWrapper<EventMap extends EventEmitter.ValidEventTypes> extends TextStore {
   // JS/TS can't do true multiple inheritance, so we maintain class events on a readonly field.
   public readonly events: EventEmitter<EventMap, this> = new EventEmitter<EventMap, this>();
 
diff --git a/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts b/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
index 5d9745726b1..d15898078dc 100644
--- a/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
+++ b/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
@@ -1,6 +1,6 @@
 import { LexicalModelTypes } from '@keymanapp/common-types';
 import { EventEmitter } from "eventemitter3";
-import { OutputTargetBase } from "keyman/engine/keyboard";
+import { TextStore } from "keyman/engine/keyboard";
 
 export class ReadySuggestions {
   suggestions: LexicalModelTypes.Suggestion[];
@@ -45,10 +45,10 @@ export interface LanguageProcessorEventMap {
   /**
    * Is called synchronously once suggestion application is successful and the context has been updated.
    *
-   * @param outputTarget The `OutputTargetBase` representation of the context the suggestion was applied to.
+   * @param textStore The `TextStore` representation of the context the suggestion was applied to.
    * @returns
    */
-  'suggestionapplied': (outputTarget: OutputTargetBase) => boolean
+  'suggestionapplied': (textStore: TextStore) => boolean
 }
 
 
@@ -56,19 +56,19 @@ export interface LanguageProcessorSpec extends EventEmitter<LanguageProcessorEve
 
   get state(): StateChangeEnum;
 
-  invalidateContext(outputTarget: OutputTargetBase, layerId: string): Promise<LexicalModelTypes.Suggestion[]>;
+  invalidateContext(textStore: TextStore, layerId: string): Promise<LexicalModelTypes.Suggestion[]>;
 
   /**
    *
    * @param suggestion
-   * @param outputTarget
+   * @param textStore
    * @param getLayerId      a function that returns the current layerId,
    *                        required because layerid can be changed by PostKeystroke
    * @returns
    */
-  applySuggestion(suggestion: LexicalModelTypes.Suggestion, outputTarget: OutputTargetBase, getLayerId: () => string): Promise<LexicalModelTypes.Reversion>;
+  applySuggestion(suggestion: LexicalModelTypes.Suggestion, textStore: TextStore, getLayerId: () => string): Promise<LexicalModelTypes.Reversion>;
 
-  applyReversion(reversion: LexicalModelTypes.Reversion, outputTarget: OutputTargetBase): Promise<LexicalModelTypes.Suggestion[]>;
+  applyReversion(reversion: LexicalModelTypes.Reversion, textStore: TextStore): Promise<LexicalModelTypes.Suggestion[]>;
 
   get wordbreaksAfterSuggestions(): boolean;
 
diff --git a/web/src/engine/interfaces/src/prediction/predictionContext.ts b/web/src/engine/interfaces/src/prediction/predictionContext.ts
index ae2d097aa42..7ee27de9bff 100644
--- a/web/src/engine/interfaces/src/prediction/predictionContext.ts
+++ b/web/src/engine/interfaces/src/prediction/predictionContext.ts
@@ -4,7 +4,7 @@ import Keep = LexicalModelTypes.Keep;
 import Reversion = LexicalModelTypes.Reversion;
 import Suggestion = LexicalModelTypes.Suggestion;
 import { type LanguageProcessorSpec , ReadySuggestions, type InvalidateSourceEnum, StateChangeHandler } from './languageProcessor.interface.js';
-import { type OutputTargetBase } from "keyman/engine/keyboard";
+import { type TextStore } from "keyman/engine/keyboard";
 
 interface PredictionContextEventMap {
   update: (suggestions: Suggestion[]) => void;
@@ -41,13 +41,13 @@ export default class PredictionContext extends EventEmitter<PredictionContextEve
   /**
    * Represents the active context used when requesting and applying predictive-text operations.
    */
-  private _currentTarget: OutputTargetBase;
+  private _currentTarget: TextStore;
 
-  public get currentTarget(): OutputTargetBase {
+  public get currentTarget(): TextStore {
     return this._currentTarget;
   }
 
-  public setCurrentTarget(target: OutputTargetBase): Promise<Suggestion[]> {
+  public setCurrentTarget(target: TextStore): Promise<Suggestion[]> {
     const originalTarget = this._currentTarget;
     this._currentTarget = target;
 
diff --git a/web/src/engine/js-processor/src/jsKeyboardInterface.ts b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
index 1bfa90ef603..3a45cbaa6b7 100644
--- a/web/src/engine/js-processor/src/jsKeyboardInterface.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
@@ -20,7 +20,7 @@ import {
   SystemStoreIDs,
   type Deadkey,
   type KeyEvent,
-  type OutputTargetBase,
+  type TextStore,
   VariableStore,
   VariableStoreDictionary,
   VariableStoreSerializer,
@@ -186,7 +186,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
   cachedContextEx: CachedContextEx = new CachedContextEx();
   ruleContextEx: CachedContextEx;
 
-  activeTargetOutput: OutputTargetBase;
+  activeTargetOutput: TextStore;
   ruleBehavior: ProcessorAction;
 
   systemStores: {[storeID: number]: SystemStore};
@@ -229,7 +229,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * A text-insertion method used by custom OSKs for helpHTML interaction, like with sil_euro_latin.
    *
    * This function currently bypasses web-core's standard text handling control path and all predictive text processing.
-   * It also has DOM-dependencies that help ensure KMW's active OutputTarget retains focus during use.
+   * It also has DOM-dependencies that help ensure KMW's active TextStore retains focus during use.
    */
   insertText?: (Ptext: string, PdeadKey: number) => void;
 
@@ -254,7 +254,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *
    * @param       {number}      n             Number of characters to move back from caret
    * @param       {number}      ln            Number of characters to return
-   * @param       {Object}      outputTarget  Element to work with (must be currently focused element)
+   * @param       {Object}      textStore  Element to work with (must be currently focused element)
    * @return      {string}                    Context string
    *
    * Example     [abcdef|ghi] as INPUT, with the caret position marked by |:
@@ -263,13 +263,13 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *             KC(10,10,Pelem) == "abcdef"  i.e. return as much as possible of the requested string
    */
 
-  context(n: number, ln: number, outputTarget: OutputTargetBase): string {
+  context(n: number, ln: number, textStore: TextStore): string {
     const v = this.cachedContext.get(n, ln);
     if(v !== null) {
       return v;
     }
 
-    const r = this.KC_(n, ln, outputTarget);
+    const r = this.KC_(n, ln, textStore);
     this.cachedContext.set(n, ln, r);
     return r;
   }
@@ -279,7 +279,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *
    * @param       {number}      n             Number of characters to move back from caret
    * @param       {number}      ln            Number of characters to return
-   * @param       {Object}      outputTarget  Element to work with (must be currently focused element)
+   * @param       {Object}      textStore  Element to work with (must be currently focused element)
    * @return      {string}                    Context string
    *
    * Example     [abcdef|ghi] as INPUT, with the caret position marked by |:
@@ -287,11 +287,11 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *             KC(3,3,Pelem) == "def"
    *             KC(10,10,Pelem) == "XXXXabcdef"  i.e. return as much as possible of the requested string, where X = \uFFFE
    */
-  private KC_(n: number, ln: number, outputTarget: OutputTargetBase): string {
+  private KC_(n: number, ln: number, textStore: TextStore): string {
     let tempContext = '';
 
     // If we have a selection, we have an empty context
-    tempContext = outputTarget.isSelectionEmpty() ? outputTarget.getTextBeforeCaret() : "";
+    tempContext = textStore.isSelectionEmpty() ? textStore.getTextBeforeCaret() : "";
 
     if(KMWString.length(tempContext) < n) {
       tempContext = Array(n-KMWString.length(tempContext)+1).join("\uFFFE") + tempContext;
@@ -304,7 +304,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * Function     nul           KN
    * Scope        Public
    * @param       {number}      n             Length of context to check
-   * @param       {Object}      outputTarget  Element to work with (must be currently focused element)
+   * @param       {Object}      textStore  Element to work with (must be currently focused element)
    * @return      {boolean}                   True if length of context is less than or equal to n
    * Description  Test length of context, return true if the length of the context is less than or equal to n
    *
@@ -313,8 +313,8 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *             KN(2,Pelem) == FALSE
    *             KN(4,Pelem) == TRUE
    */
-  nul(n: number, outputTarget: OutputTargetBase): boolean {
-    const cx=this.context(n+1, 1, outputTarget);
+  nul(n: number, textStore: TextStore): boolean {
+    const cx=this.context(n+1, 1, textStore);
 
     // With #31, the result will be a replacement character if context is empty.
     return cx === "\uFFFE";
@@ -324,18 +324,18 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * Function     contextMatch  KCM
    * Scope        Public
    * @param       {number}      n             Number of characters to move back from caret
-   * @param       {Object}      outputTarget  Focused element
+   * @param       {Object}      textStore  Focused element
    * @param       {string}      val           String to match
    * @param       {number}      ln            Number of characters to return
    * @return      {boolean}                   True if selected context matches val
    * Description  Test keyboard context for match
    */
-  contextMatch(n: number, outputTarget: OutputTargetBase, val: string, ln: number): boolean {
-    const cx=this.context(n, ln, outputTarget);
+  contextMatch(n: number, textStore: TextStore, val: string, ln: number): boolean {
+    const cx=this.context(n, ln, textStore);
     if(cx === val) {
       return true; // I3318
     }
-    (outputTarget as OutputTargetBase).deadkeys().resetMatched(); // I3318
+    (textStore as TextStore).deadkeys().resetMatched(); // I3318
     return false;
   }
 
@@ -344,10 +344,10 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *
    * @param       {number}      n             Number of characters to move back from caret
    * @param       {number}      ln            Number of characters to return
-   * @param       {Object}      outputTarget  Element to work with (must be currently focused element)
+   * @param       {Object}      textStore  Element to work with (must be currently focused element)
    * @return      {Array}                     Context array (of strings and numbers)
    */
-  private _BuildExtendedContext(n: number, ln: number, outputTarget: OutputTargetBase): CachedExEntry {
+  private _BuildExtendedContext(n: number, ln: number, textStore: TextStore): CachedExEntry {
     let cache: CachedExEntry = this.cachedContextEx.get(n, ln);
     if(cache !== null) {
       return cache;
@@ -357,14 +357,14 @@ export class JSKeyboardInterface extends KeyboardHarness {
       cache = this.cachedContextEx.get(n, n);
       if(cache === null) {
         // First, let's make sure we have a cloned, sorted copy of the deadkey array.
-        const unmatchedDeadkeys = outputTarget.deadkeys().toSortedArray(); // Is reverse-order sorted for us already.
+        const unmatchedDeadkeys = textStore.deadkeys().toSortedArray(); // Is reverse-order sorted for us already.
 
         // Time to build from scratch!
         let index = 0;
         cache = { valContext: [], deadContext: []};
         while(cache.valContext.length < n) {
           // As adapted from `deadkeyMatch`.
-          const sp = outputTarget.getDeadkeyCaret();
+          const sp = textStore.getDeadkeyCaret();
           const deadPos = sp - index;
           if(unmatchedDeadkeys.length > 0 && unmatchedDeadkeys[0].p > deadPos) {
             // We have deadkeys at the right-hand side of the caret!  They don't belong in the context, so pop 'em off.
@@ -377,7 +377,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
             unmatchedDeadkeys.splice(0, 1);
           } else {
             // Take the character.  We get "\ufffe" if it doesn't exist.
-            const kc = this.context(++index, 1, outputTarget);
+            const kc = this.context(++index, 1, textStore);
             cache.valContext = ([kc] as (string|number)[]).concat(cache.valContext);
           }
         }
@@ -397,16 +397,16 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * Function       fullContextMatch    KFCM
    * Scope          Private
    * @param         {number}    n             Number of characters to move back from caret
-   * @param         {Object}    outputTarget  Focused element
+   * @param         {Object}    textStore  Focused element
    * @param         {Array}     rule          An array of ContextEntries to match.
    * @return        {boolean}                 True if the fully-specified rule context matches the current KMW state.
    *
    * A KMW 10+ function designed to bring KMW closer to Keyman Desktop functionality,
    * near-directly modeling (externally) the compiled form of Desktop rules' context section.
    */
-  fullContextMatch(n: number, outputTarget: OutputTargetBase, rule: ContextEntry[]): boolean {
+  fullContextMatch(n: number, textStore: TextStore, rule: ContextEntry[]): boolean {
     // Stage one:  build the context index map.
-    const fullContext = this._BuildExtendedContext(n, rule.length, outputTarget);
+    const fullContext = this._BuildExtendedContext(n, rule.length, textStore);
     this.ruleContextEx = this.cachedContextEx.clone();
     const context = fullContext.valContext;
     const deadContext = fullContext.deadContext;
@@ -497,7 +497,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
 
     if(mismatch) {
       // Reset the matched 'any' indices, if any.
-      outputTarget.deadkeys().resetMatched();
+      textStore.deadkeys().resetMatched();
       this._AnyIndices = [];
     }
 
@@ -588,7 +588,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
       retVal = (keyCode == Lrulekey); // I3318, I3555
     }
     if(!retVal) {
-      (this.activeTargetOutput as OutputTargetBase).deadkeys().resetMatched();  // I3318
+      (this.activeTargetOutput as TextStore).deadkeys().resetMatched();  // I3318
     }
     return retVal; // I3318
   };
@@ -623,22 +623,22 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * Function     deadkeyMatch  KDM
    * Scope        Public
    * @param       {number}      n             offset from current cursor position
-   * @param       {Object}      outputTarget  target element
+   * @param       {Object}      textStore  target element
    * @param       {number}      d             deadkey
    * @return      {boolean}                   True if deadkey found selected context matches val
    * Description  Match deadkey at current cursor position
    */
-  deadkeyMatch(n: number, outputTarget: OutputTargetBase, d: number): boolean {
-    return outputTarget.hasDeadkeyMatch(n, d);
+  deadkeyMatch(n: number, textStore: TextStore, d: number): boolean {
+    return textStore.hasDeadkeyMatch(n, d);
   }
 
   /**
    * Function     beep          KB
    * Scope        Public
-   * @param       {Object}      outputTarget  element to flash
+   * @param       {Object}      textStore  element to flash
    * Description  Flash body as substitute for audible beep; notify embedded device to vibrate
    */
-  beep(outputTarget: OutputTargetBase): void {
+  beep(textStore: TextStore): void {
     this.resetContextCache();
 
     // Denote as part of the matched rule's behavior.
@@ -728,10 +728,10 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param       {number}      Pdn           no of character to overwrite (delete)
    * @param       {string}      Ps            string
    * @param       {number}      Pn            index
-   * @param       {Object}      outputTarget  element to output to
+   * @param       {Object}      textStore  element to output to
    * Description  Output a character selected from the string according to the offset in the index array
    */
-  indexOutput(Pdn: number, Ps: KeyboardStore, Pn: number, outputTarget: OutputTargetBase): void {
+  indexOutput(Pdn: number, Ps: KeyboardStore, Pn: number, textStore: TextStore): void {
     this.resetContextCache();
 
     const assertNever = function(x: never): never {
@@ -742,20 +742,20 @@ export class JSKeyboardInterface extends KeyboardHarness {
     const indexChar = this._Index(Ps, Pn);
     if(indexChar !== "") {
       if(typeof indexChar == 'string' ) {
-        this.output(Pdn, outputTarget, indexChar);  //I3319
+        this.output(Pdn, textStore, indexChar);  //I3319
       } else if(indexChar.t) {
         switch(indexChar.t) {
           case 'b': // Beep commands may appear within stores.
-            this.beep(outputTarget);
+            this.beep(textStore);
             break;
           case 'd':
-            this.deadkeyOutput(Pdn, outputTarget, indexChar.d);
+            this.deadkeyOutput(Pdn, textStore, indexChar.d);
             break;
           default:
             assertNever(indexChar);
         }
       } else { // For keyboards developed during 10.0's alpha phase - t:'d' was assumed.
-        this.deadkeyOutput(Pdn, outputTarget, (indexChar as any).d);
+        this.deadkeyOutput(Pdn, textStore, (indexChar as any).d);
       }
     }
   }
@@ -765,15 +765,15 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * Function     deleteContext KDC
    * Scope        Public
    * @param       {number}      dn            number of context entries to overwrite
-   * @param       {Object}      outputTarget  element to output to
+   * @param       {Object}      textStore  element to output to
    * Description  Keyboard output
    */
-  deleteContext(dn: number, outputTarget: OutputTargetBase): void {
+  deleteContext(dn: number, textStore: TextStore): void {
     let context: CachedExEntry;
 
     // We want to control exactly which deadkeys get removed.
     if(dn > 0) {
-      context = this._BuildExtendedContext(dn, dn, (outputTarget as OutputTargetBase));
+      context = this._BuildExtendedContext(dn, dn, (textStore as TextStore));
       let nulCount = 0;
 
       for(let i=0; i < context.valContext.length; i++) {
@@ -781,7 +781,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
 
         if(dk) {
           // Remove deadkey in context.
-          (outputTarget as OutputTargetBase).deadkeys().remove(dk);
+          (textStore as TextStore).deadkeys().remove(dk);
 
           // Reduce our reported context size.
           dn--;
@@ -800,33 +800,33 @@ export class JSKeyboardInterface extends KeyboardHarness {
     }
 
     // If a matched deadkey hasn't been deleted, we don't WANT to delete it.
-    (outputTarget as OutputTargetBase).deadkeys().resetMatched();
+    (textStore as TextStore).deadkeys().resetMatched();
 
     // Why reinvent the wheel?  Delete the remaining characters by 'inserting a blank string'.
-    this.output(dn, outputTarget, '');
+    this.output(dn, textStore, '');
   }
 
   /**
    * Function     output        KO
    * Scope        Public
    * @param       {number}      dn            number of characters to overwrite
-   * @param       {Object}      outputTarget  element to output to
+   * @param       {Object}      textStore  element to output to
    * @param       {string}      s             string to output
    * Description  Keyboard output
    */
-  output(dn: number, outputTarget: OutputTargetBase, s:string): void {
+  output(dn: number, textStore: TextStore, s:string): void {
     this.resetContextCache();
 
-    outputTarget.saveProperties();
-    outputTarget.clearSelection();
-    (outputTarget as OutputTargetBase).deadkeys().deleteMatched(); // I3318
+    textStore.saveProperties();
+    textStore.clearSelection();
+    (textStore as TextStore).deadkeys().deleteMatched(); // I3318
     if(dn >= 0) {
       // Automatically manages affected deadkey positions.  Does not delete deadkeys b/c legacy behavior support.
-      outputTarget.deleteCharsBeforeCaret(dn);
+      textStore.deleteCharsBeforeCaret(dn);
     }
     // Automatically manages affected deadkey positions.
-    outputTarget.insertTextBeforeCaret(s);
-    outputTarget.restoreProperties();
+    textStore.insertTextBeforeCaret(s);
+    textStore.restoreProperties();
   }
 
   /**
@@ -837,23 +837,23 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @alias       KCXO
    * @public
    * @param       {number}        Pdn            number of characters to delete left of cursor
-   * @param       {OutputTargetBase}  outputTarget   target to output to
+   * @param       {TextStore}  textStore   target to output to
    * @param       {number}        contextLength  length of current rule context to retrieve
    * @param       {number}        contextOffset  offset from start of current rule context, 1-based
    */
-  contextExOutput(Pdn: number, outputTarget: OutputTargetBase, contextLength: number, contextOffset: number): void {
+  contextExOutput(Pdn: number, textStore: TextStore, contextLength: number, contextOffset: number): void {
     this.resetContextCache();
 
     if(Pdn >= 0) {
-      this.output(Pdn, outputTarget, "");
+      this.output(Pdn, textStore, "");
     }
 
     const context = this.ruleContextEx.get(contextLength, contextLength);
     const dk = context.deadContext[contextOffset-1], vc = context.valContext[contextOffset-1];
     if(dk) {
-      outputTarget.insertDeadkeyBeforeCaret(dk.d);
+      textStore.insertDeadkeyBeforeCaret(dk.d);
     } else if(typeof vc == 'string') {
-      this.output(-1, outputTarget, vc);
+      this.output(-1, textStore, vc);
     } else {
       throw new Error("contextExOutput: should never be a numeric valContext with no corresponding deadContext");
     }
@@ -863,18 +863,18 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * Function     deadkeyOutput KDO
    * Scope        Public
    * @param       {number}      Pdn           no of character to overwrite (delete)
-   * @param       {OutputTargetBase}      outputTarget  element to output to
+   * @param       {TextStore}      textStore  element to output to
    * @param       {number}      Pd            deadkey id
    * Description  Record a deadkey at current cursor position, deleting Pdn characters first
    */
-  deadkeyOutput(Pdn: number, outputTarget: OutputTargetBase, Pd: number): void {
+  deadkeyOutput(Pdn: number, textStore: TextStore, Pd: number): void {
     this.resetContextCache();
 
     if(Pdn >= 0) {
-      this.output(Pdn, outputTarget,"");  //I3318 corrected to >=
+      this.output(Pdn, textStore,"");  //I3318 corrected to >=
     }
 
-    outputTarget.insertDeadkeyBeforeCaret(Pd);
+    textStore.insertDeadkeyBeforeCaret(Pd);
     //    _DebugDeadKeys(Pelem, 'KDeadKeyOutput: dn='+Pdn+'; deadKey='+Pd);
   }
 
@@ -883,10 +883,10 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *
    * @param       {number}      systemId      ID of the system store to test (only TSS_LAYER currently supported)
    * @param       {string}      strValue      String value to compare to
-   * @param       {OutputTargetBase}      outputTarget  Currently active element (may be needed by future tests)
+   * @param       {TextStore}      textStore  Currently active element (may be needed by future tests)
    * @return      {boolean}                   True if the test succeeds
    */
-  ifStore(systemId: number, strValue: string, outputTarget: OutputTargetBase): boolean {
+  ifStore(systemId: number, strValue: string, textStore: TextStore): boolean {
     let result=true;
     const store = this.systemStores[systemId];
     if(store) {
@@ -900,14 +900,14 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *
    * @param       {number}      systemId      ID of the system store to set (only TSS_LAYER currently supported)
    * @param       {string}      strValue      String to set as the system store content
-   * @param       {OutputTargetBase}      outputTarget  Currently active element (may be needed in future tests)
+   * @param       {TextStore}      textStore  Currently active element (may be needed in future tests)
    * @return      {boolean}                   True if command succeeds
    *                                          (i.e. for TSS_LAYER, if the layer is successfully selected)
    *
    * Note that option/variable stores are instead set within keyboard script code, as they only
    * affect keyboard behavior.
    */
-  setStore(systemId: number, strValue: string, outputTarget: OutputTargetBase): boolean {
+  setStore(systemId: number, strValue: string, textStore: TextStore): boolean {
     this.resetContextCache();
     // Unique case:  we only allow set(&layer) ops from keyboard rules triggered by touch OSKs.
     if(systemId == SystemStoreIDs.TSS_LAYER && this.activeDevice.touchable) {
@@ -977,64 +977,64 @@ export class JSKeyboardInterface extends KeyboardHarness {
     this.cachedContextEx.reset();
   }
 
-  defaultBackspace(outputTarget: OutputTargetBase) {
-    if(outputTarget.isSelectionEmpty()) {
+  defaultBackspace(textStore: TextStore) {
+    if(textStore.isSelectionEmpty()) {
       // Delete the character left of the caret
-      this.output(1, outputTarget, "");
+      this.output(1, textStore, "");
     } else {
       // Delete just the selection
-      this.output(0, outputTarget, "");
+      this.output(0, textStore, "");
     }
   }
 
   /**
    * Function     processNewContextEvent
    * Scope        Private
-   * @param       {Object}        outputTarget   The target receiving input
+   * @param       {Object}        textStore   The target receiving input
    * @param       {Object}        keystroke      The input keystroke (with its properties) to be mapped by the keyboard.
    * Description  Calls the keyboard's `begin newContext` group
    * @returns     {ProcessorAction}  Record of commands and state changes that result from executing `begin NewContext`
    */
-  processNewContextEvent(outputTarget: OutputTargetBase, keystroke: KeyEvent): ProcessorAction {
+  processNewContextEvent(textStore: TextStore, keystroke: KeyEvent): ProcessorAction {
     if(!this.activeKeyboard) {
       throw "No active keyboard for keystroke processing!";
     }
-    return this.process(this.activeKeyboard.processNewContextEvent.bind(this.activeKeyboard), outputTarget, keystroke, true);
+    return this.process(this.activeKeyboard.processNewContextEvent.bind(this.activeKeyboard), textStore, keystroke, true);
   }
 
   /**
    * Function     processPostKeystroke
    * Scope        Private
-   * @param       {Object}        outputTarget   The target receiving input
+   * @param       {Object}        textStore   The target receiving input
    * @param       {Object}        keystroke      The input keystroke with relevant properties to be mapped by the keyboard.
    * Description  Calls the keyboard's `begin postKeystroke` group
    * @returns     {ProcessorAction}  Record of commands and state changes that result from executing `begin PostKeystroke`
    */
-  processPostKeystroke(outputTarget: OutputTargetBase, keystroke: KeyEvent): ProcessorAction {
+  processPostKeystroke(textStore: TextStore, keystroke: KeyEvent): ProcessorAction {
     if(!this.activeKeyboard) {
       throw "No active keyboard for keystroke processing!";
     }
-    return this.process(this.activeKeyboard.processPostKeystroke.bind(this.activeKeyboard), outputTarget, keystroke, true);
+    return this.process(this.activeKeyboard.processPostKeystroke.bind(this.activeKeyboard), textStore, keystroke, true);
   }
 
   /**
    * Function     processKeystroke
    * Scope        Private
-   * @param       {Object}        outputTarget   The target receiving input
+   * @param       {Object}        textStore   The target receiving input
    * @param       {Object}        keystroke   The input keystroke (with its properties) to be mapped by the keyboard.
    * Description  Encapsulates calls to keyboard input processing.
    * @returns     {ProcessorAction}  Record of commands and state changes that result from executing `begin Unicode`
    */
-  processKeystroke(outputTarget: OutputTargetBase, keystroke: KeyEvent): ProcessorAction {
+  processKeystroke(textStore: TextStore, keystroke: KeyEvent): ProcessorAction {
     if(!this.activeKeyboard) {
       throw "No active keyboard for keystroke processing!";
     }
-    return this.process(this.activeKeyboard.process.bind(this.activeKeyboard), outputTarget, keystroke, false);
+    return this.process(this.activeKeyboard.process.bind(this.activeKeyboard), textStore, keystroke, false);
   }
 
-  private process(callee: (outputTarget: OutputTargetBase, keystroke: KeyEvent) => boolean, outputTarget: OutputTargetBase, keystroke: KeyEvent, readonly: boolean): ProcessorAction {
+  private process(callee: (textStore: TextStore, keystroke: KeyEvent) => boolean, textStore: TextStore, keystroke: KeyEvent, readonly: boolean): ProcessorAction {
     // Clear internal state tracking data from prior keystrokes.
-    if(!outputTarget) {
+    if(!textStore) {
       throw "No target specified for keyboard output!";
     } else if(!this.activeKeyboard) {
       throw "No active keyboard for keystroke processing!";
@@ -1042,13 +1042,13 @@ export class JSKeyboardInterface extends KeyboardHarness {
       throw "No callee for keystroke processing!";
     }
 
-    outputTarget.invalidateSelection();
+    textStore.invalidateSelection();
 
-    outputTarget.deadkeys().resetMatched();       // I3318
+    textStore.deadkeys().resetMatched();       // I3318
     this.resetContextCache();
 
-    // Capture the initial state of the OutputTarget before any rules are matched.
-    const preInput = Mock.from(outputTarget, true);
+    // Capture the initial state of the TextStore before any rules are matched.
+    const preInput = Mock.from(textStore, true);
 
     // Capture the initial state of any variable stores
     const cachedVariableStores = this.activeKeyboard.variableStores;
@@ -1061,12 +1061,12 @@ export class JSKeyboardInterface extends KeyboardHarness {
     this.activeDevice = keystroke.device;
 
     // Calls the start-group of the active keyboard.
-    this.activeTargetOutput = outputTarget;
-    const matched = callee(outputTarget, keystroke);
+    this.activeTargetOutput = textStore;
+    const matched = callee(textStore, keystroke);
     this.activeTargetOutput = null;
 
     // Finalize the rule's results.
-    this.ruleBehavior.transcription = outputTarget.buildTranscriptionFrom(preInput, keystroke, readonly);
+    this.ruleBehavior.transcription = textStore.buildTranscriptionFrom(preInput, keystroke, readonly);
 
     // We always backup the changes to variable stores to the ProcessorAction, to
     // be applied during finalization, then restore them to the cached initial
diff --git a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
index 52510cda650..14f720b3ce8 100644
--- a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
@@ -11,7 +11,7 @@ import { ModifierKeyConstants } from '@keymanapp/common-types';
 import {
   Codes, type JSKeyboard, MinimalKeymanGlobal, KeyEvent, Layouts,
   DefaultRules, EmulationKeystrokes, type MutableSystemStore,
-  OutputTargetBase, ProcessorAction, SystemStoreIDs, Mock
+  TextStore, ProcessorAction, SystemStoreIDs, Mock
 } from "keyman/engine/keyboard";
 import { JSKeyboardInterface }  from './jsKeyboardInterface.js';
 import { DeviceSpec, globalObject, KMWString } from "@keymanapp/web-utils";
@@ -20,7 +20,7 @@ import { DeviceSpec, globalObject, KMWString } from "@keymanapp/web-utils";
 
 // Also relies on @keymanapp/web-utils, which is included via tsconfig.json.
 
-export type BeepHandler = (outputTarget: OutputTargetBase) => void;
+export type BeepHandler = (textStore: TextStore) => void;
 export type LogMessageHandler = (str: string) => void;
 
 export interface ProcessorInitOptions {
@@ -122,18 +122,18 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
    * where and when appropriate.
    *
    * @param   {object}  Lkc           The pre-analyzed KeyEvent object
-   * @param   {OutputTargetBase} outputTarget  The output target receiving the KeyEvent
+   * @param   {TextStore} textStore  The output target receiving the KeyEvent
    * @param   {boolean}  readonly      True if the target is read-only
    * @return  {string}
    */
-  private defaultRuleBehavior(Lkc: KeyEvent, outputTarget: OutputTargetBase, readonly: boolean): ProcessorAction {
-    const preInput = Mock.from(outputTarget, readonly);
+  private defaultRuleBehavior(Lkc: KeyEvent, textStore: TextStore, readonly: boolean): ProcessorAction {
+    const preInput = Mock.from(textStore, readonly);
     const ruleBehavior = new ProcessorAction();
 
     let matched = false;
     let char = '';
     let special: EmulationKeystrokes;
-    if(Lkc.isSynthetic || outputTarget.isSynthetic) {
+    if(Lkc.isSynthetic || textStore.isSynthetic) {
       matched = true;  // All the conditions below result in matches until the final else, which restores the expected default
                         // if no match occurs.
 
@@ -146,10 +146,10 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
       } else if((special = this.defaultRules.forSpecialEmulation(Lkc)) != null) {
         switch(special) {
           case EmulationKeystrokes.Backspace:
-            this.keyboardInterface.defaultBackspace(outputTarget);
+            this.keyboardInterface.defaultBackspace(textStore);
             break;
           case EmulationKeystrokes.Enter:
-            outputTarget.handleNewlineAtCaret();
+            textStore.handleNewlineAtCaret();
             break;
           // case '\u007f': // K_DEL
             // // For (possible) future implementation.
@@ -171,13 +171,13 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
         special = this.defaultRules.forSpecialEmulation(Lkc)
         if(special == EmulationKeystrokes.Backspace) {
           // A browser's default backspace may fail to delete both parts of an SMP character.
-          this.keyboardInterface.defaultBackspace(outputTarget);
+          this.keyboardInterface.defaultBackspace(textStore);
         } else if(special || this.defaultRules.isCommand(Lkc)) { // Filters out 'commands' like TAB.
           // We only do the "for special emulation" cases under the condition above... aside from backspace
           // Let the browser handle those.
           return null;
         } else {
-          this.keyboardInterface.output(0, outputTarget, char);
+          this.keyboardInterface.output(0, textStore, char);
         }
       } else {
         // No match, no default ProcessorAction.
@@ -190,33 +190,33 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
       return ruleBehavior;
     }
 
-    const transcription = outputTarget.buildTranscriptionFrom(preInput, Lkc, readonly);
+    const transcription = textStore.buildTranscriptionFrom(preInput, Lkc, readonly);
     ruleBehavior.transcription = transcription;
 
     return ruleBehavior;
   }
 
-  private processNewContextEvent(device: DeviceSpec, outputTarget: OutputTargetBase): ProcessorAction {
+  private processNewContextEvent(device: DeviceSpec, textStore: TextStore): ProcessorAction {
     return this.activeKeyboard ?
-      this.keyboardInterface.processNewContextEvent(outputTarget, this.activeKeyboard.constructNullKeyEvent(device, this.stateKeys)) :
+      this.keyboardInterface.processNewContextEvent(textStore, this.activeKeyboard.constructNullKeyEvent(device, this.stateKeys)) :
       null;
   }
 
-  public processPostKeystroke(device: DeviceSpec, outputTarget: OutputTargetBase): ProcessorAction {
+  public processPostKeystroke(device: DeviceSpec, textStore: TextStore): ProcessorAction {
     return this.activeKeyboard ?
-      this.keyboardInterface.processPostKeystroke(outputTarget, this.activeKeyboard.constructNullKeyEvent(device, this.stateKeys)) :
+      this.keyboardInterface.processPostKeystroke(textStore, this.activeKeyboard.constructNullKeyEvent(device, this.stateKeys)) :
       null;
   }
 
-  public processKeystroke(keyEvent: KeyEvent, outputTarget: OutputTargetBase): ProcessorAction {
+  public processKeystroke(keyEvent: KeyEvent, textStore: TextStore): ProcessorAction {
     let matchBehavior: ProcessorAction;
 
     // Before keyboard rules apply, check if the left-context is empty.
-    const nothingDeletable = KMWString.length(outputTarget.getTextBeforeCaret()) == 0 && outputTarget.isSelectionEmpty();
+    const nothingDeletable = KMWString.length(textStore.getTextBeforeCaret()) == 0 && textStore.isSelectionEmpty();
 
     // Pass this key code and state to the keyboard program
     if(this.activeKeyboard && keyEvent.Lcode != 0) {
-      matchBehavior = this.keyboardInterface.processKeystroke(outputTarget, keyEvent);
+      matchBehavior = this.keyboardInterface.processKeystroke(textStore, keyEvent);
     }
 
     // Final conditional component - if someone actually makes a keyboard rule that blocks output
@@ -226,7 +226,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
     // behavior in cases where such rules actually would appear.  (Though, _that_ should be caught
     // in the keyboard-review process and heavily discouraged, so... yeah.)
     if(nothingDeletable && keyEvent.Lcode == Codes.keyCodes.K_BKSP && matchBehavior.triggerKeyDefault) {
-      matchBehavior = this.defaultRuleBehavior(keyEvent, outputTarget, false);
+      matchBehavior = this.defaultRuleBehavior(keyEvent, textStore, false);
       matchBehavior.triggerKeyDefault = true;
       // Force a single `deleteLeft`.
       // @ts-ignore // force value override, because deleteLeft is marked readonly.
@@ -238,11 +238,11 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
 
       // Handle unmapped keys, including special keys
       // The following is physical layout dependent, so should be avoided if possible.  All keys should be mapped.
-      this.keyboardInterface.activeTargetOutput = outputTarget;
+      this.keyboardInterface.activeTargetOutput = textStore;
 
       // Match against the 'default keyboard' - rules to mimic the default string output when typing in a browser.
       // Many keyboards rely upon these 'implied rules'.
-      const defaultBehavior = this.defaultRuleBehavior(keyEvent, outputTarget, false);
+      const defaultBehavior = this.defaultRuleBehavior(keyEvent, textStore, false);
       if(defaultBehavior) {
         if(!matchBehavior) {
           matchBehavior = defaultBehavior;
@@ -537,13 +537,13 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
 
   // Returns true if the key event is a modifier press, allowing keyPress to return selectively
   // in those cases.
-  public doModifierPress(Levent: KeyEvent, outputTarget: OutputTargetBase, isKeyDown: boolean): boolean {
+  public doModifierPress(Levent: KeyEvent, textStore: TextStore, isKeyDown: boolean): boolean {
     if(!this.activeKeyboard) {
       return false;
     }
 
     if(Levent.isModifier) {
-      this.activeKeyboard.notify(Levent.Lcode, outputTarget, isKeyDown ? 1 : 0);
+      this.activeKeyboard.notify(Levent.Lcode, textStore, isKeyDown ? 1 : 0);
       // For eventual integration - we bypass an OSK update for physical keystrokes when in touch mode.
       if(!Levent.device.touchable) {
         return this._UpdateVKShift(Levent); // I2187
@@ -553,7 +553,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
     }
 
     if(Levent.LmodifierChange) {
-      this.activeKeyboard.notify(0, outputTarget, 1);
+      this.activeKeyboard.notify(0, textStore, 1);
       if(!Levent.device.touchable) {
         this._UpdateVKShift(Levent);
       }
@@ -567,20 +567,20 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
    * Tell the currently active keyboard that a new context has been selected,
    * e.g. by focus change, selection change, keyboard change, etc.
    *
-   * @param    {Object}   outputTarget  The OutputTarget that has focus
+   * @param    {Object}   textStore  The TextStore that has focus
    * @returns  {Object}                 A ProcessorAction object describing the cumulative effects of
    *                                    all matched keyboard rules
    */
-  private performNewContextEvent(outputTarget: OutputTargetBase): ProcessorAction {
-    const ruleBehavior = this.processNewContextEvent(this.contextDevice, outputTarget);
+  private performNewContextEvent(textStore: TextStore): ProcessorAction {
+    const ruleBehavior = this.processNewContextEvent(this.contextDevice, textStore);
 
     if (ruleBehavior) {
-      this.finalizeProcessorAction(ruleBehavior, outputTarget);
+      this.finalizeProcessorAction(ruleBehavior, textStore);
     }
     return ruleBehavior;
   }
 
-  public resetContext(target?: OutputTargetBase) {
+  public resetContext(target?: TextStore) {
     this.layerId = 'default';
 
     // Make sure all deadkeys for the context get cleared properly.
@@ -608,13 +608,13 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
     }
   };
 
-  public finalizeProcessorAction(data: ProcessorAction, outputTarget: OutputTargetBase): void {
+  public finalizeProcessorAction(data: ProcessorAction, textStore: TextStore): void {
     if (!data.transcription) {
       throw "Cannot finalize a ProcessorAction with no transcription.";
     }
 
     if (this.beepHandler && data.beep) {
-      this.beepHandler(outputTarget);
+      this.beepHandler(textStore);
     }
 
     for (const storeID in data.setStore) {
@@ -642,7 +642,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
 
     if (data.triggersDefaultCommand) {
       const keyEvent = data.transcription.keystroke;
-      this.defaultRules.applyCommand(keyEvent, outputTarget);
+      this.defaultRules.applyCommand(keyEvent, textStore);
     }
 
     if (this.warningLogger && data.warningLog) {
diff --git a/web/src/engine/keyboard/src/defaultRules.ts b/web/src/engine/keyboard/src/defaultRules.ts
index 1c32056e144..d39cdbe34f1 100644
--- a/web/src/engine/keyboard/src/defaultRules.ts
+++ b/web/src/engine/keyboard/src/defaultRules.ts
@@ -7,7 +7,7 @@
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 import { Codes } from './codes.js';
 import { type KeyEvent } from './keyEvent.js';
-import { type OutputTargetBase }  from './outputTargetBase.js';
+import { type TextStore }  from './textStore.js';
 
 export enum EmulationKeystrokes {
   Enter = '\n',
@@ -78,12 +78,12 @@ export default class DefaultRules {
 
   /**
    * Used when a ProcessorAction represents a non-text "command" within the Engine.  This will generally
-   * trigger events that require context reset - often by moving the caret or by moving what OutputTarget
+   * trigger events that require context reset - often by moving the caret or by moving what TextStore
    * the caret is in.  However, we let those events perform the actual context reset.
    *
    * Note:  is extended by DOM-aware KeymanWeb code.
    */
-  public applyCommand(Lkc: KeyEvent, outputTarget: OutputTargetBase): void {
+  public applyCommand(Lkc: KeyEvent, textStore: TextStore): void {
     // Notes for potential default-handling extensions:
     //
     // switch(code) {
@@ -112,7 +112,7 @@ export default class DefaultRules {
 
   /**
    * Codes matched here generally have default implementations when in a browser but require emulation
-   * for 'synthetic' `OutputTarget`s like `Mock`s, which have no default text handling.
+   * for 'synthetic' `TextStore`s like `Mock`s, which have no default text handling.
    */
   public forSpecialEmulation(Lkc: KeyEvent): EmulationKeystrokes {
     let code = this.codeForEvent(Lkc);
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index eaf175c31b1..dad2d5f4c53 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -33,7 +33,7 @@ export { type SystemStoreMutationHandler, MutableSystemStore, SystemStore, Syste
 export { type VariableStore, VariableStoreSerializer, VariableStoreDictionary } from "./variableStore.js";
 
 export { Mock } from "./mock.js";
-export { OutputTargetBase } from "./outputTargetBase.js";
+export { TextStore } from "./textStore.js";
 export { findCommonSubstringEndIndex } from "./stringDivergence.js";
 export { Deadkey } from "./deadkeys.js";
 
@@ -41,6 +41,6 @@ export * from "@keymanapp/web-utils";
 
 // At the top level, there should be no default export.
 
-// Without the line below... OutputTarget would likely be aliased there, as it's
+// Without the line below... TextStore would likely be aliased there, as it's
 // the last `export { default as _ }` => `export * from` pairing seen above.
 export default undefined;
diff --git a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
index 22400dc01b7..8305e3ec106 100644
--- a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
+++ b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
@@ -2,7 +2,7 @@ import { Codes } from "../codes.js";
 import { Layouts } from "./defaultLayouts.js";
 import { ActiveKey, ActiveLayout, ActiveSubKey } from "./activeLayout.js";
 import { KeyEvent } from "../keyEvent.js";
-import { type OutputTargetBase } from "../outputTargetBase.js";
+import { type TextStore } from "../textStore.js";
 import { KeymanWebKeyboard, ModifierKeyConstants, TouchLayout } from "@keymanapp/common-types";
 import { VariableStoreDictionary } from "../variableStore.js";
 
@@ -50,7 +50,7 @@ type KmwKeyboardObject = KeyboardObject & {
  */
 export class JSKeyboard {
   public static DEFAULT_SCRIPT_OBJECT: KmwKeyboardObject = {
-    'gs': function(outputTarget: OutputTargetBase, keystroke: KeyEvent) { return false; }, // no matching rules; rely on defaultRuleOutput entirely
+    'gs': function(textStore: TextStore, keystroke: KeyEvent) { return false; }, // no matching rules; rely on defaultRuleOutput entirely
     'KI': '', // The currently-existing default keyboard ID; we already have checks that focus against this.
     'KN': '',
     'KV': Layouts.DEFAULT_RAW_SPEC,
@@ -78,22 +78,22 @@ export class JSKeyboard {
   /**
    * Calls the keyboard's `gs` function, which represents the keyboard source's begin Unicode group.
    */
-  process(outputTarget: OutputTargetBase, keystroke: KeyEvent): boolean {
-    return this.scriptObject['gs'](outputTarget, keystroke);
+  process(textStore: TextStore, keystroke: KeyEvent): boolean {
+    return this.scriptObject['gs'](textStore, keystroke);
   }
 
   /**
    * Calls the keyboard's `gn` function, which represents the keyboard source's begin newContext group.
    */
-  processNewContextEvent(outputTarget: OutputTargetBase, keystroke: KeyEvent): boolean {
-    return this.scriptObject['gn'] ? this.scriptObject['gn'](outputTarget, keystroke) : false;
+  processNewContextEvent(textStore: TextStore, keystroke: KeyEvent): boolean {
+    return this.scriptObject['gn'] ? this.scriptObject['gn'](textStore, keystroke) : false;
   }
 
   /**
    * Calls the keyboard's `gpk` function, which represents the keyboard source's begin postKeystroke group.
    */
-  processPostKeystroke(outputTarget: OutputTargetBase, keystroke: KeyEvent): boolean {
-    return this.scriptObject['gpk'] ? this.scriptObject['gpk'](outputTarget, keystroke) : false;
+  processPostKeystroke(textStore: TextStore, keystroke: KeyEvent): boolean {
+    return this.scriptObject['gpk'] ? this.scriptObject['gpk'](textStore, keystroke) : false;
   }
 
   get isHollow(): boolean {
@@ -359,7 +359,7 @@ export class JSKeyboard {
    * @param       {number}    _PData        1 or 0
    * Notifies keyboard of keystroke or other event
    */
-  notify(_PCommand: number, _PTarget: OutputTargetBase, _PData: number) { // I2187
+  notify(_PCommand: number, _PTarget: TextStore, _PData: number) { // I2187
     // Good example use case - the Japanese CJK-picker keyboard
     if(typeof(this.scriptObject['KNS']) == 'function') {
       this.scriptObject['KNS'](_PCommand, _PTarget, _PData);
diff --git a/web/src/engine/keyboard/src/keyboards/transcription.ts b/web/src/engine/keyboard/src/keyboards/transcription.ts
index a0c8b759a29..7623a2f0d1c 100644
--- a/web/src/engine/keyboard/src/keyboards/transcription.ts
+++ b/web/src/engine/keyboard/src/keyboards/transcription.ts
@@ -1,7 +1,7 @@
 /*
  * Keyman is copyright (C) SIL Global. MIT License.
  */
-import { OutputTargetBase } from '../outputTargetBase.js';
+import { TextStore } from '../textStore.js';
 import { KeyEvent } from '../keyEvent.js';
 import { Alternate, TextTransform } from './textTransform.js';
 
@@ -10,11 +10,11 @@ export class Transcription {
   readonly keystroke: KeyEvent;
   readonly transform: TextTransform;
   alternates: Alternate[]; // constructed after the rest of the transcription.
-  readonly preInput: OutputTargetBase;
+  readonly preInput: TextStore;
 
   private static tokenSeed: number = 0;
 
-  constructor(keystroke: KeyEvent, transform: TextTransform, preInput: OutputTargetBase, alternates?: Alternate[]) {
+  constructor(keystroke: KeyEvent, transform: TextTransform, preInput: TextStore, alternates?: Alternate[]) {
     const token = this.token = Transcription.tokenSeed++;
 
     this.keystroke = keystroke;
diff --git a/web/src/engine/keyboard/src/mock.ts b/web/src/engine/keyboard/src/mock.ts
index 8d042dc0710..b426815c513 100644
--- a/web/src/engine/keyboard/src/mock.ts
+++ b/web/src/engine/keyboard/src/mock.ts
@@ -1,7 +1,7 @@
-import { OutputTargetBase } from './outputTargetBase.js';
+import { TextStore } from './textStore.js';
 import { KMWString } from '@keymanapp/web-utils';
 
-export class Mock extends OutputTargetBase {
+export class Mock extends TextStore {
   text: string;
 
   selStart: number;
@@ -25,34 +25,34 @@ export class Mock extends OutputTargetBase {
     this.selForward = this.selEnd >= this.selStart;
   }
 
-  static assertIsOutputTargetBase(outputTarget: OutputTargetBase): asserts outputTarget is OutputTargetBase {
-    if (!(outputTarget instanceof OutputTargetBase)) {
-      throw new TypeError("outputTarget is not a OutputTargetBase");
+  static assertIsOutputTargetBase(textStore: TextStore): asserts textStore is TextStore {
+    if (!(textStore instanceof TextStore)) {
+      throw new TypeError("textStore is not a TextStore");
     }
   }
 
   // Clones the state of an existing EditableElement, creating a Mock version of its state.
-  static from(outputTarget: OutputTargetBase, readonly?: boolean): Mock {
+  static from(textStore: TextStore, readonly?: boolean): Mock {
     let clone: Mock;
 
-    this.assertIsOutputTargetBase(outputTarget);
+    this.assertIsOutputTargetBase(textStore);
 
-    if (outputTarget instanceof Mock) {
+    if (textStore instanceof Mock) {
       // Avoids the need to run expensive kmwstring.ts `length()`
       // calculations when deep-copying Mock instances.
-      const priorMock = outputTarget as Mock;
+      const priorMock = textStore as Mock;
       clone = new Mock(priorMock.text, priorMock.selStart, priorMock.selEnd);
     } else {
-      const text = outputTarget.getText();
+      const text = textStore.getText();
       const textLen = KMWString.length(text);
 
       // If !hasSelection()
       let selectionStart: number = textLen;
       let selectionEnd: number = 0;
 
-      if (outputTarget.hasSelection()) {
-        const beforeText = outputTarget.getTextBeforeCaret();
-        const afterText = outputTarget.getTextAfterCaret();
+      if (textStore.hasSelection()) {
+        const beforeText = textStore.getTextBeforeCaret();
+        const afterText = textStore.getTextAfterCaret();
         selectionStart = KMWString.length(beforeText);
         selectionEnd = textLen - KMWString.length(afterText);
       }
@@ -64,7 +64,7 @@ export class Mock extends OutputTargetBase {
     }
 
     // Also duplicate deadkey state!  (Needed for fat-finger ops.)
-    clone.setDeadkeys((outputTarget as OutputTargetBase).deadkeys());
+    clone.setDeadkeys((textStore as TextStore).deadkeys());
 
     return clone;
   }
diff --git a/web/src/engine/keyboard/src/outputTargetBase.ts b/web/src/engine/keyboard/src/textStore.ts
similarity index 92%
rename from web/src/engine/keyboard/src/outputTargetBase.ts
rename to web/src/engine/keyboard/src/textStore.ts
index cf82e107021..1e7889f918b 100644
--- a/web/src/engine/keyboard/src/outputTargetBase.ts
+++ b/web/src/engine/keyboard/src/textStore.ts
@@ -9,7 +9,7 @@ import { type KeyEvent } from 'keyman/engine/keyboard';
 import { Deadkey, DeadkeyTracker } from "./deadkeys.js";
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
-export abstract class OutputTargetBase {
+export abstract class TextStore {
   private _dks: DeadkeyTracker;
 
   constructor() {
@@ -17,7 +17,7 @@ export abstract class OutputTargetBase {
   }
 
   /**
-   * Signifies that this OutputTarget has no default key processing behaviors.  This should be false
+   * Signifies that this TextStore has no default key processing behaviors.  This should be false
    * for OutputTargets backed by web elements like HTMLInputElement or HTMLTextAreaElement.
    */
   get isSynthetic(): boolean {
@@ -60,14 +60,14 @@ export abstract class OutputTargetBase {
   }
 
   /**
-   * Determines the basic operations needed to reconstruct the current OutputTarget's text from the prior state specified
-   * by another OutputTarget based on their text and caret positions.
+   * Determines the basic operations needed to reconstruct the current TextStore's text from the prior state specified
+   * by another TextStore based on their text and caret positions.
    *
    * This is designed for use as a "before and after" comparison to determine the effect of a single keyboard rule at a time.
    * As such, it assumes that the caret is immediately after any inserted text.
    * @param from An output target (preferably a Mock) representing the prior state of the input/output system.
    */
-  buildTransformFrom(original: OutputTargetBase): TextTransform {
+  buildTransformFrom(original: TextStore): TextTransform {
     const toLeft = this.getTextBeforeCaret();
     const fromLeft = original.getTextBeforeCaret();
 
@@ -88,7 +88,7 @@ export abstract class OutputTargetBase {
     return new TextTransform(insertedText, deletedLeft, deletedRight, original.getSelectedText() && !this.getSelectedText());
   }
 
-  buildTranscriptionFrom(original: OutputTargetBase, keyEvent: KeyEvent, readonly: boolean, alternates?: Alternate[]): Transcription {
+  buildTranscriptionFrom(original: TextStore, keyEvent: KeyEvent, readonly: boolean, alternates?: Alternate[]): Transcription {
     const transform = this.buildTransformFrom(original);
 
     // If we ever decide to re-add deadkey tracking, this is the place for it.
@@ -97,10 +97,10 @@ export abstract class OutputTargetBase {
   }
 
   /**
-   * Restores the `OutputTarget` to the indicated state.  Designed for use with `Transcription.preInput`.
-   * @param original An `OutputTarget` (usually a `Mock`).
+   * Restores the `TextStore` to the indicated state.  Designed for use with `Transcription.preInput`.
+   * @param original An `TextStore` (usually a `Mock`).
    */
-  restoreTo(original: OutputTargetBase) {
+  restoreTo(original: TextStore) {
     this.clearSelection();
     // We currently do not restore selected text; the mechanism isn't supported at present for
     // all output target types - especially in regard to re-selecting the text if restored.
@@ -140,7 +140,7 @@ export abstract class OutputTargetBase {
 
   /**
    * Helper to `restoreTo` - allows directly setting the 'before' context to that of another
-   * `OutputTarget`.
+   * `TextStore`.
    * @param s
    */
   protected setTextBeforeCaret(s: string): void {
@@ -151,7 +151,7 @@ export abstract class OutputTargetBase {
 
   /**
    * Helper to `restoreTo` - allows directly setting the 'after' context to that of another
-   * `OutputTarget`.
+   * `TextStore`.
    * @param s
    */
   protected abstract setTextAfterCaret(s: string): void;
diff --git a/web/src/engine/main/src/contextManagerBase.ts b/web/src/engine/main/src/contextManagerBase.ts
index 979fcfc7ede..58da68f34bf 100644
--- a/web/src/engine/main/src/contextManagerBase.ts
+++ b/web/src/engine/main/src/contextManagerBase.ts
@@ -1,5 +1,5 @@
 import { EventEmitter } from 'eventemitter3';
-import { ManagedPromise, type Keyboard, type OutputTargetBase } from 'keyman/engine/keyboard';
+import { ManagedPromise, type Keyboard, type TextStore } from 'keyman/engine/keyboard';
 import { type JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { StubAndKeyboardCache, type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { PredictionContext } from 'keyman/engine/interfaces';
@@ -7,7 +7,7 @@ import { EngineConfiguration } from './engineConfiguration.js';
 
 interface EventMap {
   // target, then keyboard.
-  'targetchange': (target: OutputTargetBase) => boolean;
+  'targetchange': (target: TextStore) => boolean;
 
   /**
    * This event is raised whenever a keyboard change is requested.
@@ -44,11 +44,11 @@ export interface ContextManagerConfiguration {
   /**
    * A function that resets any state-dependent keyboard key-state information such as
    * emulated modifier state and layer id.  Also purges the context cache.
-   * If an `outputTarget` is specified, it will also trigger new-context rule processing.
+   * If an `textStore` is specified, it will also trigger new-context rule processing.
    *
    * Does not reset option-stores, variable-stores, etc.
    */
-  readonly resetContext: (outputTarget?: OutputTargetBase) => void;
+  readonly resetContext: (textStore?: TextStore) => void;
 
   /**
    * A predictive-state management object that interfaces the predictive-text banner
@@ -64,7 +64,7 @@ export interface ContextManagerConfiguration {
 }
 
 interface PendingActivation {
-  target: OutputTargetBase,
+  target: TextStore,
   keyboard: Promise<Keyboard>,
   stub: KeyboardStub;
 }
@@ -74,11 +74,11 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
 
   abstract initialize(): void;
 
-  abstract get activeTarget(): OutputTargetBase;
+  abstract get activeTarget(): TextStore;
 
   private _predictionContext: PredictionContext;
   protected keyboardCache: StubAndKeyboardCache;
-  private _resetContext: (outputTarget?: OutputTargetBase) => void;
+  private _resetContext: (textStore?: TextStore) => void;
 
   private pendingActivations: PendingActivation[] = [];
   protected engineConfig: MainConfig;
@@ -101,18 +101,18 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
 
   insertText(kbdInterface: JSKeyboardInterface, Ptext: string, PdeadKey: number) {
     // Find the correct output target to manipulate.
-    const outputTarget = this.activeTarget;
+    const textStore = this.activeTarget;
 
-    if(outputTarget != null) {
+    if(textStore != null) {
       if(Ptext != null) {
-        kbdInterface.output(0, outputTarget, Ptext);
+        kbdInterface.output(0, textStore, Ptext);
       }
 
       if((typeof(PdeadKey)!=='undefined') && (PdeadKey !== null)) {
-        kbdInterface.deadkeyOutput(0, outputTarget, PdeadKey);
+        kbdInterface.deadkeyOutput(0, textStore, PdeadKey);
       }
 
-      outputTarget.invalidateSelection();
+      textStore.invalidateSelection();
 
       return true;
     }
@@ -135,7 +135,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
    * attached elements within the app/browser target.  For `app/webview`, this should
    * always return a consistent value - likely, `null`.
    */
-  protected abstract currentKeyboardSrcTarget(): OutputTargetBase;
+  protected abstract currentKeyboardSrcTarget(): TextStore;
 
   /**
    * Ensures that newly activated keyboards are set correctly within managed context, possibly
@@ -143,16 +143,16 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
    * @param kbd
    * @param target
    */
-  protected abstract activateKeyboardForTarget(kbd: { keyboard: Keyboard, metadata: KeyboardStub }, target: OutputTargetBase): void;
+  protected abstract activateKeyboardForTarget(kbd: { keyboard: Keyboard, metadata: KeyboardStub }, target: TextStore): void;
 
   /**
    * Checks the pending keyboard-activation array for an entry corresponding to the specified
-   * OutputTarget.  If found, also removes the entry for bookkeeping purposes.
-   * @param target  The specific OutputTarget affected by the pending Keyboard activation.
+   * TextStore.  If found, also removes the entry for bookkeeping purposes.
+   * @param target  The specific TextStore affected by the pending Keyboard activation.
    *                May be `null`, which corresponds to the global default Keyboard.
    * @returns `true` if pending activation is still valid, `false` otherwise.
    */
-  private findAndPopActivation(target: OutputTargetBase): PendingActivation {
+  private findAndPopActivation(target: TextStore): PendingActivation {
     // Array.findIndex requires Chrome 45+. :(
     let activationIndex;
     for(activationIndex = 0; activationIndex < this.pendingActivations.length; activationIndex++) {
@@ -180,7 +180,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
   protected async deferredKeyboardActivation(
     kbdPromise: Promise<Keyboard>,
     metadata: KeyboardStub,
-    target: OutputTargetBase
+    target: TextStore
   ): Promise<PendingActivation> {
     const activation: PendingActivation = {
       target: target,
diff --git a/web/src/engine/main/src/engineConfiguration.ts b/web/src/engine/main/src/engineConfiguration.ts
index 4c172aa00a7..9ade2643a17 100644
--- a/web/src/engine/main/src/engineConfiguration.ts
+++ b/web/src/engine/main/src/engineConfiguration.ts
@@ -1,7 +1,7 @@
 import { EventEmitter } from "eventemitter3";
 
 import {
-  DeviceSpec, KeyboardProperties, ManagedPromise, OutputTargetBase,
+  DeviceSpec, KeyboardProperties, ManagedPromise, TextStore,
   ProcessorAction, physicalKeyDeviceAlias, SpacebarText
 } from "keyman/engine/keyboard";
 import { PathConfiguration, PathOptionDefaults, PathOptionSpec } from "keyman/engine/interfaces";
@@ -110,9 +110,9 @@ export class EngineConfiguration extends EventEmitter<EventMap> {
    * after postKeystroke takes effect.  Any behaviors defined here should be considered 'readonly' in
    * terms of context and should instead facilitate integration with the engine's host platform.
    * @param ruleBehavior  The full effects of keystroke + postkeystroke rules from a processed keystroke.
-   * @param outputTarget  The engine's current source for context
+   * @param textStore  The engine's current source for context
    */
-  onRuleFinalization(ruleBehavior: ProcessorAction, outputTarget: OutputTargetBase) {};
+  onRuleFinalization(ruleBehavior: ProcessorAction, textStore: TextStore) {};
 }
 
 export interface InitOptionSpec extends PathOptionSpec {
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index 76c90f919ee..0518d989aa7 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -12,7 +12,7 @@ import {
   JSKeyboard,
   KeyboardMinimalInterface,
   Mock,
-  OutputTargetBase,
+  TextStore,
   ProcessorAction,
   SystemStoreIDs,
   type Alternate,
@@ -97,11 +97,11 @@ export class InputProcessor {
    * Handles default output and keyboard processing for both OSK and physical keystrokes.
    *
    * @param       {Object}      keyEvent      The abstracted KeyEvent to use for keystroke processing
-   * @param       {Object}      outputTarget  The OutputTarget receiving the KeyEvent
+   * @param       {Object}      textStore  The TextStore receiving the KeyEvent
    * @returns     {Object}                    A ProcessorAction object describing the cumulative effects of
    *                                          all matched keyboard rules.
    */
-  processKeyEvent(keyEvent: KeyEvent, outputTarget: OutputTargetBase): ProcessorAction {
+  processKeyEvent(keyEvent: KeyEvent, textStore: TextStore): ProcessorAction {
     const kbdMismatch = keyEvent.srcKeyboard && this.activeKeyboard != keyEvent.srcKeyboard;
     const trueActiveKeyboard = this.activeKeyboard;
 
@@ -120,10 +120,10 @@ export class InputProcessor {
           // to revert it.  If not, we assume it's a layer-change multitap, in which case
           // no such reset is needed.
           // TODO-web-core
-          if(!isEmptyTransform(transcription.transform) || !(transcription.preInput as Mock).isEqual(Mock.from(outputTarget))) {
+          if(!isEmptyTransform(transcription.transform) || !(transcription.preInput as Mock).isEqual(Mock.from(textStore))) {
             // Restores full context, including deadkeys in their exact pre-keystroke state.
             // TODO-web-core
-            (outputTarget as OutputTargetBase).restoreTo(transcription.preInput as Mock);
+            (textStore as TextStore).restoreTo(transcription.preInput as Mock);
           }
           /*
             else:
@@ -139,7 +139,7 @@ export class InputProcessor {
         }
       }
 
-      return this._processKeyEvent(keyEvent, outputTarget);
+      return this._processKeyEvent(keyEvent, textStore);
     } finally {
       if(kbdMismatch) {
         // Restore our "current" activeKeyboard to its setting before the mismatching KeyEvent.
@@ -152,10 +152,10 @@ export class InputProcessor {
    * Acts as the core of `processKeyEvent` once we're comfortable asserting that the incoming
    * keystroke matches the current `activeKeyboard`.
    * @param keyEvent
-   * @param outputTarget
+   * @param textStore
    * @returns
    */
-  private _processKeyEvent(keyEvent: KeyEvent, outputTarget: OutputTargetBase): ProcessorAction {
+  private _processKeyEvent(keyEvent: KeyEvent, textStore: TextStore): ProcessorAction {
     const formFactor = keyEvent.device.formFactor;
     const fromOSK = keyEvent.isSynthetic;
 
@@ -172,7 +172,7 @@ export class InputProcessor {
     // Will handle keystroke-based non-layer change modifier & state keys, mapping them through the physical keyboard's version
     // of state management.  `doModifierPress` must always run.
     // TODO-web-core
-    if (this.keyboardProcessor.doModifierPress(keyEvent, outputTarget as OutputTargetBase, !fromOSK)) {
+    if (this.keyboardProcessor.doModifierPress(keyEvent, textStore as TextStore, !fromOSK)) {
       // If run on a desktop platform, we know that modifier & state key presses may not
       // produce output, so we may make an immediate return safely.
       if(!fromOSK) {
@@ -197,17 +197,17 @@ export class InputProcessor {
 
     // // ...end I3363 (Build 301)
 
-    // Create a "mock" backup of the current outputTarget in its pre-input state.
+    // Create a "mock" backup of the current textStore in its pre-input state.
     // Current, long-existing assumption - it's DOM-backed.
     // TODO-web-core
-    const preInputMock = Mock.from(outputTarget as OutputTargetBase, true);
+    const preInputMock = Mock.from(textStore as TextStore, true);
 
     const startingLayerId = this.keyboardProcessor.layerId;
 
     // We presently need the true keystroke to run on the FULL context.  That index is still
     // needed for some indexing operations when comparing two different output targets.
     // TODO-web-core
-    let ruleBehavior = this.keyboardProcessor.processKeystroke(keyEvent, outputTarget as OutputTargetBase);
+    let ruleBehavior = this.keyboardProcessor.processKeystroke(keyEvent, textStore as TextStore);
 
     // Swap layer as appropriate.
     if(keyEvent.kNextLayer) {
@@ -243,7 +243,7 @@ export class InputProcessor {
 
       // Now that we've done all the keystroke processing needed, ensure any extra effects triggered
       // by the actual keystroke occur.
-      this.keyboardProcessor.finalizeProcessorAction(ruleBehavior, outputTarget);
+      this.keyboardProcessor.finalizeProcessorAction(ruleBehavior, textStore);
 
       // -- All keystroke (and 'alternate') processing is now complete.  Time to finalize everything! --
 
@@ -255,7 +255,7 @@ export class InputProcessor {
       // We need a dummy ProcessorAction for keys which have no output (e.g. Shift)
       ruleBehavior = new ProcessorAction();
       // TODO-web-core
-      ruleBehavior.transcription = (outputTarget as OutputTargetBase).buildTranscriptionFrom(outputTarget as OutputTargetBase, null, false);
+      ruleBehavior.transcription = (textStore as TextStore).buildTranscriptionFrom(textStore as TextStore, null, false);
       ruleBehavior.triggersDefaultCommand = true;
     }
 
@@ -275,9 +275,9 @@ export class InputProcessor {
     this.keyboardProcessor.oldLayerStore.set(hasLayerChanged ? startingLayerId : '');
 
     // TODO-web-core
-    const postRuleBehavior = this.keyboardProcessor.processPostKeystroke(this.contextDevice, outputTarget as OutputTargetBase);
+    const postRuleBehavior = this.keyboardProcessor.processPostKeystroke(this.contextDevice, textStore as TextStore);
     if (postRuleBehavior) {
-      this.keyboardProcessor.finalizeProcessorAction(postRuleBehavior, outputTarget);
+      this.keyboardProcessor.finalizeProcessorAction(postRuleBehavior, textStore);
     }
 
     // Yes, even for ruleBehavior.triggersDefaultCommand.  Those tend to change the context.
@@ -286,7 +286,7 @@ export class InputProcessor {
     // Text did not change (thus, no text "input") if we tabbed or merely moved the caret.
     if(!ruleBehavior.triggersDefaultCommand) {
       // For DOM-aware targets, this will trigger a DOM event page designers may listen for.
-      outputTarget.doInputEvent();
+      textStore.doInputEvent();
     }
 
     return keepRuleBehavior ? ruleBehavior : null;
@@ -398,11 +398,11 @@ export class InputProcessor {
     return alternates;
   }
 
-  public resetContext(outputTarget?: OutputTargetBase) {
+  public resetContext(textStore?: TextStore) {
     // Also handles new-context events, which may modify the layer
     // TODO-web-core
-    this.keyboardProcessor.resetContext(outputTarget as OutputTargetBase);
+    this.keyboardProcessor.resetContext(textStore as TextStore);
     // With the layer now set, we trigger new predictions.
-    this.languageProcessor.invalidateContext(outputTarget, this.keyboardProcessor.layerId);
+    this.languageProcessor.invalidateContext(textStore, this.keyboardProcessor.layerId);
   }
 }
\ No newline at end of file
diff --git a/web/src/engine/main/src/headless/languageProcessor.ts b/web/src/engine/main/src/headless/languageProcessor.ts
index 913562ef727..b3a749ce93e 100644
--- a/web/src/engine/main/src/headless/languageProcessor.ts
+++ b/web/src/engine/main/src/headless/languageProcessor.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from "eventemitter3";
 import { LMLayer, WorkerFactory } from "@keymanapp/lexical-model-layer/web";
-import { Transcription, OutputTargetBase, Mock } from 'keyman/engine/keyboard';
+import { Transcription, TextStore, Mock } from 'keyman/engine/keyboard';
 import { LanguageProcessorEventMap, ModelSpec, StateChangeEnum, ReadySuggestions } from 'keyman/engine/interfaces';
 import ContextWindow from "./contextWindow.js";
 import { TranscriptionCache } from "./transcriptionCache.js";
@@ -125,7 +125,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     });
   }
 
-  public invalidateContext(outputTarget: OutputTargetBase, layerId: string): Promise<Suggestion[]> {
+  public invalidateContext(textStore: TextStore, layerId: string): Promise<Suggestion[]> {
     // If there's no active model, there can be no predictions.
     // We'll also be missing important data needed to even properly REQUEST the predictions.
     if(!this.currentModel || !this.configuration) {
@@ -141,9 +141,9 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     // Signal to any predictive text UI that the context has changed, invalidating recent predictions.
     this.emit('invalidatesuggestions', 'context');
 
-    if(outputTarget) {
+    if(textStore) {
       // TODO-web-core
-      const transcription = (outputTarget as OutputTargetBase).buildTranscriptionFrom((outputTarget as OutputTargetBase), null, false);
+      const transcription = (textStore as TextStore).buildTranscriptionFrom((textStore as TextStore), null, false);
       return this.predict_internal(transcription, true, layerId);
     } else {
       // if there's no active context source, there's nothing to
@@ -154,13 +154,13 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     }
   }
 
-  public wordbreak(target: OutputTargetBase, layerId: string): Promise<string> {
+  public wordbreak(target: TextStore, layerId: string): Promise<string> {
     if(!this.isActive) {
       return null;
     }
 
     // TODO-web-core
-    const context = new ContextWindow(Mock.from((target as OutputTargetBase), false), this.configuration, layerId);
+    const context = new ContextWindow(Mock.from((target as TextStore), false), this.configuration, layerId);
     return this.lmEngine.wordbreak(context);
   }
 
@@ -185,14 +185,14 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
   /**
    *
    * @param suggestion
-   * @param outputTarget
+   * @param textStore
    * @param getLayerId      a function that returns the current layerId,
    *                        required because layerid can be changed by PostKeystroke
    * @returns
    */
-  public applySuggestion(suggestion: Suggestion, outputTarget: OutputTargetBase, getLayerId: ()=>string): Promise<Reversion> {
-    if(!outputTarget) {
-      throw "Accepting suggestions requires a destination OutputTargetBase instance."
+  public applySuggestion(suggestion: Suggestion, textStore: TextStore, getLayerId: ()=>string): Promise<Reversion> {
+    if(!textStore) {
+      throw "Accepting suggestions requires a destination TextStore instance."
     }
 
     if(!this.isActive) {
@@ -223,13 +223,13 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
       // In embedded mode, both Android and iOS are best served by calculating this transform and applying its
       // values as needed for use with their IME interfaces.
       // TODO-web-core
-      const transform = final.buildTransformFrom((outputTarget as OutputTargetBase));
+      const transform = final.buildTransformFrom((textStore as TextStore));
       // TODO-web-core
-      (outputTarget as OutputTargetBase).apply(transform);
+      (textStore as TextStore).apply(transform);
 
       // Tell the banner that a suggestion was applied, so it can call the
       // keyboard's PostKeystroke entry point as needed
-      this.emit('suggestionapplied', outputTarget);
+      this.emit('suggestionapplied', textStore);
 
       // Build a 'reversion' Transcription that can be used to undo this apply() if needed,
       // replacing the suggestion transform with the original input text.
@@ -259,7 +259,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
         // // If using the version from lm-layer:
         // let mappedReversion = reversion;
         // mappedReversion.transformId = reversionTranscription.token;
-        this.predictFromTarget(outputTarget, getLayerId());
+        this.predictFromTarget(textStore, getLayerId());
         return mappedReversion;
       });
 
@@ -267,9 +267,9 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     }
   }
 
-  public applyReversion(reversion: Reversion, outputTarget: OutputTargetBase) {
-    if(!outputTarget) {
-      throw "Accepting suggestions requires a destination OutputTargetBase instance."
+  public applyReversion(reversion: Reversion, textStore: TextStore) {
+    if(!textStore) {
+      throw "Accepting suggestions requires a destination TextStore instance."
     }
 
     if(!this.isActive) {
@@ -298,9 +298,9 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     // In embedded mode, both Android and iOS are best served by calculating this transform and applying its
     // values as needed for use with their IME interfaces.
     // TODO-web-core
-    const transform = final.buildTransformFrom(outputTarget as OutputTargetBase);
+    const transform = final.buildTransformFrom(textStore as TextStore);
     // TODO-web-core
-    (outputTarget as OutputTargetBase).apply(transform);
+    (textStore as TextStore).apply(transform);
 
     // The reason we need to preserve the additive-inverse 'transformId' property on Reversions.
     const promise = this.currentPromise = this.lmEngine.revertSuggestion(reversion, new ContextWindow(original.preInput as Mock, this.configuration, null))
@@ -311,13 +311,13 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     return promise;
   }
 
-  public predictFromTarget(outputTarget: OutputTargetBase, layerId: string): Promise<Suggestion[]> {
-    if(!this.isActive || !outputTarget) {
+  public predictFromTarget(textStore: TextStore, layerId: string): Promise<Suggestion[]> {
+    if(!this.isActive || !textStore) {
       return null;
     }
 
     // TODO-web-core
-    const transcription = (outputTarget as OutputTargetBase).buildTranscriptionFrom(outputTarget as OutputTargetBase, null, false);
+    const transcription = (textStore as TextStore).buildTranscriptionFrom(textStore as TextStore, null, false);
     return this.predict(transcription, layerId);
   }
 
diff --git a/web/src/engine/main/src/keyboardInterfaceBase.ts b/web/src/engine/main/src/keyboardInterfaceBase.ts
index 746a16fa831..4f830561035 100644
--- a/web/src/engine/main/src/keyboardInterfaceBase.ts
+++ b/web/src/engine/main/src/keyboardInterfaceBase.ts
@@ -112,7 +112,7 @@ export class KeyboardInterfaceBase<ContextManagerType extends ContextManagerBase
 
   insertText = (Ptext: string, PdeadKey:number): void => {
     this.resetContextCache();
-    // As this function isn't provided a handle to an active outputTarget, we rely on
+    // As this function isn't provided a handle to an active textStore, we rely on
     // the context manager to resolve said issue.
     this.engine.contextManager.insertText(this, Ptext, PdeadKey);
   }
diff --git a/web/src/engine/main/src/keymanEngineBase.ts b/web/src/engine/main/src/keymanEngineBase.ts
index 25fcca58450..f110266cbb0 100644
--- a/web/src/engine/main/src/keymanEngineBase.ts
+++ b/web/src/engine/main/src/keymanEngineBase.ts
@@ -1,4 +1,4 @@
-import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction, OutputTargetBase } from "keyman/engine/keyboard";
+import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction, TextStore } from "keyman/engine/keyboard";
 import { ProcessorInitOptions } from 'keyman/engine/js-processor';
 import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard/dom-keyboard-loader";
 import { WorkerFactory } from "@keymanapp/lexical-model-layer/web"
@@ -54,9 +54,9 @@ export class KeymanEngineBase<
   protected keyEventRefocus?: () => void;
 
   private keyEventListener: KeyEventFullHandler = (event, callback) => {
-    const outputTarget = this.contextManager.activeTarget;
+    const textStore = this.contextManager.activeTarget;
 
-    if(!this.contextManager.activeKeyboard || !outputTarget) {
+    if(!this.contextManager.activeKeyboard || !textStore) {
       if(callback) {
         callback(null, null);
       }
@@ -68,18 +68,18 @@ export class KeymanEngineBase<
     }
 
     if(this.keyEventRefocus) {
-      // Do anything needed to guarantee that the outputTarget stays active (`app/browser`: maintains focus).
+      // Do anything needed to guarantee that the textStore stays active (`app/browser`: maintains focus).
       // (Interaction with the OSK may have de-focused the element providing active context;
       // we want to restore it in case the user swaps back to the hardware keyboard afterward.)
       this.keyEventRefocus();
     }
 
     // Clear any cached codepoint data; we can rebuild it if it's unchanged.
-    outputTarget.invalidateSelection();
+    textStore.invalidateSelection();
     // Deadkey matching continues to be troublesome.
     // Deleting matched deadkeys here seems to correct some of the issues.   (JD 6/6/14)
     // TODO-web-core
-    (outputTarget as OutputTargetBase).deadkeys().deleteMatched();      // Delete any matched deadkeys before continuing
+    (textStore as TextStore).deadkeys().deleteMatched();      // Delete any matched deadkeys before continuing
 
     if(event.isSynthetic) {
       const oskLayer = this.osk.vkbd.layerId;
@@ -89,7 +89,7 @@ export class KeymanEngineBase<
         this.core.keyboardProcessor.layerId = oskLayer;
       }
     }
-    const result = this.core.processKeyEvent(event, outputTarget);
+    const result = this.core.processKeyEvent(event, textStore);
 
     if(result && result.transcription?.transform) {
       this.config.onRuleFinalization(result, this.contextManager.activeTarget);
@@ -278,7 +278,7 @@ export class KeymanEngineBase<
       keyboardProcessor.oldLayerStore.set('');
       // Call the keyboard's entry point.
       // TODO-web-core
-      const data = keyboardProcessor.processPostKeystroke(keyboardProcessor.contextDevice, predictionContext.currentTarget as OutputTargetBase)
+      const data = keyboardProcessor.processPostKeystroke(keyboardProcessor.contextDevice, predictionContext.currentTarget as TextStore)
       // If we have a ProcessorAction as a result, run it on the target. This should
       // only change system store and variable store values.
       if (data) {
diff --git a/web/src/test/auto/dom/cases/attachment/outputTargetForElement.def.ts b/web/src/test/auto/dom/cases/attachment/outputTargetForElement.def.ts
index e90e0021b23..abdb27aa0b2 100644
--- a/web/src/test/auto/dom/cases/attachment/outputTargetForElement.def.ts
+++ b/web/src/test/auto/dom/cases/attachment/outputTargetForElement.def.ts
@@ -61,7 +61,7 @@ describe('outputTargetForElement()', function () {
     this.attacher = null;
   });
 
-  describe('standard `OutputTarget` roots', () => {
+  describe('standard `TextStore` roots', () => {
     // So, for these unit tests, attachment has already been established.  We just need to
     // ensure it meets our expectations.
 
diff --git a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
index eabf6eefdd8..57ecb803acf 100644
--- a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
+++ b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
@@ -239,8 +239,8 @@ describe('app/browser:  ContextManager', function () {
 
       // Check our expectations re: the `targetchange` event.
       assert.isTrue(targetchange.calledOnce, 'targetchange event not raised');
-      const outputTarget = targetchange.firstCall.args[0]; // Should be an `Input` instance.
-      assert.equal(outputTarget.getElement(), input, '.activeTarget does not match the newly-focused element');
+      const textStore = targetchange.firstCall.args[0]; // Should be an `Input` instance.
+      assert.equal(textStore.getElement(), input, '.activeTarget does not match the newly-focused element');
     });
 
     it('change: null -> textarea', () => {
@@ -254,8 +254,8 @@ describe('app/browser:  ContextManager', function () {
 
       // Check our expectations re: the `targetchange` event.
       assert.isTrue(targetchange.calledOnce, 'targetchange event not raised');
-      const outputTarget = targetchange.firstCall.args[0]; // Should be an `Input` instance.
-      assert.equal(outputTarget.getElement(), textarea, '.activeTarget does not match the newly-focused element');
+      const textStore = targetchange.firstCall.args[0]; // Should be an `Input` instance.
+      assert.equal(textStore.getElement(), textarea, '.activeTarget does not match the newly-focused element');
     });
 
     it('change: null -> designIframe', () => {
@@ -270,7 +270,7 @@ describe('app/browser:  ContextManager', function () {
       // Either way, note that focus is handled specially for design-iframes, thus
       // we need slightly different focus-dispatch here.
       //
-      // Possible future improvement:  OutputTarget.focusElement (property)?
+      // Possible future improvement:  TextStore.focusElement (property)?
       // Though that may be affected by the Chrome vs Firefox bit noted above.
       dispatchFocus('focus', iframe.contentDocument.body);
 
@@ -278,8 +278,8 @@ describe('app/browser:  ContextManager', function () {
 
       // Check our expectations re: the `targetchange` event.
       assert.isTrue(targetchange.calledOnce, 'targetchange event not raised');
-      const outputTarget = targetchange.firstCall.args[0]; // Should be an `Input` instance.
-      assert.equal(outputTarget.getElement(), iframe, '.activeTarget does not match the newly-focused element');
+      const textStore = targetchange.firstCall.args[0]; // Should be an `Input` instance.
+      assert.equal(textStore.getElement(), iframe, '.activeTarget does not match the newly-focused element');
     });
 
     it('change: null -> contentEditable', () => {
@@ -293,8 +293,8 @@ describe('app/browser:  ContextManager', function () {
 
       // Check our expectations re: the `targetchange` event.
       assert.isTrue(targetchange.calledOnce, 'targetchange event not raised');
-      const outputTarget = targetchange.firstCall.args[0]; // Should be an `Input` instance.
-      assert.equal(outputTarget.getElement(), editable, '.activeTarget does not match the newly-focused element');
+      const textStore = targetchange.firstCall.args[0]; // Should be an `Input` instance.
+      assert.equal(textStore.getElement(), editable, '.activeTarget does not match the newly-focused element');
     });
 
     it('change: input -> null', () => {
@@ -312,8 +312,8 @@ describe('app/browser:  ContextManager', function () {
 
       // Check our expectations re: the `targetchange` event.
       assert.isTrue(targetchange.calledTwice, 'targetchange event not raised');
-      const outputTarget = targetchange.secondCall.args[0]; // Should be null, since we lost focus.
-      assert.equal(outputTarget, null, 'targetchange event did not indicate clearing of .activeTarget');
+      const textStore = targetchange.secondCall.args[0]; // Should be null, since we lost focus.
+      assert.equal(textStore, null, 'targetchange event did not indicate clearing of .activeTarget');
     });
 
     it('change: input disabled, -> null', async () => {
@@ -335,8 +335,8 @@ describe('app/browser:  ContextManager', function () {
 
       // Check our expectations re: the `targetchange` event.
       assert.isTrue(targetchange.calledTwice, 'targetchange event not raised');
-      const outputTarget = targetchange.secondCall.args[0]; // Should be null, since we lost focus.
-      assert.equal(outputTarget, null, 'targetchange event did not indicate clearing of .activeTarget');
+      const textStore = targetchange.secondCall.args[0]; // Should be null, since we lost focus.
+      assert.equal(textStore, null, 'targetchange event did not indicate clearing of .activeTarget');
     });
 
     it('change: input -> textarea', () => {
@@ -358,8 +358,8 @@ describe('app/browser:  ContextManager', function () {
 
       // Check our expectations re: the `targetchange` event.
       assert.isTrue(targetchange.calledThrice, 'targetchange event not raised');
-      const outputTarget = targetchange.thirdCall.args[0]; // Should be an `Input` instance.
-      assert.equal(outputTarget.getElement(), textarea, '.activeTarget does not match the newly-focused element');
+      const textStore = targetchange.thirdCall.args[0]; // Should be an `Input` instance.
+      assert.equal(textStore.getElement(), textarea, '.activeTarget does not match the newly-focused element');
     });
 
     it('restoration: input (no flags set)', () => {
@@ -1145,7 +1145,7 @@ describe('app/browser:  ContextManager', function () {
         // BUT the async load component should be resolved.
         await assertPromiseResolved(keyboardasyncload.firstCall.args[1], 0);
 
-        // Aspect 4:  swap BACK to the async-loading keyboard's OutputTarget, which should
+        // Aspect 4:  swap BACK to the async-loading keyboard's TextStore, which should
         // now be fully set to the keyboard that had been requested for activation upon it.
         dispatchFocus('blur', input);
         dispatchFocus('focus', textarea);
diff --git a/web/src/test/auto/dom/cases/element-wrappers/target_mocks.tests.ts b/web/src/test/auto/dom/cases/element-wrappers/target_mocks.tests.ts
index 5dc46da4226..a6666898ca8 100644
--- a/web/src/test/auto/dom/cases/element-wrappers/target_mocks.tests.ts
+++ b/web/src/test/auto/dom/cases/element-wrappers/target_mocks.tests.ts
@@ -10,7 +10,7 @@ document.body.appendChild(host);
 
 const u = (code: number) => String.fromCodePoint(code);
 
-// Define common interface testing functions that can be run upon the OutputTarget interface.
+// Define common interface testing functions that can be run upon the TextStore interface.
 class MockTests {
   public static Apple = {
     normal: 'apple',
@@ -62,7 +62,7 @@ class MockTests {
   //#endregion
 }
 
-describe('OutputTarget Mocking', function() {
+describe('TextStore Mocking', function() {
   this.timeout(DEFAULT_BROWSER_TIMEOUT);
 
   before(function() {
@@ -87,7 +87,7 @@ describe('OutputTarget Mocking', function() {
         assert.equal(mock.getDeadkeyCaret(), 5);
       });
 
-      it('copies an existing OutputTarget without a text selection', function() {
+      it('copies an existing TextStore without a text selection', function() {
         const base = MockTests.setupBase(4);
 
         const mock = Mock.from(base);
@@ -95,7 +95,7 @@ describe('OutputTarget Mocking', function() {
         assert.deepEqual(mock.deadkeys(), base.deadkeys());
       });
 
-      it('copies an existing OutputTarget with a text selection', function() {
+      it('copies an existing TextStore with a text selection', function() {
         const base = MockTests.setupBase(4, 5);
 
         const mock = Mock.from(base);
@@ -124,7 +124,7 @@ describe('OutputTarget Mocking', function() {
         base.deadkeys().deleteMatched();
         base.deleteCharsBeforeCaret(2);
 
-        assert.notDeepEqual(base.deadkeys(), baseInitDks, 'OutputTarget deadkey return is not a proper deep-copy');
+        assert.notDeepEqual(base.deadkeys(), baseInitDks, 'TextStore deadkey return is not a proper deep-copy');
 
         assert.equal(mock.getText(), MockTests.Apple.mixed);
         assert.deepEqual(mock.deadkeys(), baseInitDks);
diff --git a/web/src/test/manual/web/osk/scratchspace/index.html b/web/src/test/manual/web/osk/scratchspace/index.html
index 70b3f8fa79b..47f9cea2b15 100644
--- a/web/src/test/manual/web/osk/scratchspace/index.html
+++ b/web/src/test/manual/web/osk/scratchspace/index.html
@@ -78,7 +78,7 @@ <h2>KeymanWeb OSK Module Testing</h2>
 
       <div id="floating-mode" class="flex panel inactive">
         <div class="group">
-          <!-- OutputTarget selector (text vs input) -->
+          <!-- TextStore selector (text vs input) -->
           <p class="category">Active Element</p>
           <div id="float-target" class="flex">
             <button onclick="setTarget('text')">Textarea</button>
@@ -102,7 +102,7 @@ <h2>KeymanWeb OSK Module Testing</h2>
 
       <div id="anchored-mode" class="flex panel inactive">
         <div class="group">
-          <!-- OutputTarget selector (text vs input) -->
+          <!-- TextStore selector (text vs input) -->
           <p class="category">Active Element</p>
           <div id="anchor-target" class="flex">
             <button onclick="setTarget('text')">Textarea</button>
diff --git a/web/src/tools/testing/recorder-core/src/index.ts b/web/src/tools/testing/recorder-core/src/index.ts
index 07e94d33b68..b1073d09cce 100644
--- a/web/src/tools/testing/recorder-core/src/index.ts
+++ b/web/src/tools/testing/recorder-core/src/index.ts
@@ -1,4 +1,4 @@
-import { KeyDistribution, KeyEvent, type OutputTargetBase, Mock } from "keyman/engine/keyboard";
+import { KeyDistribution, KeyEvent, type TextStore, Mock } from "keyman/engine/keyboard";
 
 import Proctor from "./proctor.js";
 
@@ -216,8 +216,8 @@ export abstract class TestSequence<KeyRecord extends RecordedKeystroke | InputEv
 
   abstract hasOSKInteraction(): boolean;
 
-  async test(proctor: Proctor, target?: OutputTargetBase): Promise<{success: boolean, result: string}> {
-    // Start with an empty OutputTarget and a fresh KeyboardProcessor.
+  async test(proctor: Proctor, target?: TextStore): Promise<{success: boolean, result: string}> {
+    // Start with an empty TextStore and a fresh KeyboardProcessor.
     if(!target) {
       target = new Mock();
     }
diff --git a/web/src/tools/testing/recorder-core/src/nodeProctor.ts b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
index f70828ea8f7..2bf5cc427af 100644
--- a/web/src/tools/testing/recorder-core/src/nodeProctor.ts
+++ b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
@@ -8,7 +8,7 @@ import {
   RecordedSyntheticKeystroke
 } from "./index.js";
 
-import { KeyEvent, KeyEventSpec, KeyboardHarness, Mock, OutputTargetBase } from "keyman/engine/keyboard";
+import { KeyEvent, KeyEventSpec, KeyboardHarness, Mock, TextStore } from "keyman/engine/keyboard";
 import { DeviceSpec } from "@keymanapp/web-utils";
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 
@@ -48,8 +48,8 @@ export default class NodeProctor extends Proctor {
     return true;
   }
 
-  async simulateSequence(sequence: TestSequence<any>, target?: OutputTargetBase): Promise<string> {
-    // Start with an empty OutputTarget and a fresh KeyboardProcessor.
+  async simulateSequence(sequence: TestSequence<any>, target?: TextStore): Promise<string> {
+    // Start with an empty TextStore and a fresh KeyboardProcessor.
     if(!target) {
       target = new Mock();
     }
@@ -88,7 +88,7 @@ export default class NodeProctor extends Proctor {
         // ... we _could_ if we wanted to, though.  The framework is mostly in place;
         // it's a matter of actually adding the feature.
         // TODO-web-core
-        const ruleBehavior = processor.processKeystroke(new KeyEvent(keyEvent), (target as OutputTargetBase));
+        const ruleBehavior = processor.processKeystroke(new KeyEvent(keyEvent), (target as TextStore));
 
         if (this.debugMode) {
           console.log("Processing %d:", keyEvent.Lcode);
diff --git a/web/src/tools/testing/recorder-core/src/proctor.ts b/web/src/tools/testing/recorder-core/src/proctor.ts
index db1f36110ea..1bf4a32071f 100644
--- a/web/src/tools/testing/recorder-core/src/proctor.ts
+++ b/web/src/tools/testing/recorder-core/src/proctor.ts
@@ -1,5 +1,5 @@
 import { type DeviceSpec } from "@keymanapp/web-utils";
-import { type OutputTargetBase } from "keyman/engine/keyboard";
+import { type TextStore } from "keyman/engine/keyboard";
 
 import type { KeyboardTest, TestSet, TestSequence } from "./index.js";
 
@@ -49,5 +49,5 @@ export default abstract class Proctor {
    * Simulates the specified test sequence for use in testing.
    * @param sequence The recorded sequence, generally provided by a test set.
    */
-  abstract simulateSequence(sequence: TestSequence<any>, target?: OutputTargetBase): Promise<string>;
+  abstract simulateSequence(sequence: TestSequence<any>, target?: TextStore): Promise<string>;
 }
\ No newline at end of file
diff --git a/web/src/tools/testing/recorder/browserProctor.ts b/web/src/tools/testing/recorder/browserProctor.ts
index 822f8024598..ea135c7a0db 100644
--- a/web/src/tools/testing/recorder/browserProctor.ts
+++ b/web/src/tools/testing/recorder/browserProctor.ts
@@ -4,7 +4,7 @@
 
 import { type DeviceSpec } from "@keymanapp/web-utils";
 
-import { type OutputTargetBase } from "keyman/engine/keyboard";
+import { type TextStore } from "keyman/engine/keyboard";
 
 import { type KeymanEngine } from 'keyman/app/browser';
 
@@ -81,7 +81,7 @@ export class BrowserProctor extends Proctor {
 
   // Execution of a test sequence depends on the testing environment; this handles
   // the browser-specific aspects.
-  async simulateSequence(sequence: TestSequence<any>, outputTarget?: OutputTargetBase): Promise<string> {
+  async simulateSequence(sequence: TestSequence<any>, textStore?: TextStore): Promise<string> {
     const driver = new BrowserDriver(this.target);
 
     // For the version 10.0 spec
diff --git a/web/src/tools/testing/recorder/scribe.ts b/web/src/tools/testing/recorder/scribe.ts
index 83179e76de0..b31657961fe 100644
--- a/web/src/tools/testing/recorder/scribe.ts
+++ b/web/src/tools/testing/recorder/scribe.ts
@@ -28,7 +28,7 @@ declare let keyman: KeymanEngine;
 //   export namespace dom {
 //     export declare var DOMEventHandlers: any;
 //     export declare class Utils {
-//       static getOutputTarget(elem: HTMLElement): any; // text.OutputTarget;
+//       static getOutputTarget(elem: HTMLElement): any; // text.TextStore;
 //     }
 //   }
 

From 0fc7416b682c408d14bbbb9499c59daa59eb615d Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 4 Nov 2025 14:30:46 +0100
Subject: [PATCH 106/254] =?UTF-8?q?refactor(web):=20rename=20`Mock`=20?=
 =?UTF-8?q?=E2=86=92=20`SyntheticTextStore`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/docs/internal/context-state-management.md | 16 ++--
 web/docs/internal/keystroke-lifecycle.md      |  2 +-
 web/docs/internal/keystroke-processing.md     |  6 +-
 web/src/app/webview/src/contextManager.ts     | 22 +++---
 .../js-processor/src/jsKeyboardInterface.ts   |  4 +-
 .../js-processor/src/jsKeyboardProcessor.ts   |  6 +-
 web/src/engine/keyboard/src/defaultRules.ts   |  2 +-
 web/src/engine/keyboard/src/index.ts          |  2 +-
 .../src/{mock.ts => syntheticTextStore.ts}    | 26 +++----
 web/src/engine/keyboard/src/textStore.ts      | 10 +--
 .../engine/main/src/headless/contextWindow.ts |  8 +-
 .../main/src/headless/inputProcessor.ts       | 12 +--
 .../main/src/headless/languageProcessor.ts    | 16 ++--
 .../element_interfaces.tests.ts               | 22 +++---
 .../element-wrappers/target_mocks.tests.ts    | 14 ++--
 .../cases/keyboard/domKeyboardLoader.tests.ts |  4 +-
 .../prediction/predictionContext.tests.js     | 28 +++----
 .../js-processor/bundled-module.tests.js      |  6 +-
 .../js-processor/engine/context.tests.js      |  6 +-
 .../engine/notany_context.tests.js            |  4 +-
 .../engine/js-processor/kbdInterface.tests.ts |  4 +-
 .../non-positional-rules.tests.js             | 16 ++--
 .../specialized-backspace.tests.js            | 16 ++--
 .../js-processor/transcriptions.tests.js      | 74 +++++++++----------
 .../engine/keyboard/keyboard-loading.tests.js |  4 +-
 .../keyboard/keyboardLoaderBase.tests.ts      |  4 +-
 .../headless/engine/keyboard/mocks.tests.js   | 22 +++---
 .../main/headless/inputProcessor.tests.js     | 12 +--
 .../main/headless/languageProcessor.tests.js  | 18 ++---
 .../tools/testing/recorder-core/src/index.ts  |  4 +-
 .../testing/recorder-core/src/nodeProctor.ts  |  4 +-
 31 files changed, 198 insertions(+), 196 deletions(-)
 rename web/src/engine/keyboard/src/{mock.ts => syntheticTextStore.ts} (82%)

diff --git a/web/docs/internal/context-state-management.md b/web/docs/internal/context-state-management.md
index 4d776defbf5..9c25186f7bc 100644
--- a/web/docs/internal/context-state-management.md
+++ b/web/docs/internal/context-state-management.md
@@ -71,29 +71,31 @@ It is possible to determine the `Transform` needed to transition from
 one `TextStore` to another using `TextStore.buildTransformFrom`
 (defined on `TextStore`).
 
-### The `Mock` - representing context-state
+### The `SyntheticTextStore` - representing context-state
 
 The comparison and contrast methods mentioned above for `TextStore`
 are of particular use for predictive text, which usually operates with a
-headless implementation of the type, termed a `Mock`.  This class may be
+headless implementation of the type, termed a `SyntheticTextStore`.  This class may be
 found in
-[web/src/engine/js-processor/src/mock.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/js-processor/src/mock.ts).
+[web/src/engine/keyboard/src/syntheticTextStore.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/keyboard/src/syntheticTextStore.ts).
 It is a fully-featured implementation of the `TextStore` interface.
 
-It is possible to make a `Mock`-based clone of any
+It is possible to make a `SyntheticTextStore`-based clone of any
 `TextStore`-derived type - a feature leveraged significantly within
 the inner workings of Keyman Engine for Web.  As JS keyboards can have
 side effects beyond text-manipulation, predictive text generally
-operates by first _cloning_ the "true" context source.   `Mock`s are
+operates by first _cloning_ the "true" context source.  `SyntheticTextStore`s are
 also used when saving context states within the engine for later
 reference and/or reuse - a feature also utilized significantly for
 multitap support.
 
-`Mock`s can also easily be constructed from scratch for a simple string.
+`SyntheticTextStore`s can also easily be constructed from scratch for a simple string.
 Optionally, caret position or selection data may be specified at
 construction time as well. `epic/web-core`: in theory, this should make
 them easy to utilize for integration with Keyman Core.
 
+- note: previously called `Mock`
+
 ### The `Transcription` - representing context-state transitions
 
 The `Transcription` class (defined in
@@ -144,7 +146,7 @@ multitap-generated keystrokes.
 
 ### JS-keyboard keystroke processing
 
-For JS-keyboard keystroke processing, a `Mock` clone of the context is
+For JS-keyboard keystroke processing, a `SyntheticTextStore` clone of the context is
 generated before any actual keyboard rule checks are applied.  This
 provides a clear "before" state (eventually saved at
 `Transcription.preInput`) useful for determining the scope of the
diff --git a/web/docs/internal/keystroke-lifecycle.md b/web/docs/internal/keystroke-lifecycle.md
index 9940ac6d8e3..68dfc14d02f 100644
--- a/web/docs/internal/keystroke-lifecycle.md
+++ b/web/docs/internal/keystroke-lifecycle.md
@@ -126,7 +126,7 @@ The bulk of DOM key events trigger keystroke processing on key-down, though modi
 
 The `app/webview` version of the engine, which is designed to be used while embedded in a platform-specific host app, does not have direct access to standard hardware keystroke events, as those are handled by the host app's OS and by native code handlers run outside the host app's WebView containing the app/webview Web engine. It is the responsibility of the host app to handle hardware keystroke events and preprocess them on behalf of the Web engine, then forward them to the Web engine via JS call into the WebView.  The `PassthroughKeyboard` class within `app/webview` space provides the method `raiseKeyEvent` as an internal API for this purpose, which converts the mobile-app format for hardware keystroke into the internal `KeyEvent` format.  `raiseKeyEvent` also handles mnemonic keystroke processing and remapping.
 
-Also note that this variant does not model the user's text context with Web elements - it is entirely managed through the `Mock` type.
+Also note that this variant does not model the user's text context with Web elements - it is entirely managed through the `SyntheticTextStore` type.
 
 ### On-screen keyboard
 
diff --git a/web/docs/internal/keystroke-processing.md b/web/docs/internal/keystroke-processing.md
index 0945615c09a..60c2c44f7e0 100644
--- a/web/docs/internal/keystroke-processing.md
+++ b/web/docs/internal/keystroke-processing.md
@@ -6,7 +6,7 @@ In addition to handling keystroke events produced from hardware keyboards, Keyma
 
 Defined at [web/src/engine/keyboard/src/keyEvent.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/keyboard/src/keyEvent.ts), the `KeyEvent` is used to represent incoming _and_ potential keystrokes.  This type is what the JS-keyboard processor references when evaluating keyboard rules during its keystroke processing.  For versions of the engine that support AltGr aliasing, such aliasing will be applied during generation of `KeyEvent` objects.
 
-Note that for predictive-text's fat-finger correction functionality, the engine will also generate versions of this type for nearby but _unpressed_ keys into the keystroke processing engine as well in order to facilitate predictions that follow context manipulations that could have resulted from specialized rules or reorders on neighboring keys.  `Mock`-cloned copies of the active context-state will be leveraged to prevent unwanted manipulation of the true context source.
+Note that for predictive-text's fat-finger correction functionality, the engine will also generate versions of this type for nearby but _unpressed_ keys into the keystroke processing engine as well in order to facilitate predictions that follow context manipulations that could have resulted from specialized rules or reorders on neighboring keys.  `SyntheticTextStore`-cloned copies of the active context-state will be leveraged to prevent unwanted manipulation of the true context source.
 
 ### `isSynthetic`
 `isSynthetic` should be set to `true` if generated through interaction with an on-screen-keyboard or for fat-finger simulation.  It should only be set to `false` if sending the basic key-event data through to the destination, without rule processing, leads to default handling picking up the slack.  Browsers provide default handling of keystrokes not directly defined within keyboards, but this is not available for keystrokes against the engine's OSK without internal support.
@@ -31,7 +31,7 @@ See also:  [context-state-management.md](context-state-management.md#js-keyboard
 
 The "first stop" for incoming keystrokes is the `InputProcessor`, found at [web/src/engine/main/src/headless/inputProcessor.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/main/src/headless/.inputProcessor.ts), through its `processKeyEvent` method.  This class manages higher-level functionality triggered by keystroke events while deferring actual interpretation of the incoming keystroke further down the line.  Of particular note is that it also handles control-flows that require restoration of previously-occuring contexts.
 
-This class is the connection point for generating prediction requests and receiving corresponding suggestions.  In order to facilitate higher-quality predictive-text when enabled, the `InputProcessor` will _also_ generate and trigger processing for nearby keys.  This process allows transforms, reorders, and KMN keyboard rules to take effect and be used as alternative context roots for predictions.  These are generally run against `Mock`-based clones of the true context source and are additionally prevented from triggering long-term side-effects, such as changes to KMN-keyboard variable stores, by only calling `KeyboardProcessor.finalizeProcessorAction` for the true input keystroke's result object.
+This class is the connection point for generating prediction requests and receiving corresponding suggestions.  In order to facilitate higher-quality predictive-text when enabled, the `InputProcessor` will _also_ generate and trigger processing for nearby keys.  This process allows transforms, reorders, and KMN keyboard rules to take effect and be used as alternative context roots for predictions.  These are generally run against `SyntheticTextStore`-based clones of the true context source and are additionally prevented from triggering long-term side-effects, such as changes to KMN-keyboard variable stores, by only calling `KeyboardProcessor.finalizeProcessorAction` for the true input keystroke's result object.
 
 Keys generated by OSK multitap need special handling here as well; they should always be applied to the context state as it existed at the time of the initial tap.  To facilitate this, the `InputProcessor` will directly rewind the active context-source to match the corresponding context state before requesting that the `KeyEvent` be processed.
 
@@ -64,7 +64,7 @@ The method linked above is the primary entrypoint for rule processing of individ
 
 #### JS-keyboard interfacing
 
-Certain Keyman language features can make permanent side-effect changes to state.  In order to prevent these from taking place for every keystroke, the method that interfaces with JS keyboards - `JSKeyboardInterface.process` - saves the context state (as a `Mock`) and current variable store values, then prepares a fresh `ProcessorAction` instance, before passing control off to the keyboard's backing script.  (Note that `JSKeyboardInterface` itself primarily consists of keyboard-script API called by JS-keyboard script.)
+Certain Keyman language features can make permanent side-effect changes to state.  In order to prevent these from taking place for every keystroke, the method that interfaces with JS keyboards - `JSKeyboardInterface.process` - saves the context state (as a `SyntheticTextStore`) and current variable store values, then prepares a fresh `ProcessorAction` instance, before passing control off to the keyboard's backing script.  (Note that `JSKeyboardInterface` itself primarily consists of keyboard-script API called by JS-keyboard script.)
 
 A few of the keyboard-script API methods will mark `ProcessorAction` properties directly when called, but the bulk of its data will be set once the keyboard-script returns control to Keyman Engine for Web.  At this time, variable store values will also be reverted to prevent possible cross-contamination effects when predictive text is active - they're reapplied later if `KeyboardProcessor.finalizeProcessorAction` is leveraged on the resulting instance.  Components documented in [context-state-management.md](./context-state-management.md) are then leveraged to determine the total change to context caused by the keystroke.
 
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index 63d28cf850c..68111bff6ff 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -1,4 +1,4 @@
-import { JSKeyboard, Keyboard, TextStore, Transcription, TextTransform, Mock, findCommonSubstringEndIndex } from 'keyman/engine/keyboard';
+import { JSKeyboard, Keyboard, TextStore, Transcription, TextTransform, SyntheticTextStore, findCommonSubstringEndIndex } from 'keyman/engine/keyboard';
 import { KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { ContextManagerBase } from 'keyman/engine/main';
 import { WebviewConfiguration } from './configuration.js';
@@ -7,9 +7,9 @@ import { KMWString, isEmptyTransform } from '@keymanapp/web-utils';
 
 export type OnInsertTextFunc = (deleteLeft: number, text: string, deleteRight: number) => void;
 
-export class ContextHost extends Mock {
+export class ContextHost extends SyntheticTextStore {
   readonly oninserttext?: OnInsertTextFunc;
-  private savedState: Mock;
+  private savedState: SyntheticTextStore;
 
   constructor(oninserttext: OnInsertTextFunc) {
     super();
@@ -30,7 +30,7 @@ export class ContextHost extends Mock {
 
       if(transcription) {
         //TODO-web-core: shouldn't need cast in the future?
-        const preInput = transcription.preInput as Mock;
+        const preInput = transcription.preInput as SyntheticTextStore;
         // If our saved state matches the `preInput` from the incoming transcription, just reuse its transform.
         // Will generally not match during multitap operations, though.
         //
@@ -55,18 +55,18 @@ export class ContextHost extends Mock {
   }
 
   saveState() {
-    this.savedState = Mock.from(this);
+    this.savedState = SyntheticTextStore.from(this);
   }
 
   restoreTo(original: TextStore): void {
-    this.savedState = Mock.from(this);
+    this.savedState = SyntheticTextStore.from(this);
     // TODO-web-core
     super.restoreTo(original as TextStore);
   }
 
   updateContext(text: string, selStart: number, selEnd: number): boolean {
     let shouldResetContext = false;
-    const tempMock = new Mock(text, selStart ?? KMWString.length(text), selEnd ?? KMWString.length(text));
+    const tempMock = new SyntheticTextStore(text, selStart ?? KMWString.length(text), selEnd ?? KMWString.length(text));
     const newLeft = tempMock.getTextBeforeCaret();
     const oldLeft = this.getTextBeforeCaret();
 
@@ -108,12 +108,12 @@ export class ContextHost extends Mock {
     // and we want a consistent interface for context synchronization between
     // host app + app/webview KMW.
     this.setSelection(KMWString.length(this.text));
-    this.savedState = Mock.from(this);
+    this.savedState = SyntheticTextStore.from(this);
   }
 }
 
 export default class ContextManager extends ContextManagerBase<WebviewConfiguration> {
-  // Change of context?  Just replace the Mock.  Context will be ENTIRELY controlled
+  // Change of context?  Just replace the SyntheticTextStore.  Context will be ENTIRELY controlled
   // by whatever is hosting the WebView.  (Some aspects of this context replacement have
   // yet to be modularized at this time, though.)
   private _rawContext: ContextHost;
@@ -130,7 +130,7 @@ export default class ContextManager extends ContextManagerBase<WebviewConfigurat
     this.resetContext();
   }
 
-  get activeTarget(): Mock {
+  get activeTarget(): SyntheticTextStore {
     return this._rawContext;
   }
 
@@ -149,7 +149,7 @@ export default class ContextManager extends ContextManagerBase<WebviewConfigurat
    * Reflects the active 'target' upon which any `set activeKeyboard` operation will take place.
    * For app/webview... there's only one target, thus only a "global default" matters.
    */
-  protected currentKeyboardSrcTarget(): Mock {
+  protected currentKeyboardSrcTarget(): SyntheticTextStore {
     return null;
   }
 
diff --git a/web/src/engine/js-processor/src/jsKeyboardInterface.ts b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
index 3a45cbaa6b7..463471448af 100644
--- a/web/src/engine/js-processor/src/jsKeyboardInterface.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
@@ -13,7 +13,7 @@ import {
   KeyboardHarness,
   KeyboardKeymanGlobal,
   KeyMapping,
-  Mock,
+  SyntheticTextStore,
   MutableSystemStore,
   ProcessorAction,
   SystemStore,
@@ -1048,7 +1048,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
     this.resetContextCache();
 
     // Capture the initial state of the TextStore before any rules are matched.
-    const preInput = Mock.from(textStore, true);
+    const preInput = SyntheticTextStore.from(textStore, true);
 
     // Capture the initial state of any variable stores
     const cachedVariableStores = this.activeKeyboard.variableStores;
diff --git a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
index 14f720b3ce8..1bcb7a6a8f5 100644
--- a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardProcessor.ts
@@ -11,7 +11,7 @@ import { ModifierKeyConstants } from '@keymanapp/common-types';
 import {
   Codes, type JSKeyboard, MinimalKeymanGlobal, KeyEvent, Layouts,
   DefaultRules, EmulationKeystrokes, type MutableSystemStore,
-  TextStore, ProcessorAction, SystemStoreIDs, Mock
+  TextStore, ProcessorAction, SystemStoreIDs, SyntheticTextStore
 } from "keyman/engine/keyboard";
 import { JSKeyboardInterface }  from './jsKeyboardInterface.js';
 import { DeviceSpec, globalObject, KMWString } from "@keymanapp/web-utils";
@@ -127,7 +127,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
    * @return  {string}
    */
   private defaultRuleBehavior(Lkc: KeyEvent, textStore: TextStore, readonly: boolean): ProcessorAction {
-    const preInput = Mock.from(textStore, readonly);
+    const preInput = SyntheticTextStore.from(textStore, readonly);
     const ruleBehavior = new ProcessorAction();
 
     let matched = false;
@@ -672,7 +672,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> {
 
     first.triggersDefaultCommand = first.triggersDefaultCommand || other.triggersDefaultCommand;
 
-    const mergingMock = Mock.from(first.transcription.preInput, false);
+    const mergingMock = SyntheticTextStore.from(first.transcription.preInput, false);
     mergingMock.apply(first.transcription.transform);
     mergingMock.apply(other.transcription.transform);
 
diff --git a/web/src/engine/keyboard/src/defaultRules.ts b/web/src/engine/keyboard/src/defaultRules.ts
index d39cdbe34f1..06c88507beb 100644
--- a/web/src/engine/keyboard/src/defaultRules.ts
+++ b/web/src/engine/keyboard/src/defaultRules.ts
@@ -112,7 +112,7 @@ export default class DefaultRules {
 
   /**
    * Codes matched here generally have default implementations when in a browser but require emulation
-   * for 'synthetic' `TextStore`s like `Mock`s, which have no default text handling.
+   * for 'synthetic' `TextStore`s like `SyntheticTextStore`s, which have no default text handling.
    */
   public forSpecialEmulation(Lkc: KeyEvent): EmulationKeystrokes {
     let code = this.codeForEvent(Lkc);
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index dad2d5f4c53..7bda82d4fdb 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -32,7 +32,7 @@ export { default as KeyMapping } from "./keyMapping.js";
 export { type SystemStoreMutationHandler, MutableSystemStore, SystemStore, SystemStoreIDs, type SystemStoreDictionary } from "./systemStore.js";
 export { type VariableStore, VariableStoreSerializer, VariableStoreDictionary } from "./variableStore.js";
 
-export { Mock } from "./mock.js";
+export { SyntheticTextStore } from "./syntheticTextStore.js";
 export { TextStore } from "./textStore.js";
 export { findCommonSubstringEndIndex } from "./stringDivergence.js";
 export { Deadkey } from "./deadkeys.js";
diff --git a/web/src/engine/keyboard/src/mock.ts b/web/src/engine/keyboard/src/syntheticTextStore.ts
similarity index 82%
rename from web/src/engine/keyboard/src/mock.ts
rename to web/src/engine/keyboard/src/syntheticTextStore.ts
index b426815c513..3fb9ac8cbce 100644
--- a/web/src/engine/keyboard/src/mock.ts
+++ b/web/src/engine/keyboard/src/syntheticTextStore.ts
@@ -1,7 +1,7 @@
 import { TextStore } from './textStore.js';
 import { KMWString } from '@keymanapp/web-utils';
 
-export class Mock extends TextStore {
+export class SyntheticTextStore extends TextStore {
   text: string;
 
   selStart: number;
@@ -31,17 +31,17 @@ export class Mock extends TextStore {
     }
   }
 
-  // Clones the state of an existing EditableElement, creating a Mock version of its state.
-  static from(textStore: TextStore, readonly?: boolean): Mock {
-    let clone: Mock;
+  // Clones the state of an existing EditableElement, creating a SyntheticTextStore version of its state.
+  static from(textStore: TextStore, readonly?: boolean): SyntheticTextStore {
+    let clone: SyntheticTextStore;
 
     this.assertIsOutputTargetBase(textStore);
 
-    if (textStore instanceof Mock) {
+    if (textStore instanceof SyntheticTextStore) {
       // Avoids the need to run expensive kmwstring.ts `length()`
-      // calculations when deep-copying Mock instances.
-      const priorMock = textStore as Mock;
-      clone = new Mock(priorMock.text, priorMock.selStart, priorMock.selEnd);
+      // calculations when deep-copying SyntheticTextStore instances.
+      const priorMock = textStore as SyntheticTextStore;
+      clone = new SyntheticTextStore(priorMock.text, priorMock.selStart, priorMock.selEnd);
     } else {
       const text = textStore.getText();
       const textLen = KMWString.length(text);
@@ -57,10 +57,10 @@ export class Mock extends TextStore {
         selectionEnd = textLen - KMWString.length(afterText);
       }
 
-      // readonly group or not, the returned Mock remains the same.
+      // readonly group or not, the returned SyntheticTextStore remains the same.
       // New-context events should act as if the caret were at the earlier-in-context
       // side of the selection, same as standard keyboard rules.
-      clone = new Mock(text, selectionStart, selectionEnd);
+      clone = new SyntheticTextStore(text, selectionStart, selectionEnd);
     }
 
     // Also duplicate deadkey state!  (Needed for fat-finger ops.)
@@ -147,11 +147,11 @@ export class Mock extends TextStore {
   }
 
   /**
-   * Indicates if this Mock represents an identical context to that of another Mock.
+   * Indicates if this SyntheticTextStore represents an identical context to that of another SyntheticTextStore.
    * @param other
    * @returns
    */
-  isEqual(other: Mock) {
+  isEqual(other: SyntheticTextStore) {
     return this.text == other.text
       && this.selStart == other.selStart
       && this.selEnd == other.selEnd
@@ -159,6 +159,6 @@ export class Mock extends TextStore {
   }
 
   doInputEvent() {
-    // Mock isn't backed by an element, so it won't have any event listeners.
+    // SyntheticTextStore isn't backed by an element, so it won't have any event listeners.
   }
 }
diff --git a/web/src/engine/keyboard/src/textStore.ts b/web/src/engine/keyboard/src/textStore.ts
index 1e7889f918b..9b405deee31 100644
--- a/web/src/engine/keyboard/src/textStore.ts
+++ b/web/src/engine/keyboard/src/textStore.ts
@@ -2,7 +2,7 @@ import { KMWString } from "@keymanapp/web-utils";
 import { Alternate, TextTransform } from "./keyboards/textTransform.js";
 import { Transcription } from "./keyboards/transcription.js";
 import { findCommonSubstringEndIndex } from "./stringDivergence.js";
-import { Mock } from "./mock.js";
+import { SyntheticTextStore } from "./syntheticTextStore.js";
 
 // Defines deadkey management in a manner attachable to each element interface.
 import { type KeyEvent } from 'keyman/engine/keyboard';
@@ -52,7 +52,7 @@ export abstract class TextStore {
   }
 
   /**
-   * Needed to properly clone deadkeys for use with Mock element interfaces toward predictive text purposes.
+   * Needed to properly clone deadkeys for use with SyntheticTextStore element interfaces toward predictive text purposes.
    * @param {object}  dks   An existing set of deadkeys to deep-copy for use by this element interface.
    */
   protected setDeadkeys(dks: DeadkeyTracker) {
@@ -65,7 +65,7 @@ export abstract class TextStore {
    *
    * This is designed for use as a "before and after" comparison to determine the effect of a single keyboard rule at a time.
    * As such, it assumes that the caret is immediately after any inserted text.
-   * @param from An output target (preferably a Mock) representing the prior state of the input/output system.
+   * @param from An output target (preferably a SyntheticTextStore) representing the prior state of the input/output system.
    */
   buildTransformFrom(original: TextStore): TextTransform {
     const toLeft = this.getTextBeforeCaret();
@@ -93,12 +93,12 @@ export abstract class TextStore {
 
     // If we ever decide to re-add deadkey tracking, this is the place for it.
 
-    return new Transcription(keyEvent, transform, Mock.from(original, readonly), alternates);
+    return new Transcription(keyEvent, transform, SyntheticTextStore.from(original, readonly), alternates);
   }
 
   /**
    * Restores the `TextStore` to the indicated state.  Designed for use with `Transcription.preInput`.
-   * @param original An `TextStore` (usually a `Mock`).
+   * @param original An `TextStore` (usually a `SyntheticTextStore`).
    */
   restoreTo(original: TextStore) {
     this.clearSelection();
diff --git a/web/src/engine/main/src/headless/contextWindow.ts b/web/src/engine/main/src/headless/contextWindow.ts
index 964fea5e20a..07051d23323 100644
--- a/web/src/engine/main/src/headless/contextWindow.ts
+++ b/web/src/engine/main/src/headless/contextWindow.ts
@@ -1,5 +1,5 @@
 import { LexicalModelTypes } from '@keymanapp/common-types';
-import { Mock } from "keyman/engine/keyboard";
+import { SyntheticTextStore } from "keyman/engine/keyboard";
 import { KMWString } from '@keymanapp/web-utils';
 
 export default class ContextWindow implements LexicalModelTypes.Context {
@@ -18,7 +18,7 @@ export default class ContextWindow implements LexicalModelTypes.Context {
 
   casingForm?: LexicalModelTypes.CasingForm;
 
-  constructor(mock: Mock, config: LexicalModelTypes.Configuration, layerId: string) {
+  constructor(mock: SyntheticTextStore, config: LexicalModelTypes.Configuration, layerId: string) {
     this.left = mock.getTextBeforeCaret();
     this.startOfBuffer = KMWString.length(this.left) <= config.leftContextCodePoints;
     if(!this.startOfBuffer) {
@@ -38,9 +38,9 @@ export default class ContextWindow implements LexicalModelTypes.Context {
       null;
   }
 
-  public toMock(): Mock {
+  public toMock(): SyntheticTextStore {
     const caretPos = KMWString.length(this.left);
 
-    return new Mock(this.left + (this.right || ""), caretPos);
+    return new SyntheticTextStore(this.left + (this.right || ""), caretPos);
   }
 }
\ No newline at end of file
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index 0518d989aa7..aee818c42a3 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -11,7 +11,7 @@ import {
   Codes,
   JSKeyboard,
   KeyboardMinimalInterface,
-  Mock,
+  SyntheticTextStore,
   TextStore,
   ProcessorAction,
   SystemStoreIDs,
@@ -120,10 +120,10 @@ export class InputProcessor {
           // to revert it.  If not, we assume it's a layer-change multitap, in which case
           // no such reset is needed.
           // TODO-web-core
-          if(!isEmptyTransform(transcription.transform) || !(transcription.preInput as Mock).isEqual(Mock.from(textStore))) {
+          if(!isEmptyTransform(transcription.transform) || !(transcription.preInput as SyntheticTextStore).isEqual(SyntheticTextStore.from(textStore))) {
             // Restores full context, including deadkeys in their exact pre-keystroke state.
             // TODO-web-core
-            (textStore as TextStore).restoreTo(transcription.preInput as Mock);
+            (textStore as TextStore).restoreTo(transcription.preInput as SyntheticTextStore);
           }
           /*
             else:
@@ -200,7 +200,7 @@ export class InputProcessor {
     // Create a "mock" backup of the current textStore in its pre-input state.
     // Current, long-existing assumption - it's DOM-backed.
     // TODO-web-core
-    const preInputMock = Mock.from(textStore as TextStore, true);
+    const preInputMock = SyntheticTextStore.from(textStore as TextStore, true);
 
     const startingLayerId = this.keyboardProcessor.layerId;
 
@@ -292,7 +292,7 @@ export class InputProcessor {
     return keepRuleBehavior ? ruleBehavior : null;
   }
 
-  private buildAlternates(ruleBehavior: ProcessorAction, keyEvent: KeyEvent, preInputMock: Mock): Alternate[] {
+  private buildAlternates(ruleBehavior: ProcessorAction, keyEvent: KeyEvent, preInputMock: SyntheticTextStore): Alternate[] {
     let alternates: Alternate[];
 
     // If we're performing a 'default command', it's not a standard 'typing' event - don't do fat-finger stuff.
@@ -360,7 +360,7 @@ export class InputProcessor {
             break;
           }
 
-          const mock = Mock.from(windowedMock, false);
+          const mock = SyntheticTextStore.from(windowedMock, false);
 
           const altKey = pair.keySpec;
           if(!altKey) {
diff --git a/web/src/engine/main/src/headless/languageProcessor.ts b/web/src/engine/main/src/headless/languageProcessor.ts
index b3a749ce93e..aa76d7c22be 100644
--- a/web/src/engine/main/src/headless/languageProcessor.ts
+++ b/web/src/engine/main/src/headless/languageProcessor.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from "eventemitter3";
 import { LMLayer, WorkerFactory } from "@keymanapp/lexical-model-layer/web";
-import { Transcription, TextStore, Mock } from 'keyman/engine/keyboard';
+import { Transcription, TextStore, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { LanguageProcessorEventMap, ModelSpec, StateChangeEnum, ReadySuggestions } from 'keyman/engine/interfaces';
 import ContextWindow from "./contextWindow.js";
 import { TranscriptionCache } from "./transcriptionCache.js";
@@ -160,7 +160,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     }
 
     // TODO-web-core
-    const context = new ContextWindow(Mock.from((target as TextStore), false), this.configuration, layerId);
+    const context = new ContextWindow(SyntheticTextStore.from((target as TextStore), false), this.configuration, layerId);
     return this.lmEngine.wordbreak(context);
   }
 
@@ -216,7 +216,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
       // Apply the Suggestion!
 
       // Step 1:  determine the final output text
-      const final = Mock.from(original.preInput, false);
+      const final = SyntheticTextStore.from(original.preInput, false);
       final.apply(suggestion.transform);
 
       // Step 2:  build a final, master Transform that will produce the desired results from the CURRENT state.
@@ -233,12 +233,12 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
 
       // Build a 'reversion' Transcription that can be used to undo this apply() if needed,
       // replacing the suggestion transform with the original input text.
-      const preApply = Mock.from(original.preInput, false);
+      const preApply = SyntheticTextStore.from(original.preInput, false);
       preApply.apply(original.transform);
 
       // Builds the reversion option according to the loaded lexical model's known
       // syntactic properties.
-      const suggestionContext = new ContextWindow(original.preInput as Mock, this.configuration, getLayerId());
+      const suggestionContext = new ContextWindow(original.preInput as SyntheticTextStore, this.configuration, getLayerId());
 
       // We must accept the Suggestion from its original context, which was before
       // `original.transform` was applied.
@@ -291,7 +291,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     // Apply the Reversion!
 
     // Step 1:  determine the final output text
-    const final = Mock.from(original.preInput, false);
+    const final = SyntheticTextStore.from(original.preInput, false);
     final.apply(reversion.transform); // Should match original.transform, actually. (See applySuggestion)
 
     // Step 2:  build a final, master Transform that will produce the desired results from the CURRENT state.
@@ -303,7 +303,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     (textStore as TextStore).apply(transform);
 
     // The reason we need to preserve the additive-inverse 'transformId' property on Reversions.
-    const promise = this.currentPromise = this.lmEngine.revertSuggestion(reversion, new ContextWindow(original.preInput as Mock, this.configuration, null))
+    const promise = this.currentPromise = this.lmEngine.revertSuggestion(reversion, new ContextWindow(original.preInput as SyntheticTextStore, this.configuration, null))
     // If the "current Promise" is as set above, clear it.
     // If another one has been triggered since... don't.
     promise.then(() => this.currentPromise = (this.currentPromise == promise) ? null : this.currentPromise);
@@ -331,7 +331,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
       return null;
     }
 
-    const context = new ContextWindow(transcription.preInput as Mock, this.configuration, layerId);
+    const context = new ContextWindow(transcription.preInput as SyntheticTextStore, this.configuration, layerId);
     this.recordTranscription(transcription);
 
     if(resetContext) {
diff --git a/web/src/test/auto/dom/cases/element-wrappers/element_interfaces.tests.ts b/web/src/test/auto/dom/cases/element-wrappers/element_interfaces.tests.ts
index 99997f14d4a..aeaf0078334 100644
--- a/web/src/test/auto/dom/cases/element-wrappers/element_interfaces.tests.ts
+++ b/web/src/test/auto/dom/cases/element-wrappers/element_interfaces.tests.ts
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { KMWString, Mock } from 'keyman/engine/keyboard';
+import { KMWString, SyntheticTextStore } from 'keyman/engine/keyboard';
 import * as wrappers from 'keyman/engine/element-wrappers';
 
 import { DynamicElements } from '../../test_utils.js';
@@ -320,10 +320,10 @@ class DesignIFrameTestHelper implements TestHelper {
 }
 //#endregion
 
-//#region Defines helpers related to Mock test setup.
+//#region Defines helpers related to SyntheticTextStore test setup.
 class MockTestHelper implements TestHelper {
   setupElement(): ElementPair<any> {
-    return { elem: null, wrapper: new Mock() };
+    return { elem: null, wrapper: new SyntheticTextStore() };
   }
 
   resetWithText(pair: ElementPair<any>, string: string) {
@@ -371,7 +371,7 @@ class InterfaceTests {
 
   public static DesignIFrame = new DesignIFrameTestHelper();
 
-  public static Mock = new MockTestHelper();
+  public static SyntheticTextStore = new MockTestHelper();
 
   //#region Defines common test patterns across element tests
   public static Tests = class {
@@ -1379,8 +1379,8 @@ describe('Element Input/Output Interfacing', function () {
     });
   });
 
-  describe('The "Mock" output target', function () {
-    // Unique to the Mock type - element interface cloning tests.  Is element state properly copied?
+  describe('The "SyntheticTextStore" output target', function () {
+    // Unique to the SyntheticTextStore type - element interface cloning tests.  Is element state properly copied?
     // As those require a very different setup, they're in the target_mocks.js test case file instead.
 
     // Basic text-retrieval unit tests are now done headlessly in keyman/engine/keyboard.
@@ -1388,26 +1388,26 @@ describe('Element Input/Output Interfacing', function () {
     describe('Text Mutation', function () {
       describe('deleteCharsBeforeCaret', function () {
         it("correctly deletes characters from 'context' (no active selection)", function () {
-          InterfaceTests.Tests.deleteCharsBeforeCaretNoSelection(InterfaceTests.Mock);
+          InterfaceTests.Tests.deleteCharsBeforeCaretNoSelection(InterfaceTests.SyntheticTextStore);
         });
 
         it("correctly deletes characters from 'context' (with active selection)", function () {
-          InterfaceTests.Tests.deleteCharsBeforeCaretWithSelection(InterfaceTests.Mock);
+          InterfaceTests.Tests.deleteCharsBeforeCaretWithSelection(InterfaceTests.SyntheticTextStore);
         });
       });
 
       describe('insertTextBeforeCaret', function () {
         it("correctly replaces the element's 'context' (no active selection)", function () {
-          InterfaceTests.Tests.insertTextBeforeCaretNoSelection(InterfaceTests.Mock);
+          InterfaceTests.Tests.insertTextBeforeCaretNoSelection(InterfaceTests.SyntheticTextStore);
         });
 
         it("correctly replaces the element's 'context' (with active selection)", function () {
-          InterfaceTests.Tests.insertTextBeforeCaretWithSelection(InterfaceTests.Mock);
+          InterfaceTests.Tests.insertTextBeforeCaretWithSelection(InterfaceTests.SyntheticTextStore);
         });
       });
 
       it('correctly maintains deadkeys', function () {
-        InterfaceTests.Tests.deadkeyMaintenance(InterfaceTests.Mock);
+        InterfaceTests.Tests.deadkeyMaintenance(InterfaceTests.SyntheticTextStore);
       });
     });
   });
diff --git a/web/src/test/auto/dom/cases/element-wrappers/target_mocks.tests.ts b/web/src/test/auto/dom/cases/element-wrappers/target_mocks.tests.ts
index a6666898ca8..ea4ac07707d 100644
--- a/web/src/test/auto/dom/cases/element-wrappers/target_mocks.tests.ts
+++ b/web/src/test/auto/dom/cases/element-wrappers/target_mocks.tests.ts
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { KMWString, Mock } from 'keyman/engine/keyboard';
+import { KMWString, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { Input } from 'keyman/engine/element-wrappers';
 
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
@@ -78,10 +78,10 @@ describe('TextStore Mocking', function() {
     KMWString.enableSupplementaryPlane(false);
   })
 
-  describe('The "Mock" output target', function() {
+  describe('The "SyntheticTextStore" output target', function() {
     describe('Initialization', function() {
       it('properly initializes from a raw string', function() {
-        const mock = new Mock(MockTests.Apple.mixed);
+        const mock = new SyntheticTextStore(MockTests.Apple.mixed);
 
         assert.equal(mock.getText(), MockTests.Apple.mixed);
         assert.equal(mock.getDeadkeyCaret(), 5);
@@ -90,7 +90,7 @@ describe('TextStore Mocking', function() {
       it('copies an existing TextStore without a text selection', function() {
         const base = MockTests.setupBase(4);
 
-        const mock = Mock.from(base);
+        const mock = SyntheticTextStore.from(base);
         assert.equal(mock.getText(), MockTests.Apple.mixed);
         assert.deepEqual(mock.deadkeys(), base.deadkeys());
       });
@@ -98,7 +98,7 @@ describe('TextStore Mocking', function() {
       it('copies an existing TextStore with a text selection', function() {
         const base = MockTests.setupBase(4, 5);
 
-        const mock = Mock.from(base);
+        const mock = SyntheticTextStore.from(base);
         // The selection should appear to be automatically deleted, as any text mutation
         // by KMW would automatically erase the text anyway.
         assert.equal(mock.getTextBeforeCaret(), MockTests.Apple.mixed.substr(0, 5));
@@ -114,7 +114,7 @@ describe('TextStore Mocking', function() {
       it('is not affected by mutation of the source element', function() {
         // Already-verified code
         const base = MockTests.setupBase(4);
-        const mock = Mock.from(base);
+        const mock = SyntheticTextStore.from(base);
         const baseInitDks = base.deadkeys().clone();
 
         // Now for the actual test.
@@ -133,7 +133,7 @@ describe('TextStore Mocking', function() {
       it('does not affect the source element when mutated', function() {
         // Already-verified code
         const base = MockTests.setupBase(4);
-        const mock = Mock.from(base);
+        const mock = SyntheticTextStore.from(base);
         const baseInitDks = base.deadkeys().clone();
 
         // Now for the actual test.
diff --git a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
index 8cc5493d4eb..326cb5b9aa8 100644
--- a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
+++ b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 
 import { DOMKeyboardLoader } from 'keyman/engine/keyboard/dom-keyboard-loader';
-import { KeyboardHarness, JSKeyboard, MinimalKeymanGlobal, DeviceSpec, KeyboardKeymanGlobal, KeyboardDownloadError, KeyboardScriptError, Keyboard, Mock } from 'keyman/engine/keyboard';
+import { KeyboardHarness, JSKeyboard, MinimalKeymanGlobal, DeviceSpec, KeyboardKeymanGlobal, KeyboardDownloadError, KeyboardScriptError, Keyboard, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { assertThrowsAsync } from 'keyman/tools/testing/test-utils';
 
@@ -82,7 +82,7 @@ describe('Keyboard loading in DOM', function() {
 
     // TODO:  verify actual rule processing.
     const nullKeyEvent = jsKeyboard.constructNullKeyEvent(device);
-    const mock = new Mock();
+    const mock = new SyntheticTextStore();
     const result = jsHarness.processKeystroke(mock, nullKeyEvent);
 
     assert.isOk(result);
diff --git a/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js b/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
index 96b8d98a262..dd2d75257fc 100644
--- a/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
+++ b/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
@@ -4,7 +4,7 @@ import sinon from 'sinon';
 import { LanguageProcessor, TranscriptionCache } from 'keyman/engine/main';
 import { PredictionContext } from 'keyman/engine/interfaces';
 import { Worker as LMWorker } from "@keymanapp/lexical-model-layer/node";
-import { DeviceSpec, Mock } from 'keyman/engine/keyboard';
+import { DeviceSpec, SyntheticTextStore } from 'keyman/engine/keyboard';
 
 function compileDummyModel(suggestionSets) {
   return `
@@ -81,8 +81,8 @@ describe("PredictionContext", () => {
     let updateFake = sinon.fake();
     predictiveContext.on('update', updateFake);
 
-    let mock = new Mock("appl", 4); // "appl|", with '|' as the caret position.
-    const initialMock = Mock.from(mock);
+    let mock = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
+    const initialMock = SyntheticTextStore.from(mock);
     const promise = predictiveContext.setCurrentTarget(mock);
 
     // Initial predictive state:  no suggestions.  context.initializeState() has not yet been called.
@@ -120,8 +120,8 @@ describe("PredictionContext", () => {
     let updateFake = sinon.fake();
     predictiveContext.on('update', updateFake);
 
-    let mock = new Mock("appl", 4); // "appl|", with '|' as the caret position.
-    const initialMock = Mock.from(mock);
+    let mock = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
+    const initialMock = SyntheticTextStore.from(mock);
     const promise = predictiveContext.setCurrentTarget(mock);
 
     // Initial predictive state:  no suggestions.  context.initializeState() has not yet been called.
@@ -180,7 +180,7 @@ describe("PredictionContext", () => {
 
     const predictiveContext = new PredictionContext(langProcessor, dummiedGetLayer);
 
-    let mock = new Mock("appl", 4); // "appl|", with '|' as the caret position.
+    let mock = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
     const initialSuggestions = await predictiveContext.setCurrentTarget(mock);
 
     let updateFake = sinon.fake();
@@ -204,7 +204,7 @@ describe("PredictionContext", () => {
 
     const predictiveContext = new PredictionContext(langProcessor, dummiedGetLayer);
 
-    let textState = new Mock("appl", 4); // "appl|", with '|' as the caret position.
+    let textState = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
 
     await predictiveContext.setCurrentTarget(textState);
 
@@ -213,7 +213,7 @@ describe("PredictionContext", () => {
 
     let suggestions;
 
-    let previousTextState = Mock.from(textState);
+    let previousTextState = SyntheticTextStore.from(textState);
     textState.insertTextBeforeCaret('e'); // appl| + e = apple
     let transcription = textState.buildTranscriptionFrom(previousTextState, null, true);
     await langProcessor.predict(transcription, dummiedGetLayer());
@@ -226,7 +226,7 @@ describe("PredictionContext", () => {
     assert.equal(suggestions.find((obj) => obj.transform.deleteLeft != 0).displayAs, 'apps');
 
     // Now for the real test.
-    previousTextState = Mock.from(textState); // snapshot it!
+    previousTextState = SyntheticTextStore.from(textState); // snapshot it!
 
     const suggestionApply = suggestions.find((obj) => obj.displayAs == 'apply');
     assert.isOk(suggestionApply);
@@ -270,14 +270,14 @@ describe("PredictionContext", () => {
 
     const predictiveContext = new PredictionContext(langProcessor, dummiedGetLayer);
 
-    let textState = new Mock("appl", 4); // "appl|", with '|' as the caret position.
+    let textState = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
 
     // Test setup - return to the state at the end of the prior-defined unit test ('suggestion application...')
 
     await predictiveContext.setCurrentTarget(textState);
 
     // This is the point in time that a reversion operation will rewind the context to.
-    const revertBaseTextState = Mock.from(textState);
+    const revertBaseTextState = SyntheticTextStore.from(textState);
     textState.insertTextBeforeCaret('e'); // appl| + e = apple
     let transcription = textState.buildTranscriptionFrom(revertBaseTextState, null, true);
 
@@ -291,7 +291,7 @@ describe("PredictionContext", () => {
     const suggestionApply = originalSuggestionSet.find((obj) => obj.displayAs == 'apply');
     assert.isOk(suggestionApply);
 
-    let previousTextState = Mock.from(textState);
+    let previousTextState = SyntheticTextStore.from(textState);
 
     // For awaiting the suggestions generated upon applying our desired suggestion.
     // We aren't given a direct Promise for that, but we can construct one this way.
@@ -320,7 +320,7 @@ describe("PredictionContext", () => {
     assert.equal(reversion.displayAs.length, previousTextState.getText().length + 2); // +2:  opening + closing quotes.
 
     // Fire away!  Time to apply the reversion.
-    previousTextState = Mock.from(textState);
+    previousTextState = SyntheticTextStore.from(textState);
 
     // Since the test uses a separate thread via Worker, make sure to set up any important event handlers
     // before we request the reversion.
@@ -340,7 +340,7 @@ describe("PredictionContext", () => {
     assert.isNull(returnValue); // as per the method's spec.
 
     // Verify that the rewind + application of reversion worked!
-    let rewoundTextStateWithInput = Mock.from(revertBaseTextState); // appl
+    let rewoundTextStateWithInput = SyntheticTextStore.from(revertBaseTextState); // appl
     rewoundTextStateWithInput.apply(reversion.transform); // + e
     assert.equal(rewoundTextStateWithInput.getText(), 'apple'); // For visual clarity.
 
diff --git a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
index 0eceada34ef..8601a06f45d 100644
--- a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
@@ -39,9 +39,9 @@ describe('Bundled ES Module for keyboard', function () {
     });
   });
 
-  describe('Mock', () => {
+  describe('SyntheticTextStore', () => {
     it('basic functionality test', () => {
-      let target = new KeyboardPackage.Mock("aple", 2);  // ap | le
+      let target = new KeyboardPackage.SyntheticTextStore("aple", 2);  // ap | le
       target.insertTextBeforeCaret('p');
       assert.equal(target.getText(), "apple");
     });
@@ -49,7 +49,7 @@ describe('Bundled ES Module for keyboard', function () {
     it('smp test', () => {
       KMWString.enableSupplementaryPlane(true); // Declared & defined in web-utils.
       try {
-        let target = new KeyboardPackage.Mock(u(0x1d5ba) + u(0x1d5c9) + u(0x1d5c5) + u(0x1d5be), 2);  // ap | le
+        let target = new KeyboardPackage.SyntheticTextStore(u(0x1d5ba) + u(0x1d5c9) + u(0x1d5c5) + u(0x1d5be), 2);  // ap | le
         target.insertTextBeforeCaret(u(0x1d5c9));
         assert.equal(target.getText(), u(0x1d5ba) + u(0x1d5c9) + u(0x1d5c9) + u(0x1d5c5) + u(0x1d5be));
       } finally {
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
index 813f699b1e3..54b70f84d61 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
@@ -3,7 +3,7 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { MinimalKeymanGlobal, Mock } from 'keyman/engine/keyboard';
+import { MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
@@ -61,7 +61,7 @@ function runEngineRuleSet(ruleSet, defaultNoun) {
       let proctor = new NodeProctor(keyboardWithHarness, device, assert.equal);
 
       // We want to specify the OutputTarget for this test; our actual concern is the resulting context.
-      var target = new Mock();
+      var target = new SyntheticTextStore();
       ruleSeq.test(proctor, target);
 
       // Now for the real test!
@@ -1118,7 +1118,7 @@ describe('Engine - Context Matching', function() {
       let proctor = new NodeProctor(keyboardWithHarness, device, assert.equal);
 
       // We want to specify the OutputTarget for this test; our actual concern is the resulting context.
-      var target = new Mock();
+      var target = new SyntheticTextStore();
       ruleSeq.test(proctor, target);
 
       // Now for the real test!
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
index 840de72cb09..2237d88f4e3 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
@@ -3,7 +3,7 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { MinimalKeymanGlobal, Mock } from 'keyman/engine/keyboard';
+import { MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { NodeProctor, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
@@ -23,7 +23,7 @@ function runEngineRuleSet(ruleSet) {
     // Prepare the context!
     const ruleSeq = new RecordedKeystrokeSequence(ruleDef);
     const proctor = new NodeProctor(keyboardWithHarness, device, assert.equal);
-    const target = new Mock();
+    const target = new SyntheticTextStore();
     ruleSeq.test(proctor, target);
   }
 }
diff --git a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
index d3f75964c55..41485ebf59f 100644
--- a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
+++ b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
@@ -3,7 +3,7 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { DeviceSpec, JSKeyboard, MinimalKeymanGlobal, Mock } from 'keyman/engine/keyboard';
+import { DeviceSpec, JSKeyboard, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
@@ -43,7 +43,7 @@ describe('Headless keyboard loading', function () {
       // --  END:  Standard Recorder-based unit test loading boilerplate --
 
       // Runs a blank KeyEvent through the keyboard's rule processing.
-      harness.processKeystroke(new Mock(), (keyboard as JSKeyboard).constructNullKeyEvent(device));
+      harness.processKeystroke(new SyntheticTextStore(), (keyboard as JSKeyboard).constructNullKeyEvent(device));
     });
 
     it('does not change the active kehboard', async function () {
diff --git a/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js b/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
index a041880bb07..f3b425472e4 100644
--- a/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
@@ -4,7 +4,7 @@ import { ModifierKeyConstants } from '@keymanapp/common-types';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { Codes, KeyEvent, MinimalKeymanGlobal, Mock } from 'keyman/engine/keyboard';
+import { Codes, KeyEvent, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
@@ -41,7 +41,7 @@ describe('Engine - rule processing', function() {
 
     it('matches rules with mnemonic-specced KeyEvents', () => {
       // Note:  plain 'n' is produced from default key outputs for sil_ipa, not a keyboard rule.
-      let mockMnemonic = new Mock('n');
+      let mockMnemonic = new SyntheticTextStore('n');
       let mnemonicEvent = new KeyEvent({
         // sil_ipa is a mnenomic keyboard:  it expects codes based on the key's standard character output.
         Lcode: '>'.charCodeAt(0), // 62
@@ -62,7 +62,7 @@ describe('Engine - rule processing', function() {
 
     it('requires correct modifiers', () => {
       // Note:  plain 'n' is produced from default key outputs for sil_ipa, not a keyboard rule.
-      let mockMnemonic = new Mock('n');
+      let mockMnemonic = new SyntheticTextStore('n');
       let mnemonicEvent = new KeyEvent({
         // sil_ipa is a mnenomic keyboard:  it expects codes based on the key's standard character output.
         Lcode: '>'.charCodeAt(0), // 62
@@ -81,7 +81,7 @@ describe('Engine - rule processing', function() {
     });
 
     it('does not match rules with positional-specced KeyEvents', () => {
-      let mockPositional = new Mock('n');
+      let mockPositional = new SyntheticTextStore('n');
       let positionalEvent = new KeyEvent({
         // If it were positional, we'd use this instead:
         Lcode: Codes.keyCodes.K_COMMA, // 188
@@ -119,7 +119,7 @@ describe('Engine - rule processing', function() {
     });
 
     it('matches rules with legacy-specced KeyEvents', () => {
-      let mockLegacy = new Mock('');
+      let mockLegacy = new SyntheticTextStore('');
       let legacyEvent = new KeyEvent({
         // armenian is a KMW 1.0 keyboard:  it expects codes based on the key's standard character output.
         Lcode: 'a'.charCodeAt(0),
@@ -139,7 +139,7 @@ describe('Engine - rule processing', function() {
     });
 
     it('ignores current modifiers and states', () => {
-      let mockLegacy = new Mock('');
+      let mockLegacy = new SyntheticTextStore('');
       let legacyEvent = new KeyEvent({
         // armenian is a KMW 1.0 keyboard:  it expects codes based on the key's standard character output.
         Lcode: 'a'.charCodeAt(0),
@@ -159,7 +159,7 @@ describe('Engine - rule processing', function() {
     });
 
     it('does not match rules with mnemonic-specced KeyEvents', () => {
-      let mockMnemonic = new Mock('');
+      let mockMnemonic = new SyntheticTextStore('');
       let mnemonicEvent = new KeyEvent({
         // armenian is a KMW 1.0 keyboard:  it expects codes based on the key's standard character output.
         Lcode: 'a'.charCodeAt(0),
@@ -178,7 +178,7 @@ describe('Engine - rule processing', function() {
     });
 
     it('does not match rules with positional-specced KeyEvents', () => {
-      let mockPositional = new Mock('');
+      let mockPositional = new SyntheticTextStore('');
       let positionalEvent = new KeyEvent({
         // If it were positional, we'd use this instead:
         Lcode: Codes.keyCodes.K_A,
diff --git a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
index a1a2d1b2290..a9a229bd757 100644
--- a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
@@ -5,7 +5,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { KMWString } from '@keymanapp/web-utils';
-import { Codes, KeyEvent, MinimalKeymanGlobal, Mock } from 'keyman/engine/keyboard';
+import { Codes, KeyEvent, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
@@ -128,7 +128,7 @@ describe('Engine - specialized backspace handling', function() {
   });
 
   it('empty context, positional keyboard', () => {
-    let contextSource = new Mock('');
+    let contextSource = new SyntheticTextStore('');
     let event = new KeyEvent({
       Lcode: Codes.keyCodes.K_BKSP,
       Lmodifiers: 0,
@@ -156,7 +156,7 @@ describe('Engine - specialized backspace handling', function() {
   });
 
   it("empty context, positional keyboard, outputless-key that's not BKSP", () => {
-    let contextSource = new Mock('');
+    let contextSource = new SyntheticTextStore('');
     let event = new KeyEvent({
       Lcode: Codes.keyCodes.K_A,
       Lmodifiers: 0,
@@ -189,7 +189,7 @@ describe('Engine - specialized backspace handling', function() {
   });
 
   it('empty context, positional keyboard, but text is selected', () => {
-    let contextSource = new Mock('selected text', 0);
+    let contextSource = new SyntheticTextStore('selected text', 0);
     contextSource.setSelection(0, KMWString.length(contextSource.getText()));
 
     let event = new KeyEvent({
@@ -226,7 +226,7 @@ describe('Engine - specialized backspace handling', function() {
   });
 
   it('empty left-context, positional keyboard', () => {
-    let contextSource = new Mock('post-caret text', 0);
+    let contextSource = new SyntheticTextStore('post-caret text', 0);
     let event = new KeyEvent({
       Lcode: Codes.keyCodes.K_BKSP,
       Lmodifiers: 0,
@@ -254,7 +254,7 @@ describe('Engine - specialized backspace handling', function() {
   });
 
   it('empty context, mnemonic keyboard', () => {
-    let contextSource = new Mock('');
+    let contextSource = new SyntheticTextStore('');
     let event = new KeyEvent({
       Lcode: Codes.keyCodes.K_BKSP,
       Lmodifiers: 0,
@@ -282,7 +282,7 @@ describe('Engine - specialized backspace handling', function() {
   });
 
   it('final empty context, positional keyboard, rule-handled BKSP', () => {
-    let contextSource = new Mock('abc', 2);
+    let contextSource = new SyntheticTextStore('abc', 2);
     let event = new KeyEvent({
       Lcode: Codes.keyCodes.K_BKSP,
       Lmodifiers: 0,
@@ -317,7 +317,7 @@ describe('Engine - specialized backspace handling', function() {
 
   // Special case:  BKSP rule-matches with empty left-context.
   it("empty context, positional keyboard, outputless BKSP rule", () => {
-    let contextSource = new Mock('');
+    let contextSource = new SyntheticTextStore('');
     let event = new KeyEvent({
       Lcode: Codes.keyCodes.K_BKSP,
       Lmodifiers: 0,
diff --git a/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js b/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js
index 8f81f0d3628..2632431060c 100644
--- a/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { Mock, findCommonSubstringEndIndex } from 'keyman/engine/keyboard';
+import { SyntheticTextStore, findCommonSubstringEndIndex } from 'keyman/engine/keyboard';
 import { KMWString } from '@keymanapp/web-utils';
 
 // A unicode-coding like alias for use in constructing non-BMP strings.
@@ -157,8 +157,8 @@ describe("Transcriptions and Transforms", function() {
   it("does not store an alias for related OutputTargets", function() {
     // We have other texts validating Mocks; by using them as our base 'element', this unit test file
     // could eventually run in 'headless' mode.
-    var target = new Mock("apple");
-    var original = Mock.from(target);
+    var target = new SyntheticTextStore("apple");
+    var original = SyntheticTextStore.from(target);
     target.insertTextBeforeCaret("s");
 
     /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
@@ -174,8 +174,8 @@ describe("Transcriptions and Transforms", function() {
     it("handles context-free single-char output rules", function() {
       // We have other texts validating Mocks; by using them as our base 'element', this unit test file
       // could eventually run in 'headless' mode.
-      var target = new Mock("apple");
-      var original = Mock.from(target);
+      var target = new SyntheticTextStore("apple");
+      var original = SyntheticTextStore.from(target);
       target.insertTextBeforeCaret("s");
 
       /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
@@ -187,8 +187,8 @@ describe("Transcriptions and Transforms", function() {
       assert.equal(transcription.transform.deleteLeft, 0, "Incorrectly detected left-of-caret deletions");
       assert.equal(transcription.transform.deleteRight, 0, "Incorrectly detected right-of-caret deletions");
 
-      target = new Mock("apple", 3);
-      original = Mock.from(target);
+      target = new SyntheticTextStore("apple", 3);
+      original = SyntheticTextStore.from(target);
       target.insertTextBeforeCaret("s"); // "appsle"
 
       var transcription = target.buildTranscriptionFrom(original, null);
@@ -199,8 +199,8 @@ describe("Transcriptions and Transforms", function() {
     });
 
     it("handles operations with moderately long text", function() {
-      var target = new Mock("The quick brown cat jumped onto the lazy dog.", 19);
-      var original = Mock.from(target);
+      var target = new SyntheticTextStore("The quick brown cat jumped onto the lazy dog.", 19);
+      var original = SyntheticTextStore.from(target);
       target.setSelection(30); // 19 + 11:  moves it to after "onto".
       target.deleteCharsBeforeCaret(14); // delete:  "cat jumped onto"
       target.insertTextBeforeCaret("fox jumped over");
@@ -228,8 +228,8 @@ he did. Unfortunately, he taught his apprentice everything he knew, then his
 apprentice killed him in his sleep. It's ironic he could save others from death,
 but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
-      var target = new Mock(text, text.length);
-      var original = Mock.from(target);
+      var target = new SyntheticTextStore(text, text.length);
+      var original = SyntheticTextStore.from(target);
       target.deleteCharsBeforeCaret(1);
       target.insertTextBeforeCaret("!");
 
@@ -244,8 +244,8 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
     });
 
     it("handles deletions around the caret without text insertion", function() {
-      var target = new Mock("apple", 2);
-      var original = Mock.from(target);
+      var target = new SyntheticTextStore("apple", 2);
+      var original = SyntheticTextStore.from(target);
       target.setSelection(3);
       target.deleteCharsBeforeCaret(2); // "ale"
 
@@ -262,8 +262,8 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
     it("handles deletions around the caret without text insertion (non-BMP text)", function() {
       try {
         KMWString.enableSupplementaryPlane(true);
-        var target = new Mock(smpApple, 2);
-        var original = Mock.from(target);
+        var target = new SyntheticTextStore(smpApple, 2);
+        var original = SyntheticTextStore.from(target);
         target.setSelection(3);
         target.deleteCharsBeforeCaret(2); // "ale"
 
@@ -283,8 +283,8 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
     it("handles deletions around the caret with text insertion", function() {
       // We have other texts validating Mocks; by using them as our base 'element', this unit test file
       // could eventually run in 'headless' mode.
-      var target = new Mock("apple", 2);
-      var original = Mock.from(target);
+      var target = new SyntheticTextStore("apple", 2);
+      var original = SyntheticTextStore.from(target);
       target.setSelection(3);
       target.deleteCharsBeforeCaret(2);
       target.insertTextBeforeCaret("PP"); // "aPPle"
@@ -300,8 +300,8 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
       // CASE 2
 
-      var target = new Mock("apple", 2);
-      var original = Mock.from(target);
+      var target = new SyntheticTextStore("apple", 2);
+      var original = SyntheticTextStore.from(target);
       target.setSelection(4);
       target.deleteCharsBeforeCaret(3);
       target.insertTextBeforeCaret("P"); // "aPe"
@@ -317,8 +317,8 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
       // CASE 3
 
-      var target = new Mock("apple", 2);
-      var original = Mock.from(target);
+      var target = new SyntheticTextStore("apple", 2);
+      var original = SyntheticTextStore.from(target);
       target.setSelection(4);
       target.deleteCharsBeforeCaret(3);
       target.insertTextBeforeCaret("aaaaaaaaaaaaaa"); // "aaaaaaaaaaaaaaae"
@@ -334,8 +334,8 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
       // CASE 4
 
-      var target = new Mock("apple", 2);
-      var original = Mock.from(target);
+      var target = new SyntheticTextStore("apple", 2);
+      var original = SyntheticTextStore.from(target);
       target.setSelection(5);
       target.deleteCharsBeforeCaret(4);
       target.insertTextBeforeCaret("les"); // "ales" - since we've appended a letter at the very end, the whole right-hand is indeed an insertion.
@@ -357,9 +357,9 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
         // We have other texts validating Mocks; by using them as our base 'element', this unit test file
         // could eventually run in 'headless' mode.
-        var target = new Mock(smpApple, 2);
+        var target = new SyntheticTextStore(smpApple, 2);
         let smpLE = u(0x1d5c5)+u(0x1d5be);
-        var original = Mock.from(target);
+        var original = SyntheticTextStore.from(target);
         target.setSelection(3);
         target.deleteCharsBeforeCaret(2);
         target.insertTextBeforeCaret(smpLE); // "alele"
@@ -377,9 +377,9 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
         // CASE 2
 
-        var target = new Mock(smpApple, 2);
+        var target = new SyntheticTextStore(smpApple, 2);
         let smpB = u(0x1d5bb);
-        var original = Mock.from(target);
+        var original = SyntheticTextStore.from(target);
         target.setSelection(4);
         target.deleteCharsBeforeCaret(3);
         target.insertTextBeforeCaret(smpB); // "aPe"
@@ -395,8 +395,8 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
         // CASE 3
 
-        var target = new Mock(smpApple, 2);
-        var original = Mock.from(target);
+        var target = new SyntheticTextStore(smpApple, 2);
+        var original = SyntheticTextStore.from(target);
         target.setSelection(4);
         target.deleteCharsBeforeCaret(3);
         target.insertTextBeforeCaret("aaaaaaaaaaaaaa"); // "aaaaaaaaaaaaaaae"
@@ -412,9 +412,9 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
         // CASE 4
 
-        var target = new Mock(smpApple, 2);
+        var target = new SyntheticTextStore(smpApple, 2);
         let smpLES = u(0x1d5c5)+u(0x1d5be)+u(0x1d5cb);
-        var original = Mock.from(target);
+        var original = SyntheticTextStore.from(target);
         target.setSelection(5);
         target.deleteCharsBeforeCaret(4);
         target.insertTextBeforeCaret(smpLES); // "ales" - since we've appended a letter at the very end, the whole right-hand is indeed an insertion.
@@ -435,9 +435,9 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
     it('from targets with existing selection', () => {
       //                              |            |
-      const target = new Mock("testing testing one two three");
+      const target = new SyntheticTextStore("testing testing one two three");
       target.setSelection(8, 20)
-      const original = Mock.from(target);
+      const original = SyntheticTextStore.from(target);
       target.clearSelection();
 
       const transform = target.buildTransformFrom(original);
@@ -451,7 +451,7 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
     it('to targets with existing selection', () => {
       //                              |            |
-      const target = new Mock("testing testing one two three");
+      const target = new SyntheticTextStore("testing testing one two three");
       target.setSelection(8, 20)
       const transform = {
         insert: '',
@@ -471,8 +471,8 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
       // We have other texts validating Mocks; by using them as our base 'element', this unit test file
       // could eventually run in 'headless' mode.
-      var target = new Mock("apple");
-      var original = Mock.from(target);
+      var target = new SyntheticTextStore("apple");
+      var original = SyntheticTextStore.from(target);
 
       target.setSelection(4);
       target.insertDeadkeyBeforeCaret(0);
@@ -481,7 +481,7 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
       target.setSelection(2);
       target.insertDeadkeyBeforeCaret(2); // 'a' dk(1) 'p' dk(2) | 'p' 'l' dk(0) 'e'
 
-      var original = Mock.from(target);
+      var original = SyntheticTextStore.from(target);
 
       target.hasDeadkeyMatch(0, 2);
       target.deadkeys().deleteMatched();
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js b/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
index e789f6bf518..d9dd5e74148 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
@@ -3,7 +3,7 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { KeyboardHarness, MinimalKeymanGlobal, Mock } from 'keyman/engine/keyboard';
+import { KeyboardHarness, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 
@@ -61,7 +61,7 @@ describe('Headless keyboard loading', function() {
       let ruleHarness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
       ruleHarness.activeKeyboard = keyboard;
       try {
-        ruleHarness.processKeystroke(new Mock(), keyboard.constructNullKeyEvent(device));
+        ruleHarness.processKeystroke(new SyntheticTextStore(), keyboard.constructNullKeyEvent(device));
         assert.fail();
       } catch (err) {
         // Drives home an important detail: the 'global' object is effectively
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
index 232293fbc29..e7f7ecd6d34 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
@@ -3,7 +3,7 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { KeyboardHarness, MinimalKeymanGlobal, KeyboardDownloadError, DeviceSpec, InvalidKeyboardError, JSKeyboard, Mock } from 'keyman/engine/keyboard';
+import { KeyboardHarness, MinimalKeymanGlobal, KeyboardDownloadError, DeviceSpec, InvalidKeyboardError, JSKeyboard, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { assertThrowsAsync, assertThrows } from 'keyman/tools/testing/test-utils';
@@ -84,7 +84,7 @@ describe('Headless keyboard loading', function() {
       // 'sandboxed' keyboard loading in the DOM!)
       const ruleHarness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
       ruleHarness.activeKeyboard = keyboard as JSKeyboard;
-      assertThrows(() => ruleHarness.processKeystroke(new Mock(), (keyboard as JSKeyboard).constructNullKeyEvent(device)), 'k.KKM is not a function');
+      assertThrows(() => ruleHarness.processKeystroke(new SyntheticTextStore(), (keyboard as JSKeyboard).constructNullKeyEvent(device)), 'k.KKM is not a function');
     });
   });
 });
diff --git a/web/src/test/auto/headless/engine/keyboard/mocks.tests.js b/web/src/test/auto/headless/engine/keyboard/mocks.tests.js
index b02f259886f..eaf0f37a3b0 100644
--- a/web/src/test/auto/headless/engine/keyboard/mocks.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard/mocks.tests.js
@@ -1,13 +1,13 @@
 import { assert } from 'chai';
-import { Mock } from 'keyman/engine/keyboard';
+import { SyntheticTextStore } from 'keyman/engine/keyboard';
 
 describe('Mocks', function() {
   describe('app|les', () => {
-    const testMock = new Mock('apples', 3);
+    const testMock = new SyntheticTextStore('apples', 3);
 
     it('Cloning with .from()', () => {
-      assert.deepEqual(Mock.from(testMock), testMock);
-      assert.notStrictEqual(Mock.from(testMock), testMock);
+      assert.deepEqual(SyntheticTextStore.from(testMock), testMock);
+      assert.notStrictEqual(SyntheticTextStore.from(testMock), testMock);
     });
 
     it('getText', () => {
@@ -31,7 +31,7 @@ describe('Mocks', function() {
     });
 
     it('clearSelection', () => {
-      let editMock = Mock.from(testMock);
+      let editMock = SyntheticTextStore.from(testMock);
       editMock.clearSelection();
 
       assert.equal(editMock.getText(), testMock.getTextBeforeCaret() + testMock.getTextAfterCaret());
@@ -39,7 +39,7 @@ describe('Mocks', function() {
       assert.equal(editMock.getTextAfterCaret(), testMock.getTextAfterCaret());
       assert.isTrue(editMock.isSelectionEmpty());
 
-      let postClear = Mock.from(editMock);
+      let postClear = SyntheticTextStore.from(editMock);
       editMock.clearSelection(); // on same object; make sure its internal selection stuff updates correctly!
       assert.notStrictEqual(postClear, editMock);
       assert.deepEqual(postClear, editMock);
@@ -47,11 +47,11 @@ describe('Mocks', function() {
   });
 
   describe('app|les and ba|nanas', () => {  // selection = 'les and ba'
-    const testMock = new Mock('apples and bananas', 3, 13);
+    const testMock = new SyntheticTextStore('apples and bananas', 3, 13);
 
     it('Cloning with from()', () => {
-      assert.deepEqual(Mock.from(testMock), testMock);
-      assert.notStrictEqual(Mock.from(testMock), testMock);
+      assert.deepEqual(SyntheticTextStore.from(testMock), testMock);
+      assert.notStrictEqual(SyntheticTextStore.from(testMock), testMock);
     });
 
     it('getText', () => {
@@ -75,7 +75,7 @@ describe('Mocks', function() {
     });
 
     it('clearSelection', () => {
-      let editMock = Mock.from(testMock);
+      let editMock = SyntheticTextStore.from(testMock);
       editMock.clearSelection();
 
       assert.equal(editMock.getText(), testMock.getTextBeforeCaret() + testMock.getTextAfterCaret());
@@ -83,7 +83,7 @@ describe('Mocks', function() {
       assert.equal(editMock.getTextAfterCaret(), testMock.getTextAfterCaret());
       assert.isTrue(editMock.isSelectionEmpty());
 
-      let postClear = Mock.from(editMock);
+      let postClear = SyntheticTextStore.from(editMock);
       editMock.clearSelection(); // on same object; make sure its internal selection stuff updates correctly!
       assert.notStrictEqual(postClear, editMock);
       assert.deepEqual(postClear, editMock);
diff --git a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
index d5b8eb1d867..01cfce2780c 100644
--- a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
@@ -6,7 +6,7 @@ const require = createRequire(import.meta.url);
 
 import { InputProcessor } from 'keyman/engine/main';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { MinimalKeymanGlobal, Mock } from 'keyman/engine/keyboard';
+import { MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest } from '@keymanapp/recorder-core';
 
@@ -104,7 +104,7 @@ describe('InputProcessor', function() {
       it('with minimal context (no fat-fingers)', function() {
         this.timeout(32); // ms
         let core = new InputProcessor(device);
-        let context = new Mock("", 0);
+        let context = new SyntheticTextStore("", 0);
 
         core.keyboardProcessor.keyboardInterface = keyboardWithHarness;
         let keyboard = keyboardWithHarness.activeKeyboard;
@@ -118,7 +118,7 @@ describe('InputProcessor', function() {
 
       it('with extremely long context (' + KMWString.length(coreSourceCode) + ' chars, no fat-fingers)', function() {
         // Assumes no SMP chars in the source, which is fine.
-        let context = new Mock(coreSourceCode, KMWString.length(coreSourceCode));
+        let context = new SyntheticTextStore(coreSourceCode, KMWString.length(coreSourceCode));
 
         this.timeout(500);                // 500 ms, excluding text import.
                                           // These often run on VMs, so we'll be a bit generous.
@@ -141,7 +141,7 @@ describe('InputProcessor', function() {
       it('with minimal context (with fat-fingers)', function() {
         this.timeout(32); // ms
         let core = new InputProcessor(device);
-        let context = new Mock("", 0);
+        let context = new SyntheticTextStore("", 0);
 
         core.keyboardProcessor.keyboardInterface = keyboardWithHarness;
         let keyboard = keyboardWithHarness.activeKeyboard;
@@ -156,7 +156,7 @@ describe('InputProcessor', function() {
 
       it('with extremely long context (' + KMWString.length(coreSourceCode) + ' chars, with fat-fingers)', function() {
         // Assumes no SMP chars in the source, which is fine.
-        let context = new Mock(coreSourceCode, KMWString.length(coreSourceCode));
+        let context = new SyntheticTextStore(coreSourceCode, KMWString.length(coreSourceCode));
 
         this.timeout(500);                // 500 ms, excluding text import.
                                           // These often run on VMs, so we'll be a bit generous.
@@ -202,7 +202,7 @@ describe('InputProcessor', function() {
       it(testSet.msg ?? 'test', function() {
         this.timeout(32); // ms
         let core = new InputProcessor(device);
-        let context = new Mock("", 0);
+        let context = new SyntheticTextStore("", 0);
 
         core.keyboardProcessor.keyboardInterface = keyboardWithHarness;
         let keyboard = keyboardWithHarness.activeKeyboard;
diff --git a/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
index 4fc2b0d9bd3..a8b524f6b2e 100644
--- a/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
@@ -2,7 +2,7 @@ import { assert } from 'chai';
 
 import { LanguageProcessor, TranscriptionCache } from 'keyman/engine/main';
 import { SourcemappedWorker as LMWorker } from "@keymanapp/lexical-model-layer/node";
-import { Mock } from 'keyman/engine/keyboard';
+import { SyntheticTextStore } from 'keyman/engine/keyboard';
 
 /*
  * Unit tests for the Dummy prediction model.
@@ -110,7 +110,7 @@ describe('LanguageProcessor', function() {
       });
 
       it("generates the expected prediction set", function(done) {
-        let contextSource = new Mock("li", 2);
+        let contextSource = new SyntheticTextStore("li", 2);
         let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
         languageProcessor.loadModel(modelSpec).then(function() {
@@ -147,7 +147,7 @@ describe('LanguageProcessor', function() {
 
         describe("does not alter casing when input is lowercased", function() {
           it("when input is fully lowercased", function(done) {
-            let contextSource = new Mock("li", 2);
+            let contextSource = new SyntheticTextStore("li", 2);
             let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
             languageProcessor.loadModel(modelSpec).then(function() {
@@ -164,7 +164,7 @@ describe('LanguageProcessor', function() {
           });
 
           it("when input has non-initial uppercased letters", function(done) {
-            let contextSource = new Mock("lI", 2);
+            let contextSource = new SyntheticTextStore("lI", 2);
             let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
             languageProcessor.loadModel(modelSpec).then(function() {
@@ -182,7 +182,7 @@ describe('LanguageProcessor', function() {
           });
 
           it("unless the suggestion has uppercased letters", function(done) {
-            let contextSource = new Mock("i", 1);
+            let contextSource = new SyntheticTextStore("i", 1);
             let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
             languageProcessor.loadModel(modelSpec).then(function() {
@@ -201,7 +201,7 @@ describe('LanguageProcessor', function() {
 
         describe("uppercases suggestions when input is fully capitalized ", function() {
           it("for suggestions with default casing  (== 'lower')", function(done) {
-            let contextSource = new Mock("LI", 2);
+            let contextSource = new SyntheticTextStore("LI", 2);
             let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
             languageProcessor.loadModel(modelSpec).then(function() {
@@ -219,7 +219,7 @@ describe('LanguageProcessor', function() {
           });
 
           it("for precapitalized suggestions", function(done) {
-            let contextSource = new Mock("I", 1);
+            let contextSource = new SyntheticTextStore("I", 1);
             let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
             languageProcessor.loadModel(modelSpec).then(function() {
@@ -239,7 +239,7 @@ describe('LanguageProcessor', function() {
         describe("initial-cases suggestions when input uses initial casing ", function() {
           describe("when input is a single capitalized letter", function() {
             it("for suggestions with default casing (== 'lower')", function(done) {
-              let contextSource = new Mock("L", 1);
+              let contextSource = new SyntheticTextStore("L", 1);
               let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
               languageProcessor.loadModel(modelSpec).then(function() {
@@ -259,7 +259,7 @@ describe('LanguageProcessor', function() {
 
           describe("input length > 1", function() {
             it("for suggestions with default casing (== 'lower')", function(done) {
-              let contextSource = new Mock("Li", 2);
+              let contextSource = new SyntheticTextStore("Li", 2);
               let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
               languageProcessor.loadModel(modelSpec).then(function() {
diff --git a/web/src/tools/testing/recorder-core/src/index.ts b/web/src/tools/testing/recorder-core/src/index.ts
index b1073d09cce..f74639f207b 100644
--- a/web/src/tools/testing/recorder-core/src/index.ts
+++ b/web/src/tools/testing/recorder-core/src/index.ts
@@ -1,4 +1,4 @@
-import { KeyDistribution, KeyEvent, type TextStore, Mock } from "keyman/engine/keyboard";
+import { KeyDistribution, KeyEvent, type TextStore, SyntheticTextStore } from "keyman/engine/keyboard";
 
 import Proctor from "./proctor.js";
 
@@ -219,7 +219,7 @@ export abstract class TestSequence<KeyRecord extends RecordedKeystroke | InputEv
   async test(proctor: Proctor, target?: TextStore): Promise<{success: boolean, result: string}> {
     // Start with an empty TextStore and a fresh KeyboardProcessor.
     if(!target) {
-      target = new Mock();
+      target = new SyntheticTextStore();
     }
 
     proctor.before();
diff --git a/web/src/tools/testing/recorder-core/src/nodeProctor.ts b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
index 2bf5cc427af..9297e45e84f 100644
--- a/web/src/tools/testing/recorder-core/src/nodeProctor.ts
+++ b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
@@ -8,7 +8,7 @@ import {
   RecordedSyntheticKeystroke
 } from "./index.js";
 
-import { KeyEvent, KeyEventSpec, KeyboardHarness, Mock, TextStore } from "keyman/engine/keyboard";
+import { KeyEvent, KeyEventSpec, KeyboardHarness, SyntheticTextStore, TextStore } from "keyman/engine/keyboard";
 import { DeviceSpec } from "@keymanapp/web-utils";
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 
@@ -51,7 +51,7 @@ export default class NodeProctor extends Proctor {
   async simulateSequence(sequence: TestSequence<any>, target?: TextStore): Promise<string> {
     // Start with an empty TextStore and a fresh KeyboardProcessor.
     if(!target) {
-      target = new Mock();
+      target = new SyntheticTextStore();
     }
 
     // Establish a fresh processor, setting its keyboard appropriately for the test.

From 22a93cd3f6ea94b411e71453ae294c70e4f5e3fa Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 4 Nov 2025 14:39:40 +0100
Subject: [PATCH 107/254] =?UTF-8?q?refactor(web):=20rename=20directory=20`?=
 =?UTF-8?q?element-wrappers`=20=E2=86=92=20`element-text-stores`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also rename module from element-wrappers → element-text-stores.
---
 web/README.md                                 |  2 +-
 web/build.sh                                  | 92 +++++++++----------
 web/package.json                              |  8 +-
 web/src/app/browser/src/beepHandler.ts        |  2 +-
 web/src/app/browser/src/configuration.ts      |  2 +-
 web/src/app/browser/src/contextManager.ts     |  2 +-
 .../app/browser/src/hardwareEventKeyboard.ts  |  2 +-
 web/src/app/browser/src/keyboardInterface.ts  |  2 +-
 web/src/app/browser/src/keymanEngine.ts       |  2 +-
 web/src/engine/attachment/build.sh            |  2 +-
 .../engine/attachment/src/attachmentInfo.ts   |  2 +-
 web/src/engine/attachment/src/index.ts        |  4 +-
 .../attachment/src/outputTargetForElement.ts  |  2 +-
 .../attachment/src/pageContextAttachment.ts   |  2 +-
 web/src/engine/attachment/tsconfig.json       |  2 +-
 .../build.sh                                  |  2 +-
 .../readme.md                                 |  2 +-
 .../src/contentEditable.ts                    |  0
 .../src/designIFrame.ts                       |  0
 .../src/index.ts                              |  0
 .../src/input.ts                              |  0
 .../src/outputTargetElementWrapper.ts         |  0
 .../src/readme.md                             |  0
 .../src/textarea.ts                           |  0
 .../src/utils.ts                              |  0
 .../src/wrapElement.ts                        |  0
 .../tsconfig.json                             |  4 +-
 .../element_interfaces.tests.ts               |  2 +-
 .../target_mocks.tests.ts                     |  2 +-
 .../test/auto/dom/web-test-runner.config.mjs  |  4 +-
 30 files changed, 72 insertions(+), 72 deletions(-)
 rename web/src/engine/{element-wrappers => element-text-stores}/build.sh (97%)
 rename web/src/engine/{element-wrappers => element-text-stores}/readme.md (86%)
 rename web/src/engine/{element-wrappers => element-text-stores}/src/contentEditable.ts (100%)
 rename web/src/engine/{element-wrappers => element-text-stores}/src/designIFrame.ts (100%)
 rename web/src/engine/{element-wrappers => element-text-stores}/src/index.ts (100%)
 rename web/src/engine/{element-wrappers => element-text-stores}/src/input.ts (100%)
 rename web/src/engine/{element-wrappers => element-text-stores}/src/outputTargetElementWrapper.ts (100%)
 rename web/src/engine/{element-wrappers => element-text-stores}/src/readme.md (100%)
 rename web/src/engine/{element-wrappers => element-text-stores}/src/textarea.ts (100%)
 rename web/src/engine/{element-wrappers => element-text-stores}/src/utils.ts (100%)
 rename web/src/engine/{element-wrappers => element-text-stores}/src/wrapElement.ts (100%)
 rename web/src/engine/{element-wrappers => element-text-stores}/tsconfig.json (56%)
 rename web/src/test/auto/dom/cases/{element-wrappers => element-text-stores}/element_interfaces.tests.ts (99%)
 rename web/src/test/auto/dom/cases/{element-wrappers => element-text-stores}/target_mocks.tests.ts (98%)

diff --git a/web/README.md b/web/README.md
index 54173090674..1a8129a7b8c 100644
--- a/web/README.md
+++ b/web/README.md
@@ -117,7 +117,7 @@ graph TD;
 
     subgraph ClassicWeb["`**ClassicWeb**
     Intermediate-level engine modules`"]
-        Elements["/web/src/engine/element-wrappers"];
+        Elements["/web/src/engine/element-text-stores"];
         Elements-->JSProc;
         KeyboardStorage["/web/src/engine/keyboard-storage"];
         KeyboardStorage-->Interfaces;
diff --git a/web/build.sh b/web/build.sh
index 5c9b54647d9..8f2c7984ede 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -22,28 +22,28 @@ builder_describe "Builds engine modules for Keyman Engine for Web (KMW)." \
   "build" \
   "start                     Starts the test server" \
   "test" \
-  "coverage                  Create an HTML page with code coverage" \
-  ":app/browser              The form of Keyman Engine for Web for use on websites" \
-  ":app/webview              A puppetable version of KMW designed for use in a host app's WebView" \
-  ":app/ui                   Builds KMW's desktop form-factor keyboard-selection UI modules" \
-  ":engine/attachment        Subset used for detecting valid page contexts for use in text editing " \
-  ":engine/core-processor    Keyman Core WASM integration" \
-  ":engine/common/web-utils  Low-level, headless utility methods and classes used across multiple modules" \
-  ":engine/dom-utils         A common subset of function used for DOM calculations, layout, etc" \
-  ":engine/events            Specialized classes utilized to support KMW API events" \
-  ":engine/element-wrappers  Subset used to integrate with website elements" \
-  ":engine/interfaces        Subset used to configure KMW" \
-  ":engine/js-processor      Build JS processor for KMW" \
-  ":engine/keyboard          Builds KMW's keyboard-loading and caching code" \
-  ":engine/keyboard-storage  Subset used to collate keyboards and request them from the cloud" \
-  ":engine/main              Builds all common code used by KMW's app/-level targets" \
-  ":engine/osk               Builds the Web OSK module" \
-  ":engine/predictive-text   Builds KMW's predictive text module" \
-  ":help                     Online documentation" \
-  ":samples                  Builds all needed resources for the KMW sample-page set" \
-  ":tools                    Builds engine-related development resources" \
-  ":test-pages=src/test/manual   Builds resources needed for the KMW manual testing pages" \
-  ":_all                     (Meta build target used when targets are not specified)"
+  "coverage                     Create an HTML page with code coverage" \
+  ":app/browser                 The form of Keyman Engine for Web for use on websites" \
+  ":app/webview                 A puppetable version of KMW designed for use in a host app's WebView" \
+  ":app/ui                      Builds KMW's desktop form-factor keyboard-selection UI modules" \
+  ":engine/attachment           Subset used for detecting valid page contexts for use in text editing " \
+  ":engine/core-processor       Keyman Core WASM integration" \
+  ":engine/common/web-utils     Low-level, headless utility methods and classes used across multiple modules" \
+  ":engine/dom-utils            A common subset of function used for DOM calculations, layout, etc" \
+  ":engine/events               Specialized classes utilized to support KMW API events" \
+  ":engine/element-text-stores  Subset used to integrate with website elements" \
+  ":engine/interfaces           Subset used to configure KMW" \
+  ":engine/js-processor         Build JS processor for KMW" \
+  ":engine/keyboard             Builds KMW's keyboard-loading and caching code" \
+  ":engine/keyboard-storage     Subset used to collate keyboards and request them from the cloud" \
+  ":engine/main                 Builds all common code used by KMW's app/-level targets" \
+  ":engine/osk                  Builds the Web OSK module" \
+  ":engine/predictive-text      Builds KMW's predictive text module" \
+  ":help                        Online documentation" \
+  ":samples                     Builds all needed resources for the KMW sample-page set" \
+  ":tools                       Builds engine-related development resources" \
+  ":test-pages=src/test/manual  Builds resources needed for the KMW manual testing pages" \
+  ":_all                        (Meta build target used when targets are not specified)"
 
 # Possible TODO?
 # "upload-symbols   Uploads build product to Sentry for error report symbolification.  Only defined for $DOC_BUILD_EMBED_WEB" \
@@ -56,27 +56,27 @@ if builder_is_debug_build; then
 fi
 
 builder_describe_outputs \
-  configure                     "/node_modules" \
-  build                         "/web/build/test/dom/cases/attachment/outputTargetForElement.tests.html" \
-  build:app/browser             "/web/build/app/browser/lib/index.mjs" \
-  build:app/webview             "/web/build/app/webview/${config}/keymanweb-webview.js" \
-  build:app/ui                  "/web/build/app/ui/${config}/kmwuitoggle.js" \
-  build:engine/attachment       "/web/build/engine/attachment/lib/index.mjs" \
-  build:engine/core-processor   "/web/build/engine/core-processor/lib/index.mjs" \
-  build:engine/dom-utils        "/web/build/engine/dom-utils/obj/index.js" \
-  build:engine/events           "/web/build/engine/events/lib/index.mjs" \
-  build:engine/element-wrappers "/web/build/engine/element-wrappers/lib/index.mjs" \
-  build:engine/interfaces       "/web/build/engine/interfaces/lib/index.mjs" \
-  build:engine/js-processor     "/web/build/engine/js-processor/lib/index.mjs" \
-  build:engine/keyboard         "/web/build/engine/keyboard/lib/index.mjs" \
-  build:engine/keyboard-storage "/web/build/engine/keyboard-storage/lib/index.mjs" \
-  build:engine/main             "/web/build/engine/main/lib/index.mjs" \
-  build:engine/osk              "/web/build/engine/osk/lib/index.mjs" \
-  build:engine/predictive-text  "/web/src/engine/predictive-text/worker-main/build/lib/web/index.mjs" \
-  build:engine/common/web-utils "/web/src/engine/common/web-utils/build/lib/index.mjs" \
-  build:samples                 "/web/src/samples/simplest/keymanweb.js" \
-  build:tools                   "/web/build/tools/building/sourcemap-root/index.js" \
-  build:test-pages              "/web/build/test-resources/sentry-manager.js"
+  configure                        "/node_modules" \
+  build                            "/web/build/test/dom/cases/attachment/outputTargetForElement.tests.html" \
+  build:app/browser                "/web/build/app/browser/lib/index.mjs" \
+  build:app/webview                "/web/build/app/webview/${config}/keymanweb-webview.js" \
+  build:app/ui                     "/web/build/app/ui/${config}/kmwuitoggle.js" \
+  build:engine/attachment          "/web/build/engine/attachment/lib/index.mjs" \
+  build:engine/core-processor      "/web/build/engine/core-processor/lib/index.mjs" \
+  build:engine/dom-utils           "/web/build/engine/dom-utils/obj/index.js" \
+  build:engine/events              "/web/build/engine/events/lib/index.mjs" \
+  build:engine/element-text-stores "/web/build/engine/element-text-stores/lib/index.mjs" \
+  build:engine/interfaces          "/web/build/engine/interfaces/lib/index.mjs" \
+  build:engine/js-processor        "/web/build/engine/js-processor/lib/index.mjs" \
+  build:engine/keyboard            "/web/build/engine/keyboard/lib/index.mjs" \
+  build:engine/keyboard-storage    "/web/build/engine/keyboard-storage/lib/index.mjs" \
+  build:engine/main                "/web/build/engine/main/lib/index.mjs" \
+  build:engine/osk                 "/web/build/engine/osk/lib/index.mjs" \
+  build:engine/predictive-text     "/web/src/engine/predictive-text/worker-main/build/lib/web/index.mjs" \
+  build:engine/common/web-utils    "/web/src/engine/common/web-utils/build/lib/index.mjs" \
+  build:samples                    "/web/src/samples/simplest/keymanweb.js" \
+  build:tools                      "/web/build/tools/building/sourcemap-root/index.js" \
+  build:test-pages                 "/web/build/test-resources/sentry-manager.js"
 
 BUNDLE_CMD="node ${KEYMAN_ROOT}/web/src/tools/es-bundling/build/common-bundle.mjs"
 
@@ -169,14 +169,14 @@ builder_run_child_actions build:engine/dom-utils
 
 builder_run_child_actions build:engine/keyboard
 builder_run_child_actions build:engine/js-processor
-builder_run_child_actions build:engine/element-wrappers
+builder_run_child_actions build:engine/element-text-stores
 builder_run_child_actions build:engine/events
 builder_run_child_actions build:engine/interfaces
 
 # Uses engine/dom-utils and engine/interfaces
 builder_run_child_actions build:engine/osk
 
-# Uses engine/element-wrappers
+# Uses engine/element-text-stores
 builder_run_child_actions build:engine/attachment
 
 # Uses engine/interfaces (due to resource-path config interface)
@@ -191,7 +191,7 @@ builder_run_child_actions build:engine/core-processor
 # Uses engine/interfaces, engine/keyboard-storage, & engine/osk
 builder_run_child_actions build:engine/main
 
-# Uses all but engine/element-wrappers and engine/attachment
+# Uses all but engine/element-text-stores and engine/attachment
 builder_run_child_actions build:app/webview
 
 # Uses literally everything `engine/` above
diff --git a/web/package.json b/web/package.json
index 5d3f9be6f6d..3506c5e9f9c 100644
--- a/web/package.json
+++ b/web/package.json
@@ -22,10 +22,10 @@
       "types": "./build/engine/dom-utils/obj/index.d.ts",
       "import": "./build/engine/dom-utils/obj/index.js"
     },
-    "./engine/element-wrappers": {
-      "es6-bundling": "./src/engine/element-wrappers/src/index.ts",
-      "types": "./build/engine/element-wrappers/obj/index.d.ts",
-      "import": "./build/engine/element-wrappers/obj/index.js"
+    "./engine/element-text-stores": {
+      "es6-bundling": "./src/engine/element-text-stores/src/index.ts",
+      "types": "./build/engine/element-text-stores/obj/index.d.ts",
+      "import": "./build/engine/element-text-stores/obj/index.js"
     },
     "./engine/events": {
       "es6-bundling": "./src/engine/events/src/index.ts",
diff --git a/web/src/app/browser/src/beepHandler.ts b/web/src/app/browser/src/beepHandler.ts
index 05fb6516bbe..51d036eaf7b 100644
--- a/web/src/app/browser/src/beepHandler.ts
+++ b/web/src/app/browser/src/beepHandler.ts
@@ -1,6 +1,6 @@
 import { type JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { JSKeyboard, type KeyboardMinimalInterface } from 'keyman/engine/keyboard';
-import { DesignIFrame, OutputTargetElementWrapper } from 'keyman/engine/element-wrappers';
+import { DesignIFrame, OutputTargetElementWrapper } from 'keyman/engine/element-text-stores';
 
 // Utility object used to handle beep (keyboard error response) operations.
 class BeepData {
diff --git a/web/src/app/browser/src/configuration.ts b/web/src/app/browser/src/configuration.ts
index 60f033a3589..9910f358ece 100644
--- a/web/src/app/browser/src/configuration.ts
+++ b/web/src/app/browser/src/configuration.ts
@@ -1,6 +1,6 @@
 import { EngineConfiguration, InitOptionSpec, InitOptionDefaults } from "keyman/engine/main";
 
-import { OutputTargetElementWrapper as DOMOutputTarget } from 'keyman/engine/element-wrappers';
+import { OutputTargetElementWrapper as DOMOutputTarget } from 'keyman/engine/element-text-stores';
 import { TextStore, ProcessorAction } from 'keyman/engine/keyboard';
 import { isEmptyTransform } from '@keymanapp/web-utils';
 import { AlertHost } from "./utils/alertHost.js";
diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index fb7e5ef92cf..f570769f9fd 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -3,7 +3,7 @@ import { type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { CookieSerializer } from 'keyman/engine/dom-utils';
 import { eventOutputTarget, outputTargetForElement, PageContextAttachment } from 'keyman/engine/attachment';
 import { DomEventTracker, LegacyEventEmitter } from 'keyman/engine/events';
-import { DesignIFrame, OutputTargetElementWrapper, nestedInstanceOf } from 'keyman/engine/element-wrappers';
+import { DesignIFrame, OutputTargetElementWrapper, nestedInstanceOf } from 'keyman/engine/element-text-stores';
 import {
   ContextManagerBase,
   type KeyboardInterfaceBase,
diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts
index c25497aae3c..c3e63760fbf 100644
--- a/web/src/app/browser/src/hardwareEventKeyboard.ts
+++ b/web/src/app/browser/src/hardwareEventKeyboard.ts
@@ -4,7 +4,7 @@ import { ModifierKeyConstants } from '@keymanapp/common-types';
 
 import { HardKeyboardBase, processForMnemonicsAndLegacy } from 'keyman/engine/main';
 import { DomEventTracker } from 'keyman/engine/events';
-import { DesignIFrame, nestedInstanceOf } from 'keyman/engine/element-wrappers';
+import { DesignIFrame, nestedInstanceOf } from 'keyman/engine/element-text-stores';
 import { eventOutputTarget, outputTargetForElement } from 'keyman/engine/attachment';
 
 import ContextManager from './contextManager.js';
diff --git a/web/src/app/browser/src/keyboardInterface.ts b/web/src/app/browser/src/keyboardInterface.ts
index 69b1bc74473..7783929964b 100644
--- a/web/src/app/browser/src/keyboardInterface.ts
+++ b/web/src/app/browser/src/keyboardInterface.ts
@@ -1,4 +1,4 @@
-import { type OutputTargetElementWrapper } from 'keyman/engine/element-wrappers';
+import { type OutputTargetElementWrapper } from 'keyman/engine/element-text-stores';
 import { FloatingOSKView } from 'keyman/engine/osk';
 import { KeyboardInterfaceBase } from 'keyman/engine/main';
 
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 237eaf7b4e8..8173aeeff6b 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -1,7 +1,7 @@
 import { KeymanWebKeyboard } from '@keymanapp/common-types';
 import { KeymanEngineBase, DeviceDetector } from 'keyman/engine/main';
 import { getAbsoluteY } from 'keyman/engine/dom-utils';
-import { OutputTargetElementWrapper } from 'keyman/engine/element-wrappers';
+import { OutputTargetElementWrapper } from 'keyman/engine/element-text-stores';
 import {
   TwoStateActivator,
   VisualKeyboard
diff --git a/web/src/engine/attachment/build.sh b/web/src/engine/attachment/build.sh
index 042c5aa83ea..6294fcb41a0 100755
--- a/web/src/engine/attachment/build.sh
+++ b/web/src/engine/attachment/build.sh
@@ -16,7 +16,7 @@ SUBPROJECT_NAME=engine/attachment
 
 builder_describe "Builds the Keyman Engine for Web (KMW) attachment engine." \
   "@/web/src/engine/dom-utils" \
-  "@/web/src/engine/element-wrappers" \
+  "@/web/src/engine/element-text-stores" \
   "clean" \
   "configure" \
   "build" \
diff --git a/web/src/engine/attachment/src/attachmentInfo.ts b/web/src/engine/attachment/src/attachmentInfo.ts
index 05811300cbb..d3d447802d4 100644
--- a/web/src/engine/attachment/src/attachmentInfo.ts
+++ b/web/src/engine/attachment/src/attachmentInfo.ts
@@ -1,4 +1,4 @@
-import { OutputTargetElementWrapper } from 'keyman/engine/element-wrappers';
+import { OutputTargetElementWrapper } from 'keyman/engine/element-text-stores';
 
 export class AttachmentInfo {
   /**
diff --git a/web/src/engine/attachment/src/index.ts b/web/src/engine/attachment/src/index.ts
index 8e75e7645f2..cb0fc518712 100644
--- a/web/src/engine/attachment/src/index.ts
+++ b/web/src/engine/attachment/src/index.ts
@@ -9,7 +9,7 @@ export { eventOutputTarget, outputTargetForElement } from './outputTargetForElem
 export { PageContextAttachment, PageAttachmentOptions } from './pageContextAttachment.js';
 
 /*
- * Following from the prior "Note:", we republish `engine/element-wrappers` here -
+ * Following from the prior "Note:", we republish `engine/element-text-stores` here -
  * this matters quite strongly for certain unit tests.
  */
-export * from 'keyman/engine/element-wrappers';
\ No newline at end of file
+export * from 'keyman/engine/element-text-stores';
\ No newline at end of file
diff --git a/web/src/engine/attachment/src/outputTargetForElement.ts b/web/src/engine/attachment/src/outputTargetForElement.ts
index 2dee5327c97..10bb5ac5b0d 100644
--- a/web/src/engine/attachment/src/outputTargetForElement.ts
+++ b/web/src/engine/attachment/src/outputTargetForElement.ts
@@ -1,4 +1,4 @@
-import { nestedInstanceOf } from "keyman/engine/element-wrappers";
+import { nestedInstanceOf } from "keyman/engine/element-text-stores";
 
 /**
  * Given a DOM event related to an KMW-attached element, this function determines
diff --git a/web/src/engine/attachment/src/pageContextAttachment.ts b/web/src/engine/attachment/src/pageContextAttachment.ts
index 79232985781..c75e04b8286 100644
--- a/web/src/engine/attachment/src/pageContextAttachment.ts
+++ b/web/src/engine/attachment/src/pageContextAttachment.ts
@@ -1,7 +1,7 @@
 import { EventEmitter } from 'eventemitter3';
 
 import { DeviceSpec, InternalKeyboardFont } from "keyman/engine/keyboard";
-import { Input, nestedInstanceOf, wrapElement } from "keyman/engine/element-wrappers";
+import { Input, nestedInstanceOf, wrapElement } from "keyman/engine/element-text-stores";
 import {
   arrayFromNodeList,
   createStyleSheet,
diff --git a/web/src/engine/attachment/tsconfig.json b/web/src/engine/attachment/tsconfig.json
index 3ce6a07308f..2c32c333c5e 100644
--- a/web/src/engine/attachment/tsconfig.json
+++ b/web/src/engine/attachment/tsconfig.json
@@ -12,6 +12,6 @@
 
   "references": [
     { "path": "../dom-utils" },
-    { "path": "../element-wrappers" }
+    { "path": "../element-text-stores" }
   ]
 }
diff --git a/web/src/engine/element-wrappers/build.sh b/web/src/engine/element-text-stores/build.sh
similarity index 97%
rename from web/src/engine/element-wrappers/build.sh
rename to web/src/engine/element-text-stores/build.sh
index 3e653280dd2..d2833fd78e3 100755
--- a/web/src/engine/element-wrappers/build.sh
+++ b/web/src/engine/element-text-stores/build.sh
@@ -6,7 +6,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-SUBPROJECT_NAME=engine/element-wrappers
+SUBPROJECT_NAME=engine/element-text-stores
 . "$KEYMAN_ROOT/web/common.inc.sh"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
diff --git a/web/src/engine/element-wrappers/readme.md b/web/src/engine/element-text-stores/readme.md
similarity index 86%
rename from web/src/engine/element-wrappers/readme.md
rename to web/src/engine/element-text-stores/readme.md
index 2a7685edbcb..f178b184bef 100644
--- a/web/src/engine/element-wrappers/readme.md
+++ b/web/src/engine/element-text-stores/readme.md
@@ -1,4 +1,4 @@
-## engine/element-wrappers
+## engine/element-text-stores
 
 This submodule provides a subset of the main engine's Web-oriented code that's used to 'wrap' webpage
 elements as part of KMW attachment and interface the element with the `keyboard` submodule.
\ No newline at end of file
diff --git a/web/src/engine/element-wrappers/src/contentEditable.ts b/web/src/engine/element-text-stores/src/contentEditable.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/contentEditable.ts
rename to web/src/engine/element-text-stores/src/contentEditable.ts
diff --git a/web/src/engine/element-wrappers/src/designIFrame.ts b/web/src/engine/element-text-stores/src/designIFrame.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/designIFrame.ts
rename to web/src/engine/element-text-stores/src/designIFrame.ts
diff --git a/web/src/engine/element-wrappers/src/index.ts b/web/src/engine/element-text-stores/src/index.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/index.ts
rename to web/src/engine/element-text-stores/src/index.ts
diff --git a/web/src/engine/element-wrappers/src/input.ts b/web/src/engine/element-text-stores/src/input.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/input.ts
rename to web/src/engine/element-text-stores/src/input.ts
diff --git a/web/src/engine/element-wrappers/src/outputTargetElementWrapper.ts b/web/src/engine/element-text-stores/src/outputTargetElementWrapper.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/outputTargetElementWrapper.ts
rename to web/src/engine/element-text-stores/src/outputTargetElementWrapper.ts
diff --git a/web/src/engine/element-wrappers/src/readme.md b/web/src/engine/element-text-stores/src/readme.md
similarity index 100%
rename from web/src/engine/element-wrappers/src/readme.md
rename to web/src/engine/element-text-stores/src/readme.md
diff --git a/web/src/engine/element-wrappers/src/textarea.ts b/web/src/engine/element-text-stores/src/textarea.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/textarea.ts
rename to web/src/engine/element-text-stores/src/textarea.ts
diff --git a/web/src/engine/element-wrappers/src/utils.ts b/web/src/engine/element-text-stores/src/utils.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/utils.ts
rename to web/src/engine/element-text-stores/src/utils.ts
diff --git a/web/src/engine/element-wrappers/src/wrapElement.ts b/web/src/engine/element-text-stores/src/wrapElement.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/wrapElement.ts
rename to web/src/engine/element-text-stores/src/wrapElement.ts
diff --git a/web/src/engine/element-wrappers/tsconfig.json b/web/src/engine/element-text-stores/tsconfig.json
similarity index 56%
rename from web/src/engine/element-wrappers/tsconfig.json
rename to web/src/engine/element-text-stores/tsconfig.json
index 15a58bbf2a8..32b9ecd1e33 100644
--- a/web/src/engine/element-wrappers/tsconfig.json
+++ b/web/src/engine/element-text-stores/tsconfig.json
@@ -3,8 +3,8 @@
 
   "compilerOptions": {
     "baseUrl": "./",
-    "outDir": "../../../build/engine/element-wrappers/obj/",
-    "tsBuildInfoFile": "../../../build/engine/element-wrappers/obj/tsconfig.tsbuildinfo",
+    "outDir": "../../../build/engine/element-text-stores/obj/",
+    "tsBuildInfoFile": "../../../build/engine/element-text-stores/obj/tsconfig.tsbuildinfo",
     "rootDir": "./src"
   },
 
diff --git a/web/src/test/auto/dom/cases/element-wrappers/element_interfaces.tests.ts b/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts
similarity index 99%
rename from web/src/test/auto/dom/cases/element-wrappers/element_interfaces.tests.ts
rename to web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts
index aeaf0078334..43b6b03df44 100644
--- a/web/src/test/auto/dom/cases/element-wrappers/element_interfaces.tests.ts
+++ b/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 
 import { KMWString, SyntheticTextStore } from 'keyman/engine/keyboard';
-import * as wrappers from 'keyman/engine/element-wrappers';
+import * as wrappers from 'keyman/engine/element-text-stores';
 
 import { DynamicElements } from '../../test_utils.js';
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
diff --git a/web/src/test/auto/dom/cases/element-wrappers/target_mocks.tests.ts b/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts
similarity index 98%
rename from web/src/test/auto/dom/cases/element-wrappers/target_mocks.tests.ts
rename to web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts
index ea4ac07707d..ea5cb7c7310 100644
--- a/web/src/test/auto/dom/cases/element-wrappers/target_mocks.tests.ts
+++ b/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 
 import { KMWString, SyntheticTextStore } from 'keyman/engine/keyboard';
-import { Input } from 'keyman/engine/element-wrappers';
+import { Input } from 'keyman/engine/element-text-stores';
 
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
 
diff --git a/web/src/test/auto/dom/web-test-runner.config.mjs b/web/src/test/auto/dom/web-test-runner.config.mjs
index 6ac9d46c852..f1acf47d852 100644
--- a/web/src/test/auto/dom/web-test-runner.config.mjs
+++ b/web/src/test/auto/dom/web-test-runner.config.mjs
@@ -69,9 +69,9 @@ export default {
       files: ['web/build/test/dom/cases/dom-utils/**/*.tests.mjs']
     },
     {
-      name: 'engine/element-wrappers',
+      name: 'engine/element-text-stores',
       // Relative, from the containing package.json
-      files: ['web/build/test/dom/cases/element-wrappers/**/*.tests.mjs']
+      files: ['web/build/test/dom/cases/element-text-stores/**/*.tests.mjs']
     },
     {
       name: 'engine/gesture-processor',

From e4d6ae9123a0c0b788a94f2c922fdfc2c025f774 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 4 Nov 2025 15:01:18 +0100
Subject: [PATCH 108/254] =?UTF-8?q?refactor(web):=20rename=20`OutputTarget?=
 =?UTF-8?q?ElementWrapper`=20=E2=86=92=20`AbstractElementTextStore`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/app/browser/src/beepHandler.ts        |  6 ++---
 web/src/app/browser/src/configuration.ts      |  2 +-
 web/src/app/browser/src/contextManager.ts     | 26 +++++++++----------
 web/src/app/browser/src/keyboardInterface.ts  |  4 +--
 web/src/app/browser/src/keymanEngine.ts       |  4 +--
 .../engine/attachment/src/attachmentInfo.ts   |  6 ++---
 .../src/contentEditable.ts                    |  4 +--
 .../element-text-stores/src/designIFrame.ts   |  4 +--
 .../engine/element-text-stores/src/index.ts   |  2 +-
 .../engine/element-text-stores/src/input.ts   |  4 +--
 .../src/outputTargetElementWrapper.ts         |  2 +-
 .../element-text-stores/src/textarea.ts       |  4 +--
 .../element-text-stores/src/wrapElement.ts    |  4 +--
 13 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/web/src/app/browser/src/beepHandler.ts b/web/src/app/browser/src/beepHandler.ts
index 51d036eaf7b..8264bd7fe91 100644
--- a/web/src/app/browser/src/beepHandler.ts
+++ b/web/src/app/browser/src/beepHandler.ts
@@ -1,6 +1,6 @@
 import { type JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { JSKeyboard, type KeyboardMinimalInterface } from 'keyman/engine/keyboard';
-import { DesignIFrame, OutputTargetElementWrapper } from 'keyman/engine/element-text-stores';
+import { DesignIFrame, AbstractElementTextStore } from 'keyman/engine/element-text-stores';
 
 // Utility object used to handle beep (keyboard error response) operations.
 class BeepData {
@@ -33,8 +33,8 @@ export class BeepHandler {
    * @param       {Object}      Pelem     element to flash
    * Description  Flash body as substitute for audible beep; notify embedded device to vibrate
    */
-  beep(textStore: OutputTargetElementWrapper<any>) {
-    if (!(textStore instanceof OutputTargetElementWrapper)) {
+  beep(textStore: AbstractElementTextStore<any>) {
+    if (!(textStore instanceof AbstractElementTextStore)) {
       return;
     }
 
diff --git a/web/src/app/browser/src/configuration.ts b/web/src/app/browser/src/configuration.ts
index 9910f358ece..d6b73dd0139 100644
--- a/web/src/app/browser/src/configuration.ts
+++ b/web/src/app/browser/src/configuration.ts
@@ -1,6 +1,6 @@
 import { EngineConfiguration, InitOptionSpec, InitOptionDefaults } from "keyman/engine/main";
 
-import { OutputTargetElementWrapper as DOMOutputTarget } from 'keyman/engine/element-text-stores';
+import { AbstractElementTextStore as DOMOutputTarget } from 'keyman/engine/element-text-stores';
 import { TextStore, ProcessorAction } from 'keyman/engine/keyboard';
 import { isEmptyTransform } from '@keymanapp/web-utils';
 import { AlertHost } from "./utils/alertHost.js";
diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index f570769f9fd..58b2cef50e9 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -3,7 +3,7 @@ import { type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { CookieSerializer } from 'keyman/engine/dom-utils';
 import { eventOutputTarget, outputTargetForElement, PageContextAttachment } from 'keyman/engine/attachment';
 import { DomEventTracker, LegacyEventEmitter } from 'keyman/engine/events';
-import { DesignIFrame, OutputTargetElementWrapper, nestedInstanceOf } from 'keyman/engine/element-text-stores';
+import { DesignIFrame, AbstractElementTextStore, nestedInstanceOf } from 'keyman/engine/element-text-stores';
 import {
   ContextManagerBase,
   type KeyboardInterfaceBase,
@@ -47,8 +47,8 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
   private cookieManager = new CookieSerializer<KeyboardCookie>('KeymanWeb_Keyboard');
   readonly focusAssistant = new FocusAssistant(() => this.activeTarget?.isForcingScroll());
   readonly page: PageContextAttachment;
-  private mostRecentTarget: OutputTargetElementWrapper<any>;
-  private currentTarget: OutputTargetElementWrapper<any>;
+  private mostRecentTarget: AbstractElementTextStore<any>;
+  private currentTarget: AbstractElementTextStore<any>;
 
   private globalKeyboard: {keyboard: JSKeyboard, metadata: KeyboardStub};
 
@@ -175,7 +175,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     });
   }
 
-  get activeTarget(): OutputTargetElementWrapper<any> {
+  get activeTarget(): AbstractElementTextStore<any> {
     /*
      * Assumption:  the maintainingFocus flag may only be set when there is a current target.
      * This is not enforced proactively at present, but the assumption should hold.  (2023-05-03)
@@ -184,7 +184,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     return this.currentTarget || (maintainingFocus ? this.mostRecentTarget : null);
   }
 
-  get lastActiveTarget(): OutputTargetElementWrapper<any> {
+  get lastActiveTarget(): AbstractElementTextStore<any> {
     return this.mostRecentTarget;
   }
 
@@ -229,7 +229,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     }
   }
 
-  public setActiveTarget(target: OutputTargetElementWrapper<any>, sendEvents?: boolean) {
+  public setActiveTarget(target: AbstractElementTextStore<any>, sendEvents?: boolean) {
     const previousTarget = this.mostRecentTarget;
     const originalTarget = this.activeTarget; // may differ, depending on focus state.
 
@@ -369,7 +369,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
    *
    * This is based on the current `.activeTarget` and its related attachment metadata.
    */
-  protected currentKeyboardSrcTarget(): OutputTargetElementWrapper<any> {
+  protected currentKeyboardSrcTarget(): AbstractElementTextStore<any> {
     const target = this.currentTarget || this.mostRecentTarget;
 
     if(this.isTargetKeyboardIndependent(target)) {
@@ -379,7 +379,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     }
   }
 
-  private isTargetKeyboardIndependent(target: OutputTargetElementWrapper<any>): boolean {
+  private isTargetKeyboardIndependent(target: AbstractElementTextStore<any>): boolean {
     const attachmentInfo = target?.getElement()._kmwAttachment;
 
     // If null or undefined, we're in 'global' mode.
@@ -387,7 +387,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
   }
 
   // Note:  is part of the keyboard activation process.  Not to be called directly by published API.
-  activateKeyboardForTarget(kbd: { keyboard: JSKeyboard, metadata: KeyboardStub }, target: OutputTargetElementWrapper<any>) {
+  activateKeyboardForTarget(kbd: { keyboard: JSKeyboard, metadata: KeyboardStub }, target: AbstractElementTextStore<any>) {
     const attachment = target?.getElement()._kmwAttachment;
 
     if(!attachment) {
@@ -421,7 +421,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
    * @param target
    * @param metadata
    */
-  public setKeyboardForTarget(target: OutputTargetElementWrapper<any>, kbdId: string, langId: string) {
+  public setKeyboardForTarget(target: AbstractElementTextStore<any>, kbdId: string, langId: string) {
     if(target instanceof DesignIFrame) {
       console.warn("'keymanweb.setKeyboardForControl' cannot set keyboard on iframes.");
       return;
@@ -456,7 +456,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     }
   }
 
-  public getKeyboardStubForTarget(target: OutputTargetElementWrapper<any>) {
+  public getKeyboardStubForTarget(target: AbstractElementTextStore<any>) {
     if(!this.isTargetKeyboardIndependent(target)) {
       return this.globalKeyboard.metadata;
     } else {
@@ -614,7 +614,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
    *                      The return value indicates whether (true) or not (false) the calling event handler
    *                      should be terminated immediately after the call.
    */
-  _CommonFocusHelper(textStore: OutputTargetElementWrapper<any>): boolean {
+  _CommonFocusHelper(textStore: AbstractElementTextStore<any>): boolean {
     const focusAssistant = this.focusAssistant;
 
     const activeKeyboard = this.activeKeyboard?.keyboard;
@@ -738,7 +738,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     return true;
   }
 
-  doChangeEvent(target: OutputTargetElementWrapper<any>) {
+  doChangeEvent(target: AbstractElementTextStore<any>) {
     if(target.changed) {
       const event = new Event('change', {"bubbles": true, "cancelable": false});
       target.getElement().dispatchEvent(event);
diff --git a/web/src/app/browser/src/keyboardInterface.ts b/web/src/app/browser/src/keyboardInterface.ts
index 7783929964b..ded3a1d71ce 100644
--- a/web/src/app/browser/src/keyboardInterface.ts
+++ b/web/src/app/browser/src/keyboardInterface.ts
@@ -1,4 +1,4 @@
-import { type OutputTargetElementWrapper } from 'keyman/engine/element-text-stores';
+import { type AbstractElementTextStore } from 'keyman/engine/element-text-stores';
 import { FloatingOSKView } from 'keyman/engine/osk';
 import { KeyboardInterfaceBase } from 'keyman/engine/main';
 
@@ -29,7 +29,7 @@ export class KeyboardInterface extends KeyboardInterfaceBase<ContextManager> {
   /**
    * Legacy entry points (non-standard names)- included only to allow existing IME keyboards to continue to be used
    */
-  getLastActiveElement(): OutputTargetElementWrapper<any> {
+  getLastActiveElement(): AbstractElementTextStore<any> {
     return this.engine.contextManager.lastActiveTarget;
   }
 
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 8173aeeff6b..45166e563ed 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -1,7 +1,7 @@
 import { KeymanWebKeyboard } from '@keymanapp/common-types';
 import { KeymanEngineBase, DeviceDetector } from 'keyman/engine/main';
 import { getAbsoluteY } from 'keyman/engine/dom-utils';
-import { OutputTargetElementWrapper } from 'keyman/engine/element-text-stores';
+import { AbstractElementTextStore } from 'keyman/engine/element-text-stores';
 import {
   TwoStateActivator,
   VisualKeyboard
@@ -76,7 +76,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
 
     // Scrolls the document-body to ensure that a focused element remains visible after the OSK appears.
     this.contextManager.on('targetchange', (target) => {
-      const e = (target as OutputTargetElementWrapper<any>)?.getElement();
+      const e = (target as AbstractElementTextStore<any>)?.getElement();
       if(this.osk) {
         (this.osk.activationModel as TwoStateActivator<HTMLElement>).activationTrigger = e;
       }
diff --git a/web/src/engine/attachment/src/attachmentInfo.ts b/web/src/engine/attachment/src/attachmentInfo.ts
index d3d447802d4..4b3042ab2a9 100644
--- a/web/src/engine/attachment/src/attachmentInfo.ts
+++ b/web/src/engine/attachment/src/attachmentInfo.ts
@@ -1,10 +1,10 @@
-import { OutputTargetElementWrapper } from 'keyman/engine/element-text-stores';
+import { AbstractElementTextStore } from 'keyman/engine/element-text-stores';
 
 export class AttachmentInfo {
   /**
    * Provides the core interface between the DOM and the actual keyboard.
    */
-  interface: OutputTargetElementWrapper<any>;
+  interface: AbstractElementTextStore<any>;
 
   /**
    * Tracks the control's independent keyboard selection, when applicable.
@@ -21,7 +21,7 @@ export class AttachmentInfo {
    */
   inputMode?: string;
 
-  constructor(eleInterface: OutputTargetElementWrapper<any>, kbd: string, touch?: boolean) {
+  constructor(eleInterface: AbstractElementTextStore<any>, kbd: string, touch?: boolean) {
     this.interface = eleInterface;
     this.keyboard = kbd;
   }
diff --git a/web/src/engine/element-text-stores/src/contentEditable.ts b/web/src/engine/element-text-stores/src/contentEditable.ts
index 5b3169bc1a3..ae52eca86c9 100644
--- a/web/src/engine/element-text-stores/src/contentEditable.ts
+++ b/web/src/engine/element-text-stores/src/contentEditable.ts
@@ -1,4 +1,4 @@
-import { OutputTargetElementWrapper } from './outputTargetElementWrapper.js';
+import { AbstractElementTextStore } from './outputTargetElementWrapper.js';
 import { KMWString } from '@keymanapp/web-utils';
 
 class SelectionCaret {
@@ -21,7 +21,7 @@ class SelectionRange {
   }
 }
 
-export class ContentEditable extends OutputTargetElementWrapper<{}> {
+export class ContentEditable extends AbstractElementTextStore<{}> {
   root: HTMLElement;
 
   constructor(ele: HTMLElement) {
diff --git a/web/src/engine/element-text-stores/src/designIFrame.ts b/web/src/engine/element-text-stores/src/designIFrame.ts
index edf9b450cfa..701a49fdf21 100644
--- a/web/src/engine/element-text-stores/src/designIFrame.ts
+++ b/web/src/engine/element-text-stores/src/designIFrame.ts
@@ -1,4 +1,4 @@
-import { OutputTargetElementWrapper } from './outputTargetElementWrapper.js';
+import { AbstractElementTextStore } from './outputTargetElementWrapper.js';
 import { KMWString } from '@keymanapp/web-utils';
 
 class SelectionCaret {
@@ -32,7 +32,7 @@ class StyleCommand {
   }
 }
 
-export class DesignIFrame extends OutputTargetElementWrapper<{}> {
+export class DesignIFrame extends AbstractElementTextStore<{}> {
   root: HTMLIFrameElement;
   doc: Document;
   docRoot: HTMLElement;
diff --git a/web/src/engine/element-text-stores/src/index.ts b/web/src/engine/element-text-stores/src/index.ts
index 1cf3e36ecf5..c5b52643149 100644
--- a/web/src/engine/element-text-stores/src/index.ts
+++ b/web/src/engine/element-text-stores/src/index.ts
@@ -2,6 +2,6 @@ export { wrapElement } from './wrapElement.js';
 export { ContentEditable } from './contentEditable.js';
 export { DesignIFrame } from './designIFrame.js';
 export { Input } from './input.js';
-export { OutputTargetElementWrapper } from './outputTargetElementWrapper.js';
+export { AbstractElementTextStore } from './outputTargetElementWrapper.js';
 export { TextArea } from './textarea.js';
 export { nestedInstanceOf } from './utils.js';
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/src/input.ts b/web/src/engine/element-text-stores/src/input.ts
index cae3b433985..5666ad6f9ab 100644
--- a/web/src/engine/element-text-stores/src/input.ts
+++ b/web/src/engine/element-text-stores/src/input.ts
@@ -1,4 +1,4 @@
-import { OutputTargetElementWrapper } from './outputTargetElementWrapper.js';
+import { AbstractElementTextStore } from './outputTargetElementWrapper.js';
 import { KMWString } from '@keymanapp/web-utils';
 
 interface EventMap  {
@@ -22,7 +22,7 @@ interface EventMap  {
   'unhandlednewline': (element: HTMLInputElement) => void
 }
 
-export class Input extends OutputTargetElementWrapper<EventMap> {
+export class Input extends AbstractElementTextStore<EventMap> {
   root: HTMLInputElement;
 
   /**
diff --git a/web/src/engine/element-text-stores/src/outputTargetElementWrapper.ts b/web/src/engine/element-text-stores/src/outputTargetElementWrapper.ts
index 316704d51d6..e22d6588aeb 100644
--- a/web/src/engine/element-text-stores/src/outputTargetElementWrapper.ts
+++ b/web/src/engine/element-text-stores/src/outputTargetElementWrapper.ts
@@ -1,7 +1,7 @@
 import { TextStore } from "keyman/engine/keyboard";
 import { EventEmitter } from 'eventemitter3';
 
-export abstract class OutputTargetElementWrapper<EventMap extends EventEmitter.ValidEventTypes> extends TextStore {
+export abstract class AbstractElementTextStore<EventMap extends EventEmitter.ValidEventTypes> extends TextStore {
   // JS/TS can't do true multiple inheritance, so we maintain class events on a readonly field.
   public readonly events: EventEmitter<EventMap, this> = new EventEmitter<EventMap, this>();
 
diff --git a/web/src/engine/element-text-stores/src/textarea.ts b/web/src/engine/element-text-stores/src/textarea.ts
index eeb86fbd82c..e8dc6e9f528 100644
--- a/web/src/engine/element-text-stores/src/textarea.ts
+++ b/web/src/engine/element-text-stores/src/textarea.ts
@@ -1,7 +1,7 @@
-import { OutputTargetElementWrapper } from './outputTargetElementWrapper.js';
+import { AbstractElementTextStore } from './outputTargetElementWrapper.js';
 import { KMWString } from '@keymanapp/web-utils';
 
-export class TextArea extends OutputTargetElementWrapper<{}> {
+export class TextArea extends AbstractElementTextStore<{}> {
   root: HTMLTextAreaElement;
 
   /**
diff --git a/web/src/engine/element-text-stores/src/wrapElement.ts b/web/src/engine/element-text-stores/src/wrapElement.ts
index dac09b30b61..56eb0068942 100644
--- a/web/src/engine/element-text-stores/src/wrapElement.ts
+++ b/web/src/engine/element-text-stores/src/wrapElement.ts
@@ -1,11 +1,11 @@
-import { type OutputTargetElementWrapper }  from './outputTargetElementWrapper.js';
+import { type AbstractElementTextStore }  from './outputTargetElementWrapper.js';
 import { Input } from './input.js';
 import { TextArea } from './textarea.js';
 import { DesignIFrame } from './designIFrame.js';
 import { ContentEditable } from './contentEditable.js';
 import { nestedInstanceOf } from './utils.js';
 
-export function wrapElement(e: HTMLElement): OutputTargetElementWrapper<any> {
+export function wrapElement(e: HTMLElement): AbstractElementTextStore<any> {
   // Complex type scoping is implemented here so that kmwutils.ts is not a dependency for test compilations.
 
   if(nestedInstanceOf(e, "HTMLInputElement")) {

From f096be98480f4d386fd161e5c06d8f0aba238880 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 4 Nov 2025 15:28:45 +0100
Subject: [PATCH 109/254] =?UTF-8?q?refactor(web):=20rename=20element=20wra?=
 =?UTF-8?q?pper=20classes=20=E2=86=92=20*ElementTextStore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/app/browser/src/beepHandler.ts        |   4 +-
 web/src/app/browser/src/contextManager.ts     |  14 +-
 .../app/browser/src/hardwareEventKeyboard.ts  |   6 +-
 .../attachment/src/pageContextAttachment.ts   |   6 +-
 ....ts => contentEditableElementTextStore.ts} |   2 +-
 ...ame.ts => designIFrameElementTextStore.ts} |   2 +-
 .../engine/element-text-stores/src/index.ts   |   8 +-
 .../{input.ts => inputElementTextStore.ts}    |   2 +-
 ...extarea.ts => textAreaElementTextStore.ts} |   2 +-
 .../element-text-stores/src/wrapElement.ts    |  18 +-
 .../attachment/outputTargetForElement.def.ts  |  56 +++----
 .../dom/cases/browser/contextManager.tests.ts |  10 +-
 .../element_interfaces.tests.ts               | 158 +++++++++---------
 .../element-text-stores/target_mocks.tests.ts |   6 +-
 14 files changed, 147 insertions(+), 147 deletions(-)
 rename web/src/engine/element-text-stores/src/{contentEditable.ts => contentEditableElementTextStore.ts} (98%)
 rename web/src/engine/element-text-stores/src/{designIFrame.ts => designIFrameElementTextStore.ts} (99%)
 rename web/src/engine/element-text-stores/src/{input.ts => inputElementTextStore.ts} (98%)
 rename web/src/engine/element-text-stores/src/{textarea.ts => textAreaElementTextStore.ts} (98%)

diff --git a/web/src/app/browser/src/beepHandler.ts b/web/src/app/browser/src/beepHandler.ts
index 8264bd7fe91..76936c220c6 100644
--- a/web/src/app/browser/src/beepHandler.ts
+++ b/web/src/app/browser/src/beepHandler.ts
@@ -1,6 +1,6 @@
 import { type JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { JSKeyboard, type KeyboardMinimalInterface } from 'keyman/engine/keyboard';
-import { DesignIFrame, AbstractElementTextStore } from 'keyman/engine/element-text-stores';
+import { DesignIFrameElementTextStore, AbstractElementTextStore } from 'keyman/engine/element-text-stores';
 
 // Utility object used to handle beep (keyboard error response) operations.
 class BeepData {
@@ -40,7 +40,7 @@ export class BeepHandler {
 
     // All code after this point is DOM-based, triggered by the beep.
     let Pelem: HTMLElement = textStore.getElement();
-    if(textStore instanceof DesignIFrame) {
+    if(textStore instanceof DesignIFrameElementTextStore) {
       Pelem = textStore.docRoot; // I1446 - beep sometimes fails to flash when using OSK and rich control
     }
 
diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index 58b2cef50e9..5cee5fc5234 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -3,7 +3,7 @@ import { type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { CookieSerializer } from 'keyman/engine/dom-utils';
 import { eventOutputTarget, outputTargetForElement, PageContextAttachment } from 'keyman/engine/attachment';
 import { DomEventTracker, LegacyEventEmitter } from 'keyman/engine/events';
-import { DesignIFrame, AbstractElementTextStore, nestedInstanceOf } from 'keyman/engine/element-text-stores';
+import { DesignIFrameElementTextStore, AbstractElementTextStore, nestedInstanceOf } from 'keyman/engine/element-text-stores';
 import {
   ContextManagerBase,
   type KeyboardInterfaceBase,
@@ -92,7 +92,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
 
       // For any elements being attached, or being enabled after having been disabled...
       this.page.on('enabled', (elem) => {
-        if(!(elem._kmwAttachment.interface instanceof DesignIFrame)) {
+        if(!(elem._kmwAttachment.interface instanceof DesignIFrameElementTextStore)) {
           // For anything attached but (design-mode) iframes...
 
           // This block:  has to do with maintaining focus.
@@ -261,7 +261,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
        * and trigger a contextReset DURING keyboard rule processing without this
        * guard.
        *
-       * The #2 reason:  the `forceScroll` method used within the Input and Textarea
+       * The #2 reason:  the `forceScroll` method used within the InputElementTextStore and Textarea
        * types whenever the selection must be programatically updated.  The blur
        * is 'swallowed', preventing it from being dropped as 'active'. However, the
        * corresponding focus is not swallowed... until this if-condition's check.
@@ -290,7 +290,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
 
     // Set element directionality (but only if element is empty)
     let focusedElement = target?.getElement();
-    if(target instanceof DesignIFrame) {
+    if(target instanceof DesignIFrameElementTextStore) {
       focusedElement = target.docRoot;
     }
     if(focusedElement && focusedElement.ownerDocument && focusedElement instanceof focusedElement.ownerDocument.defaultView.HTMLElement) {
@@ -304,7 +304,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     //Execute external (UI) code needed on focus if required
     if(sendEvents) {
       let blurredElement = previousTarget?.getElement();
-      if(previousTarget instanceof DesignIFrame) {
+      if(previousTarget instanceof DesignIFrameElementTextStore) {
         blurredElement = previousTarget.docRoot;
       }
 
@@ -422,7 +422,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
    * @param metadata
    */
   public setKeyboardForTarget(target: AbstractElementTextStore<any>, kbdId: string, langId: string) {
-    if(target instanceof DesignIFrame) {
+    if(target instanceof DesignIFrameElementTextStore) {
       console.warn("'keymanweb.setKeyboardForControl' cannot set keyboard on iframes.");
       return;
     }
@@ -650,7 +650,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     }
 
     // ???? ?: ensure it's properly active?
-    // if(target instanceof DesignIFrame) { //**TODO: check case reference
+    // if(target instanceof DesignIFrameElementTextStore) { //**TODO: check case reference
     //   // But... the following should already have been done during attachment...
     //   // attachmentEngine._AttachToIframe(Ltarg as HTMLIFrameElement);
     //   target.docRoot
diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts
index c3e63760fbf..2516d2cd5b1 100644
--- a/web/src/app/browser/src/hardwareEventKeyboard.ts
+++ b/web/src/app/browser/src/hardwareEventKeyboard.ts
@@ -4,7 +4,7 @@ import { ModifierKeyConstants } from '@keymanapp/common-types';
 
 import { HardKeyboardBase, processForMnemonicsAndLegacy } from 'keyman/engine/main';
 import { DomEventTracker } from 'keyman/engine/events';
-import { DesignIFrame, nestedInstanceOf } from 'keyman/engine/element-text-stores';
+import { DesignIFrameElementTextStore, nestedInstanceOf } from 'keyman/engine/element-text-stores';
 import { eventOutputTarget, outputTargetForElement } from 'keyman/engine/attachment';
 
 import ContextManager from './contextManager.js';
@@ -237,7 +237,7 @@ export default class HardwareEventKeyboard extends HardKeyboardBase {
     page.on('enabled', (Pelem) => {
       const target = outputTargetForElement(Pelem);
 
-      if(!(target instanceof DesignIFrame)) {
+      if(!(target instanceof DesignIFrameElementTextStore)) {
         // These need to be on the actual input element, as otherwise the keyboard will disappear on touch.
         eventTracker.attachDOMEvent(Pelem, 'keypress', this._KeyPress);
         eventTracker.attachDOMEvent(Pelem, 'keydown', this._KeyDown);
@@ -253,7 +253,7 @@ export default class HardwareEventKeyboard extends HardKeyboardBase {
     page.on('disabled', (Pelem) => {
       const target = outputTargetForElement(Pelem);
 
-      if(!(target instanceof DesignIFrame)) {
+      if(!(target instanceof DesignIFrameElementTextStore)) {
         eventTracker.detachDOMEvent(Pelem, 'keypress', this._KeyPress);
         eventTracker.detachDOMEvent(Pelem, 'keydown', this._KeyDown);
         eventTracker.detachDOMEvent(Pelem, 'keyup', this._KeyUp);
diff --git a/web/src/engine/attachment/src/pageContextAttachment.ts b/web/src/engine/attachment/src/pageContextAttachment.ts
index c75e04b8286..cc67291189b 100644
--- a/web/src/engine/attachment/src/pageContextAttachment.ts
+++ b/web/src/engine/attachment/src/pageContextAttachment.ts
@@ -1,7 +1,7 @@
 import { EventEmitter } from 'eventemitter3';
 
 import { DeviceSpec, InternalKeyboardFont } from "keyman/engine/keyboard";
-import { Input, nestedInstanceOf, wrapElement } from "keyman/engine/element-text-stores";
+import { InputElementTextStore, nestedInstanceOf, wrapElement } from "keyman/engine/element-text-stores";
 import {
   arrayFromNodeList,
   createStyleSheet,
@@ -236,7 +236,7 @@ export class PageContextAttachment extends EventEmitter<EventMap> {
     if(x instanceof x.ownerDocument.defaultView.HTMLTextAreaElement) {
       return true;
     } else if(x instanceof x.ownerDocument.defaultView.HTMLInputElement) {
-      if (Input.isSupportedType(x.type)) {
+      if (InputElementTextStore.isSupportedType(x.type)) {
         return true;
       }
     } else if(x instanceof x.ownerDocument.defaultView.HTMLIFrameElement) {
@@ -734,7 +734,7 @@ export class PageContextAttachment extends EventEmitter<EventMap> {
     const t2=document.getElementsByTagName('textarea');
 
     for(let i=0; i<t1.length; i++) {
-      if (Input.isSupportedType(t1[i].type) && t1[i].className.indexOf('kmw-disabled') < 0) {
+      if (InputElementTextStore.isSupportedType(t1[i].type) && t1[i].className.indexOf('kmw-disabled') < 0) {
         eList.push({ip:t1[i], x: getAbsoluteX(t1[i]), y: getAbsoluteY(t1[i])});
       }
     }
diff --git a/web/src/engine/element-text-stores/src/contentEditable.ts b/web/src/engine/element-text-stores/src/contentEditableElementTextStore.ts
similarity index 98%
rename from web/src/engine/element-text-stores/src/contentEditable.ts
rename to web/src/engine/element-text-stores/src/contentEditableElementTextStore.ts
index ae52eca86c9..4d470f230d4 100644
--- a/web/src/engine/element-text-stores/src/contentEditable.ts
+++ b/web/src/engine/element-text-stores/src/contentEditableElementTextStore.ts
@@ -21,7 +21,7 @@ class SelectionRange {
   }
 }
 
-export class ContentEditable extends AbstractElementTextStore<{}> {
+export class ContentEditableElementTextStore extends AbstractElementTextStore<{}> {
   root: HTMLElement;
 
   constructor(ele: HTMLElement) {
diff --git a/web/src/engine/element-text-stores/src/designIFrame.ts b/web/src/engine/element-text-stores/src/designIFrameElementTextStore.ts
similarity index 99%
rename from web/src/engine/element-text-stores/src/designIFrame.ts
rename to web/src/engine/element-text-stores/src/designIFrameElementTextStore.ts
index 701a49fdf21..65ffa468359 100644
--- a/web/src/engine/element-text-stores/src/designIFrame.ts
+++ b/web/src/engine/element-text-stores/src/designIFrameElementTextStore.ts
@@ -32,7 +32,7 @@ class StyleCommand {
   }
 }
 
-export class DesignIFrame extends AbstractElementTextStore<{}> {
+export class DesignIFrameElementTextStore extends AbstractElementTextStore<{}> {
   root: HTMLIFrameElement;
   doc: Document;
   docRoot: HTMLElement;
diff --git a/web/src/engine/element-text-stores/src/index.ts b/web/src/engine/element-text-stores/src/index.ts
index c5b52643149..fab6323bce0 100644
--- a/web/src/engine/element-text-stores/src/index.ts
+++ b/web/src/engine/element-text-stores/src/index.ts
@@ -1,7 +1,7 @@
 export { wrapElement } from './wrapElement.js';
-export { ContentEditable } from './contentEditable.js';
-export { DesignIFrame } from './designIFrame.js';
-export { Input } from './input.js';
+export { ContentEditableElementTextStore } from './contentEditableElementTextStore.js';
+export { DesignIFrameElementTextStore } from './designIFrameElementTextStore.js';
+export { InputElementTextStore } from './inputElementTextStore.js';
 export { AbstractElementTextStore } from './outputTargetElementWrapper.js';
-export { TextArea } from './textarea.js';
+export { TextAreaElementTextStore } from './textAreaElementTextStore.js';
 export { nestedInstanceOf } from './utils.js';
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/src/input.ts b/web/src/engine/element-text-stores/src/inputElementTextStore.ts
similarity index 98%
rename from web/src/engine/element-text-stores/src/input.ts
rename to web/src/engine/element-text-stores/src/inputElementTextStore.ts
index 5666ad6f9ab..bd86e75e055 100644
--- a/web/src/engine/element-text-stores/src/input.ts
+++ b/web/src/engine/element-text-stores/src/inputElementTextStore.ts
@@ -22,7 +22,7 @@ interface EventMap  {
   'unhandlednewline': (element: HTMLInputElement) => void
 }
 
-export class Input extends AbstractElementTextStore<EventMap> {
+export class InputElementTextStore extends AbstractElementTextStore<EventMap> {
   root: HTMLInputElement;
 
   /**
diff --git a/web/src/engine/element-text-stores/src/textarea.ts b/web/src/engine/element-text-stores/src/textAreaElementTextStore.ts
similarity index 98%
rename from web/src/engine/element-text-stores/src/textarea.ts
rename to web/src/engine/element-text-stores/src/textAreaElementTextStore.ts
index e8dc6e9f528..46b753b262f 100644
--- a/web/src/engine/element-text-stores/src/textarea.ts
+++ b/web/src/engine/element-text-stores/src/textAreaElementTextStore.ts
@@ -1,7 +1,7 @@
 import { AbstractElementTextStore } from './outputTargetElementWrapper.js';
 import { KMWString } from '@keymanapp/web-utils';
 
-export class TextArea extends AbstractElementTextStore<{}> {
+export class TextAreaElementTextStore extends AbstractElementTextStore<{}> {
   root: HTMLTextAreaElement;
 
   /**
diff --git a/web/src/engine/element-text-stores/src/wrapElement.ts b/web/src/engine/element-text-stores/src/wrapElement.ts
index 56eb0068942..a4dbe019642 100644
--- a/web/src/engine/element-text-stores/src/wrapElement.ts
+++ b/web/src/engine/element-text-stores/src/wrapElement.ts
@@ -1,30 +1,30 @@
 import { type AbstractElementTextStore }  from './outputTargetElementWrapper.js';
-import { Input } from './input.js';
-import { TextArea } from './textarea.js';
-import { DesignIFrame } from './designIFrame.js';
-import { ContentEditable } from './contentEditable.js';
+import { InputElementTextStore } from './inputElementTextStore.js';
+import { TextAreaElementTextStore } from './textAreaElementTextStore.js';
+import { DesignIFrameElementTextStore } from './designIFrameElementTextStore.js';
+import { ContentEditableElementTextStore } from './contentEditableElementTextStore.js';
 import { nestedInstanceOf } from './utils.js';
 
 export function wrapElement(e: HTMLElement): AbstractElementTextStore<any> {
   // Complex type scoping is implemented here so that kmwutils.ts is not a dependency for test compilations.
 
   if(nestedInstanceOf(e, "HTMLInputElement")) {
-    return new Input(<HTMLInputElement> e);
+    return new InputElementTextStore(<HTMLInputElement> e);
   } else if(nestedInstanceOf(e, "HTMLTextAreaElement")) {
-    return new TextArea(<HTMLTextAreaElement> e);
+    return new TextAreaElementTextStore(<HTMLTextAreaElement> e);
   } else if(nestedInstanceOf(e, "HTMLIFrameElement")) {
     const iframe = <HTMLIFrameElement> e;
 
     if(iframe.contentWindow && iframe.contentWindow.document && iframe.contentWindow.document.designMode == "on") {
-      return new DesignIFrame(iframe);
+      return new DesignIFrameElementTextStore(iframe);
     } else if (e.isContentEditable) {
       // Do content-editable <iframe>s make sense?
-      return new ContentEditable(e);
+      return new ContentEditableElementTextStore(e);
     } else {
       return null;
     }
   } else if(e.isContentEditable) {
-    return new ContentEditable(e);
+    return new ContentEditableElementTextStore(e);
   }
 
   return null;
diff --git a/web/src/test/auto/dom/cases/attachment/outputTargetForElement.def.ts b/web/src/test/auto/dom/cases/attachment/outputTargetForElement.def.ts
index abdb27aa0b2..0f67806bcba 100644
--- a/web/src/test/auto/dom/cases/attachment/outputTargetForElement.def.ts
+++ b/web/src/test/auto/dom/cases/attachment/outputTargetForElement.def.ts
@@ -1,9 +1,9 @@
 import {
   // Exposed within the engine/attachment bundle b/c of unit tests requiring `instanceof` relations.
-  ContentEditable,
-  DesignIFrame,
-  Input,
-  TextArea,
+  ContentEditableElementTextStore,
+  DesignIFrameElementTextStore,
+  InputElementTextStore,
+  TextAreaElementTextStore,
 
   eventOutputTarget,
   outputTargetForElement,
@@ -65,40 +65,40 @@ describe('outputTargetForElement()', function () {
     // So, for these unit tests, attachment has already been established.  We just need to
     // ensure it meets our expectations.
 
-    it('<input> => Input', () => {
+    it('<input> => InputElementTextStore', () => {
       const inputElement = document.getElementById('input');
       const inputTarget = outputTargetForElement(inputElement);
 
-      assert.isTrue(inputTarget instanceof Input);
+      assert.isTrue(inputTarget instanceof InputElementTextStore);
     });
 
-    it('<iframe>.<input> => Input', async () => {
+    it('<iframe>.<input> => InputElementTextStore', async () => {
       const iframe = document.getElementById('iframe') as HTMLIFrameElement;
       const iframeInput = iframe.contentDocument.getElementById('iframe-input');
       const inputTarget = outputTargetForElement(iframeInput);
 
-      assert.isTrue(inputTarget instanceof Input);
+      assert.isTrue(inputTarget instanceof InputElementTextStore);
     });
 
-    it('<textarea> => TextArea', () => {
+    it('<textarea> => TextAreaElementTextStore', () => {
       const textElement = document.getElementById('textarea');
       const textTarget = outputTargetForElement(textElement);
 
-      assert.isTrue(textTarget instanceof TextArea);
+      assert.isTrue(textTarget instanceof TextAreaElementTextStore);
     });
 
-    it('<iframe>.#doc.designMode = "on" => DesignIFrame', () => {
+    it('<iframe>.#doc.designMode = "on" => DesignIFrameElementTextStore', () => {
       const designElement = document.getElementById('design-iframe');
       const designTarget = outputTargetForElement(designElement);
 
-      assert.isTrue(designTarget instanceof DesignIFrame);
+      assert.isTrue(designTarget instanceof DesignIFrameElementTextStore);
     });
 
-    it('<div contenteditable="true"/> => ContentEditable', () => {
+    it('<div contenteditable="true"/> => ContentEditableElementTextStore', () => {
       const divElement = document.getElementById('editable');
       const divTarget = outputTargetForElement(divElement);
 
-      assert.isTrue(divTarget instanceof ContentEditable);
+      assert.isTrue(divTarget instanceof ContentEditableElementTextStore);
     });
   });
 
@@ -106,25 +106,25 @@ describe('outputTargetForElement()', function () {
     // So, for these unit tests, attachment has already been established.  We just need to
     // ensure it meets our expectations.
 
-    it('DesignIFrame: from .contentDocument.body', () => {
+    it('DesignIFrameElementTextStore: from .contentDocument.body', () => {
       const designElement = document.getElementById('design-iframe') as HTMLIFrameElement;
       const designTarget = outputTargetForElement(designElement.contentDocument.body);
 
-      assert.isTrue(designTarget instanceof DesignIFrame);
+      assert.isTrue(designTarget instanceof DesignIFrameElementTextStore);
       assert.strictEqual(designTarget.getElement(), designElement);
       assert.strictEqual(designTarget, outputTargetForElement(designElement));
     });
 
-    it('DesignIFrame: from .contentDocument', () => {
+    it('DesignIFrameElementTextStore: from .contentDocument', () => {
       const designElement = document.getElementById('design-iframe') as HTMLIFrameElement;
       const designTarget = outputTargetForElement(designElement.contentDocument as any as HTMLElement);
 
-      assert.isTrue(designTarget instanceof DesignIFrame);
+      assert.isTrue(designTarget instanceof DesignIFrameElementTextStore);
       assert.strictEqual(designTarget.getElement(), designElement);
       assert.strictEqual(designTarget, outputTargetForElement(designElement));
     });
 
-    it('ContentEditable: from direct #text child', () => {
+    it('ContentEditableElementTextStore: from direct #text child', () => {
       const divElement = document.getElementById('editable');
       const textNode = divElement.firstChild as HTMLTextAreaElement;
 
@@ -133,7 +133,7 @@ describe('outputTargetForElement()', function () {
 
       const divTarget = outputTargetForElement(textNode);
 
-      assert.isTrue(divTarget instanceof ContentEditable);
+      assert.isTrue(divTarget instanceof ContentEditableElementTextStore);
       assert.strictEqual(divTarget.getElement(), divElement);
       assert.strictEqual(divTarget, outputTargetForElement(divElement));
     });
@@ -158,7 +158,7 @@ describe('eventOutputTarget()', function () {
     this.attacher = null;
   });
 
-  it('KeyEvent on <input> => Input', () => {
+  it('KeyEvent on <input> => InputElementTextStore', () => {
     const inputElement = document.getElementById('input');
     const fake = sinon.fake();
 
@@ -180,10 +180,10 @@ describe('eventOutputTarget()', function () {
 
     const inputTarget = outputTargetForElement(inputElement);
 
-    assert.isTrue(inputTarget instanceof Input);
+    assert.isTrue(inputTarget instanceof InputElementTextStore);
   });
 
-  it('FocusEvent on <textarea> => TextArea', () => {
+  it('FocusEvent on <textarea> => TextAreaElementTextStore', () => {
     const textElement = document.getElementById('textarea');
     const fake = sinon.fake();
 
@@ -202,10 +202,10 @@ describe('eventOutputTarget()', function () {
 
     const textTarget = eventOutputTarget(fake.firstCall.args[0]);
 
-    assert.isTrue(textTarget instanceof TextArea);
+    assert.isTrue(textTarget instanceof TextAreaElementTextStore);
   });
 
-  it('FocusEvent on design iframe .contentDocument => DesignIFrame', () => {
+  it('FocusEvent on design iframe .contentDocument => DesignIFrameElementTextStore', () => {
     const designElement = document.getElementById('design-iframe') as HTMLIFrameElement;
     const fake = sinon.fake();
 
@@ -222,10 +222,10 @@ describe('eventOutputTarget()', function () {
 
     const designTarget = eventOutputTarget(fake.firstCall.args[0]);
 
-    assert.isTrue(designTarget instanceof DesignIFrame);
+    assert.isTrue(designTarget instanceof DesignIFrameElementTextStore);
   });
 
-  it('KeyEvent on ContentEditable', () => {
+  it('KeyEvent on ContentEditableElementTextStore', () => {
     const divElement = document.getElementById('editable');
     const fake = sinon.fake();
 
@@ -247,6 +247,6 @@ describe('eventOutputTarget()', function () {
 
     const divTarget = outputTargetForElement(divElement);
 
-    assert.isTrue(divTarget instanceof ContentEditable);
+    assert.isTrue(divTarget instanceof ContentEditableElementTextStore);
   });
 });
\ No newline at end of file
diff --git a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
index 57ecb803acf..154ea8d15be 100644
--- a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
+++ b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
@@ -239,7 +239,7 @@ describe('app/browser:  ContextManager', function () {
 
       // Check our expectations re: the `targetchange` event.
       assert.isTrue(targetchange.calledOnce, 'targetchange event not raised');
-      const textStore = targetchange.firstCall.args[0]; // Should be an `Input` instance.
+      const textStore = targetchange.firstCall.args[0]; // Should be an `InputElementTextStore` instance.
       assert.equal(textStore.getElement(), input, '.activeTarget does not match the newly-focused element');
     });
 
@@ -254,7 +254,7 @@ describe('app/browser:  ContextManager', function () {
 
       // Check our expectations re: the `targetchange` event.
       assert.isTrue(targetchange.calledOnce, 'targetchange event not raised');
-      const textStore = targetchange.firstCall.args[0]; // Should be an `Input` instance.
+      const textStore = targetchange.firstCall.args[0]; // Should be an `InputElementTextStore` instance.
       assert.equal(textStore.getElement(), textarea, '.activeTarget does not match the newly-focused element');
     });
 
@@ -278,7 +278,7 @@ describe('app/browser:  ContextManager', function () {
 
       // Check our expectations re: the `targetchange` event.
       assert.isTrue(targetchange.calledOnce, 'targetchange event not raised');
-      const textStore = targetchange.firstCall.args[0]; // Should be an `Input` instance.
+      const textStore = targetchange.firstCall.args[0]; // Should be an `InputElementTextStore` instance.
       assert.equal(textStore.getElement(), iframe, '.activeTarget does not match the newly-focused element');
     });
 
@@ -293,7 +293,7 @@ describe('app/browser:  ContextManager', function () {
 
       // Check our expectations re: the `targetchange` event.
       assert.isTrue(targetchange.calledOnce, 'targetchange event not raised');
-      const textStore = targetchange.firstCall.args[0]; // Should be an `Input` instance.
+      const textStore = targetchange.firstCall.args[0]; // Should be an `InputElementTextStore` instance.
       assert.equal(textStore.getElement(), editable, '.activeTarget does not match the newly-focused element');
     });
 
@@ -358,7 +358,7 @@ describe('app/browser:  ContextManager', function () {
 
       // Check our expectations re: the `targetchange` event.
       assert.isTrue(targetchange.calledThrice, 'targetchange event not raised');
-      const textStore = targetchange.thirdCall.args[0]; // Should be an `Input` instance.
+      const textStore = targetchange.thirdCall.args[0]; // Should be an `InputElementTextStore` instance.
       assert.equal(textStore.getElement(), textarea, '.activeTarget does not match the newly-focused element');
     });
 
diff --git a/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts b/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts
index 43b6b03df44..fd21f7a9d45 100644
--- a/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts
+++ b/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts
@@ -33,12 +33,12 @@ interface TestHelper {
   setText(pair: ElementPair<any>, text: string): void;
 }
 
-//#region Defines helpers related to HTMLInputElement / Input test setup.
+//#region Defines helpers related to HTMLInputElement / InputElementTextStore test setup.
 class InputTestHelper implements TestHelper {
   setupElement(): InputElementPair {
     const id = DynamicElements.addInput();
     const elem = document.getElementById(id) as HTMLInputElement;
-    const wrapper = new wrappers.Input(elem);
+    const wrapper = new wrappers.InputElementTextStore(elem);
 
     return { elem: elem, wrapper: wrapper };
   }
@@ -79,12 +79,12 @@ class InputTestHelper implements TestHelper {
 }
 //#endregion
 
-//#region Defines helpers related to HTMLTextAreaElement / TextArea test setup.
+//#region Defines helpers related to HTMLTextAreaElement / TextAreaElementTextStore test setup.
 class TextAreaTestHelper implements TestHelper {
   setupElement(): TextElementPair {
     const id = DynamicElements.addText();
     const elem = document.getElementById(id) as HTMLTextAreaElement;
-    const wrapper = new wrappers.TextArea(elem);
+    const wrapper = new wrappers.TextAreaElementTextStore(elem);
 
     return { elem: elem, wrapper: wrapper };
   }
@@ -125,7 +125,7 @@ class TextAreaTestHelper implements TestHelper {
 }
 //#endregion
 
-//#region Defines helpers related to ContentEditable element test setup.
+//#region Defines helpers related to ContentEditableElementTextStore element test setup.
 
 // These functions simply make the basic (within a single text node) tests
 // compatible with the more advanced element types; more complex tests may
@@ -134,7 +134,7 @@ class ContentEditableTestHelper implements TestHelper {
   setupElement(): HTMLElementPair {
     const id = DynamicElements.addEditable();
     const elem = document.getElementById(id);
-    const wrapper = new wrappers.ContentEditable(elem);
+    const wrapper = new wrappers.ContentEditableElementTextStore(elem);
 
     return { elem: elem, wrapper: wrapper, node: null };
   }
@@ -142,7 +142,7 @@ class ContentEditableTestHelper implements TestHelper {
   setupDummyElement(): HTMLElementPair {
     const id = DynamicElements.addEditable();
     const elem = document.getElementById(id);
-    const wrapper = new wrappers.ContentEditable(elem);
+    const wrapper = new wrappers.ContentEditableElementTextStore(elem);
 
     return { elem: elem, wrapper: wrapper, node: null };
   }
@@ -235,8 +235,8 @@ class DesignIFrameTestHelper implements TestHelper {
         const elem1 = document.getElementById(id1) as HTMLIFrameElement;
         const elem2 = document.getElementById(id2) as HTMLIFrameElement;
 
-        obj.mainPair = { elem: elem1, wrapper: new wrappers.DesignIFrame(elem1), document: elem1.contentWindow.document };
-        obj.dummyPair = { elem: elem2, wrapper: new wrappers.DesignIFrame(elem2), document: elem1.contentWindow.document };
+        obj.mainPair = { elem: elem1, wrapper: new wrappers.DesignIFrameElementTextStore(elem1), document: elem1.contentWindow.document };
+        obj.dummyPair = { elem: elem2, wrapper: new wrappers.DesignIFrameElementTextStore(elem2), document: elem1.contentWindow.document };
 
         done();
       });
@@ -363,13 +363,13 @@ class InterfaceTests {
     }
   };
 
-  public static Input = new InputTestHelper();
+  public static InputElementTextStore = new InputTestHelper();
 
-  public static TextArea = new TextAreaTestHelper();
+  public static TextAreaElementTextStore = new TextAreaTestHelper();
 
-  public static ContentEditable = new ContentEditableTestHelper();
+  public static ContentEditableElementTextStore = new ContentEditableTestHelper();
 
-  public static DesignIFrame = new DesignIFrameTestHelper();
+  public static DesignIFrameElementTextStore = new DesignIFrameTestHelper();
 
   public static SyntheticTextStore = new MockTestHelper();
 
@@ -984,7 +984,7 @@ class InterfaceTests {
   }
 }
 
-describe('Element Input/Output Interfacing', function () {
+describe('Element InputElementTextStore/Output Interfacing', function () {
   this.timeout(DEFAULT_BROWSER_TIMEOUT);
 
   before(function () {
@@ -1004,21 +1004,21 @@ describe('Element Input/Output Interfacing', function () {
     describe('Caret Handling', function () {
       describe('setCaret', function () {
         it('correctly places the caret (no prior selection)', function () {
-          InterfaceTests.Tests.setCaretNoSelection(InterfaceTests.Input);
+          InterfaceTests.Tests.setCaretNoSelection(InterfaceTests.InputElementTextStore);
         });
 
         it('correctly places the caret (prior selection)', function () {
-          InterfaceTests.Tests.setCaretWithSelection(InterfaceTests.Input);
+          InterfaceTests.Tests.setCaretWithSelection(InterfaceTests.InputElementTextStore);
         });
       });
 
       describe('getCaret', function () {
         it('correctly reports the position of the caret (no selection)', function () {
-          InterfaceTests.Tests.getCaretNoSelection(InterfaceTests.Input);
+          InterfaceTests.Tests.getCaretNoSelection(InterfaceTests.InputElementTextStore);
         });
 
         it('correctly reports the position of the caret (active selection)', function () {
-          InterfaceTests.Tests.getCaretWithSelection(InterfaceTests.Input);
+          InterfaceTests.Tests.getCaretWithSelection(InterfaceTests.InputElementTextStore);
         });
       });
     });
@@ -1026,35 +1026,35 @@ describe('Element Input/Output Interfacing', function () {
     describe('Text Retrieval', function () {
       describe('getText', function () {
         it('correctly returns text (no active selection)', function () {
-          InterfaceTests.Tests.getTextNoSelection(InterfaceTests.Input);
+          InterfaceTests.Tests.getTextNoSelection(InterfaceTests.InputElementTextStore);
         });
 
         it('correctly returns text (with active selection)', function () {
-          InterfaceTests.Tests.getTextWithSelection(InterfaceTests.Input);
+          InterfaceTests.Tests.getTextWithSelection(InterfaceTests.InputElementTextStore);
         });
       });
 
       describe('getTextBeforeCaret', function () {
         it('correctly returns text (no active selection)', function () {
-          InterfaceTests.Tests.getTextBeforeCaretNoSelection(InterfaceTests.Input);
+          InterfaceTests.Tests.getTextBeforeCaretNoSelection(InterfaceTests.InputElementTextStore);
         });
 
         it('correctly returns text (with active selection)', function () {
-          InterfaceTests.Tests.getTextBeforeCaretWithSelection(InterfaceTests.Input);
+          InterfaceTests.Tests.getTextBeforeCaretWithSelection(InterfaceTests.InputElementTextStore);
         });
       });
 
       it('getSelectedText', function () {
-        InterfaceTests.Tests.getSelectedText(InterfaceTests.Input);
+        InterfaceTests.Tests.getSelectedText(InterfaceTests.InputElementTextStore);
       });
 
       describe('getTextAfterCaret', function () {
         it('correctly returns text (no active selection)', function () {
-          InterfaceTests.Tests.getTextAfterCaretNoSelection(InterfaceTests.Input);
+          InterfaceTests.Tests.getTextAfterCaretNoSelection(InterfaceTests.InputElementTextStore);
         });
 
         it('correctly returns text (with active selection)', function () {
-          InterfaceTests.Tests.getTextAfterCaretWithSelection(InterfaceTests.Input);
+          InterfaceTests.Tests.getTextAfterCaretWithSelection(InterfaceTests.InputElementTextStore);
         });
       });
     });
@@ -1062,32 +1062,32 @@ describe('Element Input/Output Interfacing', function () {
     describe('Text Mutation', function () {
       describe('clearSelection', function () {
         it('properly deletes selected text', function () {
-          InterfaceTests.Tests.clearSelection(InterfaceTests.Input);
+          InterfaceTests.Tests.clearSelection(InterfaceTests.InputElementTextStore);
         });
       });
 
       describe('deleteCharsBeforeCaret', function () {
         it("correctly deletes characters from 'context' (no active selection)", function () {
-          InterfaceTests.Tests.deleteCharsBeforeCaretNoSelection(InterfaceTests.Input);
+          InterfaceTests.Tests.deleteCharsBeforeCaretNoSelection(InterfaceTests.InputElementTextStore);
         });
 
         it("correctly deletes characters from 'context' (with active selection)", function () {
-          InterfaceTests.Tests.deleteCharsBeforeCaretWithSelection(InterfaceTests.Input);
+          InterfaceTests.Tests.deleteCharsBeforeCaretWithSelection(InterfaceTests.InputElementTextStore);
         });
       });
 
       describe('insertTextBeforeCaret', function () {
         it("correctly replaces the element's 'context' (no active selection)", function () {
-          InterfaceTests.Tests.insertTextBeforeCaretNoSelection(InterfaceTests.Input);
+          InterfaceTests.Tests.insertTextBeforeCaretNoSelection(InterfaceTests.InputElementTextStore);
         });
 
         it("correctly replaces the element's 'context' (with active selection)", function () {
-          InterfaceTests.Tests.insertTextBeforeCaretWithSelection(InterfaceTests.Input);
+          InterfaceTests.Tests.insertTextBeforeCaretWithSelection(InterfaceTests.InputElementTextStore);
         });
       });
 
       it('correctly maintains deadkeys', function () {
-        InterfaceTests.Tests.deadkeyMaintenance(InterfaceTests.Input);
+        InterfaceTests.Tests.deadkeyMaintenance(InterfaceTests.InputElementTextStore);
       });
     });
   });
@@ -1102,21 +1102,21 @@ describe('Element Input/Output Interfacing', function () {
     describe('Caret Handling', function () {
       describe('setCaret', function () {
         it('correctly places the caret (no prior selection)', function () {
-          InterfaceTests.Tests.setCaretNoSelection(InterfaceTests.TextArea);
+          InterfaceTests.Tests.setCaretNoSelection(InterfaceTests.TextAreaElementTextStore);
         });
 
         it('correctly places the caret (prior selection)', function () {
-          InterfaceTests.Tests.setCaretWithSelection(InterfaceTests.TextArea);
+          InterfaceTests.Tests.setCaretWithSelection(InterfaceTests.TextAreaElementTextStore);
         });
       });
 
       describe('getCaret', function () {
         it('correctly reports the position of the caret (no selection)', function () {
-          InterfaceTests.Tests.getCaretNoSelection(InterfaceTests.TextArea);
+          InterfaceTests.Tests.getCaretNoSelection(InterfaceTests.TextAreaElementTextStore);
         });
 
         it('correctly reports the position of the caret (active selection)', function () {
-          InterfaceTests.Tests.getCaretWithSelection(InterfaceTests.TextArea);
+          InterfaceTests.Tests.getCaretWithSelection(InterfaceTests.TextAreaElementTextStore);
         });
       });
     });
@@ -1124,35 +1124,35 @@ describe('Element Input/Output Interfacing', function () {
     describe('Text Retrieval', function () {
       describe('getText', function () {
         it('correctly returns text (no active selection)', function () {
-          InterfaceTests.Tests.getTextNoSelection(InterfaceTests.TextArea);
+          InterfaceTests.Tests.getTextNoSelection(InterfaceTests.TextAreaElementTextStore);
         });
 
         it('correctly returns text (with active selection)', function () {
-          InterfaceTests.Tests.getTextWithSelection(InterfaceTests.TextArea);
+          InterfaceTests.Tests.getTextWithSelection(InterfaceTests.TextAreaElementTextStore);
         });
       });
 
       describe('getTextBeforeCaret', function () {
         it('correctly returns text (no active selection)', function () {
-          InterfaceTests.Tests.getTextBeforeCaretNoSelection(InterfaceTests.TextArea);
+          InterfaceTests.Tests.getTextBeforeCaretNoSelection(InterfaceTests.TextAreaElementTextStore);
         });
 
         it('correctly returns text (with active selection)', function () {
-          InterfaceTests.Tests.getTextBeforeCaretWithSelection(InterfaceTests.TextArea);
+          InterfaceTests.Tests.getTextBeforeCaretWithSelection(InterfaceTests.TextAreaElementTextStore);
         });
       });
 
       it('getSelectedText', function () {
-        InterfaceTests.Tests.getSelectedText(InterfaceTests.Input);
+        InterfaceTests.Tests.getSelectedText(InterfaceTests.InputElementTextStore);
       });
 
       describe('getTextAfterCaret', function () {
         it('correctly returns text (no active selection)', function () {
-          InterfaceTests.Tests.getTextAfterCaretNoSelection(InterfaceTests.TextArea);
+          InterfaceTests.Tests.getTextAfterCaretNoSelection(InterfaceTests.TextAreaElementTextStore);
         });
 
         it('correctly returns text (with active selection)', function () {
-          InterfaceTests.Tests.getTextAfterCaretWithSelection(InterfaceTests.TextArea);
+          InterfaceTests.Tests.getTextAfterCaretWithSelection(InterfaceTests.TextAreaElementTextStore);
         });
       });
     });
@@ -1160,32 +1160,32 @@ describe('Element Input/Output Interfacing', function () {
     describe('Text Mutation', function () {
       describe('clearSelection', function () {
         it('properly deletes selected text', function () {
-          InterfaceTests.Tests.clearSelection(InterfaceTests.TextArea);
+          InterfaceTests.Tests.clearSelection(InterfaceTests.TextAreaElementTextStore);
         });
       });
 
       describe('deleteCharsBeforeCaret', function () {
         it("correctly deletes characters from 'context' (no active selection)", function () {
-          InterfaceTests.Tests.deleteCharsBeforeCaretNoSelection(InterfaceTests.TextArea);
+          InterfaceTests.Tests.deleteCharsBeforeCaretNoSelection(InterfaceTests.TextAreaElementTextStore);
         });
 
         it("correctly deletes characters from 'context' (with active selection)", function () {
-          InterfaceTests.Tests.deleteCharsBeforeCaretWithSelection(InterfaceTests.TextArea);
+          InterfaceTests.Tests.deleteCharsBeforeCaretWithSelection(InterfaceTests.TextAreaElementTextStore);
         });
       });
 
       describe('insertTextBeforeCaret', function () {
         it("correctly replaces the element's 'context' (no active selection)", function () {
-          InterfaceTests.Tests.insertTextBeforeCaretNoSelection(InterfaceTests.TextArea);
+          InterfaceTests.Tests.insertTextBeforeCaretNoSelection(InterfaceTests.TextAreaElementTextStore);
         });
 
         it("correctly replaces the element's 'context' (with active selection)", function () {
-          InterfaceTests.Tests.insertTextBeforeCaretWithSelection(InterfaceTests.TextArea);
+          InterfaceTests.Tests.insertTextBeforeCaretWithSelection(InterfaceTests.TextAreaElementTextStore);
         });
       });
 
       it('correctly maintains deadkeys', function () {
-        InterfaceTests.Tests.deadkeyMaintenance(InterfaceTests.TextArea);
+        InterfaceTests.Tests.deadkeyMaintenance(InterfaceTests.TextAreaElementTextStore);
       });
     });
   });
@@ -1197,11 +1197,11 @@ describe('Element Input/Output Interfacing', function () {
     describe('Caret Handling', function () {
       describe('hasSelection', function () {
         it('correctly recognizes Selection ownership', function () {
-          InterfaceTests.Tests.getSelectionOwned(InterfaceTests.ContentEditable);
+          InterfaceTests.Tests.getSelectionOwned(InterfaceTests.ContentEditableElementTextStore);
         });
 
         it('correctly rejects lack of Selection ownership', function () {
-          InterfaceTests.Tests.getSelectionUnowned(InterfaceTests.ContentEditable);
+          InterfaceTests.Tests.getSelectionUnowned(InterfaceTests.ContentEditableElementTextStore);
         });
 
         // Need to design a test (and necessary helpers!) for a 'partial ownership rejection' test.
@@ -1211,35 +1211,35 @@ describe('Element Input/Output Interfacing', function () {
     describe('Text Retrieval', function () {
       describe('getText', function () {
         it('correctly returns text (no active selection)', function () {
-          InterfaceTests.Tests.getTextNoSelection(InterfaceTests.ContentEditable);
+          InterfaceTests.Tests.getTextNoSelection(InterfaceTests.ContentEditableElementTextStore);
         });
 
         it('correctly returns text (with active selection)', function () {
-          InterfaceTests.Tests.getTextWithSelection(InterfaceTests.ContentEditable);
+          InterfaceTests.Tests.getTextWithSelection(InterfaceTests.ContentEditableElementTextStore);
         });
       });
 
       describe('getTextBeforeCaret', function () {
         it('correctly returns text (no active selection)', function () {
-          InterfaceTests.Tests.getTextBeforeCaretNoSelection(InterfaceTests.ContentEditable);
+          InterfaceTests.Tests.getTextBeforeCaretNoSelection(InterfaceTests.ContentEditableElementTextStore);
         });
 
         it('correctly returns text (with active selection)', function () {
-          InterfaceTests.Tests.getTextBeforeCaretWithSelection(InterfaceTests.ContentEditable);
+          InterfaceTests.Tests.getTextBeforeCaretWithSelection(InterfaceTests.ContentEditableElementTextStore);
         });
       });
 
       it.skip('getSelectedText', function () { // Not yet properly supported.
-        InterfaceTests.Tests.getSelectedText(InterfaceTests.Input);
+        InterfaceTests.Tests.getSelectedText(InterfaceTests.InputElementTextStore);
       });
 
       describe('getTextAfterCaret', function () {
         it('correctly returns text (no active selection)', function () {
-          InterfaceTests.Tests.getTextAfterCaretNoSelection(InterfaceTests.ContentEditable);
+          InterfaceTests.Tests.getTextAfterCaretNoSelection(InterfaceTests.ContentEditableElementTextStore);
         });
 
         it('correctly returns text (with active selection)', function () {
-          InterfaceTests.Tests.getTextAfterCaretWithSelection(InterfaceTests.ContentEditable);
+          InterfaceTests.Tests.getTextAfterCaretWithSelection(InterfaceTests.ContentEditableElementTextStore);
         });
       });
     });
@@ -1247,32 +1247,32 @@ describe('Element Input/Output Interfacing', function () {
     describe('Text Mutation', function () {
       describe('clearSelection', function () {
         it('properly deletes selected text', function () {
-          InterfaceTests.Tests.clearSelection(InterfaceTests.ContentEditable);
+          InterfaceTests.Tests.clearSelection(InterfaceTests.ContentEditableElementTextStore);
         });
       });
 
       describe('deleteCharsBeforeCaret', function () {
         it("correctly deletes characters from 'context' (no active selection)", function () {
-          InterfaceTests.Tests.deleteCharsBeforeCaretNoSelection(InterfaceTests.ContentEditable);
+          InterfaceTests.Tests.deleteCharsBeforeCaretNoSelection(InterfaceTests.ContentEditableElementTextStore);
         });
 
         it("correctly deletes characters from 'context' (with active selection)", function () {
-          InterfaceTests.Tests.deleteCharsBeforeCaretWithSelection(InterfaceTests.ContentEditable);
+          InterfaceTests.Tests.deleteCharsBeforeCaretWithSelection(InterfaceTests.ContentEditableElementTextStore);
         });
       });
 
       describe('insertTextBeforeCaret', function () {
         it("correctly replaces the element's 'context' (no active selection)", function () {
-          InterfaceTests.Tests.insertTextBeforeCaretNoSelection(InterfaceTests.ContentEditable);
+          InterfaceTests.Tests.insertTextBeforeCaretNoSelection(InterfaceTests.ContentEditableElementTextStore);
         });
 
         it("correctly replaces the element's 'context' (with active selection)", function () {
-          InterfaceTests.Tests.insertTextBeforeCaretWithSelection(InterfaceTests.ContentEditable);
+          InterfaceTests.Tests.insertTextBeforeCaretWithSelection(InterfaceTests.ContentEditableElementTextStore);
         });
       });
 
       it('correctly maintains deadkeys', function () {
-        InterfaceTests.Tests.deadkeyMaintenance(InterfaceTests.ContentEditable);
+        InterfaceTests.Tests.deadkeyMaintenance(InterfaceTests.ContentEditableElementTextStore);
       });
     });
   });
@@ -1288,7 +1288,7 @@ describe('Element Input/Output Interfacing', function () {
     beforeEach(function (done) {
       // Per-test creation of reg. pair and dummy elements, since IFrames are async.
       // Relies on the main-level's renewal of the overall fixture to be processed first.
-      InterfaceTests.DesignIFrame.InitAsyncElements(done);
+      InterfaceTests.DesignIFrameElementTextStore.InitAsyncElements(done);
     });
 
     /**
@@ -1299,11 +1299,11 @@ describe('Element Input/Output Interfacing', function () {
     // describe.skip('Caret Handling', function() {
     //   describe('hasSelection', function() {
     //     it('correctly recognizes Selection ownership', function () {
-    //       InterfaceTests.Tests.getSelectionOwned(InterfaceTests.DesignIFrame);
+    //       InterfaceTests.Tests.getSelectionOwned(InterfaceTests.DesignIFrameElementTextStore);
     //     });
 
     //     it('correctly rejects lack of Selection ownership', function () {
-    //       InterfaceTests.Tests.getSelectionUnowned(InterfaceTests.DesignIFrame);
+    //       InterfaceTests.Tests.getSelectionUnowned(InterfaceTests.DesignIFrameElementTextStore);
     //     });
 
     //     // Need to design a test (and necessary helpers!) for a 'partial ownership rejection' test.
@@ -1313,35 +1313,35 @@ describe('Element Input/Output Interfacing', function () {
     describe('Text Retrieval', function () {
       describe('getText', function () {
         it('correctly returns text (no active selection)', function () {
-          InterfaceTests.Tests.getTextNoSelection(InterfaceTests.DesignIFrame);
+          InterfaceTests.Tests.getTextNoSelection(InterfaceTests.DesignIFrameElementTextStore);
         });
 
         it('correctly returns text (with active selection)', function () {
-          InterfaceTests.Tests.getTextWithSelection(InterfaceTests.DesignIFrame);
+          InterfaceTests.Tests.getTextWithSelection(InterfaceTests.DesignIFrameElementTextStore);
         });
       });
 
       describe('getTextBeforeCaret', function () {
         it('correctly returns text (no active selection)', function () {
-          InterfaceTests.Tests.getTextBeforeCaretNoSelection(InterfaceTests.DesignIFrame);
+          InterfaceTests.Tests.getTextBeforeCaretNoSelection(InterfaceTests.DesignIFrameElementTextStore);
         });
 
         it('correctly returns text (with active selection)', function () {
-          InterfaceTests.Tests.getTextBeforeCaretWithSelection(InterfaceTests.DesignIFrame);
+          InterfaceTests.Tests.getTextBeforeCaretWithSelection(InterfaceTests.DesignIFrameElementTextStore);
         });
       });
 
       it.skip('getSelectedText', function () { // Not yet properly supported.
-        InterfaceTests.Tests.getSelectedText(InterfaceTests.Input);
+        InterfaceTests.Tests.getSelectedText(InterfaceTests.InputElementTextStore);
       });
 
       describe('getTextAfterCaret', function () {
         it('correctly returns text (no active selection)', function () {
-          InterfaceTests.Tests.getTextAfterCaretNoSelection(InterfaceTests.DesignIFrame);
+          InterfaceTests.Tests.getTextAfterCaretNoSelection(InterfaceTests.DesignIFrameElementTextStore);
         });
 
         it('correctly returns text (with active selection)', function () {
-          InterfaceTests.Tests.getTextAfterCaretWithSelection(InterfaceTests.DesignIFrame);
+          InterfaceTests.Tests.getTextAfterCaretWithSelection(InterfaceTests.DesignIFrameElementTextStore);
         });
       });
     });
@@ -1349,32 +1349,32 @@ describe('Element Input/Output Interfacing', function () {
     describe('Text Mutation', function () {
       describe('clearSelection', function () {
         it('properly deletes selected text', function () {
-          InterfaceTests.Tests.clearSelection(InterfaceTests.DesignIFrame);
+          InterfaceTests.Tests.clearSelection(InterfaceTests.DesignIFrameElementTextStore);
         });
       });
 
       describe('deleteCharsBeforeCaret', function () {
         it("correctly deletes characters from 'context' (no active selection)", function () {
-          InterfaceTests.Tests.deleteCharsBeforeCaretNoSelection(InterfaceTests.DesignIFrame);
+          InterfaceTests.Tests.deleteCharsBeforeCaretNoSelection(InterfaceTests.DesignIFrameElementTextStore);
         });
 
         it("correctly deletes characters from 'context' (with active selection)", function () {
-          InterfaceTests.Tests.deleteCharsBeforeCaretWithSelection(InterfaceTests.DesignIFrame);
+          InterfaceTests.Tests.deleteCharsBeforeCaretWithSelection(InterfaceTests.DesignIFrameElementTextStore);
         });
       });
 
       describe('insertTextBeforeCaret', function () {
         it("correctly replaces the element's 'context' (no active selection)", function () {
-          InterfaceTests.Tests.insertTextBeforeCaretNoSelection(InterfaceTests.DesignIFrame);
+          InterfaceTests.Tests.insertTextBeforeCaretNoSelection(InterfaceTests.DesignIFrameElementTextStore);
         });
 
         it("correctly replaces the element's 'context' (with active selection)", function () {
-          InterfaceTests.Tests.insertTextBeforeCaretWithSelection(InterfaceTests.DesignIFrame);
+          InterfaceTests.Tests.insertTextBeforeCaretWithSelection(InterfaceTests.DesignIFrameElementTextStore);
         });
       });
 
       it('correctly maintains deadkeys', function () {
-        InterfaceTests.Tests.deadkeyMaintenance(InterfaceTests.DesignIFrame);
+        InterfaceTests.Tests.deadkeyMaintenance(InterfaceTests.DesignIFrameElementTextStore);
       });
     });
   });
diff --git a/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts b/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts
index ea5cb7c7310..9932d8eff50 100644
--- a/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts
+++ b/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 
 import { KMWString, SyntheticTextStore } from 'keyman/engine/keyboard';
-import { Input } from 'keyman/engine/element-text-stores';
+import { InputElementTextStore } from 'keyman/engine/element-text-stores';
 
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
 
@@ -24,11 +24,11 @@ class MockTests {
     { d: 0, p: 3 }   // After the normal 'p' character of Apple.mixed.
   ];
 
-  //#region Defines helpers related to HTMLInputElement / Input test setup.
+  //#region Defines helpers related to HTMLInputElement / InputElementTextStore test setup.
   public static initBase() {
     const elem = document.createElement('input');
     host.appendChild(elem);
-    const wrapper = new Input(elem);
+    const wrapper = new InputElementTextStore(elem);
 
     return wrapper;
   }

From f5ee9a46a24471a123b41f5ec1f80621acb88ed3 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 4 Nov 2025 15:48:16 +0100
Subject: [PATCH 110/254] =?UTF-8?q?refactor(web):=20rename=20`OutputTarget?=
 =?UTF-8?q?Stub`=20=E2=86=92=20`TextStoreStub`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/web/types/src/keyboard-object.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/web/types/src/keyboard-object.ts b/common/web/types/src/keyboard-object.ts
index 96992e203e3..3ce697ef4b1 100644
--- a/common/web/types/src/keyboard-object.ts
+++ b/common/web/types/src/keyboard-object.ts
@@ -9,7 +9,7 @@ export type ComplexKeyboardStore = (string | { t: 'd', d: number } | { ['t']: 'b
 type KeyEventStub = {};
 
 // A stub for TextStore which is properly defined in KeymanWeb
-type OutputTargetStub = {};
+type TextStoreStub = {};
 
 export interface EncodedVisualKeyboard {
   /** Represents CSS font styling to use for VisualKeyboard text */
@@ -47,7 +47,7 @@ export type KeyboardObject = {
    * @param keystroke     The full, pre-processed keystroke triggering
    * keyboard-rule application.
    */
-  gs(textStore: OutputTargetStub, keystroke: KeyEventStub): boolean;
+  gs(textStore: TextStoreStub, keystroke: KeyEventStub): boolean;
 
   /**
    * group-newcontext:  the function triggering processing for the keyboard's
@@ -56,7 +56,7 @@ export type KeyboardObject = {
    * @param textStore  The new context to be used with future keystrokes
    * @param keystroke     A 'null' `KeyEvent` providing current modifier + state information.
    */
-  gn?(textStore: OutputTargetStub, keystroke: KeyEventStub): boolean;
+  gn?(textStore: TextStoreStub, keystroke: KeyEventStub): boolean;
 
   /**
    * group-postkeystroke:  the function triggering processing for the keyboard's
@@ -67,7 +67,7 @@ export type KeyboardObject = {
    * applied.
    * @param keystroke     A 'null' `KeyEvent` providing current modifier + state information.
    */
-  gpk?(textStore: OutputTargetStub, keystroke: KeyEventStub): boolean;
+  gpk?(textStore: TextStoreStub, keystroke: KeyEventStub): boolean;
 
   /**
    * Keyboard ID:  the uniquely-identifying name for this keyboard.  Includes the standard
@@ -175,6 +175,6 @@ export type KeyboardObject = {
    * @param       {number}    _PData        1 or 0
    * @returns
    */
-  KNS?: (_PCommand: number, _PTarget: OutputTargetStub, _PData: number) => void;
+  KNS?: (_PCommand: number, _PTarget: TextStoreStub, _PData: number) => void;
 } & Record<`s${number}`, string>
 

From a82ebe8f971bede962b73e39434be6747e8e8507 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 4 Nov 2025 15:52:35 +0100
Subject: [PATCH 111/254] refactor(web): rename file
 `outputTargetElementWrapper.ts`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rename outputTargetElementWrapper.ts → abstractElementTextStore.ts.
---
 ...utputTargetElementWrapper.ts => abstractElementTextStore.ts} | 0
 .../element-text-stores/src/contentEditableElementTextStore.ts  | 2 +-
 .../element-text-stores/src/designIFrameElementTextStore.ts     | 2 +-
 web/src/engine/element-text-stores/src/index.ts                 | 2 +-
 web/src/engine/element-text-stores/src/inputElementTextStore.ts | 2 +-
 .../engine/element-text-stores/src/textAreaElementTextStore.ts  | 2 +-
 web/src/engine/element-text-stores/src/wrapElement.ts           | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename web/src/engine/element-text-stores/src/{outputTargetElementWrapper.ts => abstractElementTextStore.ts} (100%)

diff --git a/web/src/engine/element-text-stores/src/outputTargetElementWrapper.ts b/web/src/engine/element-text-stores/src/abstractElementTextStore.ts
similarity index 100%
rename from web/src/engine/element-text-stores/src/outputTargetElementWrapper.ts
rename to web/src/engine/element-text-stores/src/abstractElementTextStore.ts
diff --git a/web/src/engine/element-text-stores/src/contentEditableElementTextStore.ts b/web/src/engine/element-text-stores/src/contentEditableElementTextStore.ts
index 4d470f230d4..bd2aebcf1f8 100644
--- a/web/src/engine/element-text-stores/src/contentEditableElementTextStore.ts
+++ b/web/src/engine/element-text-stores/src/contentEditableElementTextStore.ts
@@ -1,4 +1,4 @@
-import { AbstractElementTextStore } from './outputTargetElementWrapper.js';
+import { AbstractElementTextStore } from './abstractElementTextStore.js';
 import { KMWString } from '@keymanapp/web-utils';
 
 class SelectionCaret {
diff --git a/web/src/engine/element-text-stores/src/designIFrameElementTextStore.ts b/web/src/engine/element-text-stores/src/designIFrameElementTextStore.ts
index 65ffa468359..e9a0fc1eff8 100644
--- a/web/src/engine/element-text-stores/src/designIFrameElementTextStore.ts
+++ b/web/src/engine/element-text-stores/src/designIFrameElementTextStore.ts
@@ -1,4 +1,4 @@
-import { AbstractElementTextStore } from './outputTargetElementWrapper.js';
+import { AbstractElementTextStore } from './abstractElementTextStore.js';
 import { KMWString } from '@keymanapp/web-utils';
 
 class SelectionCaret {
diff --git a/web/src/engine/element-text-stores/src/index.ts b/web/src/engine/element-text-stores/src/index.ts
index fab6323bce0..3e8173c6111 100644
--- a/web/src/engine/element-text-stores/src/index.ts
+++ b/web/src/engine/element-text-stores/src/index.ts
@@ -2,6 +2,6 @@ export { wrapElement } from './wrapElement.js';
 export { ContentEditableElementTextStore } from './contentEditableElementTextStore.js';
 export { DesignIFrameElementTextStore } from './designIFrameElementTextStore.js';
 export { InputElementTextStore } from './inputElementTextStore.js';
-export { AbstractElementTextStore } from './outputTargetElementWrapper.js';
+export { AbstractElementTextStore } from './abstractElementTextStore.js';
 export { TextAreaElementTextStore } from './textAreaElementTextStore.js';
 export { nestedInstanceOf } from './utils.js';
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/src/inputElementTextStore.ts b/web/src/engine/element-text-stores/src/inputElementTextStore.ts
index bd86e75e055..24235626ed8 100644
--- a/web/src/engine/element-text-stores/src/inputElementTextStore.ts
+++ b/web/src/engine/element-text-stores/src/inputElementTextStore.ts
@@ -1,4 +1,4 @@
-import { AbstractElementTextStore } from './outputTargetElementWrapper.js';
+import { AbstractElementTextStore } from './abstractElementTextStore.js';
 import { KMWString } from '@keymanapp/web-utils';
 
 interface EventMap  {
diff --git a/web/src/engine/element-text-stores/src/textAreaElementTextStore.ts b/web/src/engine/element-text-stores/src/textAreaElementTextStore.ts
index 46b753b262f..02423b261d4 100644
--- a/web/src/engine/element-text-stores/src/textAreaElementTextStore.ts
+++ b/web/src/engine/element-text-stores/src/textAreaElementTextStore.ts
@@ -1,4 +1,4 @@
-import { AbstractElementTextStore } from './outputTargetElementWrapper.js';
+import { AbstractElementTextStore } from './abstractElementTextStore.js';
 import { KMWString } from '@keymanapp/web-utils';
 
 export class TextAreaElementTextStore extends AbstractElementTextStore<{}> {
diff --git a/web/src/engine/element-text-stores/src/wrapElement.ts b/web/src/engine/element-text-stores/src/wrapElement.ts
index a4dbe019642..07e2cd6e7fd 100644
--- a/web/src/engine/element-text-stores/src/wrapElement.ts
+++ b/web/src/engine/element-text-stores/src/wrapElement.ts
@@ -1,4 +1,4 @@
-import { type AbstractElementTextStore }  from './outputTargetElementWrapper.js';
+import { type AbstractElementTextStore }  from './abstractElementTextStore.js';
 import { InputElementTextStore } from './inputElementTextStore.js';
 import { TextAreaElementTextStore } from './textAreaElementTextStore.js';
 import { DesignIFrameElementTextStore } from './designIFrameElementTextStore.js';

From 2997650f5a23f3d2fec6e3748452c4aaec967503 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 4 Nov 2025 16:11:15 +0100
Subject: [PATCH 112/254] refactor(web): remove `DOMOutputTarget` aliasing

---
 web/src/app/browser/src/configuration.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/app/browser/src/configuration.ts b/web/src/app/browser/src/configuration.ts
index d6b73dd0139..3d1f0c0b22f 100644
--- a/web/src/app/browser/src/configuration.ts
+++ b/web/src/app/browser/src/configuration.ts
@@ -1,6 +1,6 @@
 import { EngineConfiguration, InitOptionSpec, InitOptionDefaults } from "keyman/engine/main";
 
-import { AbstractElementTextStore as DOMOutputTarget } from 'keyman/engine/element-text-stores';
+import { AbstractElementTextStore } from 'keyman/engine/element-text-stores';
 import { TextStore, ProcessorAction } from 'keyman/engine/keyboard';
 import { isEmptyTransform } from '@keymanapp/web-utils';
 import { AlertHost } from "./utils/alertHost.js";
@@ -72,7 +72,7 @@ export class BrowserConfiguration extends EngineConfiguration {
     // If the transform isn't empty, we've changed text - which should produce a 'changed' event in the DOM.
     const ruleTransform = ruleBehavior.transcription.transform;
     if(!isEmptyTransform(ruleTransform)) {
-      if(textStore instanceof DOMOutputTarget) {
+      if (textStore instanceof AbstractElementTextStore) {
         textStore.changed = true;
       }
     }

From 07aa9e7af814ac63278e893b87ce6e90d702095f Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 4 Nov 2025 16:13:04 +0100
Subject: [PATCH 113/254] refactor(web): rename `eventOutputTarget` and
 `outputTargetForElement`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Rename `eventOutputTarget` → `textStoreForEvent`
- Rename `outputTargetForElement` → `textStoreForElement`
---
 web/build.sh                                  |  4 +-
 web/src/app/browser/src/contextManager.ts     |  8 ++--
 .../app/browser/src/hardwareEventKeyboard.ts  | 14 +++----
 web/src/app/browser/src/keymanEngine.ts       |  8 ++--
 web/src/engine/attachment/src/index.ts        |  3 +-
 ...etForElement.ts => textStoreForElement.ts} | 13 +------
 .../attachment/src/textStoreForEvent.ts       | 13 +++++++
 ...ment.def.ts => textStoreForElement.def.ts} | 38 +++++++++----------
 ...ts.html => textStoreForElement.tests.html} |  2 +-
 .../dom/cases/browser/contextManager.tests.ts | 16 ++++----
 web/src/tools/testing/recorder/scribe.ts      |  8 ++--
 11 files changed, 65 insertions(+), 62 deletions(-)
 rename web/src/engine/attachment/src/{outputTargetForElement.ts => textStoreForElement.ts} (74%)
 create mode 100644 web/src/engine/attachment/src/textStoreForEvent.ts
 rename web/src/test/auto/dom/cases/attachment/{outputTargetForElement.def.ts => textStoreForElement.def.ts} (87%)
 rename web/src/test/auto/dom/cases/attachment/{outputTargetForElement.tests.html => textStoreForElement.tests.html} (91%)

diff --git a/web/build.sh b/web/build.sh
index 8f2c7984ede..73f7a6399f2 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -57,7 +57,7 @@ fi
 
 builder_describe_outputs \
   configure                        "/node_modules" \
-  build                            "/web/build/test/dom/cases/attachment/outputTargetForElement.tests.html" \
+  build                            "/web/build/test/dom/cases/attachment/textStoreForElement.tests.html" \
   build:app/browser                "/web/build/app/browser/lib/index.mjs" \
   build:app/webview                "/web/build/app/webview/${config}/keymanweb-webview.js" \
   build:app/ui                     "/web/build/app/ui/${config}/kmwuitoggle.js" \
@@ -136,7 +136,7 @@ build_action() {
     precompile "${dir}"
   done
 
-  cp "${KEYMAN_ROOT}/web/src/test/auto/dom/cases/attachment/outputTargetForElement.tests.html" \
+  cp "${KEYMAN_ROOT}/web/src/test/auto/dom/cases/attachment/textStoreForElement.tests.html" \
     "${KEYMAN_ROOT}/web/build/test/dom/cases/attachment/"
 }
 
diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index 5cee5fc5234..2e8ebfebaa5 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -1,7 +1,7 @@
 import { JSKeyboard, type Keyboard, KeyboardScriptError } from 'keyman/engine/keyboard';
 import { type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { CookieSerializer } from 'keyman/engine/dom-utils';
-import { eventOutputTarget, outputTargetForElement, PageContextAttachment } from 'keyman/engine/attachment';
+import { textStoreForEvent, textStoreForElement, PageContextAttachment } from 'keyman/engine/attachment';
 import { DomEventTracker, LegacyEventEmitter } from 'keyman/engine/events';
 import { DesignIFrameElementTextStore, AbstractElementTextStore, nestedInstanceOf } from 'keyman/engine/element-text-stores';
 import {
@@ -126,7 +126,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
         }
 
         if(elem.ownerDocument.activeElement == elem) {
-          this.setActiveTarget(outputTargetForElement(elem), true);
+          this.setActiveTarget(textStoreForElement(elem), true);
         }
       });
 
@@ -643,7 +643,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
    */
   _ControlFocus = (e: FocusEvent): boolean => {
     // Step 1: determine the corresponding TextStore instance.
-    const target = eventOutputTarget(e);
+    const target = textStoreForEvent(e);
     if(!target) {
       // Probably should also make a warning or error?
       return true;
@@ -686,7 +686,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     }
 
     // Step 1: determine the corresponding TextStore instance.
-    const target = eventOutputTarget(e);
+    const target = textStoreForEvent(e);
     if (target == null) {
       return true;
     }
diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts
index 2516d2cd5b1..1ce88937449 100644
--- a/web/src/app/browser/src/hardwareEventKeyboard.ts
+++ b/web/src/app/browser/src/hardwareEventKeyboard.ts
@@ -5,7 +5,7 @@ import { ModifierKeyConstants } from '@keymanapp/common-types';
 import { HardKeyboardBase, processForMnemonicsAndLegacy } from 'keyman/engine/main';
 import { DomEventTracker } from 'keyman/engine/events';
 import { DesignIFrameElementTextStore, nestedInstanceOf } from 'keyman/engine/element-text-stores';
-import { eventOutputTarget, outputTargetForElement } from 'keyman/engine/attachment';
+import { textStoreForEvent, textStoreForElement } from 'keyman/engine/attachment';
 
 import ContextManager from './contextManager.js';
 
@@ -235,7 +235,7 @@ export default class HardwareEventKeyboard extends HardKeyboardBase {
     const eventTracker = this.domEventTracker;
 
     page.on('enabled', (Pelem) => {
-      const target = outputTargetForElement(Pelem);
+      const target = textStoreForElement(Pelem);
 
       if(!(target instanceof DesignIFrameElementTextStore)) {
         // These need to be on the actual input element, as otherwise the keyboard will disappear on touch.
@@ -251,7 +251,7 @@ export default class HardwareEventKeyboard extends HardKeyboardBase {
     });
 
     page.on('disabled', (Pelem) => {
-      const target = outputTargetForElement(Pelem);
+      const target = textStoreForElement(Pelem);
 
       if(!(target instanceof DesignIFrameElementTextStore)) {
         eventTracker.detachDOMEvent(Pelem, 'keypress', this._KeyPress);
@@ -277,7 +277,7 @@ export default class HardwareEventKeyboard extends HardKeyboardBase {
    */
   _KeyDown: (e: KeyboardEvent) => boolean = (e) => {
     const activeKeyboard = this.contextManager.activeKeyboard;
-    const target = eventOutputTarget(e);
+    const target = textStoreForEvent(e);
 
     if(!target || activeKeyboard == null) {
       return true;
@@ -298,7 +298,7 @@ export default class HardwareEventKeyboard extends HardKeyboardBase {
    * Description Processes keypress event (does not pass data to keyboard)
    */
   _KeyPress: (e: KeyboardEvent) => boolean = (e) => {
-    const target = eventOutputTarget(e);
+    const target = textStoreForEvent(e);
     if(!target || this.contextManager.activeKeyboard?.keyboard == null) {
       return true;
     }
@@ -312,7 +312,7 @@ export default class HardwareEventKeyboard extends HardKeyboardBase {
    * Description Processes keyup event and passes event data to keyboard
    */
   _KeyUp: (e: KeyboardEvent) => boolean = (e) => {
-    const target = eventOutputTarget(e);
+    const target = textStoreForEvent(e);
     const Levent = preprocessKeyboardEvent(e, this.processor, this.hardDevice);
     if(Levent == null || target == null) {
       return true;
@@ -399,7 +399,7 @@ export default class HardwareEventKeyboard extends HardKeyboardBase {
       return true;
     }
 
-    const textStore = eventOutputTarget(e);
+    const textStore = textStoreForEvent(e);
     return this.processor.doModifierPress(Levent, textStore, false);
   }
 
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 45166e563ed..a0b97228784 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -20,7 +20,7 @@ import { PageIntegrationHandlers } from './context/pageIntegrationHandlers.js';
 import { LanguageMenu } from './languageMenu.js';
 import { setupOskListeners } from './oskConfiguration.js';
 import { whenDocumentReady } from './utils/documentReady.js';
-import { outputTargetForElement } from 'keyman/engine/attachment';
+import { textStoreForElement } from 'keyman/engine/attachment';
 
 import { UtilApiEndpoint} from './utilApiEndpoint.js';
 import { UIModule } from './uiModuleInterface.js';
@@ -315,7 +315,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
    * See https://help.keyman.com/developer/engine/web/current-version/reference/core/getKeyboardForControl
    */
   public getKeyboardForControl(Pelem: HTMLElement) {
-    const target = outputTargetForElement(Pelem);
+    const target = textStoreForElement(Pelem);
     return this.contextManager.getKeyboardStubForTarget(target).id;
   }
 
@@ -329,7 +329,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
    *              If it is currently following the global keyboard setting, returns null instead.
    */
   getLanguageForControl(Pelem: HTMLElement) {
-    const target = outputTargetForElement(Pelem);
+    const target = textStoreForElement(Pelem);
     return this.contextManager.getKeyboardStubForTarget(target).langId;
   }
 
@@ -570,7 +570,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
       }
     }
 
-    const target = outputTargetForElement(e);
+    const target = textStoreForElement(e);
     if(!target) {
       throw new Error(`KMW is not attached to the specified element (id: ${e.id}).`);
     }
diff --git a/web/src/engine/attachment/src/index.ts b/web/src/engine/attachment/src/index.ts
index cb0fc518712..a8386b5200f 100644
--- a/web/src/engine/attachment/src/index.ts
+++ b/web/src/engine/attachment/src/index.ts
@@ -5,7 +5,8 @@ export { AttachmentInfo } from './attachmentInfo.js';
  * to match that of the actual objects within the browser when bundled, the
  * **same bundle** must contain reference points for those classes' definitions.
  */
-export { eventOutputTarget, outputTargetForElement } from './outputTargetForElement.js';
+export { textStoreForElement } from './textStoreForElement.js';
+export { textStoreForEvent } from './textStoreForEvent.js';
 export { PageContextAttachment, PageAttachmentOptions } from './pageContextAttachment.js';
 
 /*
diff --git a/web/src/engine/attachment/src/outputTargetForElement.ts b/web/src/engine/attachment/src/textStoreForElement.ts
similarity index 74%
rename from web/src/engine/attachment/src/outputTargetForElement.ts
rename to web/src/engine/attachment/src/textStoreForElement.ts
index 10bb5ac5b0d..a6abca02614 100644
--- a/web/src/engine/attachment/src/outputTargetForElement.ts
+++ b/web/src/engine/attachment/src/textStoreForElement.ts
@@ -6,18 +6,7 @@ import { nestedInstanceOf } from "keyman/engine/element-text-stores";
  * @param e
  * @returns
  */
-export function eventOutputTarget(e: Event) {
-  const Ltarg: HTMLElement = e?.target as HTMLElement;
-  return outputTargetForElement(Ltarg);
-}
-
-/**
- * Given a DOM event related to an KMW-attached element, this function determines
- * the corresponding TextStore.
- * @param e
- * @returns
- */
-export function outputTargetForElement(Ltarg: HTMLElement) {
+export function textStoreForElement(Ltarg: HTMLElement) {
   if (Ltarg == null) {
     return null;
   }
diff --git a/web/src/engine/attachment/src/textStoreForEvent.ts b/web/src/engine/attachment/src/textStoreForEvent.ts
new file mode 100644
index 00000000000..726d5441b96
--- /dev/null
+++ b/web/src/engine/attachment/src/textStoreForEvent.ts
@@ -0,0 +1,13 @@
+import { textStoreForElement } from './textStoreForElement.js';
+
+/**
+ * Given a DOM event related to an KMW-attached element, this function determines
+ * the corresponding TextStore.
+ * @param e
+ * @returns
+ */
+
+export function textStoreForEvent(e: Event) {
+  const Ltarg: HTMLElement = e?.target as HTMLElement;
+  return textStoreForElement(Ltarg);
+}
diff --git a/web/src/test/auto/dom/cases/attachment/outputTargetForElement.def.ts b/web/src/test/auto/dom/cases/attachment/textStoreForElement.def.ts
similarity index 87%
rename from web/src/test/auto/dom/cases/attachment/outputTargetForElement.def.ts
rename to web/src/test/auto/dom/cases/attachment/textStoreForElement.def.ts
index 0f67806bcba..46aef0aef61 100644
--- a/web/src/test/auto/dom/cases/attachment/outputTargetForElement.def.ts
+++ b/web/src/test/auto/dom/cases/attachment/textStoreForElement.def.ts
@@ -5,8 +5,8 @@ import {
   InputElementTextStore,
   TextAreaElementTextStore,
 
-  eventOutputTarget,
-  outputTargetForElement,
+  textStoreForEvent,
+  textStoreForElement,
   PageContextAttachment,
   PageAttachmentOptions,
 } from 'keyman/engine/attachment';
@@ -42,7 +42,7 @@ function promiseForIframeLoad(iframe: HTMLIFrameElement) {
   }
 }
 
-describe('outputTargetForElement()', function () {
+describe('textStoreForElement()', function () {
   this.timeout(DEFAULT_BROWSER_TIMEOUT);
 
   before(async function() {
@@ -67,7 +67,7 @@ describe('outputTargetForElement()', function () {
 
     it('<input> => InputElementTextStore', () => {
       const inputElement = document.getElementById('input');
-      const inputTarget = outputTargetForElement(inputElement);
+      const inputTarget = textStoreForElement(inputElement);
 
       assert.isTrue(inputTarget instanceof InputElementTextStore);
     });
@@ -75,28 +75,28 @@ describe('outputTargetForElement()', function () {
     it('<iframe>.<input> => InputElementTextStore', async () => {
       const iframe = document.getElementById('iframe') as HTMLIFrameElement;
       const iframeInput = iframe.contentDocument.getElementById('iframe-input');
-      const inputTarget = outputTargetForElement(iframeInput);
+      const inputTarget = textStoreForElement(iframeInput);
 
       assert.isTrue(inputTarget instanceof InputElementTextStore);
     });
 
     it('<textarea> => TextAreaElementTextStore', () => {
       const textElement = document.getElementById('textarea');
-      const textTarget = outputTargetForElement(textElement);
+      const textTarget = textStoreForElement(textElement);
 
       assert.isTrue(textTarget instanceof TextAreaElementTextStore);
     });
 
     it('<iframe>.#doc.designMode = "on" => DesignIFrameElementTextStore', () => {
       const designElement = document.getElementById('design-iframe');
-      const designTarget = outputTargetForElement(designElement);
+      const designTarget = textStoreForElement(designElement);
 
       assert.isTrue(designTarget instanceof DesignIFrameElementTextStore);
     });
 
     it('<div contenteditable="true"/> => ContentEditableElementTextStore', () => {
       const divElement = document.getElementById('editable');
-      const divTarget = outputTargetForElement(divElement);
+      const divTarget = textStoreForElement(divElement);
 
       assert.isTrue(divTarget instanceof ContentEditableElementTextStore);
     });
@@ -108,20 +108,20 @@ describe('outputTargetForElement()', function () {
 
     it('DesignIFrameElementTextStore: from .contentDocument.body', () => {
       const designElement = document.getElementById('design-iframe') as HTMLIFrameElement;
-      const designTarget = outputTargetForElement(designElement.contentDocument.body);
+      const designTarget = textStoreForElement(designElement.contentDocument.body);
 
       assert.isTrue(designTarget instanceof DesignIFrameElementTextStore);
       assert.strictEqual(designTarget.getElement(), designElement);
-      assert.strictEqual(designTarget, outputTargetForElement(designElement));
+      assert.strictEqual(designTarget, textStoreForElement(designElement));
     });
 
     it('DesignIFrameElementTextStore: from .contentDocument', () => {
       const designElement = document.getElementById('design-iframe') as HTMLIFrameElement;
-      const designTarget = outputTargetForElement(designElement.contentDocument as any as HTMLElement);
+      const designTarget = textStoreForElement(designElement.contentDocument as any as HTMLElement);
 
       assert.isTrue(designTarget instanceof DesignIFrameElementTextStore);
       assert.strictEqual(designTarget.getElement(), designElement);
-      assert.strictEqual(designTarget, outputTargetForElement(designElement));
+      assert.strictEqual(designTarget, textStoreForElement(designElement));
     });
 
     it('ContentEditableElementTextStore: from direct #text child', () => {
@@ -131,16 +131,16 @@ describe('outputTargetForElement()', function () {
       // Text node!  Corresponds to a `// defeat Safari bug` comment in the codebase.
       assert.equal(textNode.nodeType, 3);
 
-      const divTarget = outputTargetForElement(textNode);
+      const divTarget = textStoreForElement(textNode);
 
       assert.isTrue(divTarget instanceof ContentEditableElementTextStore);
       assert.strictEqual(divTarget.getElement(), divElement);
-      assert.strictEqual(divTarget, outputTargetForElement(divElement));
+      assert.strictEqual(divTarget, textStoreForElement(divElement));
     });
   });
 });
 
-describe('eventOutputTarget()', function () {
+describe('textStoreForEvent()', function () {
   this.timeout(DEFAULT_BROWSER_TIMEOUT);
 
   before(async function() {
@@ -178,7 +178,7 @@ describe('eventOutputTarget()', function () {
       inputElement.removeEventListener('keydown', fake);
     }
 
-    const inputTarget = outputTargetForElement(inputElement);
+    const inputTarget = textStoreForElement(inputElement);
 
     assert.isTrue(inputTarget instanceof InputElementTextStore);
   });
@@ -200,7 +200,7 @@ describe('eventOutputTarget()', function () {
       textElement.blur();
     }
 
-    const textTarget = eventOutputTarget(fake.firstCall.args[0]);
+    const textTarget = textStoreForEvent(fake.firstCall.args[0]);
 
     assert.isTrue(textTarget instanceof TextAreaElementTextStore);
   });
@@ -220,7 +220,7 @@ describe('eventOutputTarget()', function () {
       designElement.contentDocument.removeEventListener('focus', fake, true);
     }
 
-    const designTarget = eventOutputTarget(fake.firstCall.args[0]);
+    const designTarget = textStoreForEvent(fake.firstCall.args[0]);
 
     assert.isTrue(designTarget instanceof DesignIFrameElementTextStore);
   });
@@ -245,7 +245,7 @@ describe('eventOutputTarget()', function () {
       divElement.removeEventListener('keydown', fake);
     }
 
-    const divTarget = outputTargetForElement(divElement);
+    const divTarget = textStoreForElement(divElement);
 
     assert.isTrue(divTarget instanceof ContentEditableElementTextStore);
   });
diff --git a/web/src/test/auto/dom/cases/attachment/outputTargetForElement.tests.html b/web/src/test/auto/dom/cases/attachment/textStoreForElement.tests.html
similarity index 91%
rename from web/src/test/auto/dom/cases/attachment/outputTargetForElement.tests.html
rename to web/src/test/auto/dom/cases/attachment/textStoreForElement.tests.html
index c58095bb426..98e5f66ce14 100644
--- a/web/src/test/auto/dom/cases/attachment/outputTargetForElement.tests.html
+++ b/web/src/test/auto/dom/cases/attachment/textStoreForElement.tests.html
@@ -4,7 +4,7 @@
       import { runTests } from '@web/test-runner-mocha';
 
       runTests(async() => {
-        await import('./outputTargetForElement.def.mjs');
+        await import('./textStoreForElement.def.mjs');
       });
     </script>
   </head>
diff --git a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
index 154ea8d15be..f85ec181c7b 100644
--- a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
+++ b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
@@ -1,6 +1,6 @@
 import { ContextManager } from 'keyman/app/browser';
 import {
-  outputTargetForElement
+  textStoreForElement
 } from 'keyman/engine/attachment';
 import { LegacyEventEmitter } from 'keyman/engine/events';
 import { StubAndKeyboardCache, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage';
@@ -862,7 +862,7 @@ describe('app/browser:  ContextManager', function () {
         contextManager.on('keyboardchange', keyboardchange);
 
         const textarea = document.getElementById('textarea');
-        const target = outputTargetForElement(textarea);
+        const target = textStoreForElement(textarea);
         contextManager.setKeyboardForTarget(target, 'lao_2008_basic', 'lo');
 
         // As we haven't yet focused the affected target, no keyboard-change events should have triggered yet.
@@ -908,7 +908,7 @@ describe('app/browser:  ContextManager', function () {
         await contextManager.activateKeyboard('khmer_angkor', 'km');
 
         const textarea = document.getElementById('textarea');
-        const target = outputTargetForElement(textarea);
+        const target = textStoreForElement(textarea);
         contextManager.setKeyboardForTarget(target, 'lao_2008_basic', 'lo');
         dispatchFocus('focus', textarea);
 
@@ -949,7 +949,7 @@ describe('app/browser:  ContextManager', function () {
         await contextManager.activateKeyboard('khmer_angkor', 'km');
 
         const textarea = document.getElementById('textarea');
-        const target = outputTargetForElement(textarea);
+        const target = textStoreForElement(textarea);
         contextManager.setKeyboardForTarget(target, 'lao_2008_basic', 'lo');
         dispatchFocus('focus', textarea);
 
@@ -998,7 +998,7 @@ describe('app/browser:  ContextManager', function () {
         await contextManager.activateKeyboard('khmer_angkor', 'km');
 
         const textarea = document.getElementById('textarea');
-        const target = outputTargetForElement(textarea);
+        const target = textStoreForElement(textarea);
         contextManager.setKeyboardForTarget(target, 'lao_2008_basic', 'lo');
         dispatchFocus('focus', textarea);
 
@@ -1035,7 +1035,7 @@ describe('app/browser:  ContextManager', function () {
         await contextManager.activateKeyboard('khmer_angkor', 'km');
 
         const textarea = document.getElementById('textarea');
-        const target = outputTargetForElement(textarea);
+        const target = textStoreForElement(textarea);
         contextManager.setKeyboardForTarget(target, 'lao_2008_basic', 'lo');
         dispatchFocus('focus', textarea);
 
@@ -1085,7 +1085,7 @@ describe('app/browser:  ContextManager', function () {
         await contextManager.activateKeyboard('khmer_angkor', 'km');
 
         const textarea = document.getElementById('textarea');
-        const target = outputTargetForElement(textarea);
+        const target = textStoreForElement(textarea);
         contextManager.setKeyboardForTarget(target, 'lao_2008_basic', 'lo');
         dispatchFocus('focus', textarea);
 
@@ -1179,7 +1179,7 @@ describe('app/browser:  ContextManager', function () {
         await contextManager.activateKeyboard('khmer_angkor', 'km');
 
         const textarea = document.getElementById('textarea');
-        const target = outputTargetForElement(textarea);
+        const target = textStoreForElement(textarea);
         // Matches the current global keyboard, but still sets it to independent-mode.
         contextManager.setKeyboardForTarget(target, 'khmer_angkor', 'km');
         dispatchFocus('focus', textarea);
diff --git a/web/src/tools/testing/recorder/scribe.ts b/web/src/tools/testing/recorder/scribe.ts
index b31657961fe..cef6e728255 100644
--- a/web/src/tools/testing/recorder/scribe.ts
+++ b/web/src/tools/testing/recorder/scribe.ts
@@ -17,7 +17,7 @@ import {
   RecordedSyntheticKeystroke
 } from "@keymanapp/recorder-core";
 
-import { outputTargetForElement } from 'keyman/engine/attachment';
+import { textStoreForElement } from 'keyman/engine/attachment';
 
 import { type KeymanEngine } from 'keyman/app/browser';
 
@@ -183,7 +183,7 @@ export class Scribe extends EventEmitter {
     const recorderScribe = this;
 
     keyman.hardKeyboard.on('keyevent', (e) => {
-      const in_output = outputTargetForElement(recordingElement);
+      const in_output = textStoreForElement(recordingElement);
       if(!in_output || keyman.contextManager.activeTarget != in_output) {
         return;
       }
@@ -199,7 +199,7 @@ export class Scribe extends EventEmitter {
     });
 
     keyman.osk.on('keyevent', (e) => {
-      const in_output = outputTargetForElement(recordingElement);
+      const in_output = textStoreForElement(recordingElement);
       if(!in_output || keyman.contextManager.activeTarget != in_output) {
         return;
       }
@@ -212,7 +212,7 @@ export class Scribe extends EventEmitter {
     });
 
     keyman.contextManager.on('keyboardchange', (kbdTuple) => {
-      const in_output = outputTargetForElement(recordingElement);
+      const in_output = textStoreForElement(recordingElement);
       // If it's not on our recording control, ignore the change and do nothing special.
       if(!in_output || document.activeElement != in_output.getElement()) {
         return;

From 96275fff2c064577bd450586f960d1472bff418d Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 4 Nov 2025 16:29:26 +0100
Subject: [PATCH 114/254] refactor(web): cleanup

---
 web/src/app/webview/src/contextManager.ts     |  3 +--
 .../js-processor/src/jsKeyboardInterface.ts   | 12 +++++-----
 .../engine/keyboard/src/syntheticTextStore.ts |  2 +-
 .../main/src/headless/inputProcessor.ts       | 20 ++++++----------
 .../main/src/headless/languageProcessor.ts    | 23 +++++++------------
 web/src/engine/main/src/keymanEngineBase.ts   |  8 +++----
 .../testing/recorder-core/src/nodeProctor.ts  | 19 ++++++++-------
 7 files changed, 35 insertions(+), 52 deletions(-)

diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index 68111bff6ff..b38e22e5bcc 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -60,8 +60,7 @@ export class ContextHost extends SyntheticTextStore {
 
   restoreTo(original: TextStore): void {
     this.savedState = SyntheticTextStore.from(this);
-    // TODO-web-core
-    super.restoreTo(original as TextStore);
+    super.restoreTo(original);
   }
 
   updateContext(text: string, selStart: number, selEnd: number): boolean {
diff --git a/web/src/engine/js-processor/src/jsKeyboardInterface.ts b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
index 463471448af..724bf2e0a52 100644
--- a/web/src/engine/js-processor/src/jsKeyboardInterface.ts
+++ b/web/src/engine/js-processor/src/jsKeyboardInterface.ts
@@ -335,7 +335,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
     if(cx === val) {
       return true; // I3318
     }
-    (textStore as TextStore).deadkeys().resetMatched(); // I3318
+    textStore.deadkeys().resetMatched(); // I3318
     return false;
   }
 
@@ -588,7 +588,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
       retVal = (keyCode == Lrulekey); // I3318, I3555
     }
     if(!retVal) {
-      (this.activeTargetOutput as TextStore).deadkeys().resetMatched();  // I3318
+      this.activeTargetOutput.deadkeys().resetMatched();  // I3318
     }
     return retVal; // I3318
   };
@@ -773,7 +773,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
 
     // We want to control exactly which deadkeys get removed.
     if(dn > 0) {
-      context = this._BuildExtendedContext(dn, dn, (textStore as TextStore));
+      context = this._BuildExtendedContext(dn, dn, textStore);
       let nulCount = 0;
 
       for(let i=0; i < context.valContext.length; i++) {
@@ -781,7 +781,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
 
         if(dk) {
           // Remove deadkey in context.
-          (textStore as TextStore).deadkeys().remove(dk);
+          textStore.deadkeys().remove(dk);
 
           // Reduce our reported context size.
           dn--;
@@ -800,7 +800,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
     }
 
     // If a matched deadkey hasn't been deleted, we don't WANT to delete it.
-    (textStore as TextStore).deadkeys().resetMatched();
+    textStore.deadkeys().resetMatched();
 
     // Why reinvent the wheel?  Delete the remaining characters by 'inserting a blank string'.
     this.output(dn, textStore, '');
@@ -819,7 +819,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
 
     textStore.saveProperties();
     textStore.clearSelection();
-    (textStore as TextStore).deadkeys().deleteMatched(); // I3318
+    textStore.deadkeys().deleteMatched(); // I3318
     if(dn >= 0) {
       // Automatically manages affected deadkey positions.  Does not delete deadkeys b/c legacy behavior support.
       textStore.deleteCharsBeforeCaret(dn);
diff --git a/web/src/engine/keyboard/src/syntheticTextStore.ts b/web/src/engine/keyboard/src/syntheticTextStore.ts
index 3fb9ac8cbce..d015b52fe66 100644
--- a/web/src/engine/keyboard/src/syntheticTextStore.ts
+++ b/web/src/engine/keyboard/src/syntheticTextStore.ts
@@ -64,7 +64,7 @@ export class SyntheticTextStore extends TextStore {
     }
 
     // Also duplicate deadkey state!  (Needed for fat-finger ops.)
-    clone.setDeadkeys((textStore as TextStore).deadkeys());
+    clone.setDeadkeys(textStore.deadkeys());
 
     return clone;
   }
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index aee818c42a3..1e043622d52 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -123,7 +123,7 @@ export class InputProcessor {
           if(!isEmptyTransform(transcription.transform) || !(transcription.preInput as SyntheticTextStore).isEqual(SyntheticTextStore.from(textStore))) {
             // Restores full context, including deadkeys in their exact pre-keystroke state.
             // TODO-web-core
-            (textStore as TextStore).restoreTo(transcription.preInput as SyntheticTextStore);
+            textStore.restoreTo(transcription.preInput as SyntheticTextStore);
           }
           /*
             else:
@@ -171,8 +171,7 @@ export class InputProcessor {
 
     // Will handle keystroke-based non-layer change modifier & state keys, mapping them through the physical keyboard's version
     // of state management.  `doModifierPress` must always run.
-    // TODO-web-core
-    if (this.keyboardProcessor.doModifierPress(keyEvent, textStore as TextStore, !fromOSK)) {
+    if (this.keyboardProcessor.doModifierPress(keyEvent, textStore, !fromOSK)) {
       // If run on a desktop platform, we know that modifier & state key presses may not
       // produce output, so we may make an immediate return safely.
       if(!fromOSK) {
@@ -199,15 +198,13 @@ export class InputProcessor {
 
     // Create a "mock" backup of the current textStore in its pre-input state.
     // Current, long-existing assumption - it's DOM-backed.
-    // TODO-web-core
-    const preInputMock = SyntheticTextStore.from(textStore as TextStore, true);
+    const preInputMock = SyntheticTextStore.from(textStore, true);
 
     const startingLayerId = this.keyboardProcessor.layerId;
 
     // We presently need the true keystroke to run on the FULL context.  That index is still
     // needed for some indexing operations when comparing two different output targets.
-    // TODO-web-core
-    let ruleBehavior = this.keyboardProcessor.processKeystroke(keyEvent, textStore as TextStore);
+    let ruleBehavior = this.keyboardProcessor.processKeystroke(keyEvent, textStore);
 
     // Swap layer as appropriate.
     if(keyEvent.kNextLayer) {
@@ -254,8 +251,7 @@ export class InputProcessor {
     } else {
       // We need a dummy ProcessorAction for keys which have no output (e.g. Shift)
       ruleBehavior = new ProcessorAction();
-      // TODO-web-core
-      ruleBehavior.transcription = (textStore as TextStore).buildTranscriptionFrom(textStore as TextStore, null, false);
+      ruleBehavior.transcription = textStore.buildTranscriptionFrom(textStore, null, false);
       ruleBehavior.triggersDefaultCommand = true;
     }
 
@@ -274,8 +270,7 @@ export class InputProcessor {
     this.keyboardProcessor.newLayerStore.set(hasLayerChanged ? this.keyboardProcessor.layerId : '');
     this.keyboardProcessor.oldLayerStore.set(hasLayerChanged ? startingLayerId : '');
 
-    // TODO-web-core
-    const postRuleBehavior = this.keyboardProcessor.processPostKeystroke(this.contextDevice, textStore as TextStore);
+    const postRuleBehavior = this.keyboardProcessor.processPostKeystroke(this.contextDevice, textStore);
     if (postRuleBehavior) {
       this.keyboardProcessor.finalizeProcessorAction(postRuleBehavior, textStore);
     }
@@ -400,8 +395,7 @@ export class InputProcessor {
 
   public resetContext(textStore?: TextStore) {
     // Also handles new-context events, which may modify the layer
-    // TODO-web-core
-    this.keyboardProcessor.resetContext(textStore as TextStore);
+    this.keyboardProcessor.resetContext(textStore);
     // With the layer now set, we trigger new predictions.
     this.languageProcessor.invalidateContext(textStore, this.keyboardProcessor.layerId);
   }
diff --git a/web/src/engine/main/src/headless/languageProcessor.ts b/web/src/engine/main/src/headless/languageProcessor.ts
index aa76d7c22be..b8e12ba9855 100644
--- a/web/src/engine/main/src/headless/languageProcessor.ts
+++ b/web/src/engine/main/src/headless/languageProcessor.ts
@@ -142,8 +142,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     this.emit('invalidatesuggestions', 'context');
 
     if(textStore) {
-      // TODO-web-core
-      const transcription = (textStore as TextStore).buildTranscriptionFrom((textStore as TextStore), null, false);
+      const transcription = textStore.buildTranscriptionFrom(textStore, null, false);
       return this.predict_internal(transcription, true, layerId);
     } else {
       // if there's no active context source, there's nothing to
@@ -154,13 +153,12 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     }
   }
 
-  public wordbreak(target: TextStore, layerId: string): Promise<string> {
+  public wordbreak(textStore: TextStore, layerId: string): Promise<string> {
     if(!this.isActive) {
       return null;
     }
 
-    // TODO-web-core
-    const context = new ContextWindow(SyntheticTextStore.from((target as TextStore), false), this.configuration, layerId);
+    const context = new ContextWindow(SyntheticTextStore.from(textStore, false), this.configuration, layerId);
     return this.lmEngine.wordbreak(context);
   }
 
@@ -222,10 +220,8 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
       // Step 2:  build a final, master Transform that will produce the desired results from the CURRENT state.
       // In embedded mode, both Android and iOS are best served by calculating this transform and applying its
       // values as needed for use with their IME interfaces.
-      // TODO-web-core
-      const transform = final.buildTransformFrom((textStore as TextStore));
-      // TODO-web-core
-      (textStore as TextStore).apply(transform);
+      const transform = final.buildTransformFrom(textStore);
+      textStore.apply(transform);
 
       // Tell the banner that a suggestion was applied, so it can call the
       // keyboard's PostKeystroke entry point as needed
@@ -297,10 +293,8 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     // Step 2:  build a final, master Transform that will produce the desired results from the CURRENT state.
     // In embedded mode, both Android and iOS are best served by calculating this transform and applying its
     // values as needed for use with their IME interfaces.
-    // TODO-web-core
-    const transform = final.buildTransformFrom(textStore as TextStore);
-    // TODO-web-core
-    (textStore as TextStore).apply(transform);
+    const transform = final.buildTransformFrom(textStore);
+    textStore.apply(transform);
 
     // The reason we need to preserve the additive-inverse 'transformId' property on Reversions.
     const promise = this.currentPromise = this.lmEngine.revertSuggestion(reversion, new ContextWindow(original.preInput as SyntheticTextStore, this.configuration, null))
@@ -316,8 +310,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
       return null;
     }
 
-    // TODO-web-core
-    const transcription = (textStore as TextStore).buildTranscriptionFrom(textStore as TextStore, null, false);
+    const transcription = textStore.buildTranscriptionFrom(textStore, null, false);
     return this.predict(transcription, layerId);
   }
 
diff --git a/web/src/engine/main/src/keymanEngineBase.ts b/web/src/engine/main/src/keymanEngineBase.ts
index f110266cbb0..4449c84962b 100644
--- a/web/src/engine/main/src/keymanEngineBase.ts
+++ b/web/src/engine/main/src/keymanEngineBase.ts
@@ -1,4 +1,4 @@
-import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction, TextStore } from "keyman/engine/keyboard";
+import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction } from "keyman/engine/keyboard";
 import { ProcessorInitOptions } from 'keyman/engine/js-processor';
 import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard/dom-keyboard-loader";
 import { WorkerFactory } from "@keymanapp/lexical-model-layer/web"
@@ -78,8 +78,7 @@ export class KeymanEngineBase<
     textStore.invalidateSelection();
     // Deadkey matching continues to be troublesome.
     // Deleting matched deadkeys here seems to correct some of the issues.   (JD 6/6/14)
-    // TODO-web-core
-    (textStore as TextStore).deadkeys().deleteMatched();      // Delete any matched deadkeys before continuing
+    textStore.deadkeys().deleteMatched();      // Delete any matched deadkeys before continuing
 
     if(event.isSynthetic) {
       const oskLayer = this.osk.vkbd.layerId;
@@ -277,8 +276,7 @@ export class KeymanEngineBase<
       keyboardProcessor.newLayerStore.set('');
       keyboardProcessor.oldLayerStore.set('');
       // Call the keyboard's entry point.
-      // TODO-web-core
-      const data = keyboardProcessor.processPostKeystroke(keyboardProcessor.contextDevice, predictionContext.currentTarget as TextStore)
+      const data = keyboardProcessor.processPostKeystroke(keyboardProcessor.contextDevice, predictionContext.currentTarget)
       // If we have a ProcessorAction as a result, run it on the target. This should
       // only change system store and variable store values.
       if (data) {
diff --git a/web/src/tools/testing/recorder-core/src/nodeProctor.ts b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
index 9297e45e84f..b6e2968ed57 100644
--- a/web/src/tools/testing/recorder-core/src/nodeProctor.ts
+++ b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
@@ -48,19 +48,19 @@ export default class NodeProctor extends Proctor {
     return true;
   }
 
-  async simulateSequence(sequence: TestSequence<any>, target?: TextStore): Promise<string> {
+  async simulateSequence(sequence: TestSequence<any>, textStore?: TextStore): Promise<string> {
     // Start with an empty TextStore and a fresh KeyboardProcessor.
-    if(!target) {
-      target = new SyntheticTextStore();
+    if(!textStore) {
+      textStore = new SyntheticTextStore();
     }
 
     // Establish a fresh processor, setting its keyboard appropriately for the test.
-    let processor = new JSKeyboardProcessor(this.device);
+    const processor = new JSKeyboardProcessor(this.device);
     processor.keyboardInterface = this.keyboardWithHarness as JSKeyboardInterface;
     const keyboard = processor.activeKeyboard;
 
     if(sequence instanceof RecordedKeystrokeSequence) {
-      for(let keystroke of sequence.inputs) {
+      for(const keystroke of sequence.inputs) {
         let keyEvent: KeyEventSpec;
         if(keystroke instanceof RecordedPhysicalKeystroke) {
           // Use the keystroke's stored data to reconstruct the KeyEvent.
@@ -76,7 +76,7 @@ export default class NodeProctor extends Proctor {
             LisVirtualKey: keyboard.definesPositionalOrMnemonic // Only false for 1.0 keyboards.
           }
         } else if(keystroke instanceof RecordedSyntheticKeystroke) {
-          let key = keyboard.layout(this.device.formFactor).getLayer(keystroke.layer).getKey(keystroke.keyName);
+          const key = keyboard.layout(this.device.formFactor).getLayer(keystroke.layer).getKey(keystroke.keyName);
           keyEvent = keyboard.constructKeyEvent(key, this.device, processor.stateKeys);
         }
 
@@ -87,18 +87,17 @@ export default class NodeProctor extends Proctor {
         // We don't care too much about particularities of per-keystroke behavior yet.
         // ... we _could_ if we wanted to, though.  The framework is mostly in place;
         // it's a matter of actually adding the feature.
-        // TODO-web-core
-        const ruleBehavior = processor.processKeystroke(new KeyEvent(keyEvent), (target as TextStore));
+        const ruleBehavior = processor.processKeystroke(new KeyEvent(keyEvent), textStore);
 
         if (this.debugMode) {
           console.log("Processing %d:", keyEvent.Lcode);
-          console.log("target=%s", JSON.stringify(target, null, '  '));
+          console.log("target=%s", JSON.stringify(textStore, null, '  '));
           console.log("ruleBehavior=%s", JSON.stringify(ruleBehavior, null, '  '));
         }
       }
     } else {
       throw new Error("NodeProctor only supports RecordedKeystrokeSequences for testing at present.");
     }
-    return target.getText();
+    return textStore.getText();
   }
 }

From b169aafa4fccbdbe12b37f306da4c892cf72997d Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 4 Nov 2025 17:12:01 +0100
Subject: [PATCH 115/254] refactor(web): cleanup exports of keyboards module

- explicitly list exports instead of using `*`
- remove `default` exports
---
 web/src/engine/keyboard/src/defaultRules.ts           | 2 +-
 web/src/engine/keyboard/src/index.ts                  | 5 ++---
 web/src/engine/keyboard/src/keyEvent.ts               | 2 +-
 web/src/engine/keyboard/src/keyMapping.ts             | 2 +-
 web/src/engine/keyboard/src/keyboards/activeLayout.ts | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/web/src/engine/keyboard/src/defaultRules.ts b/web/src/engine/keyboard/src/defaultRules.ts
index 06c88507beb..585069f6d1f 100644
--- a/web/src/engine/keyboard/src/defaultRules.ts
+++ b/web/src/engine/keyboard/src/defaultRules.ts
@@ -22,7 +22,7 @@ export class LogMessages {
 /**
  * Defines a collection of static library functions that define KeymanWeb's default (implied) keyboard rule behaviors.
  */
-export default class DefaultRules {
+export class DefaultRules {
   codeForEvent(Lkc: KeyEvent) {
     return Codes.keyCodes[Lkc.kName] || Lkc.Lcode;;
   }
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index 7bda82d4fdb..fc8064cb375 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -25,10 +25,9 @@ export { type Alternate, TextTransform } from "./keyboards/textTransform.js";
 export { Transcription } from "./keyboards/transcription.js";
 
 export { Codes } from "./codes.js";
-export { default as DefaultRules } from "./defaultRules.js";
-export * from "./defaultRules.js";
+export { EmulationKeystrokes, LogMessages, DefaultRules } from "./defaultRules.js";
 export { type KeyDistribution, KeyEventSpec, KeyEvent } from "./keyEvent.js";
-export { default as KeyMapping } from "./keyMapping.js";
+export { KeyMapping } from "./keyMapping.js";
 export { type SystemStoreMutationHandler, MutableSystemStore, SystemStore, SystemStoreIDs, type SystemStoreDictionary } from "./systemStore.js";
 export { type VariableStore, VariableStoreSerializer, VariableStoreDictionary } from "./variableStore.js";
 
diff --git a/web/src/engine/keyboard/src/keyEvent.ts b/web/src/engine/keyboard/src/keyEvent.ts
index 8c25c964baf..967d5409df0 100644
--- a/web/src/engine/keyboard/src/keyEvent.ts
+++ b/web/src/engine/keyboard/src/keyEvent.ts
@@ -10,7 +10,7 @@ import { type JSKeyboard } from "./keyboards/jsKeyboard.js";
 import { type DeviceSpec } from "@keymanapp/web-utils";
 
 import { Codes } from './codes.js';
-import DefaultRules from "./defaultRules.js";
+import { DefaultRules } from "./defaultRules.js";
 import { ActiveKeyBase } from './keyboards/activeLayout.js';
 
 // Represents a probability distribution over a keyboard's keys.
diff --git a/web/src/engine/keyboard/src/keyMapping.ts b/web/src/engine/keyboard/src/keyMapping.ts
index 52b053de6a5..72920d3b9c1 100644
--- a/web/src/engine/keyboard/src/keyMapping.ts
+++ b/web/src/engine/keyboard/src/keyMapping.ts
@@ -54,7 +54,7 @@ class LanguageKeyMaps {
   }
 }
 
-export default class KeyMapping {
+export class KeyMapping {
   static readonly browserMap: BrowserKeyMaps = new BrowserKeyMaps();
   static readonly languageMap: LanguageKeyMaps = new LanguageKeyMaps();
 
diff --git a/web/src/engine/keyboard/src/keyboards/activeLayout.ts b/web/src/engine/keyboard/src/keyboards/activeLayout.ts
index 44b77670d91..cb5175f54a7 100644
--- a/web/src/engine/keyboard/src/keyboards/activeLayout.ts
+++ b/web/src/engine/keyboard/src/keyboards/activeLayout.ts
@@ -1,6 +1,6 @@
 import { Codes } from "../codes.js";
 import { KeyEvent, KeyEventSpec } from "../keyEvent.js";
-import KeyMapping from "../keyMapping.js";
+import { KeyMapping } from "../keyMapping.js";
 import { ButtonClasses, Layouts } from "./defaultLayouts.js";
 import type { LayoutKey, LayoutSubKey, LayoutRow, LayoutLayer, LayoutFormFactor, ButtonClass } from "./defaultLayouts.js";
 import { type JSKeyboard } from "./jsKeyboard.js";

From 533473c1997d5b8c9db93c3872a915cddb0c3399 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 4 Nov 2025 17:53:15 +0100
Subject: [PATCH 116/254] refactor(web): extract minimal TextStore interface
 that LanguageProcessor can use

---
 .../src/prediction/languageProcessor.interface.ts |  4 ++--
 web/src/engine/keyboard/src/index.ts              |  1 +
 web/src/engine/keyboard/src/syntheticTextStore.ts | 11 +++--------
 web/src/engine/keyboard/src/textStore.ts          | 14 ++++++++++++--
 .../src/textStoreTranscriptionInterface.ts        | 15 +++++++++++++++
 .../engine/main/src/headless/languageProcessor.ts | 12 ++++++------
 6 files changed, 39 insertions(+), 18 deletions(-)
 create mode 100644 web/src/engine/keyboard/src/textStoreTranscriptionInterface.ts

diff --git a/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts b/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
index d15898078dc..eef934495ad 100644
--- a/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
+++ b/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
@@ -1,6 +1,6 @@
 import { LexicalModelTypes } from '@keymanapp/common-types';
 import { EventEmitter } from "eventemitter3";
-import { TextStore } from "keyman/engine/keyboard";
+import { TextStore, TextStoreTranscriptionInterface } from "keyman/engine/keyboard";
 
 export class ReadySuggestions {
   suggestions: LexicalModelTypes.Suggestion[];
@@ -48,7 +48,7 @@ export interface LanguageProcessorEventMap {
    * @param textStore The `TextStore` representation of the context the suggestion was applied to.
    * @returns
    */
-  'suggestionapplied': (textStore: TextStore) => boolean
+  'suggestionapplied': (textStore: TextStoreTranscriptionInterface) => boolean
 }
 
 
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index fc8064cb375..15f97cbf8e1 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -33,6 +33,7 @@ export { type VariableStore, VariableStoreSerializer, VariableStoreDictionary }
 
 export { SyntheticTextStore } from "./syntheticTextStore.js";
 export { TextStore } from "./textStore.js";
+export { TextStoreTranscriptionInterface } from "./textStoreTranscriptionInterface.js";
 export { findCommonSubstringEndIndex } from "./stringDivergence.js";
 export { Deadkey } from "./deadkeys.js";
 
diff --git a/web/src/engine/keyboard/src/syntheticTextStore.ts b/web/src/engine/keyboard/src/syntheticTextStore.ts
index d015b52fe66..bf4f0815c8a 100644
--- a/web/src/engine/keyboard/src/syntheticTextStore.ts
+++ b/web/src/engine/keyboard/src/syntheticTextStore.ts
@@ -1,4 +1,5 @@
 import { TextStore } from './textStore.js';
+import { TextStoreTranscriptionInterface } from './textStoreTranscriptionInterface.js';
 import { KMWString } from '@keymanapp/web-utils';
 
 export class SyntheticTextStore extends TextStore {
@@ -25,17 +26,11 @@ export class SyntheticTextStore extends TextStore {
     this.selForward = this.selEnd >= this.selStart;
   }
 
-  static assertIsOutputTargetBase(textStore: TextStore): asserts textStore is TextStore {
-    if (!(textStore instanceof TextStore)) {
-      throw new TypeError("textStore is not a TextStore");
-    }
-  }
-
   // Clones the state of an existing EditableElement, creating a SyntheticTextStore version of its state.
-  static from(textStore: TextStore, readonly?: boolean): SyntheticTextStore {
+  static from(textStore: TextStoreTranscriptionInterface, readonly?: boolean): SyntheticTextStore {
     let clone: SyntheticTextStore;
 
-    this.assertIsOutputTargetBase(textStore);
+    this.assertIsTextStore(textStore);
 
     if (textStore instanceof SyntheticTextStore) {
       // Avoids the need to run expensive kmwstring.ts `length()`
diff --git a/web/src/engine/keyboard/src/textStore.ts b/web/src/engine/keyboard/src/textStore.ts
index 9b405deee31..55ec6bd7740 100644
--- a/web/src/engine/keyboard/src/textStore.ts
+++ b/web/src/engine/keyboard/src/textStore.ts
@@ -5,7 +5,8 @@ import { findCommonSubstringEndIndex } from "./stringDivergence.js";
 import { SyntheticTextStore } from "./syntheticTextStore.js";
 
 // Defines deadkey management in a manner attachable to each element interface.
-import { type KeyEvent } from 'keyman/engine/keyboard';
+import { type KeyEvent } from './keyEvent.js';
+import { TextStoreTranscriptionInterface } from './textStoreTranscriptionInterface.js';
 import { Deadkey, DeadkeyTracker } from "./deadkeys.js";
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
@@ -59,6 +60,13 @@ export abstract class TextStore {
     this._dks = dks.clone();
   }
 
+  static assertIsTextStore(textStore: TextStoreTranscriptionInterface): asserts textStore is TextStore {
+    if (!(textStore instanceof TextStore)) {
+      throw new TypeError("textStore is not a TextStore");
+    }
+  }
+
+
   /**
    * Determines the basic operations needed to reconstruct the current TextStore's text from the prior state specified
    * by another TextStore based on their text and caret positions.
@@ -67,7 +75,9 @@ export abstract class TextStore {
    * As such, it assumes that the caret is immediately after any inserted text.
    * @param from An output target (preferably a SyntheticTextStore) representing the prior state of the input/output system.
    */
-  buildTransformFrom(original: TextStore): TextTransform {
+  buildTransformFrom(original: TextStoreTranscriptionInterface): TextTransform {
+    TextStore.assertIsTextStore(original);
+
     const toLeft = this.getTextBeforeCaret();
     const fromLeft = original.getTextBeforeCaret();
 
diff --git a/web/src/engine/keyboard/src/textStoreTranscriptionInterface.ts b/web/src/engine/keyboard/src/textStoreTranscriptionInterface.ts
new file mode 100644
index 00000000000..259318adcf1
--- /dev/null
+++ b/web/src/engine/keyboard/src/textStoreTranscriptionInterface.ts
@@ -0,0 +1,15 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+
+import { LexicalModelTypes } from '@keymanapp/common-types';
+import { KeyEvent } from './keyEvent.js';
+import { Transcription } from './keyboards/transcription.js';
+import { Alternate } from './keyboards/textTransform.js';
+
+// Interface with the methods LanguageProcessor needs from TextStore
+// for transcription building and applying transforms.
+export interface TextStoreTranscriptionInterface {
+  buildTranscriptionFrom(original: TextStoreTranscriptionInterface, keyEvent: KeyEvent, readonly: boolean, alternates?: Alternate[]): Transcription;
+  apply(transform: LexicalModelTypes.Transform): void;
+}
diff --git a/web/src/engine/main/src/headless/languageProcessor.ts b/web/src/engine/main/src/headless/languageProcessor.ts
index b8e12ba9855..7ded8c1cf70 100644
--- a/web/src/engine/main/src/headless/languageProcessor.ts
+++ b/web/src/engine/main/src/headless/languageProcessor.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from "eventemitter3";
 import { LMLayer, WorkerFactory } from "@keymanapp/lexical-model-layer/web";
-import { Transcription, TextStore, SyntheticTextStore } from 'keyman/engine/keyboard';
+import { Transcription, TextStoreTranscriptionInterface, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { LanguageProcessorEventMap, ModelSpec, StateChangeEnum, ReadySuggestions } from 'keyman/engine/interfaces';
 import ContextWindow from "./contextWindow.js";
 import { TranscriptionCache } from "./transcriptionCache.js";
@@ -125,7 +125,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     });
   }
 
-  public invalidateContext(textStore: TextStore, layerId: string): Promise<Suggestion[]> {
+  public invalidateContext(textStore: TextStoreTranscriptionInterface, layerId: string): Promise<Suggestion[]> {
     // If there's no active model, there can be no predictions.
     // We'll also be missing important data needed to even properly REQUEST the predictions.
     if(!this.currentModel || !this.configuration) {
@@ -153,7 +153,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     }
   }
 
-  public wordbreak(textStore: TextStore, layerId: string): Promise<string> {
+  public wordbreak(textStore: TextStoreTranscriptionInterface, layerId: string): Promise<string> {
     if(!this.isActive) {
       return null;
     }
@@ -188,7 +188,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
    *                        required because layerid can be changed by PostKeystroke
    * @returns
    */
-  public applySuggestion(suggestion: Suggestion, textStore: TextStore, getLayerId: ()=>string): Promise<Reversion> {
+  public applySuggestion(suggestion: Suggestion, textStore: TextStoreTranscriptionInterface, getLayerId: ()=>string): Promise<Reversion> {
     if(!textStore) {
       throw "Accepting suggestions requires a destination TextStore instance."
     }
@@ -263,7 +263,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     }
   }
 
-  public applyReversion(reversion: Reversion, textStore: TextStore) {
+  public applyReversion(reversion: Reversion, textStore: TextStoreTranscriptionInterface) {
     if(!textStore) {
       throw "Accepting suggestions requires a destination TextStore instance."
     }
@@ -305,7 +305,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     return promise;
   }
 
-  public predictFromTarget(textStore: TextStore, layerId: string): Promise<Suggestion[]> {
+  public predictFromTarget(textStore: TextStoreTranscriptionInterface, layerId: string): Promise<Suggestion[]> {
     if(!this.isActive || !textStore) {
       return null;
     }

From 9d2c23e0d3f5c320d2cb7832be8610294fa49fe7 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 4 Nov 2025 17:05:59 +0100
Subject: [PATCH 117/254] refactor(web): merge engine modules

In order to simplify and make the build significantly faster, as well as
reduce duplication of configuration files, we have merged most of the
engine modules into a single module, engine:
  * engine/attachment
  * engine/core-processor
  * engine/dom-utils
  * engine/element-wrappers
  * engine/events
  * engine/interfaces
  * engine/js-processor
  * engine/keyboard
  * engine/keyboard-storage
  * engine/main
  * engine/osk

A few test-specific files have been moved from engine to test, such as
nodeCloudRequester.ts and nodeKeyboardLoader.ts.
---
 package-lock.json                             |  19 +-
 package.json                                  |   1 -
 tsconfig.json                                 |   3 +-
 web/.mocharc.json                             |   4 -
 web/README.md                                 |   2 +-
 web/build.sh                                  |  49 +----
 web/common.inc.sh                             |   1 +
 web/package.json                              | 100 ++++------
 web/src/app/browser/build.sh                  |   3 +-
 web/src/app/browser/tsconfig.json             |   8 +-
 web/src/app/ui/tsconfig.json                  |   3 +
 web/src/app/webview/build.sh                  |   2 +-
 web/src/app/webview/tsconfig.json             |   7 +-
 web/src/engine/{interfaces => }/.c8rc.json    |   2 +-
 web/src/engine/attachment/.c8rc.json          |  10 -
 web/src/engine/attachment/build.sh            |  47 -----
 web/src/engine/attachment/tsconfig.json       |  17 --
 web/src/engine/build.sh                       |  73 +++++++
 web/src/engine/common/web-utils/package.json  |   2 +-
 web/src/engine/core-processor/.gitignore      |   1 -
 web/src/engine/core-processor/build.sh        |  64 -------
 web/src/engine/core-processor/tsconfig.json   |  13 --
 web/src/engine/dom-utils/build.sh             |  42 -----
 web/src/engine/dom-utils/tsconfig.json        |  17 --
 web/src/engine/element-wrappers/build.sh      |  47 -----
 web/src/engine/element-wrappers/readme.md     |   4 -
 web/src/engine/element-wrappers/tsconfig.json |  16 --
 web/src/engine/events/build.sh                |  46 -----
 web/src/engine/events/tsconfig.json           |  17 --
 web/src/engine/interfaces/build.sh            |  47 -----
 web/src/engine/interfaces/tsconfig.json       |  17 --
 web/src/engine/js-processor/build.sh          |  47 -----
 web/src/engine/js-processor/tsconfig.json     |  16 --
 web/src/engine/keyboard-storage/.c8rc.json    |  10 -
 web/src/engine/keyboard-storage/build.sh      |  54 ------
 web/src/engine/keyboard-storage/tsconfig.json |  16 --
 web/src/engine/keyboard/.c8rc.json            |  15 --
 web/src/engine/keyboard/.gitignore            |  18 --
 web/src/engine/keyboard/build.sh              |  85 ---------
 .../src/keyboards/loaders/tsconfig.dom.json   |  13 --
 web/src/engine/keyboard/tsconfig.all.json     |  16 --
 web/src/engine/keyboard/tsconfig.json         |  15 --
 web/src/engine/main/build.sh                  |  53 ------
 web/src/engine/main/tsconfig.json             |  19 --
 web/src/engine/osk/build.sh                   |  69 -------
 .../engine/osk/gesture-processor/.c8rc.json   |  18 --
 .../engine/osk/gesture-processor/.gitignore   |  11 --
 web/src/engine/osk/gesture-processor/build.sh |  65 -------
 .../engine/osk/gesture-processor/package.json |  27 ---
 .../tools/unit-test-resources/tsconfig.json   |  14 --
 .../osk/gesture-processor/tsconfig.json       |  15 --
 web/src/engine/osk/tsconfig.json              |  20 --
 .../predictive-text/wordbreakers/build.sh     |   1 +
 web/src/engine/{attachment => }/readme.md     |   0
 .../src => src/attachment}/attachmentInfo.ts  |   0
 .../src => src/attachment}/index.ts           |   0
 .../attachment}/outputTargetForElement.ts     |   0
 .../attachment}/pageContextAttachment.ts      |   0
 web/src/engine/src/core-processor/.gitignore  |   1 +
 .../src => src/core-processor}/KM_Core.ts     |   0
 .../src => src/core-processor}/index.ts       |   0
 .../dom-utils}/arrayFromNodeList.ts           |   0
 .../src => src/dom-utils}/cookieSerializer.ts |   0
 .../dom-utils}/createUnselectableElement.ts   |   0
 .../src => src/dom-utils}/getAbsolute.ts      |   0
 .../{dom-utils/src => src/dom-utils}/index.ts |   0
 .../src => src/dom-utils}/landscapeView.ts    |   0
 web/src/engine/{ => src}/dom-utils/readme.md  |   0
 .../src => src/dom-utils}/stylesheets.ts      |   0
 .../element-wrappers}/contentEditable.ts      |   0
 .../element-wrappers}/designIFrame.ts         |   0
 .../src => src/element-wrappers}/index.ts     |   0
 .../src => src/element-wrappers}/input.ts     |   0
 .../outputTargetElementWrapper.ts             |   0
 .../src => src/element-wrappers}/readme.md    |   6 +
 .../src => src/element-wrappers}/textarea.ts  |   0
 .../src => src/element-wrappers}/utils.ts     |   0
 .../element-wrappers}/wrapElement.ts          |   0
 web/src/engine/{ => src}/events/.c8rc.json    |   0
 .../src => src/events}/domEventTracker.ts     |   0
 .../src => src/events}/emitterListenerSpy.ts  |   0
 .../{events/src => src/events}/index.ts       |   0
 .../src => src/events}/legacyEventEmitter.ts  |   0
 web/src/engine/{ => src}/events/readme.md     |   0
 .../{osk => src}/gesture-processor/README.md  |   0
 .../gestureRecognizerConfiguration.ts         |   2 +-
 .../configuration/paddedZoneSource.ts         |   0
 .../configuration/recognitionZoneSource.ts    |   0
 .../configuration/viewportZoneSource.ts       |   0
 .../configuration/zoneBoundaryChecker.ts      |   0
 .../gesture-processor}/gestureRecognizer.ts   |   0
 .../headless/asyncClosureDispatchQueue.ts     |   0
 .../headless/cumulativePathStats.ts           |   0
 .../headless/gestureDebugPath.ts              |   0
 .../headless/gestureDebugSource.ts            |   0
 .../headless/gesturePath.ts                   |   0
 .../headless/gestureSource.ts                 |   0
 .../headless/gestures/index.ts                |   0
 .../gestures/matchers/gestureMatcher.ts       |   0
 .../gestures/matchers/gestureSequence.ts      |   0
 .../headless/gestures/matchers/index.ts       |   0
 .../gestures/matchers/matcherSelector.ts      |   0
 .../headless/gestures/matchers/pathMatcher.ts |   0
 .../headless/gestures/specs/contactModel.ts   |   0
 .../headless/gestures/specs/gestureModel.ts   |   0
 .../gestures/specs/gestureModelDefs.ts        |   0
 .../headless/gestures/specs/index.ts          |   0
 .../gestures/specs/modelDefValidator.ts       |   0
 .../headless/gestures/specs/pathModel.ts      |   0
 .../headless/inputEngineBase.ts               |   0
 .../headless/inputSample.ts                   |   0
 .../headless/segmentClassifier.ts             |   0
 .../headless/touchpointCoordinator.ts         |   0
 .../engine => src/gesture-processor}/index.ts |   0
 .../gesture-processor}/inputEventEngine.ts    |   0
 .../gesture-processor}/mouseEventEngine.ts    |   0
 .../gesture-processor}/mutable.ts             |   0
 .../gesture-processor}/nonoptional.ts         |   0
 .../gesture-processor}/reportError.ts         |   0
 .../gesture-processor}/touchEventEngine.ts    |   0
 web/src/engine/src/index.ts                   |   1 +
 .../src => src/interfaces}/index.ts           |   0
 .../src => src/interfaces}/modelSpec.ts       |   0
 .../interfaces}/optionSpec.interface.ts       |   0
 .../oskResourcePathConfiguration.interface.ts |   0
 .../interfaces}/pathConfiguration.ts          |   0
 .../prediction/languageProcessor.interface.ts |   0
 .../prediction/predictionContext.ts           |   0
 .../src => src/js-processor}/deadkeys.ts      |   0
 .../src => src/js-processor}/index.ts         |   0
 .../js-processor}/jsKeyboardInterface.ts      |   0
 .../js-processor}/jsKeyboardProcessor.ts      |   0
 .../src => src/js-processor}/mock.ts          |   0
 .../js-processor}/outputTargetBase.ts         |   0
 .../js-processor}/platformSystemStore.ts      |   0
 .../src => src/js-processor}/stores.ts        |   0
 .../js-processor}/stringDivergence.ts         |   0
 .../{ => src}/keyboard-storage/README.md      |   0
 .../keyboard-storage}/cloud/index.ts          |   0
 .../keyboard-storage}/cloud/queryEngine.ts    |   0
 .../cloud/requesterInterface.ts               |   0
 .../keyboard-storage}/domCloudRequester.ts    |   0
 .../src => src/keyboard-storage}/index.ts     |   4 +-
 .../keyboardRequisitioner.ts                  |   0
 .../keyboard-storage}/keyboardStub.ts         |   0
 .../keyboard-storage}/modelCache.ts           |   0
 .../keyboard-storage}/stubAndKeyboardCache.ts |   0
 web/src/engine/{ => src}/keyboard/README.md   |   0
 .../{keyboard/src => src/keyboard}/codes.ts   |   0
 .../src => src/keyboard}/defaultRules.ts      |   0
 .../{keyboard/src => src/keyboard}/index.ts   |   2 +
 .../src => src/keyboard}/keyEvent.ts          |   0
 .../src => src/keyboard}/keyMapping.ts        |   0
 .../keyboard}/keyboards/activeLayout.ts       |   0
 .../keyboard}/keyboards/defaultLayouts.ts     |   0
 .../keyboard}/keyboards/jsKeyboard.ts         |   0
 .../keyboard}/keyboards/keyboardHarness.ts    |   0
 .../keyboard}/keyboards/keyboardLoadError.ts  |   0
 .../keyboard}/keyboards/keyboardLoaderBase.ts |   0
 .../keyboards/keyboardMinimalInterface.ts     |   0
 .../keyboard}/keyboards/keyboardProperties.ts |   0
 .../keyboard}/keyboards/kmxKeyboard.ts        |   0
 .../keyboards/loaders/dom-keyboard-loader.ts  |   0
 .../keyboards/loaders/domKeyboardLoader.ts    |   0
 .../keyboard}/keyboards/processorAction.ts    |   0
 .../keyboard}/keyboards/spacebarText.ts       |   0
 .../keyboard}/keyboards/stateKeyMap.ts        |   0
 .../keyboard}/keyboards/textTransform.ts      |   0
 .../keyboard}/keyboards/transcription.ts      |   0
 .../keyboard}/outputTargetInterface.ts        |   0
 .../src => src/keyboard}/systemStore.ts       |   0
 .../src => src/keyboard}/variableStore.ts     |   0
 .../src => src/main}/contextManagerBase.ts    |   0
 .../src => src/main}/engineConfiguration.ts   |   0
 .../src => src/main}/hardKeyboardBase.ts      |   0
 .../main}/headless/contextWindow.ts           |   0
 .../main}/headless/deviceDetector.ts          |   0
 .../main}/headless/inputProcessor.ts          |   0
 .../main}/headless/languageProcessor.ts       |   0
 .../main}/headless/transcriptionCache.ts      |   0
 .../main}/headless/utils/styleConstants.ts    |   0
 .../engine/{main/src => src/main}/index.ts    |   0
 .../src => src/main}/keyboardInterfaceBase.ts |   0
 .../src => src/main}/keymanEngineBase.ts      |   6 +-
 .../{main/src => src/main}/legacyAPIEvents.ts |   0
 web/src/engine/{ => src}/main/readme.md       |   0
 .../main}/variableStoreCookieSerializer.ts    |   0
 .../{osk/src => src/osk}/banner/banner.ts     |   0
 .../osk}/banner/bannerController.ts           |   0
 .../osk}/banner/bannerGestureSet.ts           |   2 +-
 .../osk}/banner/bannerScrollState.ts          |   2 +-
 .../{osk/src => src/osk}/banner/bannerView.ts |   0
 .../src => src/osk}/banner/blankBanner.ts     |   0
 .../{osk/src => src/osk}/banner/htmlBanner.ts |   0
 .../src => src/osk}/banner/imageBanner.ts     |   0
 .../osk}/banner/suggestionBanner.ts           |   2 +-
 .../{osk/src => src/osk}/buttonClassNames.ts  |   0
 .../src => src/osk}/components/emptyView.ts   |   0
 .../osk}/components/helpPageView.ts           |   0
 .../osk}/components/keyboardView.interface.ts |   0
 .../components/oskViewComponent.interface.ts  |   0
 .../src => src/osk}/components/resizeBar.ts   |   0
 .../src => src/osk}/components/titleBar.ts    |   0
 .../osk}/config/commonConfiguration.ts        |   0
 .../osk}/config/embeddedGestureConfig.ts      |   0
 .../osk}/config/viewConfiguration.ts          |   0
 .../{osk/src => src/osk}/correctionLayout.ts  |   0
 .../{osk/src => src/osk}/corrections.ts       |   0
 .../{osk/src => src/osk}/fontSizeUtils.ts     |   0
 .../src => src/osk}/globehint.interface.ts    |   0
 web/src/engine/{osk/src => src/osk}/index.ts  |   3 +
 .../osk}/input/gestures/browser/flick.ts      |   2 +-
 .../osk}/input/gestures/browser/keytip.ts     |   0
 .../osk}/input/gestures/browser/modipress.ts  |   2 +-
 .../osk}/input/gestures/browser/multitap.ts   |   2 +-
 .../osk}/input/gestures/browser/oskSubKey.ts  |   0
 .../input/gestures/browser/subkeyPopup.ts     |   2 +-
 .../input/gestures/browser/tabletPreview.ts   |   0
 .../osk}/input/gestures/gestureHandler.ts     |   0
 .../osk}/input/gestures/heldRepeater.ts       |   2 +-
 .../osk}/input/gestures/specsForLayout.ts     |   2 +-
 .../osk}/input/mouseDragOperation.ts          |   0
 .../engine/{osk/src => src/osk}/keyElement.ts |   0
 .../keyboard-layout/gesturePreviewHost.ts     |   0
 .../osk}/keyboard-layout/getTextMetrics.ts    |   0
 .../osk}/keyboard-layout/oskBaseKey.ts        |   0
 .../src => src/osk}/keyboard-layout/oskKey.ts |   0
 .../osk}/keyboard-layout/oskLayer.ts          |   0
 .../osk}/keyboard-layout/oskLayerGroup.ts     |   2 +-
 .../src => src/osk}/keyboard-layout/oskRow.ts |   0
 .../{osk/src => src/osk}/keytip.interface.ts  |   0
 .../{osk/src => src/osk}/lengthStyle.ts       |   0
 .../{osk/src => src/osk}/screenUtils.ts       |   0
 .../{osk/src => src/osk}/specialCharacters.ts |   0
 .../engine/{osk/src => src/osk}/test-index.ts |   0
 .../{ => src}/osk/validate-gesture-specs.js   |   2 +-
 .../{osk/src => src/osk}/views/activator.ts   |   0
 .../src => src/osk}/views/anchoredOskView.ts  |   0
 .../osk}/views/floatingOskCookie.ts           |   0
 .../src => src/osk}/views/floatingOskView.ts  |   0
 .../src => src/osk}/views/inlinedOskView.ts   |   0
 .../osk}/views/keyEventSource.interface.ts    |   0
 .../{osk/src => src/osk}/views/oskView.ts     |   0
 .../src => src/osk}/views/simpleActivator.ts  |   0
 .../osk}/views/touchEventPromiseMap.ts        |   0
 .../osk}/views/twoStateActivator.ts           |   0
 .../{osk/src => src/osk}/visualKeyboard.ts    |   2 +-
 web/src/engine/tsconfig.json                  |  15 ++
 .../dom/cases/browser/contextManager.tests.ts |   2 +-
 .../recordedCoordSequences.tests.ts           |   2 +-
 .../keyboard-storage/cloudQueries.tests.ts    |   3 +-
 .../domCloudRequester.tests.ts                |   2 +-
 .../keyboardRequisitioner.tests.ts            |   4 +-
 .../cases/keyboard/domKeyboardLoader.tests.ts |   2 +-
 web/src/test/auto/dom/kbdLoader.ts            |   2 +-
 web/src/test/auto/dom/tsconfig.json           |   9 -
 .../engine/js-processor/basic-engine.tests.js |   2 +-
 .../engine/js-processor/basic-init.tests.js   |   2 +-
 .../engine/js-processor/chirality.tests.js    |   2 +-
 .../engine/js-processor/deadkeys.tests.js     |   2 +-
 .../js-processor/engine/context.tests.js      |   6 +-
 .../engine/notany_context.tests.js            |   2 +-
 .../engine/unmatched_final_group.tests.js     |   2 +-
 .../engine/js-processor/kbdInterface.tests.ts |   2 +-
 .../non-positional-rules.tests.js             |   2 +-
 .../specialized-backspace.tests.js            |   2 +-
 .../keyboard-storage/cloudQueries.tests.js    |   2 +-
 .../keyboardRequisitioner.tests.js            |   4 +-
 .../keyboard-storage/keyboardStub.tests.js    |   2 +-
 .../nodeCloudRequester.tests.js               |   2 +-
 .../stubAndKeyboardCache.tests.js             |   2 +-
 .../engine/keyboard/keyboard-loading.tests.js |   2 +-
 .../engine/keyboard/keyboard.tests.ts         |   2 +-
 .../keyboard/keyboardLoaderBase.tests.ts      |   2 +-
 .../main/headless/inputProcessor.tests.js     |   2 +-
 .../asyncClosureDispatchQueue.tests.ts        |   2 +-
 .../gesture-processor/gesturePath.tests.ts    |   2 +-
 .../gesture-processor/gestureSource.tests.ts  |   2 +-
 .../gestures/gestureMatcher.tests.ts          |   2 +-
 .../gestures/gestureModelDefs.tests.ts        |   2 +-
 .../gestures/gestureSequence.tests.ts         |   2 +-
 .../gestures/isolatedGestureSpecs.ts          |   2 +-
 .../gestures/isolatedPathSpecs.ts             |   2 +-
 .../gestures/matcherSelector.tests.ts         |   2 +-
 .../gestures/pathMatcher.tests.ts             |   2 +-
 .../gestures/touchpointCoordinator.tests.ts   |   2 +-
 .../osk/gesture-processor/pathStats.tests.ts  |   2 +-
 .../gestures/browser/subkeyPopup.tests.ts     |   9 +-
 .../engine/osk/visualKeyboard.tests.ts        | 178 +++++++++---------
 .../auto/resources/assertSegmentSimilarity.js |   2 +-
 .../resources/loader}/node-keyboard-loader.ts |   0
 .../resources/loader}/nodeCloudRequester.ts   |   4 +-
 .../resources/loader}/nodeKeyboardLoader.ts   |   5 +-
 .../auto/resources/loader}/tsconfig.node.json |   0
 .../test/auto/resources/sequenceAssertions.ts |   2 +-
 .../resources/simulateMultiSourceInput.ts     |   2 +-
 web/src/test/auto/tsconfig.json               |  11 +-
 web/src/test/manual/build.sh                  |  10 +-
 web/src/tools/build.sh                        |   5 +-
 .../testing/bulk_rendering/tsconfig.json      |   7 +-
 .../testing/gesture-processor}/build.sh       |  34 ++--
 .../host-fixture/extract-fixture.sh           |   0
 .../host-fixture/extractor.cjs                |   0
 .../host-fixture/gestureHost.css              |   0
 .../host-fixture/host-fixture.html            |   0
 .../recorder/src/index.html                   |   0
 .../recorder/src/pageStyle.css                |   0
 .../recorder/src/recorder.mjs                 |   0
 .../recorder/update-index.cjs                 |   0
 .../unit-test-resources/build-bundler.js      |   0
 .../src/fixtureLayoutConfiguration.ts         |   0
 .../src/headlessInputEngine.ts                |   2 +-
 .../src/hostFixtureLayoutController.ts        |   2 +-
 .../unit-test-resources/src/index.ts          |   0
 .../unit-test-resources/src/inputRecording.ts |   2 +-
 .../src/inputSequenceSimulator.ts             |   2 +-
 .../unit-test-resources/src/jsonObject.ts     |   0
 .../src/sequenceRecorder.ts                   |   2 +-
 .../src/touchpathTurtle.ts                    |   2 +-
 .../unit-test-resources/tsconfig.json         |  17 ++
 .../tools/testing/recorder-core/tsconfig.json |   8 +-
 web/src/tools/testing/recorder/build.sh       |   2 +-
 web/src/tools/testing/recorder/tsconfig.json  |   7 +-
 323 files changed, 421 insertions(+), 1353 deletions(-)
 delete mode 100644 web/.mocharc.json
 rename web/src/engine/{interfaces => }/.c8rc.json (68%)
 delete mode 100644 web/src/engine/attachment/.c8rc.json
 delete mode 100755 web/src/engine/attachment/build.sh
 delete mode 100644 web/src/engine/attachment/tsconfig.json
 create mode 100755 web/src/engine/build.sh
 delete mode 100644 web/src/engine/core-processor/.gitignore
 delete mode 100755 web/src/engine/core-processor/build.sh
 delete mode 100644 web/src/engine/core-processor/tsconfig.json
 delete mode 100755 web/src/engine/dom-utils/build.sh
 delete mode 100644 web/src/engine/dom-utils/tsconfig.json
 delete mode 100755 web/src/engine/element-wrappers/build.sh
 delete mode 100644 web/src/engine/element-wrappers/readme.md
 delete mode 100644 web/src/engine/element-wrappers/tsconfig.json
 delete mode 100755 web/src/engine/events/build.sh
 delete mode 100644 web/src/engine/events/tsconfig.json
 delete mode 100755 web/src/engine/interfaces/build.sh
 delete mode 100644 web/src/engine/interfaces/tsconfig.json
 delete mode 100755 web/src/engine/js-processor/build.sh
 delete mode 100644 web/src/engine/js-processor/tsconfig.json
 delete mode 100644 web/src/engine/keyboard-storage/.c8rc.json
 delete mode 100755 web/src/engine/keyboard-storage/build.sh
 delete mode 100644 web/src/engine/keyboard-storage/tsconfig.json
 delete mode 100644 web/src/engine/keyboard/.c8rc.json
 delete mode 100644 web/src/engine/keyboard/.gitignore
 delete mode 100755 web/src/engine/keyboard/build.sh
 delete mode 100644 web/src/engine/keyboard/src/keyboards/loaders/tsconfig.dom.json
 delete mode 100644 web/src/engine/keyboard/tsconfig.all.json
 delete mode 100644 web/src/engine/keyboard/tsconfig.json
 delete mode 100755 web/src/engine/main/build.sh
 delete mode 100644 web/src/engine/main/tsconfig.json
 delete mode 100755 web/src/engine/osk/build.sh
 delete mode 100644 web/src/engine/osk/gesture-processor/.c8rc.json
 delete mode 100644 web/src/engine/osk/gesture-processor/.gitignore
 delete mode 100755 web/src/engine/osk/gesture-processor/build.sh
 delete mode 100644 web/src/engine/osk/gesture-processor/package.json
 delete mode 100644 web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/tsconfig.json
 delete mode 100644 web/src/engine/osk/gesture-processor/tsconfig.json
 delete mode 100644 web/src/engine/osk/tsconfig.json
 rename web/src/engine/{attachment => }/readme.md (100%)
 rename web/src/engine/{attachment/src => src/attachment}/attachmentInfo.ts (100%)
 rename web/src/engine/{attachment/src => src/attachment}/index.ts (100%)
 rename web/src/engine/{attachment/src => src/attachment}/outputTargetForElement.ts (100%)
 rename web/src/engine/{attachment/src => src/attachment}/pageContextAttachment.ts (100%)
 create mode 100644 web/src/engine/src/core-processor/.gitignore
 rename web/src/engine/{core-processor/src => src/core-processor}/KM_Core.ts (100%)
 rename web/src/engine/{core-processor/src => src/core-processor}/index.ts (100%)
 rename web/src/engine/{dom-utils/src => src/dom-utils}/arrayFromNodeList.ts (100%)
 rename web/src/engine/{dom-utils/src => src/dom-utils}/cookieSerializer.ts (100%)
 rename web/src/engine/{dom-utils/src => src/dom-utils}/createUnselectableElement.ts (100%)
 rename web/src/engine/{dom-utils/src => src/dom-utils}/getAbsolute.ts (100%)
 rename web/src/engine/{dom-utils/src => src/dom-utils}/index.ts (100%)
 rename web/src/engine/{dom-utils/src => src/dom-utils}/landscapeView.ts (100%)
 rename web/src/engine/{ => src}/dom-utils/readme.md (100%)
 rename web/src/engine/{dom-utils/src => src/dom-utils}/stylesheets.ts (100%)
 rename web/src/engine/{element-wrappers/src => src/element-wrappers}/contentEditable.ts (100%)
 rename web/src/engine/{element-wrappers/src => src/element-wrappers}/designIFrame.ts (100%)
 rename web/src/engine/{element-wrappers/src => src/element-wrappers}/index.ts (100%)
 rename web/src/engine/{element-wrappers/src => src/element-wrappers}/input.ts (100%)
 rename web/src/engine/{element-wrappers/src => src/element-wrappers}/outputTargetElementWrapper.ts (100%)
 rename web/src/engine/{element-wrappers/src => src/element-wrappers}/readme.md (67%)
 rename web/src/engine/{element-wrappers/src => src/element-wrappers}/textarea.ts (100%)
 rename web/src/engine/{element-wrappers/src => src/element-wrappers}/utils.ts (100%)
 rename web/src/engine/{element-wrappers/src => src/element-wrappers}/wrapElement.ts (100%)
 rename web/src/engine/{ => src}/events/.c8rc.json (100%)
 rename web/src/engine/{events/src => src/events}/domEventTracker.ts (100%)
 rename web/src/engine/{events/src => src/events}/emitterListenerSpy.ts (100%)
 rename web/src/engine/{events/src => src/events}/index.ts (100%)
 rename web/src/engine/{events/src => src/events}/legacyEventEmitter.ts (100%)
 rename web/src/engine/{ => src}/events/readme.md (100%)
 rename web/src/engine/{osk => src}/gesture-processor/README.md (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/configuration/gestureRecognizerConfiguration.ts (99%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/configuration/paddedZoneSource.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/configuration/recognitionZoneSource.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/configuration/viewportZoneSource.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/configuration/zoneBoundaryChecker.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/gestureRecognizer.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/asyncClosureDispatchQueue.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/cumulativePathStats.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gestureDebugPath.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gestureDebugSource.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gesturePath.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gestureSource.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gestures/index.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gestures/matchers/gestureMatcher.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gestures/matchers/gestureSequence.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gestures/matchers/index.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gestures/matchers/matcherSelector.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gestures/matchers/pathMatcher.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gestures/specs/contactModel.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gestures/specs/gestureModel.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gestures/specs/gestureModelDefs.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gestures/specs/index.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gestures/specs/modelDefValidator.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/gestures/specs/pathModel.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/inputEngineBase.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/inputSample.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/segmentClassifier.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/headless/touchpointCoordinator.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/index.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/inputEventEngine.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/mouseEventEngine.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/mutable.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/nonoptional.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/reportError.ts (100%)
 rename web/src/engine/{osk/gesture-processor/src/engine => src/gesture-processor}/touchEventEngine.ts (100%)
 create mode 100644 web/src/engine/src/index.ts
 rename web/src/engine/{interfaces/src => src/interfaces}/index.ts (100%)
 rename web/src/engine/{interfaces/src => src/interfaces}/modelSpec.ts (100%)
 rename web/src/engine/{interfaces/src => src/interfaces}/optionSpec.interface.ts (100%)
 rename web/src/engine/{interfaces/src => src/interfaces}/oskResourcePathConfiguration.interface.ts (100%)
 rename web/src/engine/{interfaces/src => src/interfaces}/pathConfiguration.ts (100%)
 rename web/src/engine/{interfaces/src => src/interfaces}/prediction/languageProcessor.interface.ts (100%)
 rename web/src/engine/{interfaces/src => src/interfaces}/prediction/predictionContext.ts (100%)
 rename web/src/engine/{js-processor/src => src/js-processor}/deadkeys.ts (100%)
 rename web/src/engine/{js-processor/src => src/js-processor}/index.ts (100%)
 rename web/src/engine/{js-processor/src => src/js-processor}/jsKeyboardInterface.ts (100%)
 rename web/src/engine/{js-processor/src => src/js-processor}/jsKeyboardProcessor.ts (100%)
 rename web/src/engine/{js-processor/src => src/js-processor}/mock.ts (100%)
 rename web/src/engine/{js-processor/src => src/js-processor}/outputTargetBase.ts (100%)
 rename web/src/engine/{js-processor/src => src/js-processor}/platformSystemStore.ts (100%)
 rename web/src/engine/{js-processor/src => src/js-processor}/stores.ts (100%)
 rename web/src/engine/{js-processor/src => src/js-processor}/stringDivergence.ts (100%)
 rename web/src/engine/{ => src}/keyboard-storage/README.md (100%)
 rename web/src/engine/{keyboard-storage/src => src/keyboard-storage}/cloud/index.ts (100%)
 rename web/src/engine/{keyboard-storage/src => src/keyboard-storage}/cloud/queryEngine.ts (100%)
 rename web/src/engine/{keyboard-storage/src => src/keyboard-storage}/cloud/requesterInterface.ts (100%)
 rename web/src/engine/{keyboard-storage/src => src/keyboard-storage}/domCloudRequester.ts (100%)
 rename web/src/engine/{keyboard-storage/src => src/keyboard-storage}/index.ts (73%)
 rename web/src/engine/{keyboard-storage/src => src/keyboard-storage}/keyboardRequisitioner.ts (100%)
 rename web/src/engine/{keyboard-storage/src => src/keyboard-storage}/keyboardStub.ts (100%)
 rename web/src/engine/{keyboard-storage/src => src/keyboard-storage}/modelCache.ts (100%)
 rename web/src/engine/{keyboard-storage/src => src/keyboard-storage}/stubAndKeyboardCache.ts (100%)
 rename web/src/engine/{ => src}/keyboard/README.md (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/codes.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/defaultRules.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/index.ts (96%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyEvent.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyMapping.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/activeLayout.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/defaultLayouts.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/jsKeyboard.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/keyboardHarness.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/keyboardLoadError.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/keyboardLoaderBase.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/keyboardMinimalInterface.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/keyboardProperties.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/kmxKeyboard.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/loaders/dom-keyboard-loader.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/loaders/domKeyboardLoader.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/processorAction.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/spacebarText.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/stateKeyMap.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/textTransform.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/keyboards/transcription.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/outputTargetInterface.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/systemStore.ts (100%)
 rename web/src/engine/{keyboard/src => src/keyboard}/variableStore.ts (100%)
 rename web/src/engine/{main/src => src/main}/contextManagerBase.ts (100%)
 rename web/src/engine/{main/src => src/main}/engineConfiguration.ts (100%)
 rename web/src/engine/{main/src => src/main}/hardKeyboardBase.ts (100%)
 rename web/src/engine/{main/src => src/main}/headless/contextWindow.ts (100%)
 rename web/src/engine/{main/src => src/main}/headless/deviceDetector.ts (100%)
 rename web/src/engine/{main/src => src/main}/headless/inputProcessor.ts (100%)
 rename web/src/engine/{main/src => src/main}/headless/languageProcessor.ts (100%)
 rename web/src/engine/{main/src => src/main}/headless/transcriptionCache.ts (100%)
 rename web/src/engine/{main/src => src/main}/headless/utils/styleConstants.ts (100%)
 rename web/src/engine/{main/src => src/main}/index.ts (100%)
 rename web/src/engine/{main/src => src/main}/keyboardInterfaceBase.ts (100%)
 rename web/src/engine/{main/src => src/main}/keymanEngineBase.ts (99%)
 rename web/src/engine/{main/src => src/main}/legacyAPIEvents.ts (100%)
 rename web/src/engine/{ => src}/main/readme.md (100%)
 rename web/src/engine/{main/src => src/main}/variableStoreCookieSerializer.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/banner/banner.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/banner/bannerController.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/banner/bannerGestureSet.ts (93%)
 rename web/src/engine/{osk/src => src/osk}/banner/bannerScrollState.ts (95%)
 rename web/src/engine/{osk/src => src/osk}/banner/bannerView.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/banner/blankBanner.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/banner/htmlBanner.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/banner/imageBanner.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/banner/suggestionBanner.ts (99%)
 rename web/src/engine/{osk/src => src/osk}/buttonClassNames.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/components/emptyView.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/components/helpPageView.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/components/keyboardView.interface.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/components/oskViewComponent.interface.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/components/resizeBar.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/components/titleBar.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/config/commonConfiguration.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/config/embeddedGestureConfig.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/config/viewConfiguration.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/correctionLayout.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/corrections.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/fontSizeUtils.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/globehint.interface.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/index.ts (94%)
 rename web/src/engine/{osk/src => src/osk}/input/gestures/browser/flick.ts (99%)
 rename web/src/engine/{osk/src => src/osk}/input/gestures/browser/keytip.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/input/gestures/browser/modipress.ts (96%)
 rename web/src/engine/{osk/src => src/osk}/input/gestures/browser/multitap.ts (99%)
 rename web/src/engine/{osk/src => src/osk}/input/gestures/browser/oskSubKey.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/input/gestures/browser/subkeyPopup.ts (99%)
 rename web/src/engine/{osk/src => src/osk}/input/gestures/browser/tabletPreview.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/input/gestures/gestureHandler.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/input/gestures/heldRepeater.ts (95%)
 rename web/src/engine/{osk/src => src/osk}/input/gestures/specsForLayout.ts (99%)
 rename web/src/engine/{osk/src => src/osk}/input/mouseDragOperation.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/keyElement.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/keyboard-layout/gesturePreviewHost.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/keyboard-layout/getTextMetrics.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/keyboard-layout/oskBaseKey.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/keyboard-layout/oskKey.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/keyboard-layout/oskLayer.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/keyboard-layout/oskLayerGroup.ts (99%)
 rename web/src/engine/{osk/src => src/osk}/keyboard-layout/oskRow.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/keytip.interface.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/lengthStyle.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/screenUtils.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/specialCharacters.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/test-index.ts (100%)
 rename web/src/engine/{ => src}/osk/validate-gesture-specs.js (93%)
 rename web/src/engine/{osk/src => src/osk}/views/activator.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/views/anchoredOskView.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/views/floatingOskCookie.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/views/floatingOskView.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/views/inlinedOskView.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/views/keyEventSource.interface.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/views/oskView.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/views/simpleActivator.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/views/touchEventPromiseMap.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/views/twoStateActivator.ts (100%)
 rename web/src/engine/{osk/src => src/osk}/visualKeyboard.ts (99%)
 create mode 100644 web/src/engine/tsconfig.json
 delete mode 100644 web/src/test/auto/dom/tsconfig.json
 rename web/src/{engine/keyboard/src/keyboards/loaders => test/auto/resources/loader}/node-keyboard-loader.ts (100%)
 rename web/src/{engine/keyboard-storage/src => test/auto/resources/loader}/nodeCloudRequester.ts (93%)
 rename web/src/{engine/keyboard/src/keyboards/loaders => test/auto/resources/loader}/nodeKeyboardLoader.ts (87%)
 rename web/src/{engine/keyboard/src/keyboards/loaders => test/auto/resources/loader}/tsconfig.node.json (100%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/build.sh (65%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/host-fixture/extract-fixture.sh (100%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/host-fixture/extractor.cjs (100%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/host-fixture/gestureHost.css (100%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/host-fixture/host-fixture.html (100%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/recorder/src/index.html (100%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/recorder/src/pageStyle.css (100%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/recorder/src/recorder.mjs (100%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/recorder/update-index.cjs (100%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/unit-test-resources/build-bundler.js (100%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/unit-test-resources/src/fixtureLayoutConfiguration.ts (100%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/unit-test-resources/src/headlessInputEngine.ts (98%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/unit-test-resources/src/hostFixtureLayoutController.ts (98%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/unit-test-resources/src/index.ts (100%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/unit-test-resources/src/inputRecording.ts (81%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/unit-test-resources/src/inputSequenceSimulator.ts (99%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/unit-test-resources/src/jsonObject.ts (100%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/unit-test-resources/src/sequenceRecorder.ts (95%)
 rename web/src/{engine/osk/gesture-processor/src/tools => tools/testing/gesture-processor}/unit-test-resources/src/touchpathTurtle.ts (99%)
 create mode 100644 web/src/tools/testing/gesture-processor/unit-test-resources/tsconfig.json

diff --git a/package-lock.json b/package-lock.json
index cdeed6ce983..4520b1d0662 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,6 @@
         "common/tools/sourcemap-path-remapper",
         "common/tools/hextobin",
         "web",
-        "web/src/engine/osk/gesture-processor",
         "web/src/engine/predictive-text/*"
       ],
       "dependencies": {
@@ -1678,10 +1677,6 @@
       "resolved": "developer/src/common/web/utils",
       "link": true
     },
-    "node_modules/@keymanapp/gesture-recognizer": {
-      "resolved": "web/src/engine/osk/gesture-processor",
-      "link": true
-    },
     "node_modules/@keymanapp/hextobin": {
       "resolved": "common/tools/hextobin",
       "link": true
@@ -14186,6 +14181,7 @@
         "c8": "^7.12.0",
         "express": "^4.19.2",
         "jsdom": "^23.0.1",
+        "promise-status-async": "^1.2.10",
         "tsx": "^4.19.0"
       }
     },
@@ -14228,6 +14224,7 @@
     },
     "web/src/engine/osk/gesture-processor": {
       "name": "@keymanapp/gesture-recognizer",
+      "extraneous": true,
       "dependencies": {
         "@keymanapp/web-utils": "*",
         "eventemitter3": "^5.0.0"
@@ -14323,6 +14320,18 @@
         "typescript": "^5.4.5"
       }
     },
+    "web/src/engine/src/gesture-processor": {
+      "extraneous": true,
+      "dependencies": {
+        "@keymanapp/web-utils": "*",
+        "eventemitter3": "^5.0.0"
+      },
+      "devDependencies": {
+        "@keymanapp/resources-gosh": "*",
+        "promise-status-async": "^1.2.10",
+        "typescript": "^5.4.5"
+      }
+    },
     "web/src/tools/testing/recorder-core": {
       "name": "@keymanapp/recorder-core",
       "license": "MIT",
diff --git a/package.json b/package.json
index 9ce87b3f120..ac19bf5cdb8 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,6 @@
     "common/tools/sourcemap-path-remapper",
     "common/tools/hextobin",
     "web",
-    "web/src/engine/osk/gesture-processor",
     "web/src/engine/predictive-text/*"
   ],
   "dependencies": {
diff --git a/tsconfig.json b/tsconfig.json
index ac2a37037b1..8f63a70a700 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -43,8 +43,7 @@
     { "path": "./web/src/engine/predictive-text/wordbreakers" },
     { "path": "./web/src/engine/predictive-text/worker-main/tsconfig.all.json" },
     { "path": "./web/src/engine/predictive-text/worker-thread" },
-    { "path": "./web/src/engine/osk/gesture-processor/tsconfig.json" },
-    { "path": "./web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/tsconfig.json" },
+    { "path": "./web/src/tools/testing/gesture-processor/unit-test-resources" },
     { "path": "./web/src/engine/sentry-manager/src" },
 
     { "path": "./web/src/tools/testing/recorder" },
diff --git a/web/.mocharc.json b/web/.mocharc.json
deleted file mode 100644
index e8ecf2c60fd..00000000000
--- a/web/.mocharc.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/mocharc.json",
-  "require": "tsx"
-}
diff --git a/web/README.md b/web/README.md
index 54173090674..5c89d9ff5ef 100644
--- a/web/README.md
+++ b/web/README.md
@@ -95,7 +95,7 @@ graph TD;
     LMWorker-->Wordbreakers;
     LMLayer["@keymanapp/lexical-model-layer<br>(/web/src/engine/predictive-text/worker-main)"];
     LMLayer-->LMWorker;
-    Gestures["@keymanapp/gesture-recognizer<br>(/web/src/engine/osk/gesture-recognizer)"];
+    Gestures["/web/src/engine/gesture-processor"];
     Gestures-->WebUtils;
 
     subgraph PredText["PredText: WebWorker + its interface"]
diff --git a/web/build.sh b/web/build.sh
index 5c9b54647d9..aee8985e4ce 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -26,18 +26,8 @@ builder_describe "Builds engine modules for Keyman Engine for Web (KMW)." \
   ":app/browser              The form of Keyman Engine for Web for use on websites" \
   ":app/webview              A puppetable version of KMW designed for use in a host app's WebView" \
   ":app/ui                   Builds KMW's desktop form-factor keyboard-selection UI modules" \
-  ":engine/attachment        Subset used for detecting valid page contexts for use in text editing " \
-  ":engine/core-processor    Keyman Core WASM integration" \
-  ":engine/common/web-utils  Low-level, headless utility methods and classes used across multiple modules" \
-  ":engine/dom-utils         A common subset of function used for DOM calculations, layout, etc" \
-  ":engine/events            Specialized classes utilized to support KMW API events" \
-  ":engine/element-wrappers  Subset used to integrate with website elements" \
-  ":engine/interfaces        Subset used to configure KMW" \
-  ":engine/js-processor      Build JS processor for KMW" \
-  ":engine/keyboard          Builds KMW's keyboard-loading and caching code" \
-  ":engine/keyboard-storage  Subset used to collate keyboards and request them from the cloud" \
-  ":engine/main              Builds all common code used by KMW's app/-level targets" \
-  ":engine/osk               Builds the Web OSK module" \
+  ":engine                   Keyman Engine for Web" \
+  ":engine/common/web-utils  Shared utils" \
   ":engine/predictive-text   Builds KMW's predictive text module" \
   ":help                     Online documentation" \
   ":samples                  Builds all needed resources for the KMW sample-page set" \
@@ -123,10 +113,12 @@ build_action() {
   # errors when compiling against it with current tsc versions.
   rm -f "${KEYMAN_ROOT}/node_modules/promise-status-async/lib/index.d.ts"
 
-  tsc --project "${KEYMAN_ROOT}/web/src/test/auto/tsconfig.json"
+  tsc -b "${KEYMAN_ROOT}/web/src/test/auto/tsconfig.json"
+
+  builder_echo "Copying some files"
 
   mkdir -p "${KEYMAN_ROOT}/web/build/test/dom/cases/core-processor/import/core/"
-  cp "${KEYMAN_ROOT}/web/src/engine/core-processor/src/import/core/keymancore.d.ts" "${KEYMAN_ROOT}/web/build/test/dom/cases/core-processor/import/core/"
+  cp "${KEYMAN_ROOT}/web/src/engine/src/core-processor/import/core/keymancore.d.ts" "${KEYMAN_ROOT}/web/build/test/dom/cases/core-processor/import/core/"
 
   for dir in \
     "${KEYMAN_ROOT}/web/build/test/dom/cases"/*/ \
@@ -164,33 +156,12 @@ coverage_action() {
   rm -rf build/coverage/tmp
 }
 
-builder_run_child_actions build:engine/common/web-utils
-builder_run_child_actions build:engine/dom-utils
-
-builder_run_child_actions build:engine/keyboard
-builder_run_child_actions build:engine/js-processor
-builder_run_child_actions build:engine/element-wrappers
-builder_run_child_actions build:engine/events
-builder_run_child_actions build:engine/interfaces
-
-# Uses engine/dom-utils and engine/interfaces
-builder_run_child_actions build:engine/osk
-
-# Uses engine/element-wrappers
-builder_run_child_actions build:engine/attachment
-
-# Uses engine/interfaces (due to resource-path config interface)
-builder_run_child_actions build:engine/keyboard-storage
+builder_run_child_actions build:tools
 
-# Builds the predictive-text components
+builder_run_child_actions build:engine/common/web-utils
+builder_run_child_actions build:engine
 builder_run_child_actions build:engine/predictive-text
 
-# Uses engine/interfaces, engine/keyboard-storage, engine/predictive-text, & engine/osk
-builder_run_child_actions build:engine/core-processor
-
-# Uses engine/interfaces, engine/keyboard-storage, & engine/osk
-builder_run_child_actions build:engine/main
-
 # Uses all but engine/element-wrappers and engine/attachment
 builder_run_child_actions build:app/webview
 
@@ -203,8 +174,6 @@ builder_run_child_actions build:app/ui
 # Needs both app/browser and app/ui.
 builder_run_child_actions build:samples
 
-builder_run_child_actions build:tools
-
 # Some test pages refer to KMW tools.
 builder_run_child_actions build:test-pages
 
diff --git a/web/common.inc.sh b/web/common.inc.sh
index 32249094a3f..eafbf29ae2e 100644
--- a/web/common.inc.sh
+++ b/web/common.inc.sh
@@ -109,6 +109,7 @@ function test-headless() {
     TEST_OPTS+=(--extension "${TEST_EXTENSIONS}")
   fi
 
+  builder_echo '> ' mocha --recursive "${TEST_BASE}${TEST_FOLDER}" "${TEST_OPTS[@]}"
   if [[ -e .c8rc.json ]]; then
     c8 mocha --recursive "${TEST_BASE}${TEST_FOLDER}" "${TEST_OPTS[@]}"
   else
diff --git a/web/package.json b/web/package.json
index 5d3f9be6f6d..7c722a724c6 100644
--- a/web/package.json
+++ b/web/package.json
@@ -8,84 +8,65 @@
       "import": "./build/app/browser/obj/test-index.js"
     },
     "./engine/attachment": {
-      "es6-bundling": "./src/engine/attachment/src/index.ts",
-      "types": "./build/engine/attachment/obj/index.d.ts",
-      "import": "./build/engine/attachment/obj/index.js"
+      "es6-bundling": "./src/engine/src/attachment/index.ts",
+      "types": "./build/engine/obj/attachment/index.d.ts",
+      "import": "./build/engine/obj/attachment/index.js"
     },
     "./engine/core-processor": {
-      "es6-bundling": "./src/engine/core-processor/src/index.ts",
-      "types": "./build/engine/core-processor/obj/index.d.ts",
-      "import": "./build/engine/core-processor/obj/index.js"
+      "es6-bundling": "./src/engine/src/core-processor/index.ts",
+      "types": "./build/engine/obj/core-processor/index.d.ts",
+      "import": "./build/engine/obj/core-processor/index.js"
     },
     "./engine/dom-utils": {
-      "es6-bundling": "./src/engine/dom-utils/src/index.ts",
-      "types": "./build/engine/dom-utils/obj/index.d.ts",
-      "import": "./build/engine/dom-utils/obj/index.js"
+      "es6-bundling": "./src/engine/src/dom-utils/index.ts",
+      "types": "./build/engine/obj/dom-utils/index.d.ts",
+      "import": "./build/engine/obj/dom-utils/index.js"
     },
     "./engine/element-wrappers": {
-      "es6-bundling": "./src/engine/element-wrappers/src/index.ts",
-      "types": "./build/engine/element-wrappers/obj/index.d.ts",
-      "import": "./build/engine/element-wrappers/obj/index.js"
+      "es6-bundling": "./src/engine/src/element-wrappers/index.ts",
+      "types": "./build/engine/obj/element-wrappers/index.d.ts",
+      "import": "./build/engine/obj/element-wrappers/index.js"
     },
     "./engine/events": {
-      "es6-bundling": "./src/engine/events/src/index.ts",
-      "types": "./build/engine/events/obj/index.d.ts",
-      "import": "./build/engine/events/obj/index.js"
+      "es6-bundling": "./src/engine/src/events/index.ts",
+      "types": "./build/engine/obj/events/index.d.ts",
+      "import": "./build/engine/obj/events/index.js"
+    },
+    "./engine/gesture-processor": {
+      "es6-bundling": "./src/engine/src/gesture-processor/index.ts",
+      "types": "./build/engine/obj/gesture-processor/index.d.ts",
+      "import": "./build/engine/obj/gesture-processor/index.js"
     },
     "./engine/interfaces": {
-      "es6-bundling": "./src/engine/interfaces/src/index.ts",
-      "types": "./build/engine/interfaces/obj/index.d.ts",
-      "import": "./build/engine/interfaces/obj/index.js"
+      "es6-bundling": "./src/engine/src/interfaces/index.ts",
+      "types": "./build/engine/obj/interfaces/index.d.ts",
+      "import": "./build/engine/obj/interfaces/index.js"
     },
     "./engine/js-processor": {
-      "es6-bundling": "./src/engine/js-processor/src/index.ts",
-      "types": "./build/engine/js-processor/obj/index.d.ts",
-      "import": "./build/engine/js-processor/obj/index.js"
+      "es6-bundling": "./src/engine/src/js-processor/index.ts",
+      "types": "./build/engine/obj/js-processor/index.d.ts",
+      "import": "./build/engine/obj/js-processor/index.js"
     },
     "./engine/keyboard": {
-      "es6-bundling": "./src/engine/keyboard/src/index.ts",
-      "types": "./build/engine/keyboard/obj/index.d.ts",
-      "import": "./build/engine/keyboard/obj/index.js"
-    },
-    "./engine/keyboard/node-keyboard-loader": {
-      "es6-bundling": "./src/engine/keyboard/src/keyboards/loaders/node-keyboard-loader.ts",
-      "types": "./build/engine/keyboard/obj/keyboards/loaders/node-keyboard-loader.d.ts",
-      "import": "./build/engine/keyboard/obj/keyboards/loaders/node-keyboard-loader.js"
-    },
-    "./engine/keyboard/dom-keyboard-loader": {
-      "es6-bundling": "./src/engine/keyboard/src/keyboards/loaders/dom-keyboard-loader.ts",
-      "types": "./build/engine/keyboard/obj/keyboards/loaders/dom-keyboard-loader.d.ts",
-      "import": "./build/engine/keyboard/obj/keyboards/loaders/dom-keyboard-loader.js"
+      "es6-bundling": "./src/engine/src/keyboard/index.ts",
+      "types": "./build/engine/obj/keyboard/index.d.ts",
+      "import": "./build/engine/obj/keyboard/index.js"
     },
     "./engine/keyboard-storage": {
-      "es6-bundling": "./src/engine/keyboard-storage/src/index.ts",
-      "types": "./build/engine/keyboard-storage/obj/index.d.ts",
-      "import": "./build/engine/keyboard-storage/obj/index.js",
-      "require": "./build/engine/keyboard-storage/obj/index.js"
-    },
-    "./engine/keyboard-storage/dom-requester": {
-      "es6-bundling": "./src/engine/keyboard-storage/src/domCloudRequester.ts",
-      "types": "./build/engine/keyboard-storage/obj/domCloudRequester.d.ts",
-      "import": "./build/engine/keyboard-storage/obj/domCloudRequester.js"
-    },
-    "./engine/keyboard-storage/node-requester": {
-      "es6-bundling": "./src/engine/keyboard-storage/src/nodeCloudRequester.ts",
-      "types": "./build/engine/keyboard-storage/obj/nodeCloudRequester.d.ts",
-      "import": "./build/engine/keyboard-storage/obj/nodeCloudRequester.js"
+      "es6-bundling": "./src/engine/src/keyboard-storage/index.ts",
+      "types": "./build/engine/obj/keyboard-storage/index.d.ts",
+      "import": "./build/engine/obj/keyboard-storage/index.js",
+      "require": "./build/engine/obj/keyboard-storage/index.js"
     },
     "./engine/main": {
-      "es6-bundling": "./src/engine/main/src/index.ts",
-      "types": "./build/engine/main/obj/index.d.ts",
-      "import": "./build/engine/main/obj/index.js"
+      "es6-bundling": "./src/engine/src/main/index.ts",
+      "types": "./build/engine/obj/main/index.d.ts",
+      "import": "./build/engine/obj/main/index.js"
     },
     "./engine/osk": {
-      "es6-bundling": "./src/engine/osk/src/index.ts",
-      "types": "./build/engine/osk/obj/index.d.ts",
-      "import": "./build/engine/osk/obj/index.js"
-    },
-    "./engine/osk/internals": {
-      "types": "./build/engine/osk/obj/test-index.d.ts",
-      "import": "./build/engine/osk/obj/test-index.js"
+      "es6-bundling": "./src/engine/src/osk/index.ts",
+      "types": "./build/engine/obj/osk/index.d.ts",
+      "import": "./build/engine/obj/osk/index.js"
     },
     "./tools/testing/test-utils": {
       "types": "./build/tools/testing/test-utils/obj/index.d.ts",
@@ -93,7 +74,7 @@
     }
   },
   "imports": {
-    "#gesture-tools": "./src/engine/osk/gesture-processor/build/tools/obj/index.js",
+    "#gesture-tools": "./build/tools/testing/gesture-processor/unit-test-resources/obj/index.js",
     "#recorder": "./build/tools/testing/recorder/obj/index.js"
   },
   "repository": {
@@ -119,6 +100,7 @@
     "c8": "^7.12.0",
     "express": "^4.19.2",
     "jsdom": "^23.0.1",
+    "promise-status-async": "^1.2.10",
     "tsx": "^4.19.0"
   },
   "scripts": {
diff --git a/web/src/app/browser/build.sh b/web/src/app/browser/build.sh
index ef23b7c0464..fff02369012 100755
--- a/web/src/app/browser/build.sh
+++ b/web/src/app/browser/build.sh
@@ -14,8 +14,7 @@ SUBPROJECT_NAME=app/browser
 # ################################ Main script ################################
 
 builder_describe "Builds the Keyman Engine for Web's website-integrating version for use in non-puppeted browsers." \
-  "@/web/src/engine/attachment build" \
-  "@/web/src/engine/main build" \
+  "@/web/src/engine build" \
   "@/web/src/tools/building/sourcemap-root" \
   "clean" \
   "configure" \
diff --git a/web/src/app/browser/tsconfig.json b/web/src/app/browser/tsconfig.json
index 4aeb519f295..e537e787766 100644
--- a/web/src/app/browser/tsconfig.json
+++ b/web/src/app/browser/tsconfig.json
@@ -5,13 +5,15 @@
     "baseUrl": "./",
     "outDir": "../../../build/app/browser/obj/",
     "rootDir": "./src",
-    "tsBuildInfoFile": "../../../build/app/browser/obj/tsconfig.tsbuildinfo"
+    "tsBuildInfoFile": "../../../build/app/browser/obj/tsconfig.tsbuildinfo",
+    "paths": {
+      "keyman/engine/*": [ "../../engine/src/*/index.js" ],
+    }
   },
 
   "include": [ "**/*.ts" ],
 
   "references": [
-    { "path": "../../engine/attachment" },
-    { "path": "../../engine/main" }
+    { "path": "../../engine" },
   ]
 }
diff --git a/web/src/app/ui/tsconfig.json b/web/src/app/ui/tsconfig.json
index 8d6da3884a7..698b6f307ad 100644
--- a/web/src/app/ui/tsconfig.json
+++ b/web/src/app/ui/tsconfig.json
@@ -6,6 +6,9 @@
 		"outDir": "../../../build/app/ui/obj",
 		"rootDir": "",
     "tsBuildInfoFile": "../../../build/app/ui/obj/tsconfig.tsbuildinfo",
+    "paths": {
+      "keyman/engine/*": ["../../engine/src/*/index.js"],
+    },
   },
   "files": [
 		"kmwuibutton.ts",
diff --git a/web/src/app/webview/build.sh b/web/src/app/webview/build.sh
index e90cddccda3..9735d816c2b 100755
--- a/web/src/app/webview/build.sh
+++ b/web/src/app/webview/build.sh
@@ -14,7 +14,7 @@ SUBPROJECT_NAME=app/webview
 # ################################ Main script ################################
 
 builder_describe "Builds the Keyman Engine for Web's puppetable version designed for use within WebViews." \
-  "@/web/src/engine/main build" \
+  "@/web/src/engine build" \
   "@/web/src/tools/building/sourcemap-root" \
   "clean" \
   "configure" \
diff --git a/web/src/app/webview/tsconfig.json b/web/src/app/webview/tsconfig.json
index b595456aba2..07ba67057b2 100644
--- a/web/src/app/webview/tsconfig.json
+++ b/web/src/app/webview/tsconfig.json
@@ -5,12 +5,15 @@
     "baseUrl": "./",
     "outDir": "../../../build/app/webview/obj/",
     "rootDir": "./src",
-    "tsBuildInfoFile": "../../../build/app/webview/obj/tsconfig.tsbuildinfo"
+    "tsBuildInfoFile": "../../../build/app/webview/obj/tsconfig.tsbuildinfo",
+    "paths": {
+      "keyman/engine/*": ["../../engine/src/*/index.js"],
+    },
   },
 
   "include": [ "**/*.ts" ],
 
   "references": [
-    { "path": "../../engine/main" }
+    { "path": "../../engine" }
   ]
 }
diff --git a/web/src/engine/interfaces/.c8rc.json b/web/src/engine/.c8rc.json
similarity index 68%
rename from web/src/engine/interfaces/.c8rc.json
rename to web/src/engine/.c8rc.json
index ebcb215dbaa..dd274be9404 100644
--- a/web/src/engine/interfaces/.c8rc.json
+++ b/web/src/engine/.c8rc.json
@@ -3,7 +3,7 @@
   "clean": true,
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "../../../build/coverage/raw/engine/interfaces",
+  "reports-dir": "../../build/coverage/raw/engine/",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/attachment/.c8rc.json b/web/src/engine/attachment/.c8rc.json
deleted file mode 100644
index eea63036d20..00000000000
--- a/web/src/engine/attachment/.c8rc.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "check-coverage": false,
-  "clean": true,
-  "exclude-after-remap": true,
-  "reporter": ["text", "text-summary"],
-  "reports-dir": "../../../build/coverage/raw/engine/attachment",
-  "src": [
-    "src/"
-  ]
-}
\ No newline at end of file
diff --git a/web/src/engine/attachment/build.sh b/web/src/engine/attachment/build.sh
deleted file mode 100755
index 042c5aa83ea..00000000000
--- a/web/src/engine/attachment/build.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/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/builder-full.inc.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-# Imports common Web build-script definitions & functions
-SUBPROJECT_NAME=engine/attachment
-. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/node.inc.sh"
-. "$KEYMAN_ROOT/web/common.inc.sh"
-
-# ################################ Main script ################################
-
-builder_describe "Builds the Keyman Engine for Web (KMW) attachment engine." \
-  "@/web/src/engine/dom-utils" \
-  "@/web/src/engine/element-wrappers" \
-  "clean" \
-  "configure" \
-  "build" \
-  "test"
-
-# Possible TODO?
-# "upload-symbols   Uploads build product to Sentry for error report symbolification.  Only defined for $DOC_BUILD_EMBED_WEB" \
-
-builder_describe_outputs \
-  configure   /node_modules \
-  build       /web/build/$SUBPROJECT_NAME/lib/index.mjs
-
-builder_parse "$@"
-
-#### Build action definitions ####
-
-do_build () {
-  compile $SUBPROJECT_NAME
-
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/index.js" \
-    --out        "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/lib/index.mjs" \
-    --format esm
-}
-
-builder_run_action configure node_select_version_and_npm_ci
-builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
-builder_run_action build do_build
-builder_run_action test test-headless-typescript "${SUBPROJECT_NAME}"
diff --git a/web/src/engine/attachment/tsconfig.json b/web/src/engine/attachment/tsconfig.json
deleted file mode 100644
index 3ce6a07308f..00000000000
--- a/web/src/engine/attachment/tsconfig.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "extends": "../../tsconfig.dom.json",
-
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "../../../build/engine/attachment/obj/",
-    "tsBuildInfoFile": "../../../build/engine/attachment/obj/tsconfig.tsbuildinfo",
-    "rootDir": "./src"
-  },
-
-  "include": [ "src/**/*.ts" ],
-
-  "references": [
-    { "path": "../dom-utils" },
-    { "path": "../element-wrappers" }
-  ]
-}
diff --git a/web/src/engine/build.sh b/web/src/engine/build.sh
new file mode 100755
index 00000000000..898252b383a
--- /dev/null
+++ b/web/src/engine/build.sh
@@ -0,0 +1,73 @@
+#!/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/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+# Imports common Web build-script definitions & functions
+
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/web/common.inc.sh"
+
+# ################################ Main script ################################
+
+builder_describe "Builds Keyman Engine for Web (KMW)" \
+  "@/core:wasm" \
+  "@/web/src/engine/predictive-text" \
+  "@/web/src/engine/common/web-utils" \
+  "clean" \
+  "configure" \
+  "build" \
+  "test"
+
+# Possible TODO?
+# "upload-symbols   Uploads build product to Sentry for error report symbolification.  Only defined for $DOC_BUILD_EMBED_WEB" \
+
+builder_describe_outputs \
+  configure   /node_modules \
+  build       /web/build/engine/lib/index.mjs
+
+builder_parse "$@"
+
+#### Build action definitions ####
+
+copy_deps() {
+  mkdir -p "src/core-processor/import/core/"
+  # we don't need this file for release builds, but it's nice to have
+  # for reference and auto-completion
+  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/keymancore.d.ts" "src/core-processor/import/core/"
+
+  mkdir -p "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"
+  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/keymancore.d.ts" "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"
+  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/"km-core{.js,.wasm} "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"
+
+  cp "$KEYMAN_ROOT/common/resources/fonts/keymanweb-osk.ttf" "$KEYMAN_ROOT/web/src/resources/osk/"
+}
+
+do_build () {
+  # eslint .
+
+  copy_deps
+
+  tsc -b .
+
+  # So... tsc does declaration-bundling on its own pretty well, at least for local development.
+  tsc --emitDeclarationOnly --outFile "${KEYMAN_ROOT}/web/build/engine/lib/index.d.ts" -p "."
+
+  node "${KEYMAN_ROOT}/web/src/tools/es-bundling/build/common-bundle.mjs" \
+                "${KEYMAN_ROOT}/web/build/engine/obj/index.js" \
+    --out       "${KEYMAN_ROOT}/web/build/engine/lib/index.mjs" \
+    --format esm
+
+  # TODO-web-core: should this be in test/?
+  echo "Validating gesture model and set references"
+  node src/osk/validate-gesture-specs.js
+}
+
+builder_run_action configure node_select_version_and_npm_ci
+builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/engine"
+builder_run_action build do_build
+builder_run_action test test-headless-typescript engine
diff --git a/web/src/engine/common/web-utils/package.json b/web/src/engine/common/web-utils/package.json
index 557878d43e4..7786b82289c 100644
--- a/web/src/engine/common/web-utils/package.json
+++ b/web/src/engine/common/web-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keymanapp/web-utils",
-  "description": "Common utility functions used throughout other Keyman packages",
+  "description": "Common utility functions used in both Keyman Engine for Web and the predictive text worker",
   "main": "./build/obj/index.js",
   "exports": {
     ".": {
diff --git a/web/src/engine/core-processor/.gitignore b/web/src/engine/core-processor/.gitignore
deleted file mode 100644
index 282f91762fb..00000000000
--- a/web/src/engine/core-processor/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-src/import/
\ No newline at end of file
diff --git a/web/src/engine/core-processor/build.sh b/web/src/engine/core-processor/build.sh
deleted file mode 100755
index c468df044a8..00000000000
--- a/web/src/engine/core-processor/build.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/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/builder-full.inc.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-SUBPROJECT_NAME=engine/core-processor
-. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/node.inc.sh"
-. "$KEYMAN_ROOT/web/common.inc.sh"
-
-# ################################ Main script ################################
-
-builder_describe "Keyman Core WASM integration" \
-  "@/core:wasm" \
-  "@/web/src/engine/common/web-utils" \
-  "clean" \
-  "configure" \
-  "build" \
-  "test" \
-  "--ci+                     Set to utilize CI-based test configurations & reporting."
-
-builder_describe_outputs \
-  configure    "/web/src/engine/core-processor/src/import/core/keymancore.d.ts" \
-  build        "/web/build/${SUBPROJECT_NAME}/lib/index.mjs"
-
-builder_parse "$@"
-
-#### Build action definitions ####
-
-do_clean() {
-  rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
-  rm -rf "src/import/"
-}
-
-do_configure() {
-  node_select_version_and_npm_ci
-
-  mkdir -p "src/import/core/"
-  # we don't need this file for release builds, but it's nice to have
-  # for reference and auto-completion
-  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/keymancore.d.ts" "src/import/core/"
-}
-
-copy_deps() {
-  mkdir -p "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/import/core/"
-  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/keymancore.d.ts" "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/import/core/"
-  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/"km-core{.js,.wasm} "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/import/core/"
-}
-
-do_build () {
-  copy_deps
-  compile "${SUBPROJECT_NAME}"
-
-  ${BUNDLE_CMD} "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/index.js" \
-    --out         "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/lib/index.mjs" \
-    --format esm
-}
-
-builder_run_action clean      do_clean
-builder_run_action configure  do_configure
-builder_run_action build      do_build
diff --git a/web/src/engine/core-processor/tsconfig.json b/web/src/engine/core-processor/tsconfig.json
deleted file mode 100644
index a7b626029f8..00000000000
--- a/web/src/engine/core-processor/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  // While the actual references themselves are headless, it compiles against the DOM-reliant OSK module.
-  "extends": "../../tsconfig.dom.json",
-
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "../../../build/engine/core-processor/obj/",
-    "tsBuildInfoFile": "../../../build/engine/core-processor/obj/tsconfig.tsbuildinfo",
-    "rootDir": "./src"
-  },
-
-  "include": [ "**/*.ts", "src/import/core/km-core.js" ],
-}
diff --git a/web/src/engine/dom-utils/build.sh b/web/src/engine/dom-utils/build.sh
deleted file mode 100755
index df6180e2ed7..00000000000
--- a/web/src/engine/dom-utils/build.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/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/builder-full.inc.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/node.inc.sh"
-
-# Imports common Web build-script definitions & functions
-SUBPROJECT_NAME=engine/dom-utils
-. "$KEYMAN_ROOT/web/common.inc.sh"
-
-# ################################ Main script ################################
-
-builder_describe "Builds DOM-utility modules used by the Keyman Engine for Web (KMW)." \
-  "@/web/src/engine/common/web-utils" \
-  "@/web/src/engine/keyboard" \
-  "clean" \
-  "configure" \
-  "build" \
-  "test"
-
-# Possible TODO?
-# "upload-symbols   Uploads build product to Sentry for error report symbolification.  Only defined for $DOC_BUILD_EMBED_WEB" \
-
-builder_describe_outputs \
-  configure   /node_modules \
-  build       /web/build/$SUBPROJECT_NAME/obj/index.js
-
-builder_parse "$@"
-
-#### Build action definitions ####
-
-builder_run_action configure node_select_version_and_npm_ci
-builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
-builder_run_action build compile $SUBPROJECT_NAME
-
-# No headless tests for this child project.  Currently, DOM-based unit &
-# integrated tests are run solely by the top-level $KEYMAN_ROOT/web project.
\ No newline at end of file
diff --git a/web/src/engine/dom-utils/tsconfig.json b/web/src/engine/dom-utils/tsconfig.json
deleted file mode 100644
index aab3cabf873..00000000000
--- a/web/src/engine/dom-utils/tsconfig.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "extends": "../../tsconfig.dom.json",
-
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "../../../build/engine/dom-utils/obj/",
-    "tsBuildInfoFile": "../../../build/engine/dom-utils/obj/tsconfig.tsbuildinfo",
-    "rootDir": "./src"
-  },
-
-  "include": [ "src/**/*.ts" ],
-
-  "references": [
-    { "path": "../keyboard" },
-    { "path": "../common/web-utils" }
-  ]
-}
diff --git a/web/src/engine/element-wrappers/build.sh b/web/src/engine/element-wrappers/build.sh
deleted file mode 100755
index 055c93b00ec..00000000000
--- a/web/src/engine/element-wrappers/build.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/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/builder-full.inc.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-SUBPROJECT_NAME=engine/element-wrappers
-. "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/node.inc.sh"
-
-# ################################ Main script ################################
-
-builder_describe "Builds DOM-based OutputTarget subclasses used by the Keyman Engine for Web (KMW)." \
-  "@/web/src/engine/js-processor" \
-  "clean" \
-  "configure" \
-  "build" \
-  "test"
-
-# Possible TODO?
-# "upload-symbols   Uploads build product to Sentry for error report symbolification.  Only defined for $DOC_BUILD_EMBED_WEB" \
-
-builder_describe_outputs \
-  configure   /node_modules \
-  build       /web/build/$SUBPROJECT_NAME/lib/index.mjs
-
-builder_parse "$@"
-
-#### Build action definitions ####
-
-do_build () {
-  compile $SUBPROJECT_NAME
-
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/index.js" \
-    --out        "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/lib/index.mjs" \
-    --format esm
-}
-
-builder_run_action configure node_select_version_and_npm_ci
-builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
-builder_run_action build do_build
-
-# No headless tests for this child project.  Currently, DOM-based unit &
-# integrated tests are run solely by the top-level $KEYMAN_ROOT/web project.
\ No newline at end of file
diff --git a/web/src/engine/element-wrappers/readme.md b/web/src/engine/element-wrappers/readme.md
deleted file mode 100644
index 2a7685edbcb..00000000000
--- a/web/src/engine/element-wrappers/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## engine/element-wrappers
-
-This submodule provides a subset of the main engine's Web-oriented code that's used to 'wrap' webpage
-elements as part of KMW attachment and interface the element with the `keyboard` submodule.
\ No newline at end of file
diff --git a/web/src/engine/element-wrappers/tsconfig.json b/web/src/engine/element-wrappers/tsconfig.json
deleted file mode 100644
index 15a58bbf2a8..00000000000
--- a/web/src/engine/element-wrappers/tsconfig.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "extends": "../../tsconfig.dom.json",
-
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "../../../build/engine/element-wrappers/obj/",
-    "tsBuildInfoFile": "../../../build/engine/element-wrappers/obj/tsconfig.tsbuildinfo",
-    "rootDir": "./src"
-  },
-
-  "include": [ "src/**/*.ts" ],
-
-  "references": [
-    { "path": "../keyboard" }
-  ]
-}
diff --git a/web/src/engine/events/build.sh b/web/src/engine/events/build.sh
deleted file mode 100755
index eeeb144949a..00000000000
--- a/web/src/engine/events/build.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/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/builder-full.inc.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-SUBPROJECT_NAME=engine/events
-. "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/node.inc.sh"
-
-# ################################ Main script ################################
-
-builder_describe "Builds specialized event-related modules utilized by Keyman Engine for Web." \
-  "@/web/src/engine/common/web-utils build" \
-  "@/web/src/engine/keyboard build" \
-  "clean" \
-  "configure" \
-  "build" \
-  "test"
-
-# Possible TODO?
-# "upload-symbols   Uploads build product to Sentry for error report symbolification.  Only defined for $DOC_BUILD_EMBED_WEB" \
-
-builder_describe_outputs \
-  configure   /node_modules \
-  build       /web/build/$SUBPROJECT_NAME/obj/index.js
-
-builder_parse "$@"
-
-#### Build action definitions ####
-
-do_build () {
-  compile $SUBPROJECT_NAME
-
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/index.js" \
-    --out        "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/lib/index.mjs" \
-    --format esm
-}
-
-builder_run_action configure node_select_version_and_npm_ci
-builder_run_action clean rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
-builder_run_action build do_build
-builder_run_action test test-headless "${SUBPROJECT_NAME}"
diff --git a/web/src/engine/events/tsconfig.json b/web/src/engine/events/tsconfig.json
deleted file mode 100644
index 8ab284c473b..00000000000
--- a/web/src/engine/events/tsconfig.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "extends": "../../tsconfig.dom.json",
-
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "../../../build/engine/events/obj/",
-    "tsBuildInfoFile": "../../../build/engine/events/obj/tsconfig.tsbuildinfo",
-    "rootDir": "./src"
-  },
-
-  "include": [ "src/**/*.ts" ],
-
-  "references": [
-    { "path": "../common/web-utils" },
-    { "path": "../keyboard" }
-  ]
-}
diff --git a/web/src/engine/interfaces/build.sh b/web/src/engine/interfaces/build.sh
deleted file mode 100755
index 3ea80fdc7af..00000000000
--- a/web/src/engine/interfaces/build.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/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/builder-full.inc.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-SUBPROJECT_NAME=engine/interfaces
-. "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/node.inc.sh"
-
-# ################################ Main script ################################
-
-builder_describe "Builds configuration subclasses used by the Keyman Engine for Web (KMW)." \
-  "@/web/src/tools/es-bundling" \
-  "@/web/src/engine/keyboard" \
-  "@/web/src/engine/js-processor" \
-  "clean" \
-  "configure" \
-  "build" \
-  "test"
-
-# Possible TODO?s
-# "upload-symbols   Uploads build product to Sentry for error report symbolification.  Only defined for $DOC_BUILD_EMBED_WEB" \
-
-builder_describe_outputs \
-  configure    /node_modules \
-  build        /web/build/$SUBPROJECT_NAME/lib/index.mjs
-
-builder_parse "$@"
-
-#### Build action definitions ####
-
-do_build () {
-  compile $SUBPROJECT_NAME
-
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/index.js" \
-    --out        "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/lib/index.mjs" \
-    --format esm
-}
-
-builder_run_action configure node_select_version_and_npm_ci
-builder_run_action clean rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
-builder_run_action build do_build
-builder_run_action test test-headless "${SUBPROJECT_NAME}"
diff --git a/web/src/engine/interfaces/tsconfig.json b/web/src/engine/interfaces/tsconfig.json
deleted file mode 100644
index dcbbb7714a3..00000000000
--- a/web/src/engine/interfaces/tsconfig.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  // While the actual references themselves are headless, it compiles against the DOM-reliant OSK module.
-  "extends": "../../tsconfig.dom.json",
-
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "../../../build/engine/interfaces/obj/",
-    "tsBuildInfoFile": "../../../build/engine/interfaces/obj/tsconfig.tsbuildinfo",
-    "rootDir": "./src"
-  },
-
-  "include": [ "**/*.ts" ],
-
-  "references": [
-    { "path": "../keyboard" },
-  ]
-}
diff --git a/web/src/engine/js-processor/build.sh b/web/src/engine/js-processor/build.sh
deleted file mode 100755
index 6d5989b515d..00000000000
--- a/web/src/engine/js-processor/build.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/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/builder-full.inc.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-SUBPROJECT_NAME=engine/js-processor
-
-. "${KEYMAN_ROOT}/web/common.inc.sh"
-. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/node.inc.sh"
-
-# ################################ Main script ################################
-
-builder_describe "Builds configuration subclasses used by the Keyman Engine for Web (KMW)." \
-  "clean" \
-  "configure" \
-  "build" \
-  "test"
-
-builder_describe_outputs \
-  configure    "/node_modules" \
-  build        "/web/build/${SUBPROJECT_NAME}/lib/index.mjs"
-
-builder_parse "$@"
-
-#### Build action definitions ####
-
-do_build () {
-  compile "${SUBPROJECT_NAME}"
-
-  ${BUNDLE_CMD} "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/index.js" \
-    --out         "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/lib/index.mjs" \
-    --format esm
-}
-
-do_test() {
-  test-headless "${SUBPROJECT_NAME}" ""
-  test-headless-typescript "${SUBPROJECT_NAME}"
-}
-
-builder_run_action configure  node_select_version_and_npm_ci
-builder_run_action clean      rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
-builder_run_action build      do_build
-builder_run_action test       do_test
diff --git a/web/src/engine/js-processor/tsconfig.json b/web/src/engine/js-processor/tsconfig.json
deleted file mode 100644
index f0e38f7bc0c..00000000000
--- a/web/src/engine/js-processor/tsconfig.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  // While the actual references themselves are headless, it compiles against the DOM-reliant OSK module.
-  "extends": "../../tsconfig.dom.json",
-
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "../../../build/engine/js-processor/obj/",
-    "tsBuildInfoFile": "../../../build/engine/js-processor/obj/tsconfig.tsbuildinfo",
-    "rootDir": "./src"
-  },
-
-  "references": [
-    { "path": "../keyboard"},
-  ],
-  "include": [ "**/*.ts" ],
-}
diff --git a/web/src/engine/keyboard-storage/.c8rc.json b/web/src/engine/keyboard-storage/.c8rc.json
deleted file mode 100644
index 396d0ddcc5a..00000000000
--- a/web/src/engine/keyboard-storage/.c8rc.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "check-coverage": false,
-  "clean": true,
-  "exclude-after-remap": true,
-  "reporter": ["text", "text-summary"],
-  "reports-dir": "../../../build/coverage/raw/engine/keyboard-storage",
-  "src": [
-    "src/"
-  ]
-}
\ No newline at end of file
diff --git a/web/src/engine/keyboard-storage/build.sh b/web/src/engine/keyboard-storage/build.sh
deleted file mode 100755
index a6a233bfd8b..00000000000
--- a/web/src/engine/keyboard-storage/build.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/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/builder-full.inc.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-SUBPROJECT_NAME=engine/keyboard-storage
-. "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/node.inc.sh"
-
-# ################################ Main script ################################
-
-builder_describe "Builds Keyman Engine modules for keyboard cloud-querying & caching + model caching." \
-  "@/web/src/tools/es-bundling" \
-  "clean" \
-  "configure" \
-  "build" \
-  "test"
-
-# Possible TODO?s
-# "upload-symbols   Uploads build product to Sentry for error report symbolification.  Only defined for $DOC_BUILD_EMBED_WEB" \
-
-builder_describe_outputs \
-  configure   /node_modules \
-  build       /web/build/$SUBPROJECT_NAME/lib/index.mjs
-
-builder_parse "$@"
-
-#### Build action definitions ####
-
-do_build () {
-  compile $SUBPROJECT_NAME
-
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/index.js" \
-    --out        "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/lib/index.mjs" \
-    --format esm
-
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/domCloudRequester.js" \
-    --out        "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/lib/dom-cloud-requester.mjs" \
-    --format esm
-
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/nodeCloudRequester.js" \
-    --out        "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/lib/node-cloud-requester.mjs" \
-    --format   esm \
-    --platform node
-}
-
-builder_run_action configure node_select_version_and_npm_ci
-builder_run_action clean rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
-builder_run_action build do_build
-builder_run_action test test-headless "${SUBPROJECT_NAME}"
diff --git a/web/src/engine/keyboard-storage/tsconfig.json b/web/src/engine/keyboard-storage/tsconfig.json
deleted file mode 100644
index f093be2cbc6..00000000000
--- a/web/src/engine/keyboard-storage/tsconfig.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "extends": "../../tsconfig.dom.json",
-
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "../../../build/engine/keyboard-storage/obj/",
-    "tsBuildInfoFile": "../../../build/engine/keyboard-storage/obj/tsconfig.tsbuildinfo",
-    "rootDir": "./src"
-  },
-
-  "include": [ "src/**/*.ts" ],
-
-  "references": [
-    { "path": "../interfaces" }
-  ]
-}
diff --git a/web/src/engine/keyboard/.c8rc.json b/web/src/engine/keyboard/.c8rc.json
deleted file mode 100644
index b6bd4a818fa..00000000000
--- a/web/src/engine/keyboard/.c8rc.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "check-coverage": false,
-  "clean": true,
-  "exclude": [
-    "src/keyboards/loaders/dom*",
-    "node_modules/*",
-    "tests"
-  ],
-  "exclude-after-remap": true,
-  "reporter": ["text", "text-summary"],
-  "reports-dir": "../../../build/coverage/raw/engine/keyboard",
-  "src": [
-    "src/"
-  ]
-}
\ No newline at end of file
diff --git a/web/src/engine/keyboard/.gitignore b/web/src/engine/keyboard/.gitignore
deleted file mode 100644
index c613a78f7dc..00000000000
--- a/web/src/engine/keyboard/.gitignore
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build products
-src/environment.inc.ts
-
-# Legacy build folders.
-output/
-build/
-embedded/
-
-# Current build output folder (matches standard node publish location).
-dist/
-
-# Other local files.
-node_modules/
-unit_tests/modernizr.js
-source/environment.inc.ts
-.idea/**/*.xml
-*.iml
-*.kpj.user
\ No newline at end of file
diff --git a/web/src/engine/keyboard/build.sh b/web/src/engine/keyboard/build.sh
deleted file mode 100755
index 583d9992765..00000000000
--- a/web/src/engine/keyboard/build.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env bash
-#
-# Compile KeymanWeb's 'keyboard' module, one of the components of Web's 'core' module.
-#
-## START STANDARD BUILD SCRIPT INCLUDE
-# adjust relative paths as necessary
-THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-SUBPROJECT_NAME=engine/keyboard
-
-. "${KEYMAN_ROOT}/web/common.inc.sh"
-. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/node.inc.sh"
-
-################################ Main script ################################
-
-builder_describe \
-  "Compiles the web-oriented utility function module." \
-  "@/common/web/keyman-version" \
-  "@/common/web/types" \
-  "@/web/src/tools/testing/recorder-core  test" \
-  "@/web/src/tools/es-bundling" \
-  "@/web/src/engine/common/web-utils" \
-  "@/web/src/engine/core-processor" \
-  configure \
-  clean \
-  build \
-  test
-
-builder_describe_outputs \
-  configure     /node_modules \
-  build         /web/build/engine/keyboard/lib/index.mjs
-
-builder_parse "$@"
-
-function do_configure() {
-  node_select_version_and_npm_ci
-
-  # Configure Web browser-engine testing environments.  As is, this should only
-  # make changes when we update the dependency, even on our CI build agents.
-  playwright install
-}
-
-BUILD_DIR="${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
-
-do_build() {
-  tsc --build "${THIS_SCRIPT_PATH}/tsconfig.all.json"
-
-  # Base product - the main keyboard processor
-  builder_echo "Bundle base product - the main keyboard processor"
-  ${BUNDLE_CMD}  "${BUILD_DIR}/obj/index.js" \
-    --out        "${BUILD_DIR}/lib/index.mjs" \
-    --format esm
-
-  # The DOM-oriented keyboard loader
-  builder_echo "Bundle the DOM-oriented keyboard loader"
-  ${BUNDLE_CMD}  "${BUILD_DIR}/obj/keyboards/loaders/dom-keyboard-loader.js" \
-    --out        "${BUILD_DIR}/lib/dom-keyboard-loader.mjs" \
-    --format esm
-
-  # The Node-oriented keyboard loader
-  builder_echo "Bundle the Node-oriented keyboard loader"
-  ${BUNDLE_CMD}  "${BUILD_DIR}/obj/keyboards/loaders/node-keyboard-loader.js" \
-    --out        "${BUILD_DIR}/lib/node-keyboard-loader.mjs" \
-    --format   esm \
-    --platform node
-
-  # Declaration bundling.
-  builder_echo "Declaration bundling"
-  tsc --emitDeclarationOnly --outFile "${BUILD_DIR}/lib/index.d.ts"
-  tsc --emitDeclarationOnly --outFile "${BUILD_DIR}/lib/dom-keyboard-loader.d.ts" -p src/keyboards/loaders/tsconfig.dom.json
-  tsc --emitDeclarationOnly --outFile "${BUILD_DIR}/lib/node-keyboard-loader.d.ts" -p src/keyboards/loaders/tsconfig.node.json
-}
-
-do_test() {
-  test-headless "${SUBPROJECT_NAME}" ""
-  test-headless-typescript "${SUBPROJECT_NAME}"
-}
-
-builder_run_action configure  do_configure
-builder_run_action clean      rm -rf "${BUILD_DIR}"
-builder_run_action build      do_build
-builder_run_action test       do_test
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/tsconfig.dom.json b/web/src/engine/keyboard/src/keyboards/loaders/tsconfig.dom.json
deleted file mode 100644
index 1dd122f5485..00000000000
--- a/web/src/engine/keyboard/src/keyboards/loaders/tsconfig.dom.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../../../../../../tsconfig.base.json",
-  "compilerOptions": {
-    "baseUrl": "../../../",
-    "outDir": "../../../../../../build/engine/keyboard/obj/keyboards/loaders/",
-    "tsBuildInfoFile": "../../../../../../build/engine/keyboard/obj/keyboards/loaders/tsconfig.dom.tsbuildinfo",
-    "rootDir": "."
-  },
-  "references": [
-    { "path": "../../../tsconfig.json" }
-  ],
-  "include": ["dom-keyboard-loader.ts", "domKeyboardLoader.ts"],
-}
diff --git a/web/src/engine/keyboard/tsconfig.all.json b/web/src/engine/keyboard/tsconfig.all.json
deleted file mode 100644
index 1ee44d3e70e..00000000000
--- a/web/src/engine/keyboard/tsconfig.all.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "../../../build/engine/keyboard/obj/",
-    "tsBuildInfoFile": "../../../build/engine/keyboard/obj/tsconfig.all.tsbuildinfo",
-    "rootDir": "./src/"
-  },
-  "references": [
-    { "path": "./src/keyboards/loaders/tsconfig.dom.json" },
-    { "path": "./src/keyboards/loaders/tsconfig.node.json" },
-  ],
-  // Actual main-body compilation is in tsconfig.json.  This config is just a wrapper
-  // to trigger all three components at once.
-  "include": []
-}
diff --git a/web/src/engine/keyboard/tsconfig.json b/web/src/engine/keyboard/tsconfig.json
deleted file mode 100644
index 3e074f91c71..00000000000
--- a/web/src/engine/keyboard/tsconfig.json
+++ /dev/null
@@ -1,15 +0,0 @@
-// Is used by the keyboard-loader submodules.
-{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "../../../build/engine/keyboard/obj/",
-    "tsBuildInfoFile": "../../../build/engine/keyboard/obj/tsconfig.tsbuildinfo",
-    "rootDir": "./src/"
-  },
-  "references": [
-    { "path": "../core-processor"},
-  ],
-  "include": [ "./src/**/*.ts"],
-  "exclude": ["./src/keyboards/loaders/**/*.ts"]
-}
diff --git a/web/src/engine/main/build.sh b/web/src/engine/main/build.sh
deleted file mode 100755
index e0ef7c420e7..00000000000
--- a/web/src/engine/main/build.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-
-## START STANDARD BUILD SCRIPT INCLUDE
-# adjust relative paths as necessary
-THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../../resources/build/builder-full.inc.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-SUBPROJECT_NAME=engine/main
-. "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/node.inc.sh"
-
-# ################################ Main script ################################
-
-builder_describe "Builds the Keyman Engine for Web's common top-level base classes." \
-  "@/common/web/keyman-version" \
-  "@/web/src/engine/core-processor" \
-  "@/web/src/engine/keyboard" \
-  "@/web/src/engine/interfaces build" \
-  "@/web/src/engine/js-processor build" \
-  "@/web/src/engine/keyboard-storage build" \
-  "@/web/src/engine/osk build" \
-  "@/web/src/engine/predictive-text/worker-main" \
-  "@/developer/src/kmc-model test" \
-  "clean" \
-  "configure" \
-  "build" \
-  "test"
-
-# Possible TODO?s
-# "upload-symbols   Uploads build product to Sentry for error report symbolification.  Only defined for $DOC_BUILD_EMBED_WEB" \
-
-builder_describe_outputs \
-  configure   /node_modules \
-  build       /web/build/$SUBPROJECT_NAME/lib/index.mjs
-
-builder_parse "$@"
-
-#### Build action definitions ####
-
-do_build () {
-  compile $SUBPROJECT_NAME
-
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/index.js" \
-    --out        "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/lib/index.mjs" \
-    --format esm
-}
-
-builder_run_action configure node_select_version_and_npm_ci
-builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
-builder_run_action build do_build
-builder_run_action test test-headless "${SUBPROJECT_NAME}"
\ No newline at end of file
diff --git a/web/src/engine/main/tsconfig.json b/web/src/engine/main/tsconfig.json
deleted file mode 100644
index f49d40dc351..00000000000
--- a/web/src/engine/main/tsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "extends": "../../tsconfig.dom.json",
-
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "../../../build/engine/main/obj/",
-    "tsBuildInfoFile": "../../../build/engine/main/obj/tsconfig.tsbuildinfo",
-    "rootDir": "./src"
-  },
-
-  "include": [ "src/**/*.ts" ],
-
-  "references": [
-    { "path": "../osk" },
-    { "path": "../keyboard-storage" },
-    { "path": "../interfaces" },
-    { "path": "../js-processor" }
-  ]
-}
diff --git a/web/src/engine/osk/build.sh b/web/src/engine/osk/build.sh
deleted file mode 100755
index 8c82560f4e9..00000000000
--- a/web/src/engine/osk/build.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/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/builder-full.inc.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-SUBPROJECT_NAME=engine/osk
-. "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/node.inc.sh"
-
-# ################################ Main script ################################
-
-builder_describe "Builds the Keyman Engine for Web's On-Screen Keyboard package (OSK)." \
-  "@/web/src/engine/keyboard build" \
-  "@/web/src/engine/interfaces build" \
-  "@/web/src/engine/dom-utils build" \
-  "@/web/src/engine/events build" \
-  "@/web/src/engine/osk/gesture-processor" \
-  "clean" \
-  "configure" \
-  "build" \
-  "test"
-
-# Possible TODO?s
-# "upload-symbols   Uploads build product to Sentry for error report symbolification.  Only defined for $DOC_BUILD_EMBED_WEB" \
-
-builder_describe_outputs \
-  configure   /web/src/resources/osk/keymanweb-osk.ttf \
-  build       /web/build/$SUBPROJECT_NAME/lib/index.mjs
-
-builder_parse "$@"
-
-#### Build action definitions ####
-
-do_clean() {
-  rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
-
-  ./gesture-processor/build.sh clean
-}
-
-do_configure() {
-  node_select_version_and_npm_ci
-  cp "$KEYMAN_ROOT/common/resources/fonts/keymanweb-osk.ttf" "$KEYMAN_ROOT/web/src/resources/osk/"
-}
-
-do_build() {
-  compile "${SUBPROJECT_NAME}"
-
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/index.js" \
-    --out        "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/lib/index.mjs" \
-    --format esm
-
-  echo "Validating gesture model and set references"
-  node validate-gesture-specs.js
-}
-
-do_test() {
-  test-headless-typescript "${SUBPROJECT_NAME}"
-
-  ./gesture-processor/build.sh test
-}
-
-builder_run_action configure do_configure
-builder_run_action clean do_clean
-builder_run_action build do_build
-builder_run_action test do_test
diff --git a/web/src/engine/osk/gesture-processor/.c8rc.json b/web/src/engine/osk/gesture-processor/.c8rc.json
deleted file mode 100644
index 24afdfdddf0..00000000000
--- a/web/src/engine/osk/gesture-processor/.c8rc.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "check-coverage": false,
-  "clean": true,
-  "exclude": [
-    "src/test/*",
-    "node_modules/*",
-    "src/tools/*"
-  ],
-  "exclude-after-remap": true,
-  "include": [
-    "src/engine/headless/*"
-  ],
-  "reporter": ["text", "text-summary"],
-  "reports-dir": "../../../../build/coverage/raw/engine/osk/gesture-processor",
-  "src": [
-    "src/engine/headless/*"
-  ]
-}
\ No newline at end of file
diff --git a/web/src/engine/osk/gesture-processor/.gitignore b/web/src/engine/osk/gesture-processor/.gitignore
deleted file mode 100644
index 0b52ec7e8ac..00000000000
--- a/web/src/engine/osk/gesture-processor/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build products
-build
-
-# Legacy build folders.
-
-# Other local files.
-node_modules/
-unit_tests/modernizr.js
-.idea/**/*.xml
-*.iml
-*.kpj.user
\ No newline at end of file
diff --git a/web/src/engine/osk/gesture-processor/build.sh b/web/src/engine/osk/gesture-processor/build.sh
deleted file mode 100755
index 53c50c3d39f..00000000000
--- a/web/src/engine/osk/gesture-processor/build.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-
-## START STANDARD BUILD SCRIPT INCLUDE
-# adjust relative paths as necessary
-THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../../../resources/build/builder-full.inc.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-SUBPROJECT_NAME=engine/osk/gesture-processor
-
-. "${KEYMAN_ROOT}/web/common.inc.sh"
-. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/node.inc.sh"
-
-BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
-
-BUILD_DIR="/web/src/engine/osk/gesture-processor/build"
-
-################################ Main script ################################
-
-builder_describe "Builds the gesture-recognition model for Web-based on-screen keyboards" \
-  "@/web/src/tools/es-bundling build" \
-  "@/web/src/engine/common/web-utils build" \
-  "clean" \
-  "configure" \
-  "build" \
-  "test" \
-  ":module" \
-  ":tools  tools for testing & developing test resources for this module"
-
-builder_describe_outputs \
-  configure        /node_modules \
-  build:module     "${BUILD_DIR}/lib/index.mjs" \
-  build:tools      "${BUILD_DIR}/tools/lib/index.mjs"
-
-builder_parse "$@"
-
-# TODO: build if out-of-date if test is specified
-# TODO: configure if npm has not been run, and build is specified
-
-function do_configure() {
-  node_select_version_and_npm_ci
-}
-
-function do_build_module() {
-  # Build
-  tsc --build $builder_verbose
-
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/${BUILD_DIR}/obj/index.js" \
-    --out        "${KEYMAN_ROOT}/${BUILD_DIR}/lib/index.mjs" \
-    --format esm
-}
-
-function do_test_tools() {
-  if ! builder_has_action test:module; then
-    echo "The $(builder_term test:tools) action is currently a no-op."
-  fi
-}
-
-builder_run_action configure     do_configure
-builder_run_action clean         rm -rf build/
-builder_run_action build:module  do_build_module
-builder_run_action build:tools   src/tools/build.sh build
-builder_run_action test:module   test-headless-typescript "${SUBPROJECT_NAME}"
-builder_run_action test:tools    do_test_tools
diff --git a/web/src/engine/osk/gesture-processor/package.json b/web/src/engine/osk/gesture-processor/package.json
deleted file mode 100644
index c74ff5a3de0..00000000000
--- a/web/src/engine/osk/gesture-processor/package.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "name": "@keymanapp/gesture-recognizer",
-  "description": "The core gesture-recognition engine used by Keyman's Web-based OSKs.",
-  "devDependencies": {
-    "@keymanapp/resources-gosh": "*",
-    "promise-status-async": "^1.2.10",
-    "typescript": "^5.4.5"
-  },
-  "scripts": {
-    "build": "gosh ./build.sh",
-    "test": "gosh ./build.sh test"
-  },
-  "dependencies": {
-    "@keymanapp/web-utils": "*",
-    "eventemitter3": "^5.0.0"
-  },
-  "main": "./build/obj/index.js",
-  "exports": {
-    ".": {
-      "es6-bundling": "./src/engine/index.ts",
-      "default": "./build/obj/index.js"
-    }
-  },
-  "types": "./build/obj/index.d.ts",
-  "type": "module",
-  "sideEffects": false
-}
diff --git a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/tsconfig.json b/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/tsconfig.json
deleted file mode 100644
index 34d1929af17..00000000000
--- a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/tsconfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../../../../../../tsconfig.base.json",
-  "compilerOptions": {
-    "baseUrl": "./",
-    "lib": [ "dom", "es6" ],
-    "outDir": "../../../build/tools/obj",
-    "rootDir": "./src",
-    "tsBuildInfoFile": "../../../build/tools/tsconfig.tsbuildinfo"
-  },
-  "references": [
-    { "path": "../../../." }
-  ],
-  "include": ["./src/**/*.ts"]
-}
diff --git a/web/src/engine/osk/gesture-processor/tsconfig.json b/web/src/engine/osk/gesture-processor/tsconfig.json
deleted file mode 100644
index a6c7a8de7ab..00000000000
--- a/web/src/engine/osk/gesture-processor/tsconfig.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "extends": "../../../../tsconfig.base.json",
-  "compilerOptions": {
-    "baseUrl": "./",
-    "lib": [ "dom", "es6" ],
-    "outDir": "./build/obj/",
-    "rootDir": "./src/engine",
-    "tsBuildInfoFile": "./build/obj/tsconfig.tsbuildinfo",
-  },
-  "include": ["./src/engine/**/*.ts"],
-  "references": [
-    { "path": "../../common/web-utils" },
-  ],
-  "exclude": ["./src/test/**/*.ts", "./src/tools/**/*.ts"]
-}
diff --git a/web/src/engine/osk/tsconfig.json b/web/src/engine/osk/tsconfig.json
deleted file mode 100644
index 629443ed50c..00000000000
--- a/web/src/engine/osk/tsconfig.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extends": "../../tsconfig.dom.json",
-
-  "compilerOptions": {
-    "baseUrl": "./",
-    "downlevelIteration": true,
-    "outDir": "../../../build/engine/osk/obj/",
-    "tsBuildInfoFile": "../../../build/engine/osk/obj/tsconfig.tsbuildinfo",
-    "rootDir": "./src"
-  },
-
-  "include": [ "src/**/*.ts" ],
-
-  "references": [
-    { "path": "./gesture-processor" },
-    { "path": "../interfaces" },
-    { "path": "../dom-utils" },
-    { "path": "../events" }
-  ]
-}
diff --git a/web/src/engine/predictive-text/wordbreakers/build.sh b/web/src/engine/predictive-text/wordbreakers/build.sh
index 8deb49493e5..a9f4c429c97 100755
--- a/web/src/engine/predictive-text/wordbreakers/build.sh
+++ b/web/src/engine/predictive-text/wordbreakers/build.sh
@@ -19,6 +19,7 @@ SUBPROJECT_NAME=engine/predictive-text/wordbreakers
 # Note:  the raw text files used for data.inc.ts are found within
 # /resources/standards-data/unicode-character-database.
 builder_describe "Builds the predictive-text wordbreaker implementation module" \
+  "@/common/web/types" \
   "clean" \
   "configure" \
   "build" \
diff --git a/web/src/engine/attachment/readme.md b/web/src/engine/readme.md
similarity index 100%
rename from web/src/engine/attachment/readme.md
rename to web/src/engine/readme.md
diff --git a/web/src/engine/attachment/src/attachmentInfo.ts b/web/src/engine/src/attachment/attachmentInfo.ts
similarity index 100%
rename from web/src/engine/attachment/src/attachmentInfo.ts
rename to web/src/engine/src/attachment/attachmentInfo.ts
diff --git a/web/src/engine/attachment/src/index.ts b/web/src/engine/src/attachment/index.ts
similarity index 100%
rename from web/src/engine/attachment/src/index.ts
rename to web/src/engine/src/attachment/index.ts
diff --git a/web/src/engine/attachment/src/outputTargetForElement.ts b/web/src/engine/src/attachment/outputTargetForElement.ts
similarity index 100%
rename from web/src/engine/attachment/src/outputTargetForElement.ts
rename to web/src/engine/src/attachment/outputTargetForElement.ts
diff --git a/web/src/engine/attachment/src/pageContextAttachment.ts b/web/src/engine/src/attachment/pageContextAttachment.ts
similarity index 100%
rename from web/src/engine/attachment/src/pageContextAttachment.ts
rename to web/src/engine/src/attachment/pageContextAttachment.ts
diff --git a/web/src/engine/src/core-processor/.gitignore b/web/src/engine/src/core-processor/.gitignore
new file mode 100644
index 00000000000..735618b5a4d
--- /dev/null
+++ b/web/src/engine/src/core-processor/.gitignore
@@ -0,0 +1 @@
+import/
\ No newline at end of file
diff --git a/web/src/engine/core-processor/src/KM_Core.ts b/web/src/engine/src/core-processor/KM_Core.ts
similarity index 100%
rename from web/src/engine/core-processor/src/KM_Core.ts
rename to web/src/engine/src/core-processor/KM_Core.ts
diff --git a/web/src/engine/core-processor/src/index.ts b/web/src/engine/src/core-processor/index.ts
similarity index 100%
rename from web/src/engine/core-processor/src/index.ts
rename to web/src/engine/src/core-processor/index.ts
diff --git a/web/src/engine/dom-utils/src/arrayFromNodeList.ts b/web/src/engine/src/dom-utils/arrayFromNodeList.ts
similarity index 100%
rename from web/src/engine/dom-utils/src/arrayFromNodeList.ts
rename to web/src/engine/src/dom-utils/arrayFromNodeList.ts
diff --git a/web/src/engine/dom-utils/src/cookieSerializer.ts b/web/src/engine/src/dom-utils/cookieSerializer.ts
similarity index 100%
rename from web/src/engine/dom-utils/src/cookieSerializer.ts
rename to web/src/engine/src/dom-utils/cookieSerializer.ts
diff --git a/web/src/engine/dom-utils/src/createUnselectableElement.ts b/web/src/engine/src/dom-utils/createUnselectableElement.ts
similarity index 100%
rename from web/src/engine/dom-utils/src/createUnselectableElement.ts
rename to web/src/engine/src/dom-utils/createUnselectableElement.ts
diff --git a/web/src/engine/dom-utils/src/getAbsolute.ts b/web/src/engine/src/dom-utils/getAbsolute.ts
similarity index 100%
rename from web/src/engine/dom-utils/src/getAbsolute.ts
rename to web/src/engine/src/dom-utils/getAbsolute.ts
diff --git a/web/src/engine/dom-utils/src/index.ts b/web/src/engine/src/dom-utils/index.ts
similarity index 100%
rename from web/src/engine/dom-utils/src/index.ts
rename to web/src/engine/src/dom-utils/index.ts
diff --git a/web/src/engine/dom-utils/src/landscapeView.ts b/web/src/engine/src/dom-utils/landscapeView.ts
similarity index 100%
rename from web/src/engine/dom-utils/src/landscapeView.ts
rename to web/src/engine/src/dom-utils/landscapeView.ts
diff --git a/web/src/engine/dom-utils/readme.md b/web/src/engine/src/dom-utils/readme.md
similarity index 100%
rename from web/src/engine/dom-utils/readme.md
rename to web/src/engine/src/dom-utils/readme.md
diff --git a/web/src/engine/dom-utils/src/stylesheets.ts b/web/src/engine/src/dom-utils/stylesheets.ts
similarity index 100%
rename from web/src/engine/dom-utils/src/stylesheets.ts
rename to web/src/engine/src/dom-utils/stylesheets.ts
diff --git a/web/src/engine/element-wrappers/src/contentEditable.ts b/web/src/engine/src/element-wrappers/contentEditable.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/contentEditable.ts
rename to web/src/engine/src/element-wrappers/contentEditable.ts
diff --git a/web/src/engine/element-wrappers/src/designIFrame.ts b/web/src/engine/src/element-wrappers/designIFrame.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/designIFrame.ts
rename to web/src/engine/src/element-wrappers/designIFrame.ts
diff --git a/web/src/engine/element-wrappers/src/index.ts b/web/src/engine/src/element-wrappers/index.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/index.ts
rename to web/src/engine/src/element-wrappers/index.ts
diff --git a/web/src/engine/element-wrappers/src/input.ts b/web/src/engine/src/element-wrappers/input.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/input.ts
rename to web/src/engine/src/element-wrappers/input.ts
diff --git a/web/src/engine/element-wrappers/src/outputTargetElementWrapper.ts b/web/src/engine/src/element-wrappers/outputTargetElementWrapper.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/outputTargetElementWrapper.ts
rename to web/src/engine/src/element-wrappers/outputTargetElementWrapper.ts
diff --git a/web/src/engine/element-wrappers/src/readme.md b/web/src/engine/src/element-wrappers/readme.md
similarity index 67%
rename from web/src/engine/element-wrappers/src/readme.md
rename to web/src/engine/src/element-wrappers/readme.md
index ee52947bc31..4e40b461781 100644
--- a/web/src/engine/element-wrappers/src/readme.md
+++ b/web/src/engine/src/element-wrappers/readme.md
@@ -1,3 +1,9 @@
+## engine/element-wrappers
+
+This submodule provides a subset of the main engine's Web-oriented code that's used to 'wrap' webpage
+elements as part of KMW attachment and interface the element with the `keyboard` submodule.
+
+
 Please keep any code in this folder / namespace as free as possible from dependencies on other parts of KMW.  Some of our unit tests wish to run against these types without requiring KMW to be active.
 
 Note that with a little work, we _could_ completely spin this into its own separate module - this could be useful for development and testing purposes, especially now that we've dropped the old `TouchAlias` type that was a bit entangled with main engine code.
\ No newline at end of file
diff --git a/web/src/engine/element-wrappers/src/textarea.ts b/web/src/engine/src/element-wrappers/textarea.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/textarea.ts
rename to web/src/engine/src/element-wrappers/textarea.ts
diff --git a/web/src/engine/element-wrappers/src/utils.ts b/web/src/engine/src/element-wrappers/utils.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/utils.ts
rename to web/src/engine/src/element-wrappers/utils.ts
diff --git a/web/src/engine/element-wrappers/src/wrapElement.ts b/web/src/engine/src/element-wrappers/wrapElement.ts
similarity index 100%
rename from web/src/engine/element-wrappers/src/wrapElement.ts
rename to web/src/engine/src/element-wrappers/wrapElement.ts
diff --git a/web/src/engine/events/.c8rc.json b/web/src/engine/src/events/.c8rc.json
similarity index 100%
rename from web/src/engine/events/.c8rc.json
rename to web/src/engine/src/events/.c8rc.json
diff --git a/web/src/engine/events/src/domEventTracker.ts b/web/src/engine/src/events/domEventTracker.ts
similarity index 100%
rename from web/src/engine/events/src/domEventTracker.ts
rename to web/src/engine/src/events/domEventTracker.ts
diff --git a/web/src/engine/events/src/emitterListenerSpy.ts b/web/src/engine/src/events/emitterListenerSpy.ts
similarity index 100%
rename from web/src/engine/events/src/emitterListenerSpy.ts
rename to web/src/engine/src/events/emitterListenerSpy.ts
diff --git a/web/src/engine/events/src/index.ts b/web/src/engine/src/events/index.ts
similarity index 100%
rename from web/src/engine/events/src/index.ts
rename to web/src/engine/src/events/index.ts
diff --git a/web/src/engine/events/src/legacyEventEmitter.ts b/web/src/engine/src/events/legacyEventEmitter.ts
similarity index 100%
rename from web/src/engine/events/src/legacyEventEmitter.ts
rename to web/src/engine/src/events/legacyEventEmitter.ts
diff --git a/web/src/engine/events/readme.md b/web/src/engine/src/events/readme.md
similarity index 100%
rename from web/src/engine/events/readme.md
rename to web/src/engine/src/events/readme.md
diff --git a/web/src/engine/osk/gesture-processor/README.md b/web/src/engine/src/gesture-processor/README.md
similarity index 100%
rename from web/src/engine/osk/gesture-processor/README.md
rename to web/src/engine/src/gesture-processor/README.md
diff --git a/web/src/engine/osk/gesture-processor/src/engine/configuration/gestureRecognizerConfiguration.ts b/web/src/engine/src/gesture-processor/configuration/gestureRecognizerConfiguration.ts
similarity index 99%
rename from web/src/engine/osk/gesture-processor/src/engine/configuration/gestureRecognizerConfiguration.ts
rename to web/src/engine/src/gesture-processor/configuration/gestureRecognizerConfiguration.ts
index c3d6de5974f..f2ad38e25f3 100644
--- a/web/src/engine/osk/gesture-processor/src/engine/configuration/gestureRecognizerConfiguration.ts
+++ b/web/src/engine/src/gesture-processor/configuration/gestureRecognizerConfiguration.ts
@@ -120,7 +120,7 @@ export function preprocessRecognizerConfig<HoveredItemType, StateToken = any>(
   processingConfig.maxRoamingBounds = processingConfig.maxRoamingBounds ?? processingConfig.targetRoot;
   processingConfig.safeBounds       = processingConfig.safeBounds       ?? new PaddedZoneSource([2]);
 
-  processingConfig.itemIdentifier   = processingConfig.itemIdentifier   ?? (() => null);
+  processingConfig.itemIdentifier   = processingConfig.itemIdentifier   ?? (():any => null);
   processingConfig.recordingMode = !!processingConfig.recordingMode;
   processingConfig.historyLength = (processingConfig.historyLength ?? 0) > 0 ? processingConfig.historyLength : 0;
 
diff --git a/web/src/engine/osk/gesture-processor/src/engine/configuration/paddedZoneSource.ts b/web/src/engine/src/gesture-processor/configuration/paddedZoneSource.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/configuration/paddedZoneSource.ts
rename to web/src/engine/src/gesture-processor/configuration/paddedZoneSource.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/configuration/recognitionZoneSource.ts b/web/src/engine/src/gesture-processor/configuration/recognitionZoneSource.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/configuration/recognitionZoneSource.ts
rename to web/src/engine/src/gesture-processor/configuration/recognitionZoneSource.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/configuration/viewportZoneSource.ts b/web/src/engine/src/gesture-processor/configuration/viewportZoneSource.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/configuration/viewportZoneSource.ts
rename to web/src/engine/src/gesture-processor/configuration/viewportZoneSource.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/configuration/zoneBoundaryChecker.ts b/web/src/engine/src/gesture-processor/configuration/zoneBoundaryChecker.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/configuration/zoneBoundaryChecker.ts
rename to web/src/engine/src/gesture-processor/configuration/zoneBoundaryChecker.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/gestureRecognizer.ts b/web/src/engine/src/gesture-processor/gestureRecognizer.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/gestureRecognizer.ts
rename to web/src/engine/src/gesture-processor/gestureRecognizer.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/asyncClosureDispatchQueue.ts b/web/src/engine/src/gesture-processor/headless/asyncClosureDispatchQueue.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/asyncClosureDispatchQueue.ts
rename to web/src/engine/src/gesture-processor/headless/asyncClosureDispatchQueue.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/cumulativePathStats.ts b/web/src/engine/src/gesture-processor/headless/cumulativePathStats.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/cumulativePathStats.ts
rename to web/src/engine/src/gesture-processor/headless/cumulativePathStats.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gestureDebugPath.ts b/web/src/engine/src/gesture-processor/headless/gestureDebugPath.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gestureDebugPath.ts
rename to web/src/engine/src/gesture-processor/headless/gestureDebugPath.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gestureDebugSource.ts b/web/src/engine/src/gesture-processor/headless/gestureDebugSource.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gestureDebugSource.ts
rename to web/src/engine/src/gesture-processor/headless/gestureDebugSource.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gesturePath.ts b/web/src/engine/src/gesture-processor/headless/gesturePath.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gesturePath.ts
rename to web/src/engine/src/gesture-processor/headless/gesturePath.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gestureSource.ts b/web/src/engine/src/gesture-processor/headless/gestureSource.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gestureSource.ts
rename to web/src/engine/src/gesture-processor/headless/gestureSource.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gestures/index.ts b/web/src/engine/src/gesture-processor/headless/gestures/index.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gestures/index.ts
rename to web/src/engine/src/gesture-processor/headless/gestures/index.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gestures/matchers/gestureMatcher.ts b/web/src/engine/src/gesture-processor/headless/gestures/matchers/gestureMatcher.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gestures/matchers/gestureMatcher.ts
rename to web/src/engine/src/gesture-processor/headless/gestures/matchers/gestureMatcher.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gestures/matchers/gestureSequence.ts b/web/src/engine/src/gesture-processor/headless/gestures/matchers/gestureSequence.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gestures/matchers/gestureSequence.ts
rename to web/src/engine/src/gesture-processor/headless/gestures/matchers/gestureSequence.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gestures/matchers/index.ts b/web/src/engine/src/gesture-processor/headless/gestures/matchers/index.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gestures/matchers/index.ts
rename to web/src/engine/src/gesture-processor/headless/gestures/matchers/index.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gestures/matchers/matcherSelector.ts b/web/src/engine/src/gesture-processor/headless/gestures/matchers/matcherSelector.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gestures/matchers/matcherSelector.ts
rename to web/src/engine/src/gesture-processor/headless/gestures/matchers/matcherSelector.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gestures/matchers/pathMatcher.ts b/web/src/engine/src/gesture-processor/headless/gestures/matchers/pathMatcher.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gestures/matchers/pathMatcher.ts
rename to web/src/engine/src/gesture-processor/headless/gestures/matchers/pathMatcher.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gestures/specs/contactModel.ts b/web/src/engine/src/gesture-processor/headless/gestures/specs/contactModel.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gestures/specs/contactModel.ts
rename to web/src/engine/src/gesture-processor/headless/gestures/specs/contactModel.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gestures/specs/gestureModel.ts b/web/src/engine/src/gesture-processor/headless/gestures/specs/gestureModel.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gestures/specs/gestureModel.ts
rename to web/src/engine/src/gesture-processor/headless/gestures/specs/gestureModel.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gestures/specs/gestureModelDefs.ts b/web/src/engine/src/gesture-processor/headless/gestures/specs/gestureModelDefs.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gestures/specs/gestureModelDefs.ts
rename to web/src/engine/src/gesture-processor/headless/gestures/specs/gestureModelDefs.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gestures/specs/index.ts b/web/src/engine/src/gesture-processor/headless/gestures/specs/index.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gestures/specs/index.ts
rename to web/src/engine/src/gesture-processor/headless/gestures/specs/index.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gestures/specs/modelDefValidator.ts b/web/src/engine/src/gesture-processor/headless/gestures/specs/modelDefValidator.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gestures/specs/modelDefValidator.ts
rename to web/src/engine/src/gesture-processor/headless/gestures/specs/modelDefValidator.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/gestures/specs/pathModel.ts b/web/src/engine/src/gesture-processor/headless/gestures/specs/pathModel.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/gestures/specs/pathModel.ts
rename to web/src/engine/src/gesture-processor/headless/gestures/specs/pathModel.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/inputEngineBase.ts b/web/src/engine/src/gesture-processor/headless/inputEngineBase.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/inputEngineBase.ts
rename to web/src/engine/src/gesture-processor/headless/inputEngineBase.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/inputSample.ts b/web/src/engine/src/gesture-processor/headless/inputSample.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/inputSample.ts
rename to web/src/engine/src/gesture-processor/headless/inputSample.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/segmentClassifier.ts b/web/src/engine/src/gesture-processor/headless/segmentClassifier.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/segmentClassifier.ts
rename to web/src/engine/src/gesture-processor/headless/segmentClassifier.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/headless/touchpointCoordinator.ts b/web/src/engine/src/gesture-processor/headless/touchpointCoordinator.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/headless/touchpointCoordinator.ts
rename to web/src/engine/src/gesture-processor/headless/touchpointCoordinator.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/index.ts b/web/src/engine/src/gesture-processor/index.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/index.ts
rename to web/src/engine/src/gesture-processor/index.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/inputEventEngine.ts b/web/src/engine/src/gesture-processor/inputEventEngine.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/inputEventEngine.ts
rename to web/src/engine/src/gesture-processor/inputEventEngine.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/mouseEventEngine.ts b/web/src/engine/src/gesture-processor/mouseEventEngine.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/mouseEventEngine.ts
rename to web/src/engine/src/gesture-processor/mouseEventEngine.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/mutable.ts b/web/src/engine/src/gesture-processor/mutable.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/mutable.ts
rename to web/src/engine/src/gesture-processor/mutable.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/nonoptional.ts b/web/src/engine/src/gesture-processor/nonoptional.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/nonoptional.ts
rename to web/src/engine/src/gesture-processor/nonoptional.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/reportError.ts b/web/src/engine/src/gesture-processor/reportError.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/reportError.ts
rename to web/src/engine/src/gesture-processor/reportError.ts
diff --git a/web/src/engine/osk/gesture-processor/src/engine/touchEventEngine.ts b/web/src/engine/src/gesture-processor/touchEventEngine.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/engine/touchEventEngine.ts
rename to web/src/engine/src/gesture-processor/touchEventEngine.ts
diff --git a/web/src/engine/src/index.ts b/web/src/engine/src/index.ts
new file mode 100644
index 00000000000..3fecc8c5a6f
--- /dev/null
+++ b/web/src/engine/src/index.ts
@@ -0,0 +1 @@
+export * from './main/index.js';
diff --git a/web/src/engine/interfaces/src/index.ts b/web/src/engine/src/interfaces/index.ts
similarity index 100%
rename from web/src/engine/interfaces/src/index.ts
rename to web/src/engine/src/interfaces/index.ts
diff --git a/web/src/engine/interfaces/src/modelSpec.ts b/web/src/engine/src/interfaces/modelSpec.ts
similarity index 100%
rename from web/src/engine/interfaces/src/modelSpec.ts
rename to web/src/engine/src/interfaces/modelSpec.ts
diff --git a/web/src/engine/interfaces/src/optionSpec.interface.ts b/web/src/engine/src/interfaces/optionSpec.interface.ts
similarity index 100%
rename from web/src/engine/interfaces/src/optionSpec.interface.ts
rename to web/src/engine/src/interfaces/optionSpec.interface.ts
diff --git a/web/src/engine/interfaces/src/oskResourcePathConfiguration.interface.ts b/web/src/engine/src/interfaces/oskResourcePathConfiguration.interface.ts
similarity index 100%
rename from web/src/engine/interfaces/src/oskResourcePathConfiguration.interface.ts
rename to web/src/engine/src/interfaces/oskResourcePathConfiguration.interface.ts
diff --git a/web/src/engine/interfaces/src/pathConfiguration.ts b/web/src/engine/src/interfaces/pathConfiguration.ts
similarity index 100%
rename from web/src/engine/interfaces/src/pathConfiguration.ts
rename to web/src/engine/src/interfaces/pathConfiguration.ts
diff --git a/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts b/web/src/engine/src/interfaces/prediction/languageProcessor.interface.ts
similarity index 100%
rename from web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
rename to web/src/engine/src/interfaces/prediction/languageProcessor.interface.ts
diff --git a/web/src/engine/interfaces/src/prediction/predictionContext.ts b/web/src/engine/src/interfaces/prediction/predictionContext.ts
similarity index 100%
rename from web/src/engine/interfaces/src/prediction/predictionContext.ts
rename to web/src/engine/src/interfaces/prediction/predictionContext.ts
diff --git a/web/src/engine/js-processor/src/deadkeys.ts b/web/src/engine/src/js-processor/deadkeys.ts
similarity index 100%
rename from web/src/engine/js-processor/src/deadkeys.ts
rename to web/src/engine/src/js-processor/deadkeys.ts
diff --git a/web/src/engine/js-processor/src/index.ts b/web/src/engine/src/js-processor/index.ts
similarity index 100%
rename from web/src/engine/js-processor/src/index.ts
rename to web/src/engine/src/js-processor/index.ts
diff --git a/web/src/engine/js-processor/src/jsKeyboardInterface.ts b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
similarity index 100%
rename from web/src/engine/js-processor/src/jsKeyboardInterface.ts
rename to web/src/engine/src/js-processor/jsKeyboardInterface.ts
diff --git a/web/src/engine/js-processor/src/jsKeyboardProcessor.ts b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
similarity index 100%
rename from web/src/engine/js-processor/src/jsKeyboardProcessor.ts
rename to web/src/engine/src/js-processor/jsKeyboardProcessor.ts
diff --git a/web/src/engine/js-processor/src/mock.ts b/web/src/engine/src/js-processor/mock.ts
similarity index 100%
rename from web/src/engine/js-processor/src/mock.ts
rename to web/src/engine/src/js-processor/mock.ts
diff --git a/web/src/engine/js-processor/src/outputTargetBase.ts b/web/src/engine/src/js-processor/outputTargetBase.ts
similarity index 100%
rename from web/src/engine/js-processor/src/outputTargetBase.ts
rename to web/src/engine/src/js-processor/outputTargetBase.ts
diff --git a/web/src/engine/js-processor/src/platformSystemStore.ts b/web/src/engine/src/js-processor/platformSystemStore.ts
similarity index 100%
rename from web/src/engine/js-processor/src/platformSystemStore.ts
rename to web/src/engine/src/js-processor/platformSystemStore.ts
diff --git a/web/src/engine/js-processor/src/stores.ts b/web/src/engine/src/js-processor/stores.ts
similarity index 100%
rename from web/src/engine/js-processor/src/stores.ts
rename to web/src/engine/src/js-processor/stores.ts
diff --git a/web/src/engine/js-processor/src/stringDivergence.ts b/web/src/engine/src/js-processor/stringDivergence.ts
similarity index 100%
rename from web/src/engine/js-processor/src/stringDivergence.ts
rename to web/src/engine/src/js-processor/stringDivergence.ts
diff --git a/web/src/engine/keyboard-storage/README.md b/web/src/engine/src/keyboard-storage/README.md
similarity index 100%
rename from web/src/engine/keyboard-storage/README.md
rename to web/src/engine/src/keyboard-storage/README.md
diff --git a/web/src/engine/keyboard-storage/src/cloud/index.ts b/web/src/engine/src/keyboard-storage/cloud/index.ts
similarity index 100%
rename from web/src/engine/keyboard-storage/src/cloud/index.ts
rename to web/src/engine/src/keyboard-storage/cloud/index.ts
diff --git a/web/src/engine/keyboard-storage/src/cloud/queryEngine.ts b/web/src/engine/src/keyboard-storage/cloud/queryEngine.ts
similarity index 100%
rename from web/src/engine/keyboard-storage/src/cloud/queryEngine.ts
rename to web/src/engine/src/keyboard-storage/cloud/queryEngine.ts
diff --git a/web/src/engine/keyboard-storage/src/cloud/requesterInterface.ts b/web/src/engine/src/keyboard-storage/cloud/requesterInterface.ts
similarity index 100%
rename from web/src/engine/keyboard-storage/src/cloud/requesterInterface.ts
rename to web/src/engine/src/keyboard-storage/cloud/requesterInterface.ts
diff --git a/web/src/engine/keyboard-storage/src/domCloudRequester.ts b/web/src/engine/src/keyboard-storage/domCloudRequester.ts
similarity index 100%
rename from web/src/engine/keyboard-storage/src/domCloudRequester.ts
rename to web/src/engine/src/keyboard-storage/domCloudRequester.ts
diff --git a/web/src/engine/keyboard-storage/src/index.ts b/web/src/engine/src/keyboard-storage/index.ts
similarity index 73%
rename from web/src/engine/keyboard-storage/src/index.ts
rename to web/src/engine/src/keyboard-storage/index.ts
index 49e882eaee0..f2b7bfb26ff 100644
--- a/web/src/engine/keyboard-storage/src/index.ts
+++ b/web/src/engine/src/keyboard-storage/index.ts
@@ -1,3 +1,4 @@
+// TODO-web-core: remove 'export default' to eliminate more aliases
 export {
   ErrorStub,
   type KeyboardAPISpec,
@@ -11,4 +12,5 @@ export { default as StubAndKeyboardCache, toPrefixedKeyboardId, toUnprefixedKeyb
 export { CloudQueryResult, default as CloudQueryEngine } from './cloud/queryEngine.js';
 export { default as CloudRequesterInterface } from './cloud/requesterInterface.js';
 export { default as KeyboardRequisitioner } from './keyboardRequisitioner.js';
-export { default as ModelCache } from './modelCache.js';
\ No newline at end of file
+export { default as ModelCache } from './modelCache.js';
+export { default as DOMCloudRequester } from './domCloudRequester.js';
diff --git a/web/src/engine/keyboard-storage/src/keyboardRequisitioner.ts b/web/src/engine/src/keyboard-storage/keyboardRequisitioner.ts
similarity index 100%
rename from web/src/engine/keyboard-storage/src/keyboardRequisitioner.ts
rename to web/src/engine/src/keyboard-storage/keyboardRequisitioner.ts
diff --git a/web/src/engine/keyboard-storage/src/keyboardStub.ts b/web/src/engine/src/keyboard-storage/keyboardStub.ts
similarity index 100%
rename from web/src/engine/keyboard-storage/src/keyboardStub.ts
rename to web/src/engine/src/keyboard-storage/keyboardStub.ts
diff --git a/web/src/engine/keyboard-storage/src/modelCache.ts b/web/src/engine/src/keyboard-storage/modelCache.ts
similarity index 100%
rename from web/src/engine/keyboard-storage/src/modelCache.ts
rename to web/src/engine/src/keyboard-storage/modelCache.ts
diff --git a/web/src/engine/keyboard-storage/src/stubAndKeyboardCache.ts b/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
similarity index 100%
rename from web/src/engine/keyboard-storage/src/stubAndKeyboardCache.ts
rename to web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
diff --git a/web/src/engine/keyboard/README.md b/web/src/engine/src/keyboard/README.md
similarity index 100%
rename from web/src/engine/keyboard/README.md
rename to web/src/engine/src/keyboard/README.md
diff --git a/web/src/engine/keyboard/src/codes.ts b/web/src/engine/src/keyboard/codes.ts
similarity index 100%
rename from web/src/engine/keyboard/src/codes.ts
rename to web/src/engine/src/keyboard/codes.ts
diff --git a/web/src/engine/keyboard/src/defaultRules.ts b/web/src/engine/src/keyboard/defaultRules.ts
similarity index 100%
rename from web/src/engine/keyboard/src/defaultRules.ts
rename to web/src/engine/src/keyboard/defaultRules.ts
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/src/keyboard/index.ts
similarity index 96%
rename from web/src/engine/keyboard/src/index.ts
rename to web/src/engine/src/keyboard/index.ts
index 03987bceafb..f0ad1a69a25 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/src/keyboard/index.ts
@@ -33,6 +33,8 @@ export { OutputTargetInterface } from "./outputTargetInterface.js";
 export { type SystemStoreMutationHandler, MutableSystemStore, SystemStore, SystemStoreIDs, type SystemStoreDictionary } from "./systemStore.js";
 export { type VariableStore, VariableStoreSerializer, VariableStoreDictionary } from "./variableStore.js";
 
+export { DOMKeyboardLoader } from './keyboards/loaders/domKeyboardLoader.js';
+
 export * from "@keymanapp/web-utils";
 
 // At the top level, there should be no default export.
diff --git a/web/src/engine/keyboard/src/keyEvent.ts b/web/src/engine/src/keyboard/keyEvent.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyEvent.ts
rename to web/src/engine/src/keyboard/keyEvent.ts
diff --git a/web/src/engine/keyboard/src/keyMapping.ts b/web/src/engine/src/keyboard/keyMapping.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyMapping.ts
rename to web/src/engine/src/keyboard/keyMapping.ts
diff --git a/web/src/engine/keyboard/src/keyboards/activeLayout.ts b/web/src/engine/src/keyboard/keyboards/activeLayout.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/activeLayout.ts
rename to web/src/engine/src/keyboard/keyboards/activeLayout.ts
diff --git a/web/src/engine/keyboard/src/keyboards/defaultLayouts.ts b/web/src/engine/src/keyboard/keyboards/defaultLayouts.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/defaultLayouts.ts
rename to web/src/engine/src/keyboard/keyboards/defaultLayouts.ts
diff --git a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/jsKeyboard.ts
rename to web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardHarness.ts b/web/src/engine/src/keyboard/keyboards/keyboardHarness.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/keyboardHarness.ts
rename to web/src/engine/src/keyboard/keyboards/keyboardHarness.ts
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoadError.ts b/web/src/engine/src/keyboard/keyboards/keyboardLoadError.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/keyboardLoadError.ts
rename to web/src/engine/src/keyboard/keyboards/keyboardLoadError.ts
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts b/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts
rename to web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardMinimalInterface.ts b/web/src/engine/src/keyboard/keyboards/keyboardMinimalInterface.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/keyboardMinimalInterface.ts
rename to web/src/engine/src/keyboard/keyboards/keyboardMinimalInterface.ts
diff --git a/web/src/engine/keyboard/src/keyboards/keyboardProperties.ts b/web/src/engine/src/keyboard/keyboards/keyboardProperties.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/keyboardProperties.ts
rename to web/src/engine/src/keyboard/keyboards/keyboardProperties.ts
diff --git a/web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/kmxKeyboard.ts
rename to web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/dom-keyboard-loader.ts b/web/src/engine/src/keyboard/keyboards/loaders/dom-keyboard-loader.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/loaders/dom-keyboard-loader.ts
rename to web/src/engine/src/keyboard/keyboards/loaders/dom-keyboard-loader.ts
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts b/web/src/engine/src/keyboard/keyboards/loaders/domKeyboardLoader.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts
rename to web/src/engine/src/keyboard/keyboards/loaders/domKeyboardLoader.ts
diff --git a/web/src/engine/keyboard/src/keyboards/processorAction.ts b/web/src/engine/src/keyboard/keyboards/processorAction.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/processorAction.ts
rename to web/src/engine/src/keyboard/keyboards/processorAction.ts
diff --git a/web/src/engine/keyboard/src/keyboards/spacebarText.ts b/web/src/engine/src/keyboard/keyboards/spacebarText.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/spacebarText.ts
rename to web/src/engine/src/keyboard/keyboards/spacebarText.ts
diff --git a/web/src/engine/keyboard/src/keyboards/stateKeyMap.ts b/web/src/engine/src/keyboard/keyboards/stateKeyMap.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/stateKeyMap.ts
rename to web/src/engine/src/keyboard/keyboards/stateKeyMap.ts
diff --git a/web/src/engine/keyboard/src/keyboards/textTransform.ts b/web/src/engine/src/keyboard/keyboards/textTransform.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/textTransform.ts
rename to web/src/engine/src/keyboard/keyboards/textTransform.ts
diff --git a/web/src/engine/keyboard/src/keyboards/transcription.ts b/web/src/engine/src/keyboard/keyboards/transcription.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/transcription.ts
rename to web/src/engine/src/keyboard/keyboards/transcription.ts
diff --git a/web/src/engine/keyboard/src/outputTargetInterface.ts b/web/src/engine/src/keyboard/outputTargetInterface.ts
similarity index 100%
rename from web/src/engine/keyboard/src/outputTargetInterface.ts
rename to web/src/engine/src/keyboard/outputTargetInterface.ts
diff --git a/web/src/engine/keyboard/src/systemStore.ts b/web/src/engine/src/keyboard/systemStore.ts
similarity index 100%
rename from web/src/engine/keyboard/src/systemStore.ts
rename to web/src/engine/src/keyboard/systemStore.ts
diff --git a/web/src/engine/keyboard/src/variableStore.ts b/web/src/engine/src/keyboard/variableStore.ts
similarity index 100%
rename from web/src/engine/keyboard/src/variableStore.ts
rename to web/src/engine/src/keyboard/variableStore.ts
diff --git a/web/src/engine/main/src/contextManagerBase.ts b/web/src/engine/src/main/contextManagerBase.ts
similarity index 100%
rename from web/src/engine/main/src/contextManagerBase.ts
rename to web/src/engine/src/main/contextManagerBase.ts
diff --git a/web/src/engine/main/src/engineConfiguration.ts b/web/src/engine/src/main/engineConfiguration.ts
similarity index 100%
rename from web/src/engine/main/src/engineConfiguration.ts
rename to web/src/engine/src/main/engineConfiguration.ts
diff --git a/web/src/engine/main/src/hardKeyboardBase.ts b/web/src/engine/src/main/hardKeyboardBase.ts
similarity index 100%
rename from web/src/engine/main/src/hardKeyboardBase.ts
rename to web/src/engine/src/main/hardKeyboardBase.ts
diff --git a/web/src/engine/main/src/headless/contextWindow.ts b/web/src/engine/src/main/headless/contextWindow.ts
similarity index 100%
rename from web/src/engine/main/src/headless/contextWindow.ts
rename to web/src/engine/src/main/headless/contextWindow.ts
diff --git a/web/src/engine/main/src/headless/deviceDetector.ts b/web/src/engine/src/main/headless/deviceDetector.ts
similarity index 100%
rename from web/src/engine/main/src/headless/deviceDetector.ts
rename to web/src/engine/src/main/headless/deviceDetector.ts
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
similarity index 100%
rename from web/src/engine/main/src/headless/inputProcessor.ts
rename to web/src/engine/src/main/headless/inputProcessor.ts
diff --git a/web/src/engine/main/src/headless/languageProcessor.ts b/web/src/engine/src/main/headless/languageProcessor.ts
similarity index 100%
rename from web/src/engine/main/src/headless/languageProcessor.ts
rename to web/src/engine/src/main/headless/languageProcessor.ts
diff --git a/web/src/engine/main/src/headless/transcriptionCache.ts b/web/src/engine/src/main/headless/transcriptionCache.ts
similarity index 100%
rename from web/src/engine/main/src/headless/transcriptionCache.ts
rename to web/src/engine/src/main/headless/transcriptionCache.ts
diff --git a/web/src/engine/main/src/headless/utils/styleConstants.ts b/web/src/engine/src/main/headless/utils/styleConstants.ts
similarity index 100%
rename from web/src/engine/main/src/headless/utils/styleConstants.ts
rename to web/src/engine/src/main/headless/utils/styleConstants.ts
diff --git a/web/src/engine/main/src/index.ts b/web/src/engine/src/main/index.ts
similarity index 100%
rename from web/src/engine/main/src/index.ts
rename to web/src/engine/src/main/index.ts
diff --git a/web/src/engine/main/src/keyboardInterfaceBase.ts b/web/src/engine/src/main/keyboardInterfaceBase.ts
similarity index 100%
rename from web/src/engine/main/src/keyboardInterfaceBase.ts
rename to web/src/engine/src/main/keyboardInterfaceBase.ts
diff --git a/web/src/engine/main/src/keymanEngineBase.ts b/web/src/engine/src/main/keymanEngineBase.ts
similarity index 99%
rename from web/src/engine/main/src/keymanEngineBase.ts
rename to web/src/engine/src/main/keymanEngineBase.ts
index 37acf96f2aa..be7a2109f8c 100644
--- a/web/src/engine/main/src/keymanEngineBase.ts
+++ b/web/src/engine/src/main/keymanEngineBase.ts
@@ -1,11 +1,12 @@
 import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction } from "keyman/engine/keyboard";
 // TODO-web-core: remove usage of OutputTargetBase
 import { OutputTargetBase, ProcessorInitOptions } from 'keyman/engine/js-processor';
-import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard/dom-keyboard-loader";
+// TODO-web-core: remove alias
+import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard";
 import { WorkerFactory } from "@keymanapp/lexical-model-layer/web"
 import { InputProcessor } from './headless/inputProcessor.js';
 import { OSKView, JSKeyboardData } from "keyman/engine/osk";
-import { KeyboardRequisitioner, ModelCache, toUnprefixedKeyboardId as unprefixed } from "keyman/engine/keyboard-storage";
+import { KeyboardRequisitioner, ModelCache, toUnprefixedKeyboardId as unprefixed, DOMCloudRequester } from "keyman/engine/keyboard-storage";
 import { ModelSpec, PredictionContext } from "keyman/engine/interfaces";
 
 import { EngineConfiguration, InitOptionSpec } from "./engineConfiguration.js";
@@ -14,7 +15,6 @@ import { ContextManagerBase } from "./contextManagerBase.js";
 import { HardKeyboardBase } from "./hardKeyboardBase.js";
 import { LegacyAPIEvents } from "./legacyAPIEvents.js";
 import { EventNames, EventListener, LegacyEventEmitter } from "keyman/engine/events";
-import DOMCloudRequester from "keyman/engine/keyboard-storage/dom-requester";
 import KEYMAN_VERSION from "@keymanapp/keyman-version";
 import { KMWString } from "@keymanapp/web-utils";
 
diff --git a/web/src/engine/main/src/legacyAPIEvents.ts b/web/src/engine/src/main/legacyAPIEvents.ts
similarity index 100%
rename from web/src/engine/main/src/legacyAPIEvents.ts
rename to web/src/engine/src/main/legacyAPIEvents.ts
diff --git a/web/src/engine/main/readme.md b/web/src/engine/src/main/readme.md
similarity index 100%
rename from web/src/engine/main/readme.md
rename to web/src/engine/src/main/readme.md
diff --git a/web/src/engine/main/src/variableStoreCookieSerializer.ts b/web/src/engine/src/main/variableStoreCookieSerializer.ts
similarity index 100%
rename from web/src/engine/main/src/variableStoreCookieSerializer.ts
rename to web/src/engine/src/main/variableStoreCookieSerializer.ts
diff --git a/web/src/engine/osk/src/banner/banner.ts b/web/src/engine/src/osk/banner/banner.ts
similarity index 100%
rename from web/src/engine/osk/src/banner/banner.ts
rename to web/src/engine/src/osk/banner/banner.ts
diff --git a/web/src/engine/osk/src/banner/bannerController.ts b/web/src/engine/src/osk/banner/bannerController.ts
similarity index 100%
rename from web/src/engine/osk/src/banner/bannerController.ts
rename to web/src/engine/src/osk/banner/bannerController.ts
diff --git a/web/src/engine/osk/src/banner/bannerGestureSet.ts b/web/src/engine/src/osk/banner/bannerGestureSet.ts
similarity index 93%
rename from web/src/engine/osk/src/banner/bannerGestureSet.ts
rename to web/src/engine/src/osk/banner/bannerGestureSet.ts
index 5a020a517d7..585f42360cf 100644
--- a/web/src/engine/osk/src/banner/bannerGestureSet.ts
+++ b/web/src/engine/src/osk/banner/bannerGestureSet.ts
@@ -3,7 +3,7 @@ import { deepCopy } from '@keymanapp/web-utils';
 import {
   gestures,
   GestureModelDefs
-} from '@keymanapp/gesture-recognizer';
+} from 'keyman/engine/gesture-processor';
 
 import { BannerSuggestion } from './suggestionBanner.js';
 import { simpleTapModelWithReset } from "../input/gestures/specsForLayout.js";
diff --git a/web/src/engine/osk/src/banner/bannerScrollState.ts b/web/src/engine/src/osk/banner/bannerScrollState.ts
similarity index 95%
rename from web/src/engine/osk/src/banner/bannerScrollState.ts
rename to web/src/engine/src/osk/banner/bannerScrollState.ts
index e67f7b11f25..7ce0454bb80 100644
--- a/web/src/engine/osk/src/banner/bannerScrollState.ts
+++ b/web/src/engine/src/osk/banner/bannerScrollState.ts
@@ -1,4 +1,4 @@
-import { InputSample } from "@keymanapp/gesture-recognizer";
+import { InputSample } from "keyman/engine/gesture-processor";
 
 /**
  * The amount of coordinate 'noise' allowed during a scroll-enabled touch
diff --git a/web/src/engine/osk/src/banner/bannerView.ts b/web/src/engine/src/osk/banner/bannerView.ts
similarity index 100%
rename from web/src/engine/osk/src/banner/bannerView.ts
rename to web/src/engine/src/osk/banner/bannerView.ts
diff --git a/web/src/engine/osk/src/banner/blankBanner.ts b/web/src/engine/src/osk/banner/blankBanner.ts
similarity index 100%
rename from web/src/engine/osk/src/banner/blankBanner.ts
rename to web/src/engine/src/osk/banner/blankBanner.ts
diff --git a/web/src/engine/osk/src/banner/htmlBanner.ts b/web/src/engine/src/osk/banner/htmlBanner.ts
similarity index 100%
rename from web/src/engine/osk/src/banner/htmlBanner.ts
rename to web/src/engine/src/osk/banner/htmlBanner.ts
diff --git a/web/src/engine/osk/src/banner/imageBanner.ts b/web/src/engine/src/osk/banner/imageBanner.ts
similarity index 100%
rename from web/src/engine/osk/src/banner/imageBanner.ts
rename to web/src/engine/src/osk/banner/imageBanner.ts
diff --git a/web/src/engine/osk/src/banner/suggestionBanner.ts b/web/src/engine/src/osk/banner/suggestionBanner.ts
similarity index 99%
rename from web/src/engine/osk/src/banner/suggestionBanner.ts
rename to web/src/engine/src/osk/banner/suggestionBanner.ts
index 98275f9955f..9e342ad8320 100644
--- a/web/src/engine/osk/src/banner/suggestionBanner.ts
+++ b/web/src/engine/src/osk/banner/suggestionBanner.ts
@@ -9,7 +9,7 @@ import {
   InputSample,
   PaddedZoneSource,
   RecognitionZoneSource
-} from '@keymanapp/gesture-recognizer';
+} from 'keyman/engine/gesture-processor';
 
 import { BANNER_GESTURE_SET } from './bannerGestureSet.js';
 
diff --git a/web/src/engine/osk/src/buttonClassNames.ts b/web/src/engine/src/osk/buttonClassNames.ts
similarity index 100%
rename from web/src/engine/osk/src/buttonClassNames.ts
rename to web/src/engine/src/osk/buttonClassNames.ts
diff --git a/web/src/engine/osk/src/components/emptyView.ts b/web/src/engine/src/osk/components/emptyView.ts
similarity index 100%
rename from web/src/engine/osk/src/components/emptyView.ts
rename to web/src/engine/src/osk/components/emptyView.ts
diff --git a/web/src/engine/osk/src/components/helpPageView.ts b/web/src/engine/src/osk/components/helpPageView.ts
similarity index 100%
rename from web/src/engine/osk/src/components/helpPageView.ts
rename to web/src/engine/src/osk/components/helpPageView.ts
diff --git a/web/src/engine/osk/src/components/keyboardView.interface.ts b/web/src/engine/src/osk/components/keyboardView.interface.ts
similarity index 100%
rename from web/src/engine/osk/src/components/keyboardView.interface.ts
rename to web/src/engine/src/osk/components/keyboardView.interface.ts
diff --git a/web/src/engine/osk/src/components/oskViewComponent.interface.ts b/web/src/engine/src/osk/components/oskViewComponent.interface.ts
similarity index 100%
rename from web/src/engine/osk/src/components/oskViewComponent.interface.ts
rename to web/src/engine/src/osk/components/oskViewComponent.interface.ts
diff --git a/web/src/engine/osk/src/components/resizeBar.ts b/web/src/engine/src/osk/components/resizeBar.ts
similarity index 100%
rename from web/src/engine/osk/src/components/resizeBar.ts
rename to web/src/engine/src/osk/components/resizeBar.ts
diff --git a/web/src/engine/osk/src/components/titleBar.ts b/web/src/engine/src/osk/components/titleBar.ts
similarity index 100%
rename from web/src/engine/osk/src/components/titleBar.ts
rename to web/src/engine/src/osk/components/titleBar.ts
diff --git a/web/src/engine/osk/src/config/commonConfiguration.ts b/web/src/engine/src/osk/config/commonConfiguration.ts
similarity index 100%
rename from web/src/engine/osk/src/config/commonConfiguration.ts
rename to web/src/engine/src/osk/config/commonConfiguration.ts
diff --git a/web/src/engine/osk/src/config/embeddedGestureConfig.ts b/web/src/engine/src/osk/config/embeddedGestureConfig.ts
similarity index 100%
rename from web/src/engine/osk/src/config/embeddedGestureConfig.ts
rename to web/src/engine/src/osk/config/embeddedGestureConfig.ts
diff --git a/web/src/engine/osk/src/config/viewConfiguration.ts b/web/src/engine/src/osk/config/viewConfiguration.ts
similarity index 100%
rename from web/src/engine/osk/src/config/viewConfiguration.ts
rename to web/src/engine/src/osk/config/viewConfiguration.ts
diff --git a/web/src/engine/osk/src/correctionLayout.ts b/web/src/engine/src/osk/correctionLayout.ts
similarity index 100%
rename from web/src/engine/osk/src/correctionLayout.ts
rename to web/src/engine/src/osk/correctionLayout.ts
diff --git a/web/src/engine/osk/src/corrections.ts b/web/src/engine/src/osk/corrections.ts
similarity index 100%
rename from web/src/engine/osk/src/corrections.ts
rename to web/src/engine/src/osk/corrections.ts
diff --git a/web/src/engine/osk/src/fontSizeUtils.ts b/web/src/engine/src/osk/fontSizeUtils.ts
similarity index 100%
rename from web/src/engine/osk/src/fontSizeUtils.ts
rename to web/src/engine/src/osk/fontSizeUtils.ts
diff --git a/web/src/engine/osk/src/globehint.interface.ts b/web/src/engine/src/osk/globehint.interface.ts
similarity index 100%
rename from web/src/engine/osk/src/globehint.interface.ts
rename to web/src/engine/src/osk/globehint.interface.ts
diff --git a/web/src/engine/osk/src/index.ts b/web/src/engine/src/osk/index.ts
similarity index 94%
rename from web/src/engine/osk/src/index.ts
rename to web/src/engine/src/osk/index.ts
index 4140e1537dd..1755d5b2b95 100644
--- a/web/src/engine/osk/src/index.ts
+++ b/web/src/engine/src/osk/index.ts
@@ -30,4 +30,7 @@ export { PredictionContext } from 'keyman/engine/interfaces';
 export * from './corrections.js';
 export * from './correctionLayout.js';
 
+// TODO-web-core: use a unitTestEndpoints pattern here
+export * as testIndex from './test-index.js';
+
 // More things will likely need to be added.
\ No newline at end of file
diff --git a/web/src/engine/osk/src/input/gestures/browser/flick.ts b/web/src/engine/src/osk/input/gestures/browser/flick.ts
similarity index 99%
rename from web/src/engine/osk/src/input/gestures/browser/flick.ts
rename to web/src/engine/src/osk/input/gestures/browser/flick.ts
index d9f646c2754..d0e75f5203b 100644
--- a/web/src/engine/osk/src/input/gestures/browser/flick.ts
+++ b/web/src/engine/src/osk/input/gestures/browser/flick.ts
@@ -2,7 +2,7 @@ import { type KeyElement } from '../../../keyElement.js';
 import VisualKeyboard from '../../../visualKeyboard.js';
 
 import { ActiveKey, ActiveKeyBase, ActiveSubKey, KeyDistribution, KeyEvent } from 'keyman/engine/keyboard';
-import { ConfigChangeClosure, CumulativePathStats, GestureRecognizerConfiguration, GestureSequence, GestureSource, GestureSourceSubview, InputSample, RecognitionZoneSource } from '@keymanapp/gesture-recognizer';
+import { ConfigChangeClosure, CumulativePathStats, GestureRecognizerConfiguration, GestureSequence, GestureSource, GestureSourceSubview, InputSample, RecognitionZoneSource } from 'keyman/engine/gesture-processor';
 import { GestureHandler } from '../gestureHandler.js';
 import { distributionFromDistanceMaps } from '../../../corrections.js';
 import { GestureParams } from '../specsForLayout.js';
diff --git a/web/src/engine/osk/src/input/gestures/browser/keytip.ts b/web/src/engine/src/osk/input/gestures/browser/keytip.ts
similarity index 100%
rename from web/src/engine/osk/src/input/gestures/browser/keytip.ts
rename to web/src/engine/src/osk/input/gestures/browser/keytip.ts
diff --git a/web/src/engine/osk/src/input/gestures/browser/modipress.ts b/web/src/engine/src/osk/input/gestures/browser/modipress.ts
similarity index 96%
rename from web/src/engine/osk/src/input/gestures/browser/modipress.ts
rename to web/src/engine/src/osk/input/gestures/browser/modipress.ts
index 3ffd4c206c9..94e86848de2 100644
--- a/web/src/engine/osk/src/input/gestures/browser/modipress.ts
+++ b/web/src/engine/src/osk/input/gestures/browser/modipress.ts
@@ -2,7 +2,7 @@ import { type KeyElement } from '../../../keyElement.js';
 import VisualKeyboard from '../../../visualKeyboard.js';
 
 import { KeyDistribution, ActiveKeyBase } from 'keyman/engine/keyboard';
-import { GestureSequence } from '@keymanapp/gesture-recognizer';
+import { GestureSequence } from 'keyman/engine/gesture-processor';
 import { GestureHandler } from '../gestureHandler.js';
 
 /**
diff --git a/web/src/engine/osk/src/input/gestures/browser/multitap.ts b/web/src/engine/src/osk/input/gestures/browser/multitap.ts
similarity index 99%
rename from web/src/engine/osk/src/input/gestures/browser/multitap.ts
rename to web/src/engine/src/osk/input/gestures/browser/multitap.ts
index 7a966b5f7d0..9de399d3372 100644
--- a/web/src/engine/osk/src/input/gestures/browser/multitap.ts
+++ b/web/src/engine/src/osk/input/gestures/browser/multitap.ts
@@ -2,7 +2,7 @@ import { type KeyElement } from '../../../keyElement.js';
 import VisualKeyboard from '../../../visualKeyboard.js';
 
 import { ActiveSubKey, ActiveKey, KeyDistribution, ActiveKeyBase } from 'keyman/engine/keyboard';
-import { GestureSequence, GestureStageReport } from '@keymanapp/gesture-recognizer';
+import { GestureSequence, GestureStageReport } from 'keyman/engine/gesture-processor';
 import { GestureHandler } from '../gestureHandler.js';
 import { distributionFromDistanceMaps } from '../../../corrections.js';
 import Modipress from './modipress.js';
diff --git a/web/src/engine/osk/src/input/gestures/browser/oskSubKey.ts b/web/src/engine/src/osk/input/gestures/browser/oskSubKey.ts
similarity index 100%
rename from web/src/engine/osk/src/input/gestures/browser/oskSubKey.ts
rename to web/src/engine/src/osk/input/gestures/browser/oskSubKey.ts
diff --git a/web/src/engine/osk/src/input/gestures/browser/subkeyPopup.ts b/web/src/engine/src/osk/input/gestures/browser/subkeyPopup.ts
similarity index 99%
rename from web/src/engine/osk/src/input/gestures/browser/subkeyPopup.ts
rename to web/src/engine/src/osk/input/gestures/browser/subkeyPopup.ts
index dcfd45ca9b8..4c9ae5101fc 100644
--- a/web/src/engine/osk/src/input/gestures/browser/subkeyPopup.ts
+++ b/web/src/engine/src/osk/input/gestures/browser/subkeyPopup.ts
@@ -4,7 +4,7 @@ import OSKBaseKey from '../../../keyboard-layout/oskBaseKey.js';
 import VisualKeyboard from '../../../visualKeyboard.js';
 
 import { DeviceSpec, ActiveSubKey, KeyDistribution, ActiveKeyBase } from 'keyman/engine/keyboard';
-import { ConfigChangeClosure, GestureRecognizerConfiguration, GestureSequence, PaddedZoneSource, RecognitionZoneSource } from '@keymanapp/gesture-recognizer';
+import { ConfigChangeClosure, GestureRecognizerConfiguration, GestureSequence, PaddedZoneSource, RecognitionZoneSource } from 'keyman/engine/gesture-processor';
 import { GestureHandler } from '../gestureHandler.js';
 import { CorrectionLayout, CorrectionLayoutEntry } from '../../../correctionLayout.js';
 import { distributionFromDistanceMaps, keyTouchDistances } from '../../../corrections.js';
diff --git a/web/src/engine/osk/src/input/gestures/browser/tabletPreview.ts b/web/src/engine/src/osk/input/gestures/browser/tabletPreview.ts
similarity index 100%
rename from web/src/engine/osk/src/input/gestures/browser/tabletPreview.ts
rename to web/src/engine/src/osk/input/gestures/browser/tabletPreview.ts
diff --git a/web/src/engine/osk/src/input/gestures/gestureHandler.ts b/web/src/engine/src/osk/input/gestures/gestureHandler.ts
similarity index 100%
rename from web/src/engine/osk/src/input/gestures/gestureHandler.ts
rename to web/src/engine/src/osk/input/gestures/gestureHandler.ts
diff --git a/web/src/engine/osk/src/input/gestures/heldRepeater.ts b/web/src/engine/src/osk/input/gestures/heldRepeater.ts
similarity index 95%
rename from web/src/engine/osk/src/input/gestures/heldRepeater.ts
rename to web/src/engine/src/osk/input/gestures/heldRepeater.ts
index 025d8989125..253d57930c9 100644
--- a/web/src/engine/osk/src/input/gestures/heldRepeater.ts
+++ b/web/src/engine/src/osk/input/gestures/heldRepeater.ts
@@ -1,4 +1,4 @@
-import { GestureSequence } from "@keymanapp/gesture-recognizer";
+import { GestureSequence } from "keyman/engine/gesture-processor";
 import { KeyDistribution } from "keyman/engine/keyboard";
 
 import { KeyElement } from "../../keyElement.js";
diff --git a/web/src/engine/osk/src/input/gestures/specsForLayout.ts b/web/src/engine/src/osk/input/gestures/specsForLayout.ts
similarity index 99%
rename from web/src/engine/osk/src/input/gestures/specsForLayout.ts
rename to web/src/engine/src/osk/input/gestures/specsForLayout.ts
index 19825965908..98e92f76db4 100644
--- a/web/src/engine/osk/src/input/gestures/specsForLayout.ts
+++ b/web/src/engine/src/osk/input/gestures/specsForLayout.ts
@@ -2,7 +2,7 @@ import {
   gestures,
   GestureModelDefs,
   CumulativePathStats
-} from '@keymanapp/gesture-recognizer';
+} from 'keyman/engine/gesture-processor';
 
 import {
   TouchLayout
diff --git a/web/src/engine/osk/src/input/mouseDragOperation.ts b/web/src/engine/src/osk/input/mouseDragOperation.ts
similarity index 100%
rename from web/src/engine/osk/src/input/mouseDragOperation.ts
rename to web/src/engine/src/osk/input/mouseDragOperation.ts
diff --git a/web/src/engine/osk/src/keyElement.ts b/web/src/engine/src/osk/keyElement.ts
similarity index 100%
rename from web/src/engine/osk/src/keyElement.ts
rename to web/src/engine/src/osk/keyElement.ts
diff --git a/web/src/engine/osk/src/keyboard-layout/gesturePreviewHost.ts b/web/src/engine/src/osk/keyboard-layout/gesturePreviewHost.ts
similarity index 100%
rename from web/src/engine/osk/src/keyboard-layout/gesturePreviewHost.ts
rename to web/src/engine/src/osk/keyboard-layout/gesturePreviewHost.ts
diff --git a/web/src/engine/osk/src/keyboard-layout/getTextMetrics.ts b/web/src/engine/src/osk/keyboard-layout/getTextMetrics.ts
similarity index 100%
rename from web/src/engine/osk/src/keyboard-layout/getTextMetrics.ts
rename to web/src/engine/src/osk/keyboard-layout/getTextMetrics.ts
diff --git a/web/src/engine/osk/src/keyboard-layout/oskBaseKey.ts b/web/src/engine/src/osk/keyboard-layout/oskBaseKey.ts
similarity index 100%
rename from web/src/engine/osk/src/keyboard-layout/oskBaseKey.ts
rename to web/src/engine/src/osk/keyboard-layout/oskBaseKey.ts
diff --git a/web/src/engine/osk/src/keyboard-layout/oskKey.ts b/web/src/engine/src/osk/keyboard-layout/oskKey.ts
similarity index 100%
rename from web/src/engine/osk/src/keyboard-layout/oskKey.ts
rename to web/src/engine/src/osk/keyboard-layout/oskKey.ts
diff --git a/web/src/engine/osk/src/keyboard-layout/oskLayer.ts b/web/src/engine/src/osk/keyboard-layout/oskLayer.ts
similarity index 100%
rename from web/src/engine/osk/src/keyboard-layout/oskLayer.ts
rename to web/src/engine/src/osk/keyboard-layout/oskLayer.ts
diff --git a/web/src/engine/osk/src/keyboard-layout/oskLayerGroup.ts b/web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts
similarity index 99%
rename from web/src/engine/osk/src/keyboard-layout/oskLayerGroup.ts
rename to web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts
index 061dbb1d52c..dc97bc0cba3 100644
--- a/web/src/engine/osk/src/keyboard-layout/oskLayerGroup.ts
+++ b/web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts
@@ -1,6 +1,6 @@
 import { type DeviceSpec, JSKeyboard, ActiveLayout, ButtonClasses } from 'keyman/engine/keyboard';
 
-import { InputSample } from '@keymanapp/gesture-recognizer';
+import { InputSample } from 'keyman/engine/gesture-processor';
 
 import { KeyElement } from '../keyElement.js';
 import OSKLayer, { LayerLayoutParams } from './oskLayer.js';
diff --git a/web/src/engine/osk/src/keyboard-layout/oskRow.ts b/web/src/engine/src/osk/keyboard-layout/oskRow.ts
similarity index 100%
rename from web/src/engine/osk/src/keyboard-layout/oskRow.ts
rename to web/src/engine/src/osk/keyboard-layout/oskRow.ts
diff --git a/web/src/engine/osk/src/keytip.interface.ts b/web/src/engine/src/osk/keytip.interface.ts
similarity index 100%
rename from web/src/engine/osk/src/keytip.interface.ts
rename to web/src/engine/src/osk/keytip.interface.ts
diff --git a/web/src/engine/osk/src/lengthStyle.ts b/web/src/engine/src/osk/lengthStyle.ts
similarity index 100%
rename from web/src/engine/osk/src/lengthStyle.ts
rename to web/src/engine/src/osk/lengthStyle.ts
diff --git a/web/src/engine/osk/src/screenUtils.ts b/web/src/engine/src/osk/screenUtils.ts
similarity index 100%
rename from web/src/engine/osk/src/screenUtils.ts
rename to web/src/engine/src/osk/screenUtils.ts
diff --git a/web/src/engine/osk/src/specialCharacters.ts b/web/src/engine/src/osk/specialCharacters.ts
similarity index 100%
rename from web/src/engine/osk/src/specialCharacters.ts
rename to web/src/engine/src/osk/specialCharacters.ts
diff --git a/web/src/engine/osk/src/test-index.ts b/web/src/engine/src/osk/test-index.ts
similarity index 100%
rename from web/src/engine/osk/src/test-index.ts
rename to web/src/engine/src/osk/test-index.ts
diff --git a/web/src/engine/osk/validate-gesture-specs.js b/web/src/engine/src/osk/validate-gesture-specs.js
similarity index 93%
rename from web/src/engine/osk/validate-gesture-specs.js
rename to web/src/engine/src/osk/validate-gesture-specs.js
index e937e0ffbd1..0acce1a9db1 100644
--- a/web/src/engine/osk/validate-gesture-specs.js
+++ b/web/src/engine/src/osk/validate-gesture-specs.js
@@ -1,4 +1,4 @@
-import { validateModelDefs } from '@keymanapp/gesture-recognizer';
+import { validateModelDefs } from 'keyman/engine/gesture-processor';
 import { gestureSetForLayout, DEFAULT_GESTURE_PARAMS } from 'keyman/engine/osk';
 
 const flicklessSet = gestureSetForLayout(
diff --git a/web/src/engine/osk/src/views/activator.ts b/web/src/engine/src/osk/views/activator.ts
similarity index 100%
rename from web/src/engine/osk/src/views/activator.ts
rename to web/src/engine/src/osk/views/activator.ts
diff --git a/web/src/engine/osk/src/views/anchoredOskView.ts b/web/src/engine/src/osk/views/anchoredOskView.ts
similarity index 100%
rename from web/src/engine/osk/src/views/anchoredOskView.ts
rename to web/src/engine/src/osk/views/anchoredOskView.ts
diff --git a/web/src/engine/osk/src/views/floatingOskCookie.ts b/web/src/engine/src/osk/views/floatingOskCookie.ts
similarity index 100%
rename from web/src/engine/osk/src/views/floatingOskCookie.ts
rename to web/src/engine/src/osk/views/floatingOskCookie.ts
diff --git a/web/src/engine/osk/src/views/floatingOskView.ts b/web/src/engine/src/osk/views/floatingOskView.ts
similarity index 100%
rename from web/src/engine/osk/src/views/floatingOskView.ts
rename to web/src/engine/src/osk/views/floatingOskView.ts
diff --git a/web/src/engine/osk/src/views/inlinedOskView.ts b/web/src/engine/src/osk/views/inlinedOskView.ts
similarity index 100%
rename from web/src/engine/osk/src/views/inlinedOskView.ts
rename to web/src/engine/src/osk/views/inlinedOskView.ts
diff --git a/web/src/engine/osk/src/views/keyEventSource.interface.ts b/web/src/engine/src/osk/views/keyEventSource.interface.ts
similarity index 100%
rename from web/src/engine/osk/src/views/keyEventSource.interface.ts
rename to web/src/engine/src/osk/views/keyEventSource.interface.ts
diff --git a/web/src/engine/osk/src/views/oskView.ts b/web/src/engine/src/osk/views/oskView.ts
similarity index 100%
rename from web/src/engine/osk/src/views/oskView.ts
rename to web/src/engine/src/osk/views/oskView.ts
diff --git a/web/src/engine/osk/src/views/simpleActivator.ts b/web/src/engine/src/osk/views/simpleActivator.ts
similarity index 100%
rename from web/src/engine/osk/src/views/simpleActivator.ts
rename to web/src/engine/src/osk/views/simpleActivator.ts
diff --git a/web/src/engine/osk/src/views/touchEventPromiseMap.ts b/web/src/engine/src/osk/views/touchEventPromiseMap.ts
similarity index 100%
rename from web/src/engine/osk/src/views/touchEventPromiseMap.ts
rename to web/src/engine/src/osk/views/touchEventPromiseMap.ts
diff --git a/web/src/engine/osk/src/views/twoStateActivator.ts b/web/src/engine/src/osk/views/twoStateActivator.ts
similarity index 100%
rename from web/src/engine/osk/src/views/twoStateActivator.ts
rename to web/src/engine/src/osk/views/twoStateActivator.ts
diff --git a/web/src/engine/osk/src/visualKeyboard.ts b/web/src/engine/src/osk/visualKeyboard.ts
similarity index 99%
rename from web/src/engine/osk/src/visualKeyboard.ts
rename to web/src/engine/src/osk/visualKeyboard.ts
index 6985edf1927..1fb793f6db9 100644
--- a/web/src/engine/osk/src/visualKeyboard.ts
+++ b/web/src/engine/src/osk/visualKeyboard.ts
@@ -27,7 +27,7 @@ import {
   GestureSource,
   InputSample,
   PaddedZoneSource
-} from '@keymanapp/gesture-recognizer';
+} from 'keyman/engine/gesture-processor';
 
 import { createStyleSheet, StylesheetManager } from 'keyman/engine/dom-utils';
 
diff --git a/web/src/engine/tsconfig.json b/web/src/engine/tsconfig.json
new file mode 100644
index 00000000000..d475e297af9
--- /dev/null
+++ b/web/src/engine/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../tsconfig.dom.json",
+
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "../../build/engine/obj/",
+    "tsBuildInfoFile": "../../build/engine/obj/tsconfig.tsbuildinfo",
+    "rootDir": "./src",
+    "paths": {
+      "keyman/engine/*": ["./src/*/index.js"]
+    },
+  },
+
+  "include": [ "src/**/*.ts", "src/core-processor/import/*.js" ],
+}
diff --git a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
index eabf6eefdd8..fa397f8e154 100644
--- a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
+++ b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
@@ -6,7 +6,7 @@ import { LegacyEventEmitter } from 'keyman/engine/events';
 import { StubAndKeyboardCache, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage';
 
 import { KeyboardHarness, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { DOMKeyboardLoader } from 'keyman/engine/keyboard/dom-keyboard-loader';
+import { DOMKeyboardLoader } from 'keyman/engine/keyboard';
 import { loadKeyboardsFromStubs } from '../../kbdLoader.js';
 
 import { DeviceSpec, ManagedPromise, timedPromise } from '@keymanapp/web-utils';
diff --git a/web/src/test/auto/dom/cases/gesture-processor/recordedCoordSequences.tests.ts b/web/src/test/auto/dom/cases/gesture-processor/recordedCoordSequences.tests.ts
index 06136c66a79..61da5cd09c7 100644
--- a/web/src/test/auto/dom/cases/gesture-processor/recordedCoordSequences.tests.ts
+++ b/web/src/test/auto/dom/cases/gesture-processor/recordedCoordSequences.tests.ts
@@ -1,7 +1,7 @@
 import { assert, expect } from 'chai';
 import sinon from 'sinon';
 
-import type { GestureDebugSource, InputSample, SerializedGestureSource } from '@keymanapp/gesture-recognizer';
+import type { GestureDebugSource, InputSample, SerializedGestureSource } from 'keyman/engine/gesture-processor';
 
 import {
   HostFixtureLayoutController,
diff --git a/web/src/test/auto/dom/cases/keyboard-storage/cloudQueries.tests.ts b/web/src/test/auto/dom/cases/keyboard-storage/cloudQueries.tests.ts
index 4af873b23cd..441ec9f992a 100644
--- a/web/src/test/auto/dom/cases/keyboard-storage/cloudQueries.tests.ts
+++ b/web/src/test/auto/dom/cases/keyboard-storage/cloudQueries.tests.ts
@@ -1,9 +1,8 @@
 import { assert } from 'chai';
 import sinon from 'sinon';
 
-import { CloudQueryEngine, type KeyboardStub } from 'keyman/engine/keyboard-storage';
+import { CloudQueryEngine, type KeyboardStub, DOMCloudRequester } from 'keyman/engine/keyboard-storage';
 import { PathConfiguration } from 'keyman/engine/interfaces';
-import DOMCloudRequester from 'keyman/engine/keyboard-storage/dom-requester';
 import { ManagedPromise } from '@keymanapp/web-utils';
 
 const pathConfig = new PathConfiguration({
diff --git a/web/src/test/auto/dom/cases/keyboard-storage/domCloudRequester.tests.ts b/web/src/test/auto/dom/cases/keyboard-storage/domCloudRequester.tests.ts
index 7101bfd9f7e..7165aedbc0b 100644
--- a/web/src/test/auto/dom/cases/keyboard-storage/domCloudRequester.tests.ts
+++ b/web/src/test/auto/dom/cases/keyboard-storage/domCloudRequester.tests.ts
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 import sinon from 'sinon';
 
-import DOMCloudRequester from 'keyman/engine/keyboard-storage/dom-requester';
+import { DOMCloudRequester } from 'keyman/engine/keyboard-storage';
 
 describe("Mocked cloud query results ('canary' testing)", () => {
   function performMockedRequest(mockedResultsPath: string) {
diff --git a/web/src/test/auto/dom/cases/keyboard-storage/keyboardRequisitioner.tests.ts b/web/src/test/auto/dom/cases/keyboard-storage/keyboardRequisitioner.tests.ts
index bada557bf89..5ac6f496e1b 100644
--- a/web/src/test/auto/dom/cases/keyboard-storage/keyboardRequisitioner.tests.ts
+++ b/web/src/test/auto/dom/cases/keyboard-storage/keyboardRequisitioner.tests.ts
@@ -2,10 +2,10 @@ import { assert } from 'chai';
 import sinon from 'sinon';
 
 import { KeyboardHarness, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { DOMKeyboardLoader } from 'keyman/engine/keyboard/dom-keyboard-loader';
+import { DOMKeyboardLoader } from 'keyman/engine/keyboard';
 import { PathConfiguration } from 'keyman/engine/interfaces';
 import { CloudQueryEngine, KeyboardRequisitioner, type KeyboardStub } from 'keyman/engine/keyboard-storage';
-import DOMCloudRequester from 'keyman/engine/keyboard-storage/dom-requester';
+import { DOMCloudRequester } from 'keyman/engine/keyboard-storage';
 
 const pathConfig = new PathConfiguration({
   root: '',
diff --git a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
index 38db889f61d..334e54345b4 100644
--- a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
+++ b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { DOMKeyboardLoader } from 'keyman/engine/keyboard/dom-keyboard-loader';
+import { DOMKeyboardLoader } from 'keyman/engine/keyboard';
 import { KeyboardHarness, JSKeyboard, MinimalKeymanGlobal, DeviceSpec, KeyboardKeymanGlobal, KeyboardDownloadError, KeyboardScriptError, Keyboard } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
 import { assertThrowsAsync } from 'keyman/tools/testing/test-utils';
diff --git a/web/src/test/auto/dom/kbdLoader.ts b/web/src/test/auto/dom/kbdLoader.ts
index a9a01dfe2c8..3c81dc887d4 100644
--- a/web/src/test/auto/dom/kbdLoader.ts
+++ b/web/src/test/auto/dom/kbdLoader.ts
@@ -1,6 +1,6 @@
 import {
   DOMKeyboardLoader
-} from 'keyman/engine/keyboard/dom-keyboard-loader';
+} from 'keyman/engine/keyboard';
 
 import {
   JSKeyboard,
diff --git a/web/src/test/auto/dom/tsconfig.json b/web/src/test/auto/dom/tsconfig.json
deleted file mode 100644
index e0de4828c42..00000000000
--- a/web/src/test/auto/dom/tsconfig.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "extends": "../../../tsconfig.dom.json",
-
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "../../../build/test",
-    "rootDir": "."
-  },
-}
diff --git a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
index 123d6c23407..08bec6f4368 100644
--- a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
@@ -7,7 +7,7 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
 import { env } from 'node:process';
diff --git a/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js b/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
index 15b42dd8f8a..5c950539183 100644
--- a/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
@@ -4,7 +4,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { JSKeyboardProcessor } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 
 global.keyman = {}; // So that keyboard-based checks against the global `keyman` succeed.
                     // 10.0+ dependent keyboards, like khmer_angkor, will otherwise fail to load.
diff --git a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
index 591b112392c..1c7b48cdcc7 100644
--- a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
@@ -6,7 +6,7 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
diff --git a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
index 25ae78abdef..15bb2e824f6 100644
--- a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
@@ -6,7 +6,7 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
 import { env } from 'node:process';
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
index 4469194a6dd..ee9ca5e61f7 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
@@ -5,7 +5,7 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, JSKeyboardProcessor, Mock } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 
 import { NodeProctor, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
 
@@ -882,7 +882,7 @@ var NUL_TEST_2 = {
 /* Keyman language equivalent:
  *
  * nul nul any(abc) context(3) > 'success'
- * 
+ *
  * This one may... "stretch" what's actually allowed by Keyman language rules,
  * but we wish to ensure that the actual context management is capable of
  * handling this.
@@ -925,7 +925,7 @@ var NUL_TEST_3 = {
 /* Keyman language equivalent:
  *
  * nul nul dk(1) any(abc) > 'success'
- * 
+ *
  * This may also "stretch" what's actually allowed by Keyman language rules,
  * but we wish to ensure that the actual context management is capable of
  * handling this.
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
index 8264de4efea..f7e0398f189 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
@@ -5,7 +5,7 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 import { NodeProctor, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
 
 const device = {
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
index 83936da36fc..61fd93c3e0a 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
@@ -6,7 +6,7 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
 import { env } from 'node:process';
diff --git a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
index b8a68dd55c2..181307460cd 100644
--- a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
+++ b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
@@ -5,7 +5,7 @@ const require = createRequire(import.meta.url);
 
 import { DeviceSpec, JSKeyboard, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 
 describe('Headless keyboard loading', function () {
   const laoPath = require.resolve('@keymanapp/common-test-resources/keyboards/lao_2008_basic.js');
diff --git a/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js b/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
index 1d320e0b936..d5aa97280b2 100644
--- a/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
@@ -6,7 +6,7 @@ const require = createRequire(import.meta.url);
 
 import { Codes, KeyEvent, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 
 // Compare and contrast the unit tests here with those for app/browser key-event unit testing
 // in the hardware-event-processing set; the output objects there should have the same format
diff --git a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
index 0d573ad3703..591065102d0 100644
--- a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
@@ -7,7 +7,7 @@ const require = createRequire(import.meta.url);
 import { KMWString } from '@keymanapp/web-utils';
 import { Codes, KeyEvent, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, JSKeyboardProcessor, Mock } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
 
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js
index eb078c17681..b6c5f2f4cc9 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js
@@ -4,7 +4,7 @@ import sinon from 'sinon';
 import { ManagedPromise } from '@keymanapp/web-utils';
 import { CloudQueryEngine, StubAndKeyboardCache, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage';
 import { PathConfiguration } from 'keyman/engine/interfaces';
-import NodeCloudRequester from 'keyman/engine/keyboard-storage/node-requester';
+import NodeCloudRequester from '../../../resources/loader/nodeCloudRequester.js';
 
 import path from 'path';
 import { fileURLToPath } from 'url';
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js
index b158f4ef9a2..ee93c0eb99f 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js
@@ -3,13 +3,13 @@ import sinon from 'sinon';
 import fs from 'fs';
 
 import { KeyboardHarness, ManagedPromise, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 import {
   KeyboardRequisitioner,
   toPrefixedKeyboardId as prefixed
 } from 'keyman/engine/keyboard-storage';
 import { PathConfiguration } from 'keyman/engine/interfaces';
-import NodeCloudRequester from 'keyman/engine/keyboard-storage/node-requester';
+import NodeCloudRequester from '../../../resources/loader/nodeCloudRequester.js';
 
 import path from 'path';
 import { fileURLToPath } from 'url';
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js
index af7d6b6a57b..96b67828922 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js
@@ -2,7 +2,7 @@ import { assert } from 'chai';
 import sinon from 'sinon';
 
 import { KeyboardStub } from 'keyman/engine/keyboard-storage';
-import NodeCloudRequester from 'keyman/engine/keyboard-storage/node-requester';
+import NodeCloudRequester from '../../../resources/loader/nodeCloudRequester.js';
 
 import path from 'path';
 import { fileURLToPath } from 'url';
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js
index 07ac9e98fb6..468906b1fc6 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 import sinon from 'sinon';
 
-import NodeCloudRequester from 'keyman/engine/keyboard-storage/node-requester';
+import NodeCloudRequester from '../../../resources/loader/nodeCloudRequester.js';
 
 import path from 'path';
 import { fileURLToPath } from 'url';
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/stubAndKeyboardCache.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/stubAndKeyboardCache.tests.js
index d8b52dea376..9b120d01e63 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/stubAndKeyboardCache.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/stubAndKeyboardCache.tests.js
@@ -4,7 +4,7 @@ import fs from 'fs';
 
 import { KeyboardStub, StubAndKeyboardCache } from 'keyman/engine/keyboard-storage';
 
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 import { KeyboardHarness, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 
 import path from 'path';
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js b/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
index f319b207316..bc97961b5bc 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
@@ -5,7 +5,7 @@ const require = createRequire(import.meta.url);
 
 import { KeyboardHarness, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 
 describe('Headless keyboard loading', function() {
   const laoPath = require.resolve('@keymanapp/common-test-resources/keyboards/lao_2008_basic.js');
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
index 3ebeaaa58f4..ff4cd858152 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
@@ -4,7 +4,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { KeyboardHarness, MinimalKeymanGlobal, DeviceSpec, JSKeyboard } from 'keyman/engine/keyboard';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 
 
 describe('Keyboard tests', function () {
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
index 76d5fdc1b1c..e6d0fb1be94 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
@@ -5,7 +5,7 @@ const require = createRequire(import.meta.url);
 
 import { KeyboardHarness, MinimalKeymanGlobal, KeyboardDownloadError, DeviceSpec, InvalidKeyboardError, JSKeyboard } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 import { assertThrowsAsync, assertThrows } from 'keyman/tools/testing/test-utils';
 
 describe('Headless keyboard loading', function() {
diff --git a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
index eafd740ced3..c5226137a86 100644
--- a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
@@ -7,7 +7,7 @@ const require = createRequire(import.meta.url);
 import { InputProcessor } from 'keyman/engine/main';
 import { JSKeyboardInterface, Mock } from 'keyman/engine/js-processor';
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 import { KeyboardTest } from '@keymanapp/recorder-core';
 
 import { Worker } from '@keymanapp/lexical-model-layer/node';
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/asyncClosureDispatchQueue.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/asyncClosureDispatchQueue.tests.ts
index 6b684968aa1..553322f7032 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/asyncClosureDispatchQueue.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/asyncClosureDispatchQueue.tests.ts
@@ -1,6 +1,6 @@
 import { assert } from 'chai'
 import { default as sinon, type SinonSpy } from 'sinon';
-import { AsyncClosureDispatchQueue, type QueueClosure } from '@keymanapp/gesture-recognizer';
+import { AsyncClosureDispatchQueue, type QueueClosure } from 'keyman/engine/gesture-processor';
 import { ManagedPromise, timedPromise } from '@keymanapp/web-utils';
 
 type ClosureSpy = SinonSpy<[], ReturnType<QueueClosure>>;
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gesturePath.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gesturePath.tests.ts
index 0a90b0c6289..a878c5fbd68 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gesturePath.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gesturePath.tests.ts
@@ -4,7 +4,7 @@ import path from 'path';
 import url from 'url';
 import fs from 'fs';
 
-import { GestureDebugPath } from '@keymanapp/gesture-recognizer';
+import { GestureDebugPath } from 'keyman/engine/gesture-processor';
 import { timedPromise } from '@keymanapp/web-utils';
 import { TouchpathTurtle } from '#gesture-tools';
 
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestureSource.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestureSource.tests.ts
index 08dc91350ee..689c806bbb7 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestureSource.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestureSource.tests.ts
@@ -1,5 +1,5 @@
 import { assert } from 'chai'
-import { GestureDebugSource, InputSample } from '@keymanapp/gesture-recognizer';
+import { GestureDebugSource, InputSample } from 'keyman/engine/gesture-processor';
 
 const helloSample: InputSample<string> = {
   targetX: 1,
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureMatcher.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureMatcher.tests.ts
index ede257ca758..a06ae76657d 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureMatcher.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureMatcher.tests.ts
@@ -5,7 +5,7 @@ import * as PromiseStatusModule from 'promise-status-async';
 const PromiseStatuses     = PromiseStatusModule.PromiseStatuses;
 import { assertingPromiseStatus as promiseStatus } from '../../../../../resources/assertingPromiseStatus.js';
 
-import { InputSample, gestures, GestureDebugPath } from '@keymanapp/gesture-recognizer';
+import { InputSample, gestures, GestureDebugPath } from 'keyman/engine/gesture-processor';
 
 import { TouchpathTurtle } from '#gesture-tools';
 
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureModelDefs.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureModelDefs.tests.ts
index 7349877a760..05b38aa857c 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureModelDefs.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureModelDefs.tests.ts
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { GestureModelDefs, gestures } from '@keymanapp/gesture-recognizer';
+import { GestureModelDefs, gestures } from 'keyman/engine/gesture-processor';
 
 const getGestureModel    = gestures.specs.getGestureModel;
 const getGestureModelSet = gestures.specs.getGestureModelSet;
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureSequence.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureSequence.tests.ts
index fe3837e42fe..527c6427684 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureSequence.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureSequence.tests.ts
@@ -4,7 +4,7 @@ import sinon from 'sinon';
 import * as PromiseStatusModule from 'promise-status-async';
 import { assertingPromiseStatus as promiseStatus } from '../../../../../resources/assertingPromiseStatus.js';
 
-import { GestureModelDefs, buildGestureMatchInspector, gestures } from '@keymanapp/gesture-recognizer';
+import { GestureModelDefs, buildGestureMatchInspector, gestures } from 'keyman/engine/gesture-processor';
 const { matchers } = gestures;
 
 // Huh... gotta do BOTH here?  One for constructor use, the other for generic-parameter use?
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/isolatedGestureSpecs.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/isolatedGestureSpecs.ts
index afb3bc93651..1759f30da8b 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/isolatedGestureSpecs.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/isolatedGestureSpecs.ts
@@ -1,4 +1,4 @@
-import { gestures } from '@keymanapp/gesture-recognizer';
+import { gestures } from 'keyman/engine/gesture-processor';
 import * as specs from './isolatedPathSpecs.js';
 import specTypeDefs = gestures.specs;
 
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/isolatedPathSpecs.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/isolatedPathSpecs.ts
index bf389608f93..9014fc957a9 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/isolatedPathSpecs.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/isolatedPathSpecs.ts
@@ -1,4 +1,4 @@
-import { gestures } from '@keymanapp/gesture-recognizer';
+import { gestures } from 'keyman/engine/gesture-processor';
 import specTypeDefs = gestures.specs;
 
 type ContactModel = specTypeDefs.ContactModel<string>;
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/matcherSelector.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/matcherSelector.tests.ts
index 583e0c60312..cdc7e3e7af0 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/matcherSelector.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/matcherSelector.tests.ts
@@ -8,7 +8,7 @@ import { assertingPromiseStatus as promiseStatus } from '../../../../../resource
 import { simulateMultiSourceMatcherInput, simulateSelectorInput } from "../../../../../resources/simulateMultiSourceInput.js";
 
 import { timedPromise } from '@keymanapp/web-utils';
-import { gestures } from '@keymanapp/gesture-recognizer';
+import { gestures } from 'keyman/engine/gesture-processor';
 
 import { TouchpathTurtle } from '#gesture-tools';
 
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/pathMatcher.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/pathMatcher.tests.ts
index ac2250f5f97..2b6e6d5b1a0 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/pathMatcher.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/pathMatcher.tests.ts
@@ -5,7 +5,7 @@ import * as PromiseStatusModule from 'promise-status-async';
 const PromiseStatuses     = PromiseStatusModule.PromiseStatuses;
 import { assertingPromiseStatus as promiseStatus } from '../../../../../resources/assertingPromiseStatus.js';
 
-import { InputSample, GestureSource, gestures, CumulativePathStats } from '@keymanapp/gesture-recognizer';
+import { InputSample, GestureSource, gestures, CumulativePathStats } from 'keyman/engine/gesture-processor';
 import { timedPromise } from '@keymanapp/web-utils';
 
 import {
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts
index 44f0bce4f77..221c607406a 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts
@@ -4,7 +4,7 @@ import sinon from 'sinon';
 import * as PromiseStatusModule from 'promise-status-async';
 import { assertingPromiseStatus as promiseStatus } from '../../../../../resources/assertingPromiseStatus.js';
 
-import { GestureModelDefs, GestureSource, gestures, TouchpointCoordinator } from '@keymanapp/gesture-recognizer';
+import { GestureModelDefs, GestureSource, gestures, TouchpointCoordinator } from 'keyman/engine/gesture-processor';
 const { matchers } = gestures;
 
 // Huh... gotta do BOTH here?  One for constructor use, the other for generic-parameter use?
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/pathStats.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/pathStats.tests.ts
index 3ac271b2163..4a29363ca91 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/pathStats.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/pathStats.tests.ts
@@ -1,5 +1,5 @@
 import { assert } from 'chai';
-import { CumulativePathStats, InputSample } from '@keymanapp/gesture-recognizer';
+import { CumulativePathStats, InputSample } from 'keyman/engine/gesture-processor';
 
 describe("CumulativePathStats", function() {
   it("Sample count = 0", function() {
diff --git a/web/src/test/auto/headless/engine/osk/input/gestures/browser/subkeyPopup.tests.ts b/web/src/test/auto/headless/engine/osk/input/gestures/browser/subkeyPopup.tests.ts
index 72679897f37..e893362c00d 100644
--- a/web/src/test/auto/headless/engine/osk/input/gestures/browser/subkeyPopup.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/input/gestures/browser/subkeyPopup.tests.ts
@@ -3,10 +3,15 @@ import { assert } from 'chai';
 import { JSDOM } from 'jsdom';
 import sinon from 'sinon';
 
-import { GesturePath, GestureSequence, GestureSource, GestureSourceSubview } from '@keymanapp/gesture-recognizer';
+import { GesturePath, GestureSequence, GestureSource, GestureSourceSubview } from 'keyman/engine/gesture-processor';
 import { ActiveSubKey, DeviceSpec } from 'keyman/engine/keyboard';
 import { DEFAULT_GESTURE_PARAMS, KeyElement, VisualKeyboard } from 'keyman/engine/osk';
-import { OSKBaseKey, OSKRow, SubkeyPopup, link } from 'keyman/engine/osk/internals';
+import { testIndex } from 'keyman/engine/osk';
+
+import OSKBaseKey = testIndex.OSKBaseKey;
+import OSKRow = testIndex.OSKRow;
+import SubkeyPopup = testIndex.SubkeyPopup;
+import link = testIndex.link;
 
 // Tests for #10126
 describe('subkey menu width', () => {
diff --git a/web/src/test/auto/headless/engine/osk/visualKeyboard.tests.ts b/web/src/test/auto/headless/engine/osk/visualKeyboard.tests.ts
index bbd7c7d93ca..80788976c64 100644
--- a/web/src/test/auto/headless/engine/osk/visualKeyboard.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/visualKeyboard.tests.ts
@@ -55,29 +55,29 @@ describe('VisualKeyboard', () => {
       assert.equal(vk.layoutHeight.val, 94);
     });
 
-    it('calculates LayoutHeight correctly for number string', () => {
-      const vk = createVisualKeyboard();
-      vk['_height'] = "100";
-      assert.equal(vk.layoutHeight.val, 94);
-    });
+    // it('calculates LayoutHeight correctly for number string', () => {
+    //   const vk = createVisualKeyboard();
+    //   vk['_height'] = "100";
+    //   assert.equal(vk.layoutHeight.val, 94);
+    // });
 
     it('accepts small heights for LayoutHeight', () => {
       const vk = createVisualKeyboard();
-      vk['_height'] = "5";
+      vk['_height'] = 5;
       assert.equal(vk.layoutHeight.val, 0);
     });
 
-    it('ignores non-number string for LayoutHeight', () => {
-      const vk = createVisualKeyboard();
-      vk['_height'] = "100px";
-      assert.equal(vk.layoutHeight.val, 0);
-    });
+    // it('ignores non-number string for LayoutHeight', () => {
+    //   const vk = createVisualKeyboard();
+    //   vk['_height'] = "100px";
+    //   assert.equal(vk.layoutHeight.val, 0);
+    // });
 
-    it('ignores invalid string for LayoutHeight', () => {
-      const vk = createVisualKeyboard();
-      vk['_height'] = "invalid";
-      assert.equal(vk.layoutHeight.val, 0);
-    });
+    // it('ignores invalid string for LayoutHeight', () => {
+    //   const vk = createVisualKeyboard();
+    //   vk['_height'] = "invalid";
+    //   assert.equal(vk.layoutHeight.val, 0);
+    // });
 
     it('ignores undefined value for LayoutHeight', () => {
       const vk = createVisualKeyboard();
@@ -97,18 +97,18 @@ describe('VisualKeyboard', () => {
       assert.equal(vk.layoutHeight.val, 94);
     });
 
-    it('calculates LayoutHeight correctly with fixed scaling and string', () => {
-      const vk = createVisualKeyboard(true);
-      vk['_height'] = "100px";
-      assert.equal(vk.layoutHeight.val, 0);
-    });
+    // it('calculates LayoutHeight correctly with fixed scaling and string', () => {
+    //   const vk = createVisualKeyboard(true);
+    //   vk['_height'] = "100px";
+    //   assert.equal(vk.layoutHeight.val, 0);
+    // });
 
-    it('ignores invalid borderWidth for LayoutHeight', () => {
-      const vk = createVisualKeyboard();
-      vk['_height'] = 100;
-      vk['_borderWidth'] = "3px";
-      assert.equal(vk.layoutHeight.val, 0);
-    });
+    // it('ignores invalid borderWidth for LayoutHeight', () => {
+    //   const vk = createVisualKeyboard();
+    //   vk['_height'] = 100;
+    //   vk['_borderWidth'] = "3px";
+    //   assert.equal(vk.layoutHeight.val, 0);
+    // });
   });
 
   describe('LayoutWidth', () => {
@@ -118,29 +118,29 @@ describe('VisualKeyboard', () => {
       assert.equal(vk.layoutWidth.val, 94);
     });
 
-    it('calculates LayoutWidth correctly for number string', () => {
-      const vk = createVisualKeyboard();
-      vk['_width'] = "100";
-      assert.equal(vk.layoutWidth.val, 94);
-    });
+    // it('calculates LayoutWidth correctly for number string', () => {
+    //   const vk = createVisualKeyboard();
+    //   vk['_width'] = "100";
+    //   assert.equal(vk.layoutWidth.val, 94);
+    // });
 
-    it('accepts small heights for LayoutWidth', () => {
-      const vk = createVisualKeyboard();
-      vk['_width'] = "5";
-      assert.equal(vk.layoutWidth.val, 0);
-    });
+    // it('accepts small heights for LayoutWidth', () => {
+    //   const vk = createVisualKeyboard();
+    //   vk['_width'] = "5";
+    //   assert.equal(vk.layoutWidth.val, 0);
+    // });
 
-    it('ignores non-number string for LayoutWidth', () => {
-      const vk = createVisualKeyboard();
-      vk['_width'] = "100px";
-      assert.equal(vk.layoutWidth.val, 0);
-    });
+    // it('ignores non-number string for LayoutWidth', () => {
+    //   const vk = createVisualKeyboard();
+    //   vk['_width'] = "100px";
+    //   assert.equal(vk.layoutWidth.val, 0);
+    // });
 
-    it('ignores invalid string for LayoutWidth', () => {
-      const vk = createVisualKeyboard();
-      vk['_width'] = "invalid";
-      assert.equal(vk.layoutWidth.val, 0);
-    });
+    // it('ignores invalid string for LayoutWidth', () => {
+    //   const vk = createVisualKeyboard();
+    //   vk['_width'] = "invalid";
+    //   assert.equal(vk.layoutWidth.val, 0);
+    // });
 
     it('ignores undefined value for LayoutWidth', () => {
       const vk = createVisualKeyboard();
@@ -160,18 +160,18 @@ describe('VisualKeyboard', () => {
       assert.equal(vk.layoutWidth.val, 94);
     });
 
-    it('calculates LayoutWidth correctly with fixed scaling and string', () => {
-      const vk = createVisualKeyboard(true);
-      vk['_width'] = "100px";
-      assert.equal(vk.layoutWidth.val, 0);
-    });
+    // it('calculates LayoutWidth correctly with fixed scaling and string', () => {
+    //   const vk = createVisualKeyboard(true);
+    //   vk['_width'] = "100px";
+    //   assert.equal(vk.layoutWidth.val, 0);
+    // });
 
-    it('ignores invalid borderWidth for LayoutWidth', () => {
-      const vk = createVisualKeyboard();
-      vk['_width'] = 100;
-      vk['_borderWidth'] = "3px";
-      assert.equal(vk.layoutWidth.val, 0);
-    });
+    // it('ignores invalid borderWidth for LayoutWidth', () => {
+    //   const vk = createVisualKeyboard();
+    //   vk['_width'] = 100;
+    //   vk['_borderWidth'] = "3px";
+    //   assert.equal(vk.layoutWidth.val, 0);
+    // });
 
   });
 
@@ -182,29 +182,29 @@ describe('VisualKeyboard', () => {
       assert.equal(vk.internalHeight.val, 88);
     });
 
-    it('calculates InternalHeight correctly for number string', () => {
-      const vk = createVisualKeyboard();
-      vk['_height'] = "100";
-      assert.equal(vk.internalHeight.val, 88);
-    });
+    // it('calculates InternalHeight correctly for number string', () => {
+    //   const vk = createVisualKeyboard();
+    //   vk['_height'] = "100";
+    //   assert.equal(vk.internalHeight.val, 88);
+    // });
 
-    it('accepts small heights for InternalHeight', () => {
-      const vk = createVisualKeyboard();
-      vk['_height'] = "5";
-      assert.equal(vk.internalHeight.val, 0);
-    });
+    // it('accepts small heights for InternalHeight', () => {
+    //   const vk = createVisualKeyboard();
+    //   vk['_height'] = "5";
+    //   assert.equal(vk.internalHeight.val, 0);
+    // });
 
-    it('ignores non-number string for InternalHeight', () => {
-      const vk = createVisualKeyboard();
-      vk['_height'] = "100px";
-      assert.equal(vk.internalHeight.val, 0);
-    });
+    // it('ignores non-number string for InternalHeight', () => {
+    //   const vk = createVisualKeyboard();
+    //   vk['_height'] = "100px";
+    //   assert.equal(vk.internalHeight.val, 0);
+    // });
 
-    it('ignores invalid string for InternalHeight', () => {
-      const vk = createVisualKeyboard();
-      vk['_height'] = "invalid";
-      assert.equal(vk.internalHeight.val, 0);
-    });
+    // it('ignores invalid string for InternalHeight', () => {
+    //   const vk = createVisualKeyboard();
+    //   vk['_height'] = "invalid";
+    //   assert.equal(vk.internalHeight.val, 0);
+    // });
 
     it('ignores undefined value for InternalHeight', () => {
       const vk = createVisualKeyboard();
@@ -224,18 +224,18 @@ describe('VisualKeyboard', () => {
       assert.equal(vk.internalHeight.val, 88);
     });
 
-    it('calculates InternalHeight correctly with fixed scaling and string', () => {
-      const vk = createVisualKeyboard(true);
-      vk['_height'] = "100px";
-      assert.equal(vk.internalHeight.val, 0);
-    });
+    // it('calculates InternalHeight correctly with fixed scaling and string', () => {
+    //   const vk = createVisualKeyboard(true);
+    //   vk['_height'] = "100px";
+    //   assert.equal(vk.internalHeight.val, 0);
+    // });
 
-    it('ignores invalid borderWidth for InternalHeight', () => {
-      const vk = createVisualKeyboard();
-      vk['_height'] = 100;
-      vk['_borderWidth'] = "3px";
-      assert.equal(vk.internalHeight.val, 0);
-    });
+    // it('ignores invalid borderWidth for InternalHeight', () => {
+    //   const vk = createVisualKeyboard();
+    //   vk['_height'] = 100;
+    //   vk['_borderWidth'] = "3px";
+    //   assert.equal(vk.internalHeight.val, 0);
+    // });
 
   });
 });
diff --git a/web/src/test/auto/resources/assertSegmentSimilarity.js b/web/src/test/auto/resources/assertSegmentSimilarity.js
index fa1f2b9dad9..96cc5ab20a0 100644
--- a/web/src/test/auto/resources/assertSegmentSimilarity.js
+++ b/web/src/test/auto/resources/assertSegmentSimilarity.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { PathSegmenter, Segment } from '@keymanapp/gesture-recognizer';
+import { PathSegmenter, Segment } from 'keyman/engine/gesture-processor';
 
 /**
  * Defines common assertions for loosely comparing reproduced segments to their original counterparts.
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/node-keyboard-loader.ts b/web/src/test/auto/resources/loader/node-keyboard-loader.ts
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/loaders/node-keyboard-loader.ts
rename to web/src/test/auto/resources/loader/node-keyboard-loader.ts
diff --git a/web/src/engine/keyboard-storage/src/nodeCloudRequester.ts b/web/src/test/auto/resources/loader/nodeCloudRequester.ts
similarity index 93%
rename from web/src/engine/keyboard-storage/src/nodeCloudRequester.ts
rename to web/src/test/auto/resources/loader/nodeCloudRequester.ts
index 395dad1ec1f..ae1b57e14d5 100644
--- a/web/src/engine/keyboard-storage/src/nodeCloudRequester.ts
+++ b/web/src/test/auto/resources/loader/nodeCloudRequester.ts
@@ -1,11 +1,11 @@
 import { ManagedPromise } from 'keyman/engine/keyboard';
-import CloudRequesterInterface from './cloud/requesterInterface.js';
+import CloudRequesterInterface from '../../../../engine/src/keyboard-storage/cloud/requesterInterface.js';
 import {
   CLOUD_TIMEOUT_ERR,
   CLOUD_STUB_REGISTRATION_ERR,
   CloudQueryResult,
   default as CloudQueryEngine
-} from './cloud/queryEngine.js';
+} from '../../../../engine/src/keyboard-storage/cloud/queryEngine.js';
 
 import fs from 'node:fs';
 import https from 'node:https';
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts b/web/src/test/auto/resources/loader/nodeKeyboardLoader.ts
similarity index 87%
rename from web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
rename to web/src/test/auto/resources/loader/nodeKeyboardLoader.ts
index 9ae64fac2c9..9956c1ca265 100644
--- a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts
+++ b/web/src/test/auto/resources/loader/nodeKeyboardLoader.ts
@@ -3,10 +3,7 @@ import { readFile } from 'node:fs/promises';
 
 import { globalObject } from '@keymanapp/web-utils';
 
-import { JSKeyboard } from '../jsKeyboard.js';
-import { KeyboardHarness, MinimalKeymanGlobal } from '../keyboardHarness.js';
-import { KeyboardLoaderBase } from '../keyboardLoaderBase.js';
-import { KeyboardLoadErrorBuilder } from '../keyboardLoadError.js';
+import { JSKeyboard, KeyboardHarness, MinimalKeymanGlobal, KeyboardLoaderBase, KeyboardLoadErrorBuilder } from 'keyman/engine/keyboard';
 
 export class NodeKeyboardLoader extends KeyboardLoaderBase {
   constructor()
diff --git a/web/src/engine/keyboard/src/keyboards/loaders/tsconfig.node.json b/web/src/test/auto/resources/loader/tsconfig.node.json
similarity index 100%
rename from web/src/engine/keyboard/src/keyboards/loaders/tsconfig.node.json
rename to web/src/test/auto/resources/loader/tsconfig.node.json
diff --git a/web/src/test/auto/resources/sequenceAssertions.ts b/web/src/test/auto/resources/sequenceAssertions.ts
index 7eda60b02aa..7a5414d8ff8 100644
--- a/web/src/test/auto/resources/sequenceAssertions.ts
+++ b/web/src/test/auto/resources/sequenceAssertions.ts
@@ -5,7 +5,7 @@ import * as PromiseStatusModule from 'promise-status-async';
 const PromiseStatuses     = PromiseStatusModule.PromiseStatuses;
 import { assertingPromiseStatus as promiseStatus } from './assertingPromiseStatus.js';
 
-import { GestureSource, gestures } from '@keymanapp/gesture-recognizer';
+import { GestureSource, gestures } from 'keyman/engine/gesture-processor';
 const { matchers } = gestures;
 
 // Huh... gotta do BOTH here?  One for constructor use, the other for generic-parameter use?
diff --git a/web/src/test/auto/resources/simulateMultiSourceInput.ts b/web/src/test/auto/resources/simulateMultiSourceInput.ts
index b8501326fbd..2d450498f5f 100644
--- a/web/src/test/auto/resources/simulateMultiSourceInput.ts
+++ b/web/src/test/auto/resources/simulateMultiSourceInput.ts
@@ -1,4 +1,4 @@
-import { InputSample, buildGestureMatchInspector, GestureSource, GestureSourceSubview, gestures } from '@keymanapp/gesture-recognizer';
+import { InputSample, buildGestureMatchInspector, GestureSource, GestureSourceSubview, gestures } from 'keyman/engine/gesture-processor';
 import { ManagedPromise, timedPromise } from '@keymanapp/web-utils';
 
 type GestureMatcher<Type> = gestures.matchers.GestureMatcher<Type>;
diff --git a/web/src/test/auto/tsconfig.json b/web/src/test/auto/tsconfig.json
index 066b6446f58..36c43d22d0b 100644
--- a/web/src/test/auto/tsconfig.json
+++ b/web/src/test/auto/tsconfig.json
@@ -5,7 +5,10 @@
     "baseUrl": "./",
     "outDir": "../../../build/test",
     "tsBuildInfoFile": "../../../build/test/tsconfig.tsbuildinfo",
-    "rootDir": "."
+    "rootDir": ".",
+    "paths": {
+      "keyman/engine/*": ["../../engine/src/*/index.js"],
+    },
   },
 
   "include": [
@@ -13,6 +16,10 @@
     "headless/**/*.ts",
     "integrated/**/*.ts",
     "resources/**/*.ts",
-    "predictive-text/**/*.ts"
+    "predictive-text/**/*.ts",
+  ],
+
+  "references": [
+    { "path": "../../engine" },
   ]
 }
diff --git a/web/src/test/manual/build.sh b/web/src/test/manual/build.sh
index 0278a8a0d7d..210c200d3ce 100755
--- a/web/src/test/manual/build.sh
+++ b/web/src/test/manual/build.sh
@@ -37,8 +37,8 @@ SENTRY_MANAGER_MAP="$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/index.j
 
 #### Build action definitions ####
 
-GESTURE_PROCESSOR_BUILD="$KEYMAN_ROOT/web/src/engine/osk/gesture-processor/build/lib/."
-GESTURE_PROCESSOR_TARGET="$KEYMAN_ROOT/web/build/engine/gesture-processor/lib/"
+# GESTURE_PROCESSOR_BUILD="$KEYMAN_ROOT/web/src/engine/osk/gesture-processor/build/lib/."
+# GESTURE_PROCESSOR_TARGET="$KEYMAN_ROOT/web/build/engine/gesture-processor/lib/"
 
 function do_copy() {
   mkdir -p "$KEYMAN_ROOT/$DEST"
@@ -47,9 +47,9 @@ function do_copy() {
   cp "$SENTRY_MANAGER_SRC"  "$KEYMAN_ROOT/$DEST/sentry-manager.js"
   cp "$SENTRY_MANAGER_MAP"  "$KEYMAN_ROOT/$DEST/sentry-manager.js.map"
 
-  mkdir -p "$GESTURE_PROCESSOR_TARGET"
-  cp -a "$GESTURE_PROCESSOR_BUILD" "$GESTURE_PROCESSOR_TARGET"
+  # mkdir -p "$GESTURE_PROCESSOR_TARGET"
+  # cp -a "$GESTURE_PROCESSOR_BUILD" "$GESTURE_PROCESSOR_TARGET"
 }
 
-builder_run_action clean rm -rf "$KEYMAN_ROOT/$DEST" && rm -rf "$GESTURE_PROCESSOR_TARGET"
+builder_run_action clean rm -rf "$KEYMAN_ROOT/$DEST"
 builder_run_action build do_copy
diff --git a/web/src/tools/build.sh b/web/src/tools/build.sh
index 246a9a0f006..246b013803d 100755
--- a/web/src/tools/build.sh
+++ b/web/src/tools/build.sh
@@ -14,7 +14,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 builder_describe "Builds the Keyman Engine for Web's development & unit-testing tools" \
   "@/common/web/keyman-version" \
-  "@/web/src/engine/keyboard" \
+  "@/web/src/engine" \
   "configure" \
   "clean" \
   "build" \
@@ -23,7 +23,8 @@ builder_describe "Builds the Keyman Engine for Web's development & unit-testing
   ":es-bundling                             Builds code used to esbundle Web engine artifacts for browser consumption" \
   ":recorder=testing/recorder               Builds the KMW recorder tool used for development of unit-test resources" \
   ":sourcemap-root=building/sourcemap-root  Builds the sourcemap-cleaning tool used during minification of app/ builds" \
-  ":test-utils=testing/test-utils           Builds the test-utils module"
+  ":test-utils=testing/test-utils           Builds the test-utils module" \
+  ":gesture-processor=testing/gesture-processor      Gesture processor test utilities"
 
 builder_parse "$@"
 
diff --git a/web/src/tools/testing/bulk_rendering/tsconfig.json b/web/src/tools/testing/bulk_rendering/tsconfig.json
index 8256bda7b93..f1cac77f87b 100644
--- a/web/src/tools/testing/bulk_rendering/tsconfig.json
+++ b/web/src/tools/testing/bulk_rendering/tsconfig.json
@@ -5,7 +5,10 @@
     "baseUrl": "./",
     "outDir": "../../../../build/tools/testing/bulk_rendering/obj/",
     "tsBuildInfoFile": "../../../../build/tools/testing/bulk_rendering/obj/tsconfig.tsbuildinfo",
-    "rootDir": "."
+    "rootDir": ".",
+    "paths": {
+      "keyman/engine/*": ["../../../engine/src/*/index.js"],
+    },
   },
 
   "files": [
@@ -14,6 +17,6 @@
 
 	"references": [
     { "path": "../../../app/browser" },
-    { "path": "../../../engine/main" }
+    { "path": "../../../engine" }
 	]
 }
diff --git a/web/src/engine/osk/gesture-processor/src/tools/build.sh b/web/src/tools/testing/gesture-processor/build.sh
similarity index 65%
rename from web/src/engine/osk/gesture-processor/src/tools/build.sh
rename to web/src/tools/testing/gesture-processor/build.sh
index 735e943ecc9..30d7ea32979 100755
--- a/web/src/engine/osk/gesture-processor/src/tools/build.sh
+++ b/web/src/tools/testing/gesture-processor/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../../../../../resources/build/builder-full.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/web/common.inc.sh"
@@ -11,8 +11,8 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
 
-BASE_DIR="/web/src/engine/osk/gesture-processor"
-BUILD_DIR="${BASE_DIR}/build"
+# BASE_DIR="/web/src/engine/osk/gesture-processor"
+BUILD_DIR=/web/build/tools/testing/gesture-processor
 
 ################################ Main script ################################
 
@@ -27,21 +27,21 @@ builder_parse "$@"
 
 builder_describe_outputs \
   configure            /node_modules \
-  build:fixture        "${BUILD_DIR}/tools/host-fixture.html" \
-  build:recorder       "${BASE_DIR}/src/tools/recorder/build/recorder.mjs" \
-  build:test-module    "${BUILD_DIR}/tools/lib/index.mjs"
+  build:fixture        "${BUILD_DIR}/host-fixture.html" \
+  build:recorder       "${BUILD_DIR}/recorder/build/recorder.mjs" \
+  build:test-module    "${BUILD_DIR}/unit-test-resources/lib/index.mjs"
 
 # TODO: build if out-of-date if test is specified
 # TODO: configure if npm has not been run, and build is specified
 
 function do_clean_fixture() {
-  rm -f ../../build/tools/host-fixture.html
-  rm -f ../../build/tools/gestureHost.css
+  rm -f "${KEYMAN_ROOT}/${BUILD_DIR}/unit-test-resources/host-fixture.html"
+  rm -f "${KEYMAN_ROOT}/${BUILD_DIR}/unit-test-resources/gestureHost.css"
 }
 
 function do_clean_testmodule() {
-  rm -rf ../../build/tools/*.ts*
-  rm -rf ../../build/tools/*.js*
+  rm -rf "${KEYMAN_ROOT}/${BUILD_DIR}/unit-test-resources/*.ts*"
+  rm -rf "${KEYMAN_ROOT}/${BUILD_DIR}/unit-test-resources/*.js*"
 }
 
 function do_build_recorder() {
@@ -61,18 +61,16 @@ function do_build_recorder() {
 }
 
 function do_build_fixture() {
-  if [[ ! -d ../../build/tools ]]; then
-    mkdir -p ../../build/tools
-  fi
-  ./host-fixture/extract-fixture.sh > ../../build/tools/host-fixture.html
-  cp ./host-fixture/gestureHost.css ../../build/tools/gestureHost.css
+  mkdir -p "${KEYMAN_ROOT}/${BUILD_DIR}/unit-test-resources"
+  ./host-fixture/extract-fixture.sh > "${KEYMAN_ROOT}/${BUILD_DIR}/unit-test-resources/host-fixture.html"
+  cp ./host-fixture/gestureHost.css "${KEYMAN_ROOT}/${BUILD_DIR}/unit-test-resources/gestureHost.css"
 }
 
 function do_build_testmodule() {
-  compile "" "${THIS_SCRIPT_PATH}/unit-test-resources" "${KEYMAN_ROOT}/${BUILD_DIR}/tools"
+  compile "" "${THIS_SCRIPT_PATH}/unit-test-resources" "${KEYMAN_ROOT}/${BUILD_DIR}/unit-test-resources"
 
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/${BUILD_DIR}/tools/obj/index.js" \
-    --out        "${KEYMAN_ROOT}/${BUILD_DIR}/tools/lib/index.mjs" \
+  $BUNDLE_CMD    "${KEYMAN_ROOT}/${BUILD_DIR}/unit-test-resources/obj/index.js" \
+    --out        "${KEYMAN_ROOT}/${BUILD_DIR}/unit-test-resources/lib/index.mjs" \
     --format "esm"
 }
 
diff --git a/web/src/engine/osk/gesture-processor/src/tools/host-fixture/extract-fixture.sh b/web/src/tools/testing/gesture-processor/host-fixture/extract-fixture.sh
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/tools/host-fixture/extract-fixture.sh
rename to web/src/tools/testing/gesture-processor/host-fixture/extract-fixture.sh
diff --git a/web/src/engine/osk/gesture-processor/src/tools/host-fixture/extractor.cjs b/web/src/tools/testing/gesture-processor/host-fixture/extractor.cjs
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/tools/host-fixture/extractor.cjs
rename to web/src/tools/testing/gesture-processor/host-fixture/extractor.cjs
diff --git a/web/src/engine/osk/gesture-processor/src/tools/host-fixture/gestureHost.css b/web/src/tools/testing/gesture-processor/host-fixture/gestureHost.css
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/tools/host-fixture/gestureHost.css
rename to web/src/tools/testing/gesture-processor/host-fixture/gestureHost.css
diff --git a/web/src/engine/osk/gesture-processor/src/tools/host-fixture/host-fixture.html b/web/src/tools/testing/gesture-processor/host-fixture/host-fixture.html
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/tools/host-fixture/host-fixture.html
rename to web/src/tools/testing/gesture-processor/host-fixture/host-fixture.html
diff --git a/web/src/engine/osk/gesture-processor/src/tools/recorder/src/index.html b/web/src/tools/testing/gesture-processor/recorder/src/index.html
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/tools/recorder/src/index.html
rename to web/src/tools/testing/gesture-processor/recorder/src/index.html
diff --git a/web/src/engine/osk/gesture-processor/src/tools/recorder/src/pageStyle.css b/web/src/tools/testing/gesture-processor/recorder/src/pageStyle.css
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/tools/recorder/src/pageStyle.css
rename to web/src/tools/testing/gesture-processor/recorder/src/pageStyle.css
diff --git a/web/src/engine/osk/gesture-processor/src/tools/recorder/src/recorder.mjs b/web/src/tools/testing/gesture-processor/recorder/src/recorder.mjs
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/tools/recorder/src/recorder.mjs
rename to web/src/tools/testing/gesture-processor/recorder/src/recorder.mjs
diff --git a/web/src/engine/osk/gesture-processor/src/tools/recorder/update-index.cjs b/web/src/tools/testing/gesture-processor/recorder/update-index.cjs
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/tools/recorder/update-index.cjs
rename to web/src/tools/testing/gesture-processor/recorder/update-index.cjs
diff --git a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/build-bundler.js b/web/src/tools/testing/gesture-processor/unit-test-resources/build-bundler.js
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/build-bundler.js
rename to web/src/tools/testing/gesture-processor/unit-test-resources/build-bundler.js
diff --git a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/fixtureLayoutConfiguration.ts b/web/src/tools/testing/gesture-processor/unit-test-resources/src/fixtureLayoutConfiguration.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/fixtureLayoutConfiguration.ts
rename to web/src/tools/testing/gesture-processor/unit-test-resources/src/fixtureLayoutConfiguration.ts
diff --git a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/headlessInputEngine.ts b/web/src/tools/testing/gesture-processor/unit-test-resources/src/headlessInputEngine.ts
similarity index 98%
rename from web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/headlessInputEngine.ts
rename to web/src/tools/testing/gesture-processor/unit-test-resources/src/headlessInputEngine.ts
index beb37d0755b..c0d67fe740b 100644
--- a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/headlessInputEngine.ts
+++ b/web/src/tools/testing/gesture-processor/unit-test-resources/src/headlessInputEngine.ts
@@ -2,7 +2,7 @@ import {
   InputEngineBase,
   SerializedGestureSource,
   GestureSource
-} from '@keymanapp/gesture-recognizer';
+} from 'keyman/engine/gesture-processor';
 
 import { RecordedCoordSequenceSet } from './inputRecording.js';
 import { timedPromise } from '@keymanapp/web-utils';
diff --git a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/hostFixtureLayoutController.ts b/web/src/tools/testing/gesture-processor/unit-test-resources/src/hostFixtureLayoutController.ts
similarity index 98%
rename from web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/hostFixtureLayoutController.ts
rename to web/src/tools/testing/gesture-processor/unit-test-resources/src/hostFixtureLayoutController.ts
index 79303684426..a0d191f5800 100644
--- a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/hostFixtureLayoutController.ts
+++ b/web/src/tools/testing/gesture-processor/unit-test-resources/src/hostFixtureLayoutController.ts
@@ -1,5 +1,5 @@
 import { EventEmitter } from 'eventemitter3';
-import { GestureRecognizer, GestureRecognizerConfiguration } from '@keymanapp/gesture-recognizer';
+import { GestureRecognizer, GestureRecognizerConfiguration } from 'keyman/engine/gesture-processor';
 
 import { FixtureLayoutConfiguration } from './fixtureLayoutConfiguration.js';
 
diff --git a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/index.ts b/web/src/tools/testing/gesture-processor/unit-test-resources/src/index.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/index.ts
rename to web/src/tools/testing/gesture-processor/unit-test-resources/src/index.ts
diff --git a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/inputRecording.ts b/web/src/tools/testing/gesture-processor/unit-test-resources/src/inputRecording.ts
similarity index 81%
rename from web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/inputRecording.ts
rename to web/src/tools/testing/gesture-processor/unit-test-resources/src/inputRecording.ts
index 2784dfdedc7..c055a70db5f 100644
--- a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/inputRecording.ts
+++ b/web/src/tools/testing/gesture-processor/unit-test-resources/src/inputRecording.ts
@@ -1,4 +1,4 @@
-import { type SerializedGestureSource } from "@keymanapp/gesture-recognizer";
+import { type SerializedGestureSource } from "keyman/engine/gesture-processor";
 
 import { type FixtureLayoutConfiguration } from "./fixtureLayoutConfiguration.js";
 import { type JSONObject } from "./jsonObject.js";
diff --git a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/inputSequenceSimulator.ts b/web/src/tools/testing/gesture-processor/unit-test-resources/src/inputSequenceSimulator.ts
similarity index 99%
rename from web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/inputSequenceSimulator.ts
rename to web/src/tools/testing/gesture-processor/unit-test-resources/src/inputSequenceSimulator.ts
index c6f9a89ba2f..04a6059aafc 100644
--- a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/inputSequenceSimulator.ts
+++ b/web/src/tools/testing/gesture-processor/unit-test-resources/src/inputSequenceSimulator.ts
@@ -2,7 +2,7 @@ import {
   GestureDebugPath,
   GestureDebugSource,
   type InputSample
-} from "@keymanapp/gesture-recognizer";
+} from "keyman/engine/gesture-processor";
 
 import { type HostFixtureLayoutController } from "./hostFixtureLayoutController.js";
 import { type JSONObject } from "./jsonObject.js";
diff --git a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/jsonObject.ts b/web/src/tools/testing/gesture-processor/unit-test-resources/src/jsonObject.ts
similarity index 100%
rename from web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/jsonObject.ts
rename to web/src/tools/testing/gesture-processor/unit-test-resources/src/jsonObject.ts
diff --git a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/sequenceRecorder.ts b/web/src/tools/testing/gesture-processor/unit-test-resources/src/sequenceRecorder.ts
similarity index 95%
rename from web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/sequenceRecorder.ts
rename to web/src/tools/testing/gesture-processor/unit-test-resources/src/sequenceRecorder.ts
index b0451375d4a..5b125e6b935 100644
--- a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/sequenceRecorder.ts
+++ b/web/src/tools/testing/gesture-processor/unit-test-resources/src/sequenceRecorder.ts
@@ -1,4 +1,4 @@
-import { GestureDebugSource, GestureSource } from "@keymanapp/gesture-recognizer";
+import { GestureDebugSource, GestureSource } from "keyman/engine/gesture-processor";
 import { HostFixtureLayoutController } from "./hostFixtureLayoutController.js";
 import { RecordedCoordSequenceSet } from "./inputRecording.js";
 
diff --git a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/touchpathTurtle.ts b/web/src/tools/testing/gesture-processor/unit-test-resources/src/touchpathTurtle.ts
similarity index 99%
rename from web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/touchpathTurtle.ts
rename to web/src/tools/testing/gesture-processor/unit-test-resources/src/touchpathTurtle.ts
index 524fe0de4bd..df4f15b1848 100644
--- a/web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/src/touchpathTurtle.ts
+++ b/web/src/tools/testing/gesture-processor/unit-test-resources/src/touchpathTurtle.ts
@@ -2,7 +2,7 @@ import { EventEmitter } from "eventemitter3";
 
 import {
   type InputSample
-} from "@keymanapp/gesture-recognizer"
+} from "keyman/engine/gesture-processor"
 
 interface EventMap<Type> {
   /**
diff --git a/web/src/tools/testing/gesture-processor/unit-test-resources/tsconfig.json b/web/src/tools/testing/gesture-processor/unit-test-resources/tsconfig.json
new file mode 100644
index 00000000000..1b878f20402
--- /dev/null
+++ b/web/src/tools/testing/gesture-processor/unit-test-resources/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../../../../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "./",
+    "lib": [ "dom", "es6" ],
+    "outDir": "../../../../../build/tools/testing/gesture-processor/unit-test-resources/obj",
+    "rootDir": "./src",
+    "tsBuildInfoFile": "../../../../../build/tools/testing/gesture-processor/unit-test-resources/tsconfig.tsbuildinfo",
+    "paths": {
+      "keyman/engine/*": [ "../../../../engine/src/*/index.js" ],
+    },
+  },
+  "references": [
+    { "path": "../../../../engine/" }
+  ],
+  "include": ["./src/**/*.ts"]
+}
diff --git a/web/src/tools/testing/recorder-core/tsconfig.json b/web/src/tools/testing/recorder-core/tsconfig.json
index 67affcca5ec..edff4282dc7 100644
--- a/web/src/tools/testing/recorder-core/tsconfig.json
+++ b/web/src/tools/testing/recorder-core/tsconfig.json
@@ -6,7 +6,10 @@
     "baseUrl": "./",
     "outDir": "./build/obj/",
     "tsBuildInfoFile": "./build/obj/tsconfig.tsbuildinfo",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "paths": {
+      "keyman/engine/*": ["../../../engine/src/*/index.js"],
+    },
   },
 
   "include": [
@@ -17,7 +20,6 @@
     { "path": "../../../../../common/web/keyman-version" },
     { "path": "../../../engine/common/web-utils/" },
     { "path": "../../../engine/predictive-text/types" },
-    { "path": "../../../engine/js-processor" },
-    { "path": "../../../engine/keyboard" },
+    { "path": "../../../engine" },
   ],
 }
diff --git a/web/src/tools/testing/recorder/build.sh b/web/src/tools/testing/recorder/build.sh
index 7a9b0187ec7..c8ac22380f4 100755
--- a/web/src/tools/testing/recorder/build.sh
+++ b/web/src/tools/testing/recorder/build.sh
@@ -17,7 +17,7 @@ SUBPROJECT_NAME=tools/testing/recorder
 
 builder_describe "Builds the Keyman Engine for Web's test-sequence recording tool" \
   "@/common/web/keyman-version" \
-  "@/web/src/engine/keyboard" \
+  "@/web/src/engine" \
   "@../recorder-core" \
   "clean" \
   "configure" \
diff --git a/web/src/tools/testing/recorder/tsconfig.json b/web/src/tools/testing/recorder/tsconfig.json
index a33d2ee5eb3..bbe5ae58bc0 100644
--- a/web/src/tools/testing/recorder/tsconfig.json
+++ b/web/src/tools/testing/recorder/tsconfig.json
@@ -4,7 +4,10 @@
     "baseUrl": "./",
     "outDir": "../../../../build/tools/testing/recorder/obj/",
     "rootDir": ".",
-    "tsBuildInfoFile": "../../../../build/tools/testing/recorder/obj/tsconfig.tsbuildinfo"
+    "tsBuildInfoFile": "../../../../build/tools/testing/recorder/obj/tsconfig.tsbuildinfo",
+    "paths": {
+      "keyman/engine/*": ["../../../engine/src/*/index.js"],
+    },
   },
 
   "include": [ "*.ts" ],
@@ -15,6 +18,6 @@
     { "path": "../../../engine/predictive-text/types" },
     { "path": "../../../app/browser" },
     { "path": "../recorder-core" },
-    { "path": "../../../engine/keyboard" },
+    { "path": "../../../engine" },
   ]
 }

From 6c755e7c86ea67761f8b6e0f4be04006bf8b5c79 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 5 Nov 2025 15:47:32 +0100
Subject: [PATCH 118/254] refactor(web): address code review comments

---
 web/src/app/browser/src/contextManager.ts     | 10 +++----
 web/src/app/browser/src/keymanEngine.ts       |  2 +-
 web/src/app/webview/src/contextManager.ts     | 15 +++++++----
 web/src/app/webview/src/keymanEngine.ts       |  4 +--
 .../engine/attachment/src/attachmentInfo.ts   | 21 +++++----------
 .../attachment/src/pageContextAttachment.ts   |  8 +++---
 .../attachment/src/textStoreForElement.ts     |  2 +-
 .../common/web-utils/src/isEmptyTransform.ts  | 11 ++++++++
 ...lement.ts => createTextStoreForElement.ts} | 13 +++++++++-
 .../engine/element-text-stores/src/index.ts   |  6 ++++-
 .../main/src/headless/languageProcessor.ts    |  4 +--
 .../dom/cases/browser/contextManager.tests.ts |  6 ++---
 .../element-text-stores/target_mocks.tests.ts |  2 +-
 .../prediction/predictionContext.tests.js     | 26 +++++++++----------
 .../js-processor/bundled-module.tests.js      | 16 ++++++------
 15 files changed, 85 insertions(+), 61 deletions(-)
 rename web/src/engine/element-text-stores/src/{wrapElement.ts => createTextStoreForElement.ts} (75%)

diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index 2e8ebfebaa5..d079ea6d9de 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -92,7 +92,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
 
       // For any elements being attached, or being enabled after having been disabled...
       this.page.on('enabled', (elem) => {
-        if(!(elem._kmwAttachment.interface instanceof DesignIFrameElementTextStore)) {
+        if(!(elem._kmwAttachment.textStore instanceof DesignIFrameElementTextStore)) {
           // For anything attached but (design-mode) iframes...
 
           // This block:  has to do with maintaining focus.
@@ -261,7 +261,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
        * and trigger a contextReset DURING keyboard rule processing without this
        * guard.
        *
-       * The #2 reason:  the `forceScroll` method used within the InputElementTextStore and Textarea
+       * The #2 reason:  the `forceScroll` method used within the InputElementTextStore and TextAreaTextStore
        * types whenever the selection must be programatically updated.  The blur
        * is 'swallowed', preventing it from being dropped as 'active'. However, the
        * corresponding focus is not swallowed... until this if-condition's check.
@@ -379,11 +379,11 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     }
   }
 
-  private isTargetKeyboardIndependent(target: AbstractElementTextStore<any>): boolean {
-    const attachmentInfo = target?.getElement()._kmwAttachment;
+  private isTargetKeyboardIndependent(textStore: AbstractElementTextStore<any>): boolean {
+    const attachment = textStore?.getElement()._kmwAttachment;
 
     // If null or undefined, we're in 'global' mode.
-    return !!(attachmentInfo?.keyboard || attachmentInfo?.keyboard === '');
+    return !!(attachment?.keyboard || attachment?.keyboard === '');
   }
 
   // Note:  is part of the keyboard activation process.  Not to be called directly by published API.
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index a0b97228784..1479f9be79a 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -302,7 +302,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
       }
     }
 
-    this.contextManager.setKeyboardForTarget(Pelem._kmwAttachment.interface, Pkbd, Plc);
+    this.contextManager.setKeyboardForTarget(Pelem._kmwAttachment.textStore, Pkbd, Plc);
   }
   /**
    * Function     getKeyboardForControl
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index b38e22e5bcc..dfb6c2fd308 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -7,7 +7,12 @@ import { KMWString, isEmptyTransform } from '@keymanapp/web-utils';
 
 export type OnInsertTextFunc = (deleteLeft: number, text: string, deleteRight: number) => void;
 
-export class ContextHost extends SyntheticTextStore {
+/**
+ * WebView-specific synthetic TextStore implementation that can
+ * communicate and synchronize with the host app despite not being
+ * backed by any sort of Web element.
+ */
+export class HostTextStore extends SyntheticTextStore {
   readonly oninserttext?: OnInsertTextFunc;
   private savedState: SyntheticTextStore;
 
@@ -115,7 +120,7 @@ export default class ContextManager extends ContextManagerBase<WebviewConfigurat
   // Change of context?  Just replace the SyntheticTextStore.  Context will be ENTIRELY controlled
   // by whatever is hosting the WebView.  (Some aspects of this context replacement have
   // yet to be modularized at this time, though.)
-  private _rawContext: ContextHost;
+  private _hostTextStore: HostTextStore;
 
   private _activeKeyboard: {keyboard: JSKeyboard, metadata: KeyboardStub};
 
@@ -124,13 +129,13 @@ export default class ContextManager extends ContextManagerBase<WebviewConfigurat
   }
 
   initialize(): void {
-    this._rawContext = new ContextHost(this.engineConfig.oninserttext);
+    this._hostTextStore = new HostTextStore(this.engineConfig.oninserttext);
     this.predictionContext.setCurrentTarget(this.activeTarget);
     this.resetContext();
   }
 
   get activeTarget(): SyntheticTextStore {
-    return this._rawContext;
+    return this._hostTextStore;
   }
 
   get activeKeyboard() {
@@ -217,6 +222,6 @@ export default class ContextManager extends ContextManagerBase<WebviewConfigurat
 
   public resetContext(): void {
     super.resetContext();
-    this._rawContext.saveState();
+    this._hostTextStore.saveState();
   }
 }
\ No newline at end of file
diff --git a/web/src/app/webview/src/keymanEngine.ts b/web/src/app/webview/src/keymanEngine.ts
index 52b34be4fe6..e7d98ee987d 100644
--- a/web/src/app/webview/src/keymanEngine.ts
+++ b/web/src/app/webview/src/keymanEngine.ts
@@ -5,7 +5,7 @@ import { getAbsoluteX, getAbsoluteY } from 'keyman/engine/dom-utils';
 import { toPrefixedKeyboardId, toUnprefixedKeyboardId } from 'keyman/engine/keyboard-storage';
 
 import { WebviewConfiguration, WebviewInitOptionDefaults, WebviewInitOptionSpec } from './configuration.js';
-import ContextManager, { ContextHost } from './contextManager.js';
+import ContextManager, { HostTextStore } from './contextManager.js';
 import PassthroughKeyboard from './passthroughKeyboard.js';
 import { buildEmbeddedGestureConfig, setupEmbeddedListeners } from './oskConfiguration.js';
 import { WorkerFactory } from '@keymanapp/lexical-model-layer';
@@ -18,7 +18,7 @@ export class KeymanEngine extends KeymanEngineBase<WebviewConfiguration, Context
     const config = new WebviewConfiguration(sourceUri);  // currently set to perform device auto-detect.
 
     config.onRuleFinalization = (ruleBehavior: ProcessorAction) => {
-      (this.context as ContextHost).updateHost(ruleBehavior.transcription);
+      (this.context as HostTextStore).updateHost(ruleBehavior.transcription);
     }
 
     config.stubNamespacer = (stub) => {
diff --git a/web/src/engine/attachment/src/attachmentInfo.ts b/web/src/engine/attachment/src/attachmentInfo.ts
index 4b3042ab2a9..c5752a50932 100644
--- a/web/src/engine/attachment/src/attachmentInfo.ts
+++ b/web/src/engine/attachment/src/attachmentInfo.ts
@@ -1,16 +1,6 @@
 import { AbstractElementTextStore } from 'keyman/engine/element-text-stores';
 
 export class AttachmentInfo {
-  /**
-   * Provides the core interface between the DOM and the actual keyboard.
-   */
-  interface: AbstractElementTextStore<any>;
-
-  /**
-   * Tracks the control's independent keyboard selection, when applicable.
-   */
-  keyboard:       string;
-
   /**
    * Tracks the language code corresponding to the `keyboard` field.
    */
@@ -21,8 +11,11 @@ export class AttachmentInfo {
    */
   inputMode?: string;
 
-  constructor(eleInterface: AbstractElementTextStore<any>, kbd: string, touch?: boolean) {
-    this.interface = eleInterface;
-    this.keyboard = kbd;
-  }
+  /**
+   * Constructor for AttachmentInfo.
+   *
+   * @param textStore - Provides the core interface between the DOM and the actual keyboard.
+   * @param keyboard  - Provides the keyboard identifier.
+   */
+  constructor(public readonly textStore: AbstractElementTextStore<any>, public keyboard: string) {}
 }
\ No newline at end of file
diff --git a/web/src/engine/attachment/src/pageContextAttachment.ts b/web/src/engine/attachment/src/pageContextAttachment.ts
index cc67291189b..2ffaf18f432 100644
--- a/web/src/engine/attachment/src/pageContextAttachment.ts
+++ b/web/src/engine/attachment/src/pageContextAttachment.ts
@@ -1,7 +1,7 @@
 import { EventEmitter } from 'eventemitter3';
 
 import { DeviceSpec, InternalKeyboardFont } from "keyman/engine/keyboard";
-import { InputElementTextStore, nestedInstanceOf, wrapElement } from "keyman/engine/element-text-stores";
+import { InputElementTextStore, nestedInstanceOf, createTextStoreForElement } from "keyman/engine/element-text-stores";
 import {
   arrayFromNodeList,
   createStyleSheet,
@@ -201,14 +201,14 @@ export class PageContextAttachment extends EventEmitter<EventMap> {
       // The elements in the contained document get separately wrapped, so this doesn't need a proper wrapper.
       //
       // Its attachment process might need some work.
-      const eleInterface = wrapElement(x);
+      const textStore = createTextStoreForElement(x);
 
       // May should filter better for IFrames.
-      if(!(eleInterface || nestedInstanceOf(x, "HTMLIFrameElement"))) {
+      if(!(textStore || nestedInstanceOf(x, "HTMLIFrameElement"))) {
         console.warn("Could not create processing interface for newly-attached element!");
       }
 
-      x._kmwAttachment = new AttachmentInfo(eleInterface, null, this.device.touchable);
+      x._kmwAttachment = new AttachmentInfo(textStore, null);
     }
   }
 
diff --git a/web/src/engine/attachment/src/textStoreForElement.ts b/web/src/engine/attachment/src/textStoreForElement.ts
index a6abca02614..3e8229ec976 100644
--- a/web/src/engine/attachment/src/textStoreForElement.ts
+++ b/web/src/engine/attachment/src/textStoreForElement.ts
@@ -33,5 +33,5 @@ export function textStoreForElement(Ltarg: HTMLElement) {
 
   // Step 2:  With the most likely host element determined, obtain the corresponding TextStore
   // instance.
-  return Ltarg._kmwAttachment?.interface;
+  return Ltarg._kmwAttachment?.textStore;
 }
\ No newline at end of file
diff --git a/web/src/engine/common/web-utils/src/isEmptyTransform.ts b/web/src/engine/common/web-utils/src/isEmptyTransform.ts
index db48d1d7c5e..82832d1fdd6 100644
--- a/web/src/engine/common/web-utils/src/isEmptyTransform.ts
+++ b/web/src/engine/common/web-utils/src/isEmptyTransform.ts
@@ -1,7 +1,18 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
 // Also relies on string-extensions provided by the web-utils package.
 
+/**
+ * Determines whether a lexical model transform is empty (has no effect).
+ *
+ * @param transform - The lexical model transform to check.
+ * @returns True if the transform is empty (null, or has no insertions or deletions),
+ *          false otherwise.
+ */
 export function isEmptyTransform(transform: LexicalModelTypes.Transform) {
   if (!transform) {
     return true;
diff --git a/web/src/engine/element-text-stores/src/wrapElement.ts b/web/src/engine/element-text-stores/src/createTextStoreForElement.ts
similarity index 75%
rename from web/src/engine/element-text-stores/src/wrapElement.ts
rename to web/src/engine/element-text-stores/src/createTextStoreForElement.ts
index 07e2cd6e7fd..a591ae32f92 100644
--- a/web/src/engine/element-text-stores/src/wrapElement.ts
+++ b/web/src/engine/element-text-stores/src/createTextStoreForElement.ts
@@ -1,3 +1,7 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+
 import { type AbstractElementTextStore }  from './abstractElementTextStore.js';
 import { InputElementTextStore } from './inputElementTextStore.js';
 import { TextAreaElementTextStore } from './textAreaElementTextStore.js';
@@ -5,7 +9,14 @@ import { DesignIFrameElementTextStore } from './designIFrameElementTextStore.js'
 import { ContentEditableElementTextStore } from './contentEditableElementTextStore.js';
 import { nestedInstanceOf } from './utils.js';
 
-export function wrapElement(e: HTMLElement): AbstractElementTextStore<any> {
+/**
+ * Wraps an HTMLElement in a concrete text-store implementation.
+ *
+ * @param e - The HTMLElement to create a text-store for.
+ * @returns A concrete AbstractElementTextStore for the element, or null if the element
+ *          type is not supported or no suitable store can be created.
+ */
+export function createTextStoreForElement(e: HTMLElement): AbstractElementTextStore<any> {
   // Complex type scoping is implemented here so that kmwutils.ts is not a dependency for test compilations.
 
   if(nestedInstanceOf(e, "HTMLInputElement")) {
diff --git a/web/src/engine/element-text-stores/src/index.ts b/web/src/engine/element-text-stores/src/index.ts
index 3e8173c6111..4a5dfe6e615 100644
--- a/web/src/engine/element-text-stores/src/index.ts
+++ b/web/src/engine/element-text-stores/src/index.ts
@@ -1,4 +1,8 @@
-export { wrapElement } from './wrapElement.js';
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+
+export { createTextStoreForElement } from './createTextStoreForElement.js';
 export { ContentEditableElementTextStore } from './contentEditableElementTextStore.js';
 export { DesignIFrameElementTextStore } from './designIFrameElementTextStore.js';
 export { InputElementTextStore } from './inputElementTextStore.js';
diff --git a/web/src/engine/main/src/headless/languageProcessor.ts b/web/src/engine/main/src/headless/languageProcessor.ts
index b8e12ba9855..425c2b9a40f 100644
--- a/web/src/engine/main/src/headless/languageProcessor.ts
+++ b/web/src/engine/main/src/headless/languageProcessor.ts
@@ -190,7 +190,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
    */
   public applySuggestion(suggestion: Suggestion, textStore: TextStore, getLayerId: ()=>string): Promise<Reversion> {
     if(!textStore) {
-      throw "Accepting suggestions requires a destination TextStore instance."
+      throw new Error("Accepting suggestions requires a destination TextStore instance.");
     }
 
     if(!this.isActive) {
@@ -265,7 +265,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
 
   public applyReversion(reversion: Reversion, textStore: TextStore) {
     if(!textStore) {
-      throw "Accepting suggestions requires a destination TextStore instance."
+      throw new Error("Accepting suggestions requires a destination TextStore instance.");
     }
 
     if(!this.isActive) {
diff --git a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
index f85ec181c7b..ecd1330a268 100644
--- a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
+++ b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
@@ -862,8 +862,8 @@ describe('app/browser:  ContextManager', function () {
         contextManager.on('keyboardchange', keyboardchange);
 
         const textarea = document.getElementById('textarea');
-        const target = textStoreForElement(textarea);
-        contextManager.setKeyboardForTarget(target, 'lao_2008_basic', 'lo');
+        const textStore = textStoreForElement(textarea);
+        contextManager.setKeyboardForTarget(textStore, 'lao_2008_basic', 'lo');
 
         // As we haven't yet focused the affected target, no keyboard-change events should have triggered yet.
         assert.equal((contextManager as any).currentKeyboardSrcTarget(), null);
@@ -878,7 +878,7 @@ describe('app/browser:  ContextManager', function () {
         await timedPromise(10);
 
         // No need to 'keyboardchange' when the same keyboard is kept active.
-        assert.equal((contextManager as any).currentKeyboardSrcTarget(), target);
+        assert.equal((contextManager as any).currentKeyboardSrcTarget(), textStore);
         assert.isTrue(beforekeyboardchange.calledOnce);
         assert.isTrue(keyboardchange.calledOnce);
         assert.isTrue(keyboardasyncload.notCalled);
diff --git a/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts b/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts
index 9932d8eff50..b3aa77b1026 100644
--- a/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts
+++ b/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts
@@ -62,7 +62,7 @@ class MockTests {
   //#endregion
 }
 
-describe('TextStore Mocking', function() {
+describe('SyntheticTextStore', function() {
   this.timeout(DEFAULT_BROWSER_TIMEOUT);
 
   before(function() {
diff --git a/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js b/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
index dd2d75257fc..66471f35ca9 100644
--- a/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
+++ b/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
@@ -81,9 +81,9 @@ describe("PredictionContext", () => {
     let updateFake = sinon.fake();
     predictiveContext.on('update', updateFake);
 
-    let mock = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
-    const initialMock = SyntheticTextStore.from(mock);
-    const promise = predictiveContext.setCurrentTarget(mock);
+    let textStore = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
+    const initialMock = SyntheticTextStore.from(textStore);
+    const promise = predictiveContext.setCurrentTarget(textStore);
 
     // Initial predictive state:  no suggestions.  context.initializeState() has not yet been called.
     assert.equal(updateFake.callCount, 1);
@@ -99,8 +99,8 @@ describe("PredictionContext", () => {
     assert.isNotOk(suggestions.find((obj) => obj.tag == 'keep'));
     assert.isNotOk(suggestions.find((obj) => obj.transform.deleteLeft != 0));
 
-    mock.insertTextBeforeCaret('e'); // appl| + e = apple
-    let transcription = mock.buildTranscriptionFrom(initialMock, null, true);
+    textStore.insertTextBeforeCaret('e'); // appl| + e = apple
+    let transcription = textStore.buildTranscriptionFrom(initialMock, null, true);
     await langProcessor.predict(transcription, dummiedGetLayer());
 
     // First predict call results:  our second set of dummy suggestions, the first of which includes
@@ -120,9 +120,9 @@ describe("PredictionContext", () => {
     let updateFake = sinon.fake();
     predictiveContext.on('update', updateFake);
 
-    let mock = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
-    const initialMock = SyntheticTextStore.from(mock);
-    const promise = predictiveContext.setCurrentTarget(mock);
+    let textStore = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
+    const initialMock = SyntheticTextStore.from(textStore);
+    const promise = predictiveContext.setCurrentTarget(textStore);
 
     // Initial predictive state:  no suggestions.  context.initializeState() has not yet been called.
     assert.equal(updateFake.callCount, 1);
@@ -138,14 +138,14 @@ describe("PredictionContext", () => {
     assert.isNotOk(suggestions.find((obj) => obj.tag == 'keep'));
     assert.isNotOk(suggestions.find((obj) => obj.transform.deleteLeft != 0));
 
-    const baseTranscription = mock.buildTranscriptionFrom(initialMock, null, true);
+    const baseTranscription = textStore.buildTranscriptionFrom(initialMock, null, true);
 
     // Mocking:  corresponds to the second set of mocked predictions - round 2 of
     // 'apple', 'apply', 'apples'.
     const skippedPromise = langProcessor.predict(baseTranscription, dummiedGetLayer());
 
-    mock.insertTextBeforeCaret('e'); // appl| + e = apple
-    const finalTranscription = mock.buildTranscriptionFrom(initialMock, null, true);
+    textStore.insertTextBeforeCaret('e'); // appl| + e = apple
+    const finalTranscription = textStore.buildTranscriptionFrom(initialMock, null, true);
 
     // Mocking:  corresponds to the third set of mocked predictions - 'applied'.
     const expectedPromise = langProcessor.predict(finalTranscription, dummiedGetLayer());
@@ -180,8 +180,8 @@ describe("PredictionContext", () => {
 
     const predictiveContext = new PredictionContext(langProcessor, dummiedGetLayer);
 
-    let mock = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
-    const initialSuggestions = await predictiveContext.setCurrentTarget(mock);
+    let textStore = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
+    const initialSuggestions = await predictiveContext.setCurrentTarget(textStore);
 
     let updateFake = sinon.fake();
     predictiveContext.on('update', updateFake);
diff --git a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
index 8601a06f45d..8d8b47137ca 100644
--- a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
@@ -1,7 +1,7 @@
 import { assert } from "chai";
-import * as JSProcessorPackage from "keyman/engine/js-processor";
-import * as KeyboardPackage from "keyman/engine/keyboard";
-const KMWString = KeyboardPackage.KMWString;
+import * as JSProcessorModule from "keyman/engine/js-processor";
+import * as KeyboardModule from "keyman/engine/keyboard";
+const KMWString = KeyboardModule.KMWString;
 
 // A few small tests to ensure that the ES Module bundle was successfully constructed and is usable.
 
@@ -17,7 +17,7 @@ let u = toSupplementaryPairString;
 describe('Bundled ES Module for js-processor', function() {
   describe('JSKeyboardProcessor', function () {
     it('should initialize without errors', function () {
-      let kp = new JSProcessorPackage.JSKeyboardProcessor();
+      let kp = new JSProcessorModule.JSKeyboardProcessor();
       assert.isNotNull(kp);
     });
   });
@@ -27,21 +27,21 @@ describe('Bundled ES Module for js-processor', function() {
 describe('Bundled ES Module for keyboard', function () {
   describe('Keyboard', function () {
     it('should initialize without errors', function () {
-      let kp = new KeyboardPackage.JSKeyboard();
+      let kp = new KeyboardModule.JSKeyboard();
       assert.isNotNull(kp);
     });
   });
 
   describe("Imported `utils`", function () {
     it("should include `utils` package's Version class", () => {
-      let v16 = new KeyboardPackage.Version([16, 1]);
+      let v16 = new KeyboardModule.Version([16, 1]);
       assert.equal(v16.toString(), "16.1");
     });
   });
 
   describe('SyntheticTextStore', () => {
     it('basic functionality test', () => {
-      let target = new KeyboardPackage.SyntheticTextStore("aple", 2);  // ap | le
+      let target = new KeyboardModule.SyntheticTextStore("aple", 2);  // ap | le
       target.insertTextBeforeCaret('p');
       assert.equal(target.getText(), "apple");
     });
@@ -49,7 +49,7 @@ describe('Bundled ES Module for keyboard', function () {
     it('smp test', () => {
       KMWString.enableSupplementaryPlane(true); // Declared & defined in web-utils.
       try {
-        let target = new KeyboardPackage.SyntheticTextStore(u(0x1d5ba) + u(0x1d5c9) + u(0x1d5c5) + u(0x1d5be), 2);  // ap | le
+        let target = new KeyboardModule.SyntheticTextStore(u(0x1d5ba) + u(0x1d5c9) + u(0x1d5c5) + u(0x1d5be), 2);  // ap | le
         target.insertTextBeforeCaret(u(0x1d5c9));
         assert.equal(target.getText(), u(0x1d5ba) + u(0x1d5c9) + u(0x1d5c9) + u(0x1d5c5) + u(0x1d5be));
       } finally {

From a9f0e2d2128eed4c1742c28d05b73030f4447784 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 5 Nov 2025 16:54:16 +0100
Subject: [PATCH 119/254] refactor(web): address code review comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- rename TextStoreTranscriptionInterface → TextStoreLanguageProcessorInterface
- also fixup references to TextStore in languageProcessor.interface.ts
---
 .../src/prediction/languageProcessor.interface.ts    | 10 +++++-----
 web/src/engine/keyboard/src/index.ts                 |  2 +-
 web/src/engine/keyboard/src/syntheticTextStore.ts    |  4 ++--
 web/src/engine/keyboard/src/textStore.ts             |  6 +++---
 ...ace.ts => textStoreLanguageProcessorInterface.ts} | 10 ++++++----
 .../engine/main/src/headless/languageProcessor.ts    | 12 ++++++------
 6 files changed, 23 insertions(+), 21 deletions(-)
 rename web/src/engine/keyboard/src/{textStoreTranscriptionInterface.ts => textStoreLanguageProcessorInterface.ts} (50%)

diff --git a/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts b/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
index eef934495ad..08ad2598310 100644
--- a/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
+++ b/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts
@@ -1,6 +1,6 @@
 import { LexicalModelTypes } from '@keymanapp/common-types';
 import { EventEmitter } from "eventemitter3";
-import { TextStore, TextStoreTranscriptionInterface } from "keyman/engine/keyboard";
+import { TextStoreLanguageProcessorInterface } from "keyman/engine/keyboard";
 
 export class ReadySuggestions {
   suggestions: LexicalModelTypes.Suggestion[];
@@ -48,7 +48,7 @@ export interface LanguageProcessorEventMap {
    * @param textStore The `TextStore` representation of the context the suggestion was applied to.
    * @returns
    */
-  'suggestionapplied': (textStore: TextStoreTranscriptionInterface) => boolean
+  'suggestionapplied': (textStore: TextStoreLanguageProcessorInterface) => boolean
 }
 
 
@@ -56,7 +56,7 @@ export interface LanguageProcessorSpec extends EventEmitter<LanguageProcessorEve
 
   get state(): StateChangeEnum;
 
-  invalidateContext(textStore: TextStore, layerId: string): Promise<LexicalModelTypes.Suggestion[]>;
+  invalidateContext(textStore: TextStoreLanguageProcessorInterface, layerId: string): Promise<LexicalModelTypes.Suggestion[]>;
 
   /**
    *
@@ -66,9 +66,9 @@ export interface LanguageProcessorSpec extends EventEmitter<LanguageProcessorEve
    *                        required because layerid can be changed by PostKeystroke
    * @returns
    */
-  applySuggestion(suggestion: LexicalModelTypes.Suggestion, textStore: TextStore, getLayerId: () => string): Promise<LexicalModelTypes.Reversion>;
+  applySuggestion(suggestion: LexicalModelTypes.Suggestion, textStore: TextStoreLanguageProcessorInterface, getLayerId: () => string): Promise<LexicalModelTypes.Reversion>;
 
-  applyReversion(reversion: LexicalModelTypes.Reversion, textStore: TextStore): Promise<LexicalModelTypes.Suggestion[]>;
+  applyReversion(reversion: LexicalModelTypes.Reversion, textStore: TextStoreLanguageProcessorInterface): Promise<LexicalModelTypes.Suggestion[]>;
 
   get wordbreaksAfterSuggestions(): boolean;
 
diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts
index 15f97cbf8e1..d4107ca3843 100644
--- a/web/src/engine/keyboard/src/index.ts
+++ b/web/src/engine/keyboard/src/index.ts
@@ -33,7 +33,7 @@ export { type VariableStore, VariableStoreSerializer, VariableStoreDictionary }
 
 export { SyntheticTextStore } from "./syntheticTextStore.js";
 export { TextStore } from "./textStore.js";
-export { TextStoreTranscriptionInterface } from "./textStoreTranscriptionInterface.js";
+export { TextStoreLanguageProcessorInterface } from "./textStoreLanguageProcessorInterface.js";
 export { findCommonSubstringEndIndex } from "./stringDivergence.js";
 export { Deadkey } from "./deadkeys.js";
 
diff --git a/web/src/engine/keyboard/src/syntheticTextStore.ts b/web/src/engine/keyboard/src/syntheticTextStore.ts
index bf4f0815c8a..2105f5ba7e1 100644
--- a/web/src/engine/keyboard/src/syntheticTextStore.ts
+++ b/web/src/engine/keyboard/src/syntheticTextStore.ts
@@ -1,5 +1,5 @@
 import { TextStore } from './textStore.js';
-import { TextStoreTranscriptionInterface } from './textStoreTranscriptionInterface.js';
+import { TextStoreLanguageProcessorInterface } from './textStoreLanguageProcessorInterface.js';
 import { KMWString } from '@keymanapp/web-utils';
 
 export class SyntheticTextStore extends TextStore {
@@ -27,7 +27,7 @@ export class SyntheticTextStore extends TextStore {
   }
 
   // Clones the state of an existing EditableElement, creating a SyntheticTextStore version of its state.
-  static from(textStore: TextStoreTranscriptionInterface, readonly?: boolean): SyntheticTextStore {
+  static from(textStore: TextStoreLanguageProcessorInterface, readonly?: boolean): SyntheticTextStore {
     let clone: SyntheticTextStore;
 
     this.assertIsTextStore(textStore);
diff --git a/web/src/engine/keyboard/src/textStore.ts b/web/src/engine/keyboard/src/textStore.ts
index 55ec6bd7740..95ed85cc27b 100644
--- a/web/src/engine/keyboard/src/textStore.ts
+++ b/web/src/engine/keyboard/src/textStore.ts
@@ -6,7 +6,7 @@ import { SyntheticTextStore } from "./syntheticTextStore.js";
 
 // Defines deadkey management in a manner attachable to each element interface.
 import { type KeyEvent } from './keyEvent.js';
-import { TextStoreTranscriptionInterface } from './textStoreTranscriptionInterface.js';
+import { TextStoreLanguageProcessorInterface } from './textStoreLanguageProcessorInterface.js';
 import { Deadkey, DeadkeyTracker } from "./deadkeys.js";
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
@@ -60,7 +60,7 @@ export abstract class TextStore {
     this._dks = dks.clone();
   }
 
-  static assertIsTextStore(textStore: TextStoreTranscriptionInterface): asserts textStore is TextStore {
+  static assertIsTextStore(textStore: TextStoreLanguageProcessorInterface): asserts textStore is TextStore {
     if (!(textStore instanceof TextStore)) {
       throw new TypeError("textStore is not a TextStore");
     }
@@ -75,7 +75,7 @@ export abstract class TextStore {
    * As such, it assumes that the caret is immediately after any inserted text.
    * @param from An output target (preferably a SyntheticTextStore) representing the prior state of the input/output system.
    */
-  buildTransformFrom(original: TextStoreTranscriptionInterface): TextTransform {
+  buildTransformFrom(original: TextStoreLanguageProcessorInterface): TextTransform {
     TextStore.assertIsTextStore(original);
 
     const toLeft = this.getTextBeforeCaret();
diff --git a/web/src/engine/keyboard/src/textStoreTranscriptionInterface.ts b/web/src/engine/keyboard/src/textStoreLanguageProcessorInterface.ts
similarity index 50%
rename from web/src/engine/keyboard/src/textStoreTranscriptionInterface.ts
rename to web/src/engine/keyboard/src/textStoreLanguageProcessorInterface.ts
index 259318adcf1..405c5496a96 100644
--- a/web/src/engine/keyboard/src/textStoreTranscriptionInterface.ts
+++ b/web/src/engine/keyboard/src/textStoreLanguageProcessorInterface.ts
@@ -7,9 +7,11 @@ import { KeyEvent } from './keyEvent.js';
 import { Transcription } from './keyboards/transcription.js';
 import { Alternate } from './keyboards/textTransform.js';
 
-// Interface with the methods LanguageProcessor needs from TextStore
-// for transcription building and applying transforms.
-export interface TextStoreTranscriptionInterface {
-  buildTranscriptionFrom(original: TextStoreTranscriptionInterface, keyEvent: KeyEvent, readonly: boolean, alternates?: Alternate[]): Transcription;
+/**
+ * Interface with the methods LanguageProcessor needs from TextStore
+ * for transcription building and applying transforms.
+ */
+export interface TextStoreLanguageProcessorInterface {
+  buildTranscriptionFrom(original: TextStoreLanguageProcessorInterface, keyEvent: KeyEvent, readonly: boolean, alternates?: Alternate[]): Transcription;
   apply(transform: LexicalModelTypes.Transform): void;
 }
diff --git a/web/src/engine/main/src/headless/languageProcessor.ts b/web/src/engine/main/src/headless/languageProcessor.ts
index 7ded8c1cf70..7ac7f1c8865 100644
--- a/web/src/engine/main/src/headless/languageProcessor.ts
+++ b/web/src/engine/main/src/headless/languageProcessor.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from "eventemitter3";
 import { LMLayer, WorkerFactory } from "@keymanapp/lexical-model-layer/web";
-import { Transcription, TextStoreTranscriptionInterface, SyntheticTextStore } from 'keyman/engine/keyboard';
+import { Transcription, TextStoreLanguageProcessorInterface, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { LanguageProcessorEventMap, ModelSpec, StateChangeEnum, ReadySuggestions } from 'keyman/engine/interfaces';
 import ContextWindow from "./contextWindow.js";
 import { TranscriptionCache } from "./transcriptionCache.js";
@@ -125,7 +125,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     });
   }
 
-  public invalidateContext(textStore: TextStoreTranscriptionInterface, layerId: string): Promise<Suggestion[]> {
+  public invalidateContext(textStore: TextStoreLanguageProcessorInterface, layerId: string): Promise<Suggestion[]> {
     // If there's no active model, there can be no predictions.
     // We'll also be missing important data needed to even properly REQUEST the predictions.
     if(!this.currentModel || !this.configuration) {
@@ -153,7 +153,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     }
   }
 
-  public wordbreak(textStore: TextStoreTranscriptionInterface, layerId: string): Promise<string> {
+  public wordbreak(textStore: TextStoreLanguageProcessorInterface, layerId: string): Promise<string> {
     if(!this.isActive) {
       return null;
     }
@@ -188,7 +188,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
    *                        required because layerid can be changed by PostKeystroke
    * @returns
    */
-  public applySuggestion(suggestion: Suggestion, textStore: TextStoreTranscriptionInterface, getLayerId: ()=>string): Promise<Reversion> {
+  public applySuggestion(suggestion: Suggestion, textStore: TextStoreLanguageProcessorInterface, getLayerId: ()=>string): Promise<Reversion> {
     if(!textStore) {
       throw "Accepting suggestions requires a destination TextStore instance."
     }
@@ -263,7 +263,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     }
   }
 
-  public applyReversion(reversion: Reversion, textStore: TextStoreTranscriptionInterface) {
+  public applyReversion(reversion: Reversion, textStore: TextStoreLanguageProcessorInterface) {
     if(!textStore) {
       throw "Accepting suggestions requires a destination TextStore instance."
     }
@@ -305,7 +305,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     return promise;
   }
 
-  public predictFromTarget(textStore: TextStoreTranscriptionInterface, layerId: string): Promise<Suggestion[]> {
+  public predictFromTarget(textStore: TextStoreLanguageProcessorInterface, layerId: string): Promise<Suggestion[]> {
     if(!this.isActive || !textStore) {
       return null;
     }

From 41c9cef7976f220552130efa76834d21174a2fb4 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 5 Nov 2025 16:57:06 +0100
Subject: [PATCH 120/254] refactor(web): change @keymanapp/web-utils to
 keyman/common/web-utils

Removes the need for package.json references for @keymanapp/web-utils,
and relies on bundler to include keyman/common/web-utils when building.
---
 package-lock.json                             | 25 ++++++-------
 tsconfig.base.json                            |  3 +-
 tsconfig.json                                 | 12 -------
 web/README.md                                 |  2 +-
 web/build.sh                                  | 29 ++++-----------
 web/package.json                              |  6 +++-
 web/src/app/browser/tsconfig.json             |  4 ---
 web/src/app/ui/tsconfig.json                  |  4 ---
 web/src/app/webview/src/contextManager.ts     |  2 +-
 web/src/app/webview/tsconfig.json             |  7 ++--
 .../{engine => }/common/web-utils/.c8rc.json  |  2 +-
 .../{engine => }/common/web-utils/build.sh    |  6 ++--
 .../common/web-utils/src/deepCopy.ts          |  0
 .../common/web-utils/src/deviceSpec.ts        |  0
 .../common/web-utils/src/globalObject.ts      |  0
 .../common/web-utils/src/index.ts             |  0
 .../common/web-utils/src/kmwstring.ts         |  0
 .../common/web-utils/src/managedPromise.ts    |  0
 .../common/web-utils/src/priority-queue.ts    |  0
 .../web-utils/src/tests/deepCopy.tests.js     |  2 +-
 .../src/tests/managedPromise.tests.js         |  2 +-
 .../src/tests/priorityQueue.tests.js          |  2 +-
 .../web-utils/src/tests/stringHandling.js     |  2 +-
 .../src/tests/timeoutPromise.tests.js         |  2 +-
 .../web-utils/src/tests/versions.tests.js     |  2 +-
 .../common/web-utils/src/timeoutPromise.ts    |  0
 .../common/web-utils/src/version.ts           |  0
 .../common/web-utils/tsconfig.json            |  7 ++--
 web/src/engine/build.sh                       |  2 +-
 web/src/engine/common/web-utils/.gitignore    | 17 ---------
 web/src/engine/common/web-utils/package.json  | 36 -------------------
 .../engine/predictive-text/templates/build.sh |  2 +-
 .../predictive-text/templates/package.json    |  3 --
 .../predictive-text/templates/src/common.ts   |  2 +-
 .../templates/src/trie-model.ts               |  2 +-
 .../predictive-text/templates/tsconfig.json   |  7 ++--
 .../predictive-text/types/tsconfig.json       |  1 -
 .../tools/data-compiler/tsconfig.json         |  1 -
 .../wordbreakers/tsconfig.json                |  8 +++--
 .../predictive-text/worker-main/package.json  |  1 -
 .../worker-main/src/node/tsconfig.json        |  1 -
 .../worker-main/src/tsconfig.json             |  5 ++-
 .../worker-main/src/web/tsconfig.json         |  1 -
 .../worker-main/tsconfig.all.json             |  3 +-
 .../worker-thread/package.json                |  1 -
 .../src/main/correction/context-tracker.ts    |  2 +-
 .../src/main/correction/distance-modeler.ts   |  2 +-
 .../src/main/correction/execution-timer.ts    |  2 +-
 .../worker-thread/src/main/index.ts           |  2 +-
 .../src/main/model-compositor.ts              |  2 +-
 .../worker-thread/src/main/model-helpers.ts   |  2 +-
 .../worker-thread/src/main/predict-helpers.ts |  2 +-
 .../src/main/transform-subsets.ts             |  2 +-
 .../worker-thread/tsconfig.json               |  3 +-
 .../engine/sentry-manager/src/tsconfig.json   |  1 -
 web/src/engine/src/dom-utils/stylesheets.ts   |  4 +--
 .../src/element-wrappers/contentEditable.ts   |  2 +-
 .../src/element-wrappers/designIFrame.ts      |  2 +-
 web/src/engine/src/element-wrappers/input.ts  |  2 +-
 .../engine/src/element-wrappers/textarea.ts   |  2 +-
 .../headless/asyncClosureDispatchQueue.ts     |  2 +-
 .../gestures/matchers/gestureMatcher.ts       |  2 +-
 .../gestures/matchers/gestureSequence.ts      |  2 +-
 .../gestures/matchers/matcherSelector.ts      |  2 +-
 .../headless/gestures/matchers/pathMatcher.ts |  2 +-
 .../src/gesture-processor/touchEventEngine.ts |  2 +-
 .../src/js-processor/jsKeyboardInterface.ts   |  2 +-
 .../src/js-processor/jsKeyboardProcessor.ts   |  4 +--
 web/src/engine/src/js-processor/mock.ts       |  2 +-
 .../src/js-processor/outputTargetBase.ts      |  2 +-
 web/src/engine/src/keyboard/index.ts          |  3 +-
 web/src/engine/src/keyboard/keyEvent.ts       |  2 +-
 .../src/keyboard/keyboards/activeLayout.ts    |  2 +-
 .../src/keyboard/keyboards/defaultLayouts.ts  |  2 +-
 .../src/keyboard/keyboards/jsKeyboard.ts      |  2 +-
 .../src/keyboard/keyboards/keyboardHarness.ts |  2 +-
 .../engine/src/main/headless/contextWindow.ts |  2 +-
 .../src/main/headless/deviceDetector.ts       |  2 +-
 .../src/main/headless/inputProcessor.ts       |  2 +-
 .../src/main/headless/utils/styleConstants.ts |  2 +-
 web/src/engine/src/main/keymanEngineBase.ts   |  2 +-
 .../engine/src/osk/banner/bannerController.ts |  2 +-
 .../engine/src/osk/banner/bannerGestureSet.ts |  2 +-
 .../src/osk/config/commonConfiguration.ts     |  2 +-
 web/src/engine/src/osk/fontSizeUtils.ts       |  2 +-
 web/src/engine/src/osk/screenUtils.ts         |  2 +-
 .../src/osk/views/touchEventPromiseMap.ts     |  2 +-
 web/src/engine/tsconfig.json                  |  8 ++---
 .../attachment/outputTargetForElement.def.ts  |  2 +-
 .../attachment/pageContextAttachment.tests.ts |  2 +-
 .../dom/cases/browser/contextManager.tests.ts |  2 +-
 .../keyboard-storage/cloudQueries.tests.ts    |  2 +-
 .../auto/dom/cases/osk/activation.tests.ts    |  2 +-
 .../test/auto/dom/cases/osk/events.tests.ts   |  2 +-
 .../hardware-event-processing.tests.ts        |  2 +-
 .../specialized-backspace.tests.js            |  2 +-
 .../js-processor/transcriptions.tests.js      |  2 +-
 .../keyboard-storage/cloudQueries.tests.js    |  2 +-
 .../main/headless/inputProcessor.tests.js     |  2 +-
 .../asyncClosureDispatchQueue.tests.ts        |  2 +-
 .../gesture-processor/gesturePath.tests.ts    |  2 +-
 .../gestures/gestureSequence.tests.ts         |  2 +-
 .../gestures/matcherSelector.tests.ts         |  2 +-
 .../gestures/pathMatcher.tests.ts             |  2 +-
 .../gestures/touchpointCoordinator.tests.ts   |  2 +-
 .../engine/osk/visualKeyboard.tests.ts        |  2 +-
 .../predictive-text/templates/helpers.ts      |  2 +-
 .../context/context-tracker.tests.ts          |  2 +-
 .../distance-modeler.tests.ts                 |  2 +-
 .../predict-from-corrections.tests.ts         |  2 +-
 .../suggestion-deduplication.tests.ts         |  2 +-
 .../suggestion-finalization.tests.ts          |  2 +-
 .../suggestion-similarity.tests.ts            |  2 +-
 .../worker-thread/worker-predict.tests.ts     |  2 +-
 .../auto/integrated/cases/events.tests.ts     |  2 +-
 .../integrated/cases/text_selection.tests.ts  |  2 +-
 web/src/test/auto/integrated/tsconfig.json    |  1 -
 .../resources/loader/nodeKeyboardLoader.ts    |  2 +-
 .../auto/resources/loader/tsconfig.node.json  |  1 -
 .../test/auto/resources/sequenceAssertions.ts |  2 +-
 .../resources/simulateMultiSourceInput.ts     |  2 +-
 web/src/test/auto/tsconfig.json               |  4 ---
 .../building/sourcemap-root/tsconfig.json     |  1 -
 web/src/tools/es-bundling/tsconfig.json       |  1 -
 .../testing/bulk_rendering/renderer_core.ts   |  2 +-
 .../testing/bulk_rendering/tsconfig.json      |  4 ---
 .../src/headlessInputEngine.ts                |  2 +-
 .../unit-test-resources/tsconfig.json         |  4 ---
 .../tools/testing/recorder-core/package.json  |  3 +-
 .../tools/testing/recorder-core/src/index.ts  |  2 +-
 .../testing/recorder-core/src/nodeProctor.ts  |  2 +-
 .../testing/recorder-core/src/proctor.ts      |  2 +-
 .../tools/testing/recorder-core/tsconfig.json |  6 +---
 .../tools/testing/recorder/browserDriver.ts   |  2 +-
 .../tools/testing/recorder/browserProctor.ts  |  2 +-
 web/src/tools/testing/recorder/tsconfig.json  |  6 +---
 .../tools/testing/test-utils/tsconfig.json    |  1 -
 web/src/tsconfig.all.json                     | 29 ++++++++-------
 web/tsconfig.base.json                        |  9 +++++
 139 files changed, 172 insertions(+), 285 deletions(-)
 rename web/src/{engine => }/common/web-utils/.c8rc.json (78%)
 rename web/src/{engine => }/common/web-utils/build.sh (93%)
 rename web/src/{engine => }/common/web-utils/src/deepCopy.ts (100%)
 rename web/src/{engine => }/common/web-utils/src/deviceSpec.ts (100%)
 rename web/src/{engine => }/common/web-utils/src/globalObject.ts (100%)
 rename web/src/{engine => }/common/web-utils/src/index.ts (100%)
 rename web/src/{engine => }/common/web-utils/src/kmwstring.ts (100%)
 rename web/src/{engine => }/common/web-utils/src/managedPromise.ts (100%)
 rename web/src/{engine => }/common/web-utils/src/priority-queue.ts (100%)
 rename web/src/{engine => }/common/web-utils/src/tests/deepCopy.tests.js (97%)
 rename web/src/{engine => }/common/web-utils/src/tests/managedPromise.tests.js (97%)
 rename web/src/{engine => }/common/web-utils/src/tests/priorityQueue.tests.js (98%)
 rename web/src/{engine => }/common/web-utils/src/tests/stringHandling.js (99%)
 rename web/src/{engine => }/common/web-utils/src/tests/timeoutPromise.tests.js (97%)
 rename web/src/{engine => }/common/web-utils/src/tests/versions.tests.js (96%)
 rename web/src/{engine => }/common/web-utils/src/timeoutPromise.ts (100%)
 rename web/src/{engine => }/common/web-utils/src/version.ts (100%)
 rename web/src/{engine => }/common/web-utils/tsconfig.json (51%)
 delete mode 100644 web/src/engine/common/web-utils/.gitignore
 delete mode 100644 web/src/engine/common/web-utils/package.json

diff --git a/package-lock.json b/package-lock.json
index 4520b1d0662..8ec6d9b7c31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1769,10 +1769,6 @@
       "resolved": "web/src/engine/sentry-manager",
       "link": true
     },
-    "node_modules/@keymanapp/web-utils": {
-      "resolved": "web/src/engine/common/web-utils",
-      "link": true
-    },
     "node_modules/@mdn/browser-compat-data": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-4.2.1.tgz",
@@ -14168,7 +14164,6 @@
         "@keymanapp/keyman-version": "*",
         "@keymanapp/lexical-model-layer": "*",
         "@keymanapp/recorder-core": "*",
-        "@keymanapp/web-utils": "*",
         "core-js": "^3.34.0",
         "eventemitter3": "^5.0.0",
         "tslib": "^2.5.2"
@@ -14212,8 +14207,20 @@
         "node": ">=14.18"
       }
     },
+    "web/src/common/web-utils": {
+      "name": "@keymanapp/web-utils",
+      "extraneous": true,
+      "license": "MIT",
+      "devDependencies": {
+        "@keymanapp/keyman-version": "*",
+        "@keymanapp/resources-gosh": "*",
+        "c8": "^7.12.0",
+        "typescript": "^5.4.5"
+      }
+    },
     "web/src/engine/common/web-utils": {
       "name": "@keymanapp/web-utils",
+      "extraneous": true,
       "license": "MIT",
       "devDependencies": {
         "@keymanapp/keyman-version": "*",
@@ -14240,13 +14247,10 @@
       "license": "MIT",
       "dependencies": {
         "@keymanapp/common-types": "*",
-        "@keymanapp/keyman-version": "*",
         "@keymanapp/models-wordbreakers": "*",
         "@keymanapp/resources-gosh": "*"
       },
       "devDependencies": {
-        "@keymanapp/common-types": "*",
-        "@keymanapp/web-utils": "*",
         "@types/mocha": "^7.0.2",
         "c8": "^7.12.0",
         "typescript": "^5.4.5"
@@ -14277,7 +14281,6 @@
         "@keymanapp/keyman-version": "*",
         "@keymanapp/models-templates": "*",
         "@keymanapp/models-wordbreakers": "*",
-        "@keymanapp/web-utils": "*",
         "es6-shim": "^0.35.5",
         "string.prototype.codepointat": "^0.2.1"
       },
@@ -14294,7 +14297,6 @@
         "@keymanapp/keyman-version": "*",
         "@keymanapp/models-templates": "*",
         "@keymanapp/models-wordbreakers": "*",
-        "@keymanapp/web-utils": "*",
         "es6-shim": "^0.35.5",
         "string.prototype.codepointat": "^0.2.1",
         "string.prototype.startswith": "^0.2.0"
@@ -14337,8 +14339,7 @@
       "license": "MIT",
       "dependencies": {
         "@keymanapp/common-types": "*",
-        "@keymanapp/keyman-version": "*",
-        "@keymanapp/web-utils": "*"
+        "@keymanapp/keyman-version": "*"
       },
       "devDependencies": {
         "typescript": "^5.4.5"
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 6880709c17d..4ee9ff48327 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -22,7 +22,7 @@
     "declaration": true,
     "declarationMap": true,
 
-    "baseUrl": ".",
+    "baseUrl": "./",
 
     "paths": {
       "@keymanapp/common-types": ["./common/web/types/src/main"],
@@ -30,7 +30,6 @@
       "@keymanapp/keyman": ["./web" ],
       "@keymanapp/models-templates": ["./web/src/engine/predictive-text/templates/"],
       "@keymanapp/models-wordbreakers": ["./web/src/engine/predictive-text/wordbreakers"],
-      "@keymanapp/web-utils": ["./web/src/engine/common/web-utils"],
       "@keymanapp/lm-message-types": ["./web/src/engine/predictive-text/types"],
       "@keymanapp/keyman-version": ["./common/web/keyman-version"],
       "@keymanapp/ldml-keyboard-constants": [ "./core/include/ldml" ],
diff --git a/tsconfig.json b/tsconfig.json
index 8f63a70a700..c9e8f3dc60e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -37,17 +37,5 @@
     { "path": "./resources/build/version/" },
 
     { "path": "./web/src/tsconfig.all.json" },
-    { "path": "./web/src/engine/common/web-utils" },
-    { "path": "./web/src/engine/predictive-text/types/" },
-    { "path": "./web/src/engine/predictive-text/templates" },
-    { "path": "./web/src/engine/predictive-text/wordbreakers" },
-    { "path": "./web/src/engine/predictive-text/worker-main/tsconfig.all.json" },
-    { "path": "./web/src/engine/predictive-text/worker-thread" },
-    { "path": "./web/src/tools/testing/gesture-processor/unit-test-resources" },
-    { "path": "./web/src/engine/sentry-manager/src" },
-
-    { "path": "./web/src/tools/testing/recorder" },
-    // { "path": "./web/tools/recorder/tsconfig.json" },
-    // { "path": "./web/tools/sourcemap-root/tsconfig.json" },
   ]
 }
diff --git a/web/README.md b/web/README.md
index 5c89d9ff5ef..01581fc234f 100644
--- a/web/README.md
+++ b/web/README.md
@@ -85,7 +85,7 @@ graph TD;
     KeyboardSpec["/web/src/engine/keyboard"];
     JSProc["/web/src/engine/js-processor"];
     OSK-->KeyboardSpec;
-    WebUtils["@keymanapp/web-utils<br>(/web/src/engine/common/web-utils)"];
+    WebUtils["/web/src/common/web-utils"];
     KeyboardSpec---->WebUtils;
     Wordbreakers["@keymanapp/models-wordbreakers<br>(/web/src/engine/predictive-text/wordbreakers)"];
     Models["@keymanapp/models-templates<br>(/web/src/engine/predictive-text/templates/)"];
diff --git a/web/build.sh b/web/build.sh
index aee8985e4ce..5a9152c0d7c 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -26,8 +26,8 @@ builder_describe "Builds engine modules for Keyman Engine for Web (KMW)." \
   ":app/browser              The form of Keyman Engine for Web for use on websites" \
   ":app/webview              A puppetable version of KMW designed for use in a host app's WebView" \
   ":app/ui                   Builds KMW's desktop form-factor keyboard-selection UI modules" \
+  ":common/web-utils         Shared utils" \
   ":engine                   Keyman Engine for Web" \
-  ":engine/common/web-utils  Shared utils" \
   ":engine/predictive-text   Builds KMW's predictive text module" \
   ":help                     Online documentation" \
   ":samples                  Builds all needed resources for the KMW sample-page set" \
@@ -51,19 +51,9 @@ builder_describe_outputs \
   build:app/browser             "/web/build/app/browser/lib/index.mjs" \
   build:app/webview             "/web/build/app/webview/${config}/keymanweb-webview.js" \
   build:app/ui                  "/web/build/app/ui/${config}/kmwuitoggle.js" \
-  build:engine/attachment       "/web/build/engine/attachment/lib/index.mjs" \
-  build:engine/core-processor   "/web/build/engine/core-processor/lib/index.mjs" \
-  build:engine/dom-utils        "/web/build/engine/dom-utils/obj/index.js" \
-  build:engine/events           "/web/build/engine/events/lib/index.mjs" \
-  build:engine/element-wrappers "/web/build/engine/element-wrappers/lib/index.mjs" \
-  build:engine/interfaces       "/web/build/engine/interfaces/lib/index.mjs" \
-  build:engine/js-processor     "/web/build/engine/js-processor/lib/index.mjs" \
-  build:engine/keyboard         "/web/build/engine/keyboard/lib/index.mjs" \
-  build:engine/keyboard-storage "/web/build/engine/keyboard-storage/lib/index.mjs" \
-  build:engine/main             "/web/build/engine/main/lib/index.mjs" \
-  build:engine/osk              "/web/build/engine/osk/lib/index.mjs" \
+  build:common/web-utils        "/web/build/common/web-utils/lib/index.mjs" \
+  build:engine                  "/web/build/engine/lib/index.mjs" \
   build:engine/predictive-text  "/web/src/engine/predictive-text/worker-main/build/lib/web/index.mjs" \
-  build:engine/common/web-utils "/web/src/engine/common/web-utils/build/lib/index.mjs" \
   build:samples                 "/web/src/samples/simplest/keymanweb.js" \
   build:tools                   "/web/build/tools/building/sourcemap-root/index.js" \
   build:test-pages              "/web/build/test-resources/sentry-manager.js"
@@ -72,20 +62,14 @@ BUNDLE_CMD="node ${KEYMAN_ROOT}/web/src/tools/es-bundling/build/common-bundle.mj
 
 #### Build action definitions ####
 
-##################### TODO:  call child action, verify things work as expected!
-
 # We can run all clean & configure actions at once without much issue.
 
+## Clean actions
+
 builder_run_action clean:_all rm -rf build/
 
 builder_run_child_actions clean
 
-## Clean actions
-
-###--- Future tie-in:  if #8831 gets accepted, uncomment the next two lines. ---###
-# # If a full-on general clean was requested, we can nuke the entire build folder.
-# builder_run_action clean:project rm -rf ./build
-
 builder_run_child_actions configure
 
 ## Build actions
@@ -158,7 +142,8 @@ coverage_action() {
 
 builder_run_child_actions build:tools
 
-builder_run_child_actions build:engine/common/web-utils
+builder_run_child_actions build:common/web-utils
+
 builder_run_child_actions build:engine
 builder_run_child_actions build:engine/predictive-text
 
diff --git a/web/package.json b/web/package.json
index 7c722a724c6..e5344ce1b4e 100644
--- a/web/package.json
+++ b/web/package.json
@@ -7,6 +7,11 @@
       "types": "./build/app/browser/obj/test-index.d.js",
       "import": "./build/app/browser/obj/test-index.js"
     },
+    "./common/web-utils": {
+      "es6-bundling": "./src/common/web-utils/src/index.ts",
+      "types": "./build/common/web-utils/obj/index.d.js",
+      "import": "./build/common/web-utils/obj/index.js"
+    },
     "./engine/attachment": {
       "es6-bundling": "./src/engine/src/attachment/index.ts",
       "types": "./build/engine/obj/attachment/index.d.ts",
@@ -111,7 +116,6 @@
     "@keymanapp/lexical-model-layer": "*",
     "@keymanapp/common-types": "*",
     "@keymanapp/recorder-core": "*",
-    "@keymanapp/web-utils": "*",
     "core-js": "^3.34.0",
     "eventemitter3": "^5.0.0",
     "tslib": "^2.5.2"
diff --git a/web/src/app/browser/tsconfig.json b/web/src/app/browser/tsconfig.json
index e537e787766..de34dea8d77 100644
--- a/web/src/app/browser/tsconfig.json
+++ b/web/src/app/browser/tsconfig.json
@@ -2,13 +2,9 @@
   "extends": "../../tsconfig.dom.json",
 
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "../../../build/app/browser/obj/",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../../build/app/browser/obj/tsconfig.tsbuildinfo",
-    "paths": {
-      "keyman/engine/*": [ "../../engine/src/*/index.js" ],
-    }
   },
 
   "include": [ "**/*.ts" ],
diff --git a/web/src/app/ui/tsconfig.json b/web/src/app/ui/tsconfig.json
index 698b6f307ad..b37d8bd681c 100644
--- a/web/src/app/ui/tsconfig.json
+++ b/web/src/app/ui/tsconfig.json
@@ -2,13 +2,9 @@
   "extends": "../../tsconfig.dom.json",
 
 	"compilerOptions": {
-    "baseUrl": "./",
 		"outDir": "../../../build/app/ui/obj",
 		"rootDir": "",
     "tsBuildInfoFile": "../../../build/app/ui/obj/tsconfig.tsbuildinfo",
-    "paths": {
-      "keyman/engine/*": ["../../engine/src/*/index.js"],
-    },
   },
   "files": [
 		"kmwuibutton.ts",
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index b2c52de00e3..71abc60340b 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -5,7 +5,7 @@ import { KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { ContextManagerBase } from 'keyman/engine/main';
 import { WebviewConfiguration } from './configuration.js';
 import { LexicalModelTypes } from '@keymanapp/common-types';
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 
 export type OnInsertTextFunc = (deleteLeft: number, text: string, deleteRight: number) => void;
 
diff --git a/web/src/app/webview/tsconfig.json b/web/src/app/webview/tsconfig.json
index 07ba67057b2..06f6e0064ab 100644
--- a/web/src/app/webview/tsconfig.json
+++ b/web/src/app/webview/tsconfig.json
@@ -2,18 +2,15 @@
   "extends": "../../tsconfig.dom.json",
 
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "../../../build/app/webview/obj/",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../../build/app/webview/obj/tsconfig.tsbuildinfo",
-    "paths": {
-      "keyman/engine/*": ["../../engine/src/*/index.js"],
-    },
   },
 
   "include": [ "**/*.ts" ],
 
   "references": [
-    { "path": "../../engine" }
+    { "path": "../../engine" },
+    { "path": "../../common/web-utils" },
   ]
 }
diff --git a/web/src/engine/common/web-utils/.c8rc.json b/web/src/common/web-utils/.c8rc.json
similarity index 78%
rename from web/src/engine/common/web-utils/.c8rc.json
rename to web/src/common/web-utils/.c8rc.json
index 4c652ff8922..1b73d94074b 100644
--- a/web/src/engine/common/web-utils/.c8rc.json
+++ b/web/src/common/web-utils/.c8rc.json
@@ -10,7 +10,7 @@
   ],
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "../../../build/coverage/raw/raw/engine/common/web-utils",
+  "reports-dir": "../../../build/coverage/raw/raw/common/web-utils",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/common/web-utils/build.sh b/web/src/common/web-utils/build.sh
similarity index 93%
rename from web/src/engine/common/web-utils/build.sh
rename to web/src/common/web-utils/build.sh
index 23d38cb9520..6c5da28e429 100755
--- a/web/src/engine/common/web-utils/build.sh
+++ b/web/src/common/web-utils/build.sh
@@ -5,15 +5,15 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${KEYMAN_ROOT}/web/common.inc.sh"
 . "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/build/node.inc.sh"
 
-SUBPROJECT_NAME=engine/common/web-utils
-BUILD_DIR="/web/src/engine/common/web-utils/build"
+SUBPROJECT_NAME=common/web-utils
+BUILD_DIR="/web/build/common/web-utils"
 
 BUNDLE_CMD="node ${KEYMAN_ROOT}/web/src/tools/es-bundling/build/common-bundle.mjs"
 
diff --git a/web/src/engine/common/web-utils/src/deepCopy.ts b/web/src/common/web-utils/src/deepCopy.ts
similarity index 100%
rename from web/src/engine/common/web-utils/src/deepCopy.ts
rename to web/src/common/web-utils/src/deepCopy.ts
diff --git a/web/src/engine/common/web-utils/src/deviceSpec.ts b/web/src/common/web-utils/src/deviceSpec.ts
similarity index 100%
rename from web/src/engine/common/web-utils/src/deviceSpec.ts
rename to web/src/common/web-utils/src/deviceSpec.ts
diff --git a/web/src/engine/common/web-utils/src/globalObject.ts b/web/src/common/web-utils/src/globalObject.ts
similarity index 100%
rename from web/src/engine/common/web-utils/src/globalObject.ts
rename to web/src/common/web-utils/src/globalObject.ts
diff --git a/web/src/engine/common/web-utils/src/index.ts b/web/src/common/web-utils/src/index.ts
similarity index 100%
rename from web/src/engine/common/web-utils/src/index.ts
rename to web/src/common/web-utils/src/index.ts
diff --git a/web/src/engine/common/web-utils/src/kmwstring.ts b/web/src/common/web-utils/src/kmwstring.ts
similarity index 100%
rename from web/src/engine/common/web-utils/src/kmwstring.ts
rename to web/src/common/web-utils/src/kmwstring.ts
diff --git a/web/src/engine/common/web-utils/src/managedPromise.ts b/web/src/common/web-utils/src/managedPromise.ts
similarity index 100%
rename from web/src/engine/common/web-utils/src/managedPromise.ts
rename to web/src/common/web-utils/src/managedPromise.ts
diff --git a/web/src/engine/common/web-utils/src/priority-queue.ts b/web/src/common/web-utils/src/priority-queue.ts
similarity index 100%
rename from web/src/engine/common/web-utils/src/priority-queue.ts
rename to web/src/common/web-utils/src/priority-queue.ts
diff --git a/web/src/engine/common/web-utils/src/tests/deepCopy.tests.js b/web/src/common/web-utils/src/tests/deepCopy.tests.js
similarity index 97%
rename from web/src/engine/common/web-utils/src/tests/deepCopy.tests.js
rename to web/src/common/web-utils/src/tests/deepCopy.tests.js
index 90e809dc116..5b2d8eb0ce4 100644
--- a/web/src/engine/common/web-utils/src/tests/deepCopy.tests.js
+++ b/web/src/common/web-utils/src/tests/deepCopy.tests.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { deepCopy } from '@keymanapp/web-utils';
+import { deepCopy } from 'keyman/common/web-utils';
 
 
 describe('deepCopy', function() {
diff --git a/web/src/engine/common/web-utils/src/tests/managedPromise.tests.js b/web/src/common/web-utils/src/tests/managedPromise.tests.js
similarity index 97%
rename from web/src/engine/common/web-utils/src/tests/managedPromise.tests.js
rename to web/src/common/web-utils/src/tests/managedPromise.tests.js
index 6b7fe722059..2c2b0f5a569 100644
--- a/web/src/engine/common/web-utils/src/tests/managedPromise.tests.js
+++ b/web/src/common/web-utils/src/tests/managedPromise.tests.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { ManagedPromise } from '@keymanapp/web-utils';
+import { ManagedPromise } from 'keyman/common/web-utils';
 
 describe("ManagedPromise", () => {
   it('<void> resolution', async () => {
diff --git a/web/src/engine/common/web-utils/src/tests/priorityQueue.tests.js b/web/src/common/web-utils/src/tests/priorityQueue.tests.js
similarity index 98%
rename from web/src/engine/common/web-utils/src/tests/priorityQueue.tests.js
rename to web/src/common/web-utils/src/tests/priorityQueue.tests.js
index 0aa4c50b964..2394718aec5 100644
--- a/web/src/engine/common/web-utils/src/tests/priorityQueue.tests.js
+++ b/web/src/common/web-utils/src/tests/priorityQueue.tests.js
@@ -3,7 +3,7 @@
  */
 
 import { assert } from 'chai';
-import { PriorityQueue } from '@keymanapp/web-utils';
+import { PriorityQueue } from 'keyman/common/web-utils';
 
 describe('Priority queue', function() {
   it('can act as a min-heap', function () {
diff --git a/web/src/engine/common/web-utils/src/tests/stringHandling.js b/web/src/common/web-utils/src/tests/stringHandling.js
similarity index 99%
rename from web/src/engine/common/web-utils/src/tests/stringHandling.js
rename to web/src/common/web-utils/src/tests/stringHandling.js
index e22ef633d18..be93a45c8b6 100644
--- a/web/src/engine/common/web-utils/src/tests/stringHandling.js
+++ b/web/src/common/web-utils/src/tests/stringHandling.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 // Trigger the String-extending methods.
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 
 describe('Unicode string handling', () => {
   describe('disabled: BMP-mode, BMP-only strings',  () => {
diff --git a/web/src/engine/common/web-utils/src/tests/timeoutPromise.tests.js b/web/src/common/web-utils/src/tests/timeoutPromise.tests.js
similarity index 97%
rename from web/src/engine/common/web-utils/src/tests/timeoutPromise.tests.js
rename to web/src/common/web-utils/src/tests/timeoutPromise.tests.js
index 337cf286e2d..e8a14afbeca 100644
--- a/web/src/engine/common/web-utils/src/tests/timeoutPromise.tests.js
+++ b/web/src/common/web-utils/src/tests/timeoutPromise.tests.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { TimeoutPromise, timedPromise } from '@keymanapp/web-utils';
+import { TimeoutPromise, timedPromise } from 'keyman/common/web-utils';
 
 // Set this long enough to allow a bit of delay from OS context-switching (often on the
 // order of ~16ms for some OSes) to occur multiple times without breaking these tests.
diff --git a/web/src/engine/common/web-utils/src/tests/versions.tests.js b/web/src/common/web-utils/src/tests/versions.tests.js
similarity index 96%
rename from web/src/engine/common/web-utils/src/tests/versions.tests.js
rename to web/src/common/web-utils/src/tests/versions.tests.js
index 36ed51cbacd..aa4c67c4544 100644
--- a/web/src/engine/common/web-utils/src/tests/versions.tests.js
+++ b/web/src/common/web-utils/src/tests/versions.tests.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { Version } from '@keymanapp/web-utils';
+import { Version } from 'keyman/common/web-utils';
 
 describe('Version Logic', function() {
   it('Should provide a default, fallback value when nothing is specified', function() {
diff --git a/web/src/engine/common/web-utils/src/timeoutPromise.ts b/web/src/common/web-utils/src/timeoutPromise.ts
similarity index 100%
rename from web/src/engine/common/web-utils/src/timeoutPromise.ts
rename to web/src/common/web-utils/src/timeoutPromise.ts
diff --git a/web/src/engine/common/web-utils/src/version.ts b/web/src/common/web-utils/src/version.ts
similarity index 100%
rename from web/src/engine/common/web-utils/src/version.ts
rename to web/src/common/web-utils/src/version.ts
diff --git a/web/src/engine/common/web-utils/tsconfig.json b/web/src/common/web-utils/tsconfig.json
similarity index 51%
rename from web/src/engine/common/web-utils/tsconfig.json
rename to web/src/common/web-utils/tsconfig.json
index 1747a622743..0e866bd4cc7 100644
--- a/web/src/engine/common/web-utils/tsconfig.json
+++ b/web/src/common/web-utils/tsconfig.json
@@ -1,13 +1,12 @@
 {
   "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
-    "tsBuildInfoFile": "./build/obj/tsconfig.tsbuildinfo",
-    "baseUrl": "./",
-    "outDir": "./build/obj/",
+    "tsBuildInfoFile": "../../../build/common/web-utils/obj/tsconfig.tsbuildinfo",
+    "outDir": "../../../build/common/web-utils/obj/",
     "rootDir": "./src"
   },
   "references": [
-    { "path": "../../../../../common/web/keyman-version" },
+    { "path": "../../../../common/web/keyman-version" },
   ],
   "include": [
     "src/*.ts"
diff --git a/web/src/engine/build.sh b/web/src/engine/build.sh
index 898252b383a..3ff9461c407 100755
--- a/web/src/engine/build.sh
+++ b/web/src/engine/build.sh
@@ -17,7 +17,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_describe "Builds Keyman Engine for Web (KMW)" \
   "@/core:wasm" \
   "@/web/src/engine/predictive-text" \
-  "@/web/src/engine/common/web-utils" \
+  "@/web/src/common/web-utils" \
   "clean" \
   "configure" \
   "build" \
diff --git a/web/src/engine/common/web-utils/.gitignore b/web/src/engine/common/web-utils/.gitignore
deleted file mode 100644
index 56baafc8225..00000000000
--- a/web/src/engine/common/web-utils/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build products
-src/environment.inc.ts
-
-# Legacy build folders.
-output/
-build/
-embedded/
-
-# Current build output folder (matches standard node publish location).
-dist/
-
-# Other local files.
-node_modules/
-source/environment.inc.ts
-**/.idea/**/*.xml
-**/*.iml
-**/*.kpj.user
\ No newline at end of file
diff --git a/web/src/engine/common/web-utils/package.json b/web/src/engine/common/web-utils/package.json
deleted file mode 100644
index 7786b82289c..00000000000
--- a/web/src/engine/common/web-utils/package.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "name": "@keymanapp/web-utils",
-  "description": "Common utility functions used in both Keyman Engine for Web and the predictive text worker",
-  "main": "./build/obj/index.js",
-  "exports": {
-    ".": {
-      "es6-bundling": "./src/index.ts",
-      "types": "./build/obj/index.d.ts",
-      "import": "./build/obj/index.js"
-    }
-  },
-  "scripts": {
-    "build": "gosh ./build.sh",
-    "clean": "gosh ./build.sh clean"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/keymanapp/keyman.git"
-  },
-  "author": "SIL International",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/keymanapp/keyman/issues"
-  },
-  "homepage": "https://github.com/keymanapp/keyman#readme",
-  "devDependencies": {
-    "@keymanapp/keyman-version": "*",
-    "@keymanapp/resources-gosh": "*",
-    "c8": "^7.12.0",
-    "typescript": "^5.4.5"
-  },
-  "type": "module",
-  "paths": {
-    "@keymanapp/keyman-version": "*"
-  }
-}
diff --git a/web/src/engine/predictive-text/templates/build.sh b/web/src/engine/predictive-text/templates/build.sh
index 01820ed765f..8119b5a3652 100755
--- a/web/src/engine/predictive-text/templates/build.sh
+++ b/web/src/engine/predictive-text/templates/build.sh
@@ -17,7 +17,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 SUBPROJECT_NAME=engine/predictive-text/templates
 
 builder_describe "Builds the predictive-text model template implementation module" \
-  "@/common/web/keyman-version" \
+  "@/web/src/common/web-utils" \
   "@/web/src/tools/es-bundling" \
   "@../wordbreakers" \
   "clean" \
diff --git a/web/src/engine/predictive-text/templates/package.json b/web/src/engine/predictive-text/templates/package.json
index cbe3fb87470..821d3f9e5f3 100644
--- a/web/src/engine/predictive-text/templates/package.json
+++ b/web/src/engine/predictive-text/templates/package.json
@@ -51,14 +51,11 @@
     "url": "https://github.com/keymanapp/keyman/issues"
   },
   "devDependencies": {
-    "@keymanapp/common-types": "*",
-    "@keymanapp/web-utils": "*",
     "@types/mocha": "^7.0.2",
     "c8": "^7.12.0",
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@keymanapp/keyman-version": "*",
     "@keymanapp/common-types": "*",
     "@keymanapp/models-wordbreakers": "*",
     "@keymanapp/resources-gosh": "*"
diff --git a/web/src/engine/predictive-text/templates/src/common.ts b/web/src/engine/predictive-text/templates/src/common.ts
index f23ad6095b6..5fe52be579a 100644
--- a/web/src/engine/predictive-text/templates/src/common.ts
+++ b/web/src/engine/predictive-text/templates/src/common.ts
@@ -6,7 +6,7 @@ import Outcome = LexicalModelTypes.Outcome;
 import Suggestion = LexicalModelTypes.Suggestion;
 import Transform = LexicalModelTypes.Transform;
 import WithOutcome = LexicalModelTypes.WithOutcome;
-import { KMWString } from "@keymanapp/web-utils";
+import { KMWString } from "keyman/common/web-utils";
 
 export const SENTINEL_CODE_UNIT = '\uFDD0';
 
diff --git a/web/src/engine/predictive-text/templates/src/trie-model.ts b/web/src/engine/predictive-text/templates/src/trie-model.ts
index 938553330da..7a99e64ef3b 100644
--- a/web/src/engine/predictive-text/templates/src/trie-model.ts
+++ b/web/src/engine/predictive-text/templates/src/trie-model.ts
@@ -25,7 +25,7 @@
 // Worth noting:  we're starting to get quite a 'library' of common model/LMLayer functionality.
 // Should probably make a 'lm-utils' submodule.
 
-import { KMWString, PriorityQueue } from "@keymanapp/web-utils";
+import { KMWString, PriorityQueue } from "keyman/common/web-utils";
 import { default as defaultWordBreaker } from "@keymanapp/models-wordbreakers";
 
 import { applyTransform, isHighSurrogate, isSentinel, SENTINEL_CODE_UNIT, transformToSuggestion } from "./common.js";
diff --git a/web/src/engine/predictive-text/templates/tsconfig.json b/web/src/engine/predictive-text/templates/tsconfig.json
index 176530290da..585792239d2 100644
--- a/web/src/engine/predictive-text/templates/tsconfig.json
+++ b/web/src/engine/predictive-text/templates/tsconfig.json
@@ -2,15 +2,14 @@
   "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "strict": true,
-    "baseUrl": "./",
     "outDir": "build/obj",
     "tsBuildInfoFile": "build/obj/tsconfig.tsbuildinfo",
-    "rootDir": "./src"
+    "rootDir": "./src",
   },
   "references": [
     { "path": "../../../../../common/web/types" },
-    { "path": "../../common/web-utils" },
-    { "path": "../wordbreakers" }
+    { "path": "../../../common/web-utils" },
+    { "path": "../wordbreakers" },
   ],
   "include": [
 	"src/**/*.ts"
diff --git a/web/src/engine/predictive-text/types/tsconfig.json b/web/src/engine/predictive-text/types/tsconfig.json
index 8b87ca26672..220c4440611 100644
--- a/web/src/engine/predictive-text/types/tsconfig.json
+++ b/web/src/engine/predictive-text/types/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "build/",
     "tsBuildInfoFile": "build/tsconfig.tsbuildinfo",
     "rootDir": "./src"
diff --git a/web/src/engine/predictive-text/wordbreakers/tools/data-compiler/tsconfig.json b/web/src/engine/predictive-text/wordbreakers/tools/data-compiler/tsconfig.json
index 2cef116f608..dedc9395346 100644
--- a/web/src/engine/predictive-text/wordbreakers/tools/data-compiler/tsconfig.json
+++ b/web/src/engine/predictive-text/wordbreakers/tools/data-compiler/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../../../../../tsconfig.base.json",
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "../../build/tools/data-compiler/obj",
     "tsBuildInfoFile": "../../build/tools/data-compiler/obj/tsconfig.tsbuildinfo",
     "rootDir": "./",
diff --git a/web/src/engine/predictive-text/wordbreakers/tsconfig.json b/web/src/engine/predictive-text/wordbreakers/tsconfig.json
index b122825413f..9f33fed2d93 100644
--- a/web/src/engine/predictive-text/wordbreakers/tsconfig.json
+++ b/web/src/engine/predictive-text/wordbreakers/tsconfig.json
@@ -1,15 +1,17 @@
 {
   "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "./build/main/obj",
     "tsBuildInfoFile": "./build/main/obj/tsconfig.tsbuildinfo",
-    "rootDir": "./src/main"
+    "rootDir": "./src/main",
   },
   "include": [
 	  "./src/main/**/*"
   ],
   "exclude": [
 	  "node_modules"
-  ]
+  ],
+  "references": [
+    { "path": "../../../common/web-utils" },
+  ],
 }
diff --git a/web/src/engine/predictive-text/worker-main/package.json b/web/src/engine/predictive-text/worker-main/package.json
index 535532d6803..dc6301e113c 100644
--- a/web/src/engine/predictive-text/worker-main/package.json
+++ b/web/src/engine/predictive-text/worker-main/package.json
@@ -50,7 +50,6 @@
     "@keymanapp/models-templates": "*",
     "@keymanapp/models-wordbreakers": "*",
     "@keymanapp/keyman-version": "*",
-    "@keymanapp/web-utils": "*",
     "es6-shim": "^0.35.5",
     "string.prototype.codepointat": "^0.2.1"
   }
diff --git a/web/src/engine/predictive-text/worker-main/src/node/tsconfig.json b/web/src/engine/predictive-text/worker-main/src/node/tsconfig.json
index a1ab0f2f7cd..167ca722d0f 100644
--- a/web/src/engine/predictive-text/worker-main/src/node/tsconfig.json
+++ b/web/src/engine/predictive-text/worker-main/src/node/tsconfig.json
@@ -5,7 +5,6 @@
     // error when constructing the Worker for unit tests.  ES6 is sufficient.
     "target": "ES6",
     "types": ["node"],
-    "baseUrl": "../",
     "outDir": "../../build/obj",
     "tsBuildInfoFile": "../../build/obj/node/tsconfig.tsbuildinfo",
     "rootDir": "../"
diff --git a/web/src/engine/predictive-text/worker-main/src/tsconfig.json b/web/src/engine/predictive-text/worker-main/src/tsconfig.json
index 0ee72aedbad..22b9849ca9d 100644
--- a/web/src/engine/predictive-text/worker-main/src/tsconfig.json
+++ b/web/src/engine/predictive-text/worker-main/src/tsconfig.json
@@ -2,13 +2,12 @@
   "extends": "../../../../../tsconfig.base.json",
 
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "../build/obj",
     "tsBuildInfoFile": "../build/obj/tsconfig.tsbuildinfo",
-    "rootDir": "./"
+    "rootDir": "./",
   },
   "references": [
-    { "path": "../../../common/web-utils" },
+    { "path": "../../../../common/web-utils" },
     { "path": "../../../../../../common/web/types"},
     { "path": "../../types"}
   ],
diff --git a/web/src/engine/predictive-text/worker-main/src/web/tsconfig.json b/web/src/engine/predictive-text/worker-main/src/web/tsconfig.json
index 769c97d589d..3e672735997 100644
--- a/web/src/engine/predictive-text/worker-main/src/web/tsconfig.json
+++ b/web/src/engine/predictive-text/worker-main/src/web/tsconfig.json
@@ -2,7 +2,6 @@
   "extends": "../../../../../../tsconfig.base.json",
   "compilerOptions": {
     "lib": ["es6", "DOM"],
-    "baseUrl": "../",
     "outDir": "../../build/obj",
     "tsBuildInfoFile": "../../build/obj/web/tsconfig.tsbuildinfo",
     "rootDir": "../"
diff --git a/web/src/engine/predictive-text/worker-main/tsconfig.all.json b/web/src/engine/predictive-text/worker-main/tsconfig.all.json
index 6e7eb4cc803..1a33d8a0563 100644
--- a/web/src/engine/predictive-text/worker-main/tsconfig.all.json
+++ b/web/src/engine/predictive-text/worker-main/tsconfig.all.json
@@ -6,14 +6,13 @@
   "extends": "../../../../tsconfig.base.json",
 
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "build/obj",
     "tsBuildInfoFile": "build/obj/tsconfig.all.tsbuildinfo",
     "rootDir": "./src"
   },
   "files": [],
   "references": [
-    { "path": "../../common/web-utils" },
+    { "path": "../../../common/web-utils" },
     { "path": "../../../../../common/web/types"},
     { "path": "../types"},
     { "path": "src/node" },
diff --git a/web/src/engine/predictive-text/worker-thread/package.json b/web/src/engine/predictive-text/worker-thread/package.json
index f0807d074ec..7263f20b7c4 100644
--- a/web/src/engine/predictive-text/worker-thread/package.json
+++ b/web/src/engine/predictive-text/worker-thread/package.json
@@ -39,7 +39,6 @@
     "@keymanapp/keyman-version": "*",
     "@keymanapp/models-templates": "*",
     "@keymanapp/models-wordbreakers": "*",
-    "@keymanapp/web-utils": "*",
     "es6-shim": "^0.35.5",
     "string.prototype.codepointat": "^0.2.1",
     "string.prototype.startswith": "^0.2.0"
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts b/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts
index d9639a6afdf..590a9aaa12e 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts
@@ -1,5 +1,5 @@
 import { applyTransform, buildMergedTransform, Token } from '@keymanapp/models-templates';
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 
 import { ClassicalDistanceCalculation, EditOperation } from './classical-calculation.js';
 import { SearchSpace } from './distance-modeler.js';
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/correction/distance-modeler.ts b/web/src/engine/predictive-text/worker-thread/src/main/correction/distance-modeler.ts
index 03b5500d7e2..254fa85734d 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/correction/distance-modeler.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/correction/distance-modeler.ts
@@ -1,5 +1,5 @@
 import { SENTINEL_CODE_UNIT } from '@keymanapp/models-templates';
-import { QueueComparator as Comparator, PriorityQueue } from '@keymanapp/web-utils';
+import { QueueComparator as Comparator, PriorityQueue } from 'keyman/common/web-utils';
 
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/correction/execution-timer.ts b/web/src/engine/predictive-text/worker-thread/src/main/correction/execution-timer.ts
index 2b0fe5e14eb..1ba6f535a00 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/correction/execution-timer.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/correction/execution-timer.ts
@@ -1,4 +1,4 @@
-import { timedPromise } from "@keymanapp/web-utils";
+import { timedPromise } from "keyman/common/web-utils";
 
 const MIN_OUTLIER = 1; // 1ms.
 const MAX_CANDIDATES = 5;
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/index.ts b/web/src/engine/predictive-text/worker-thread/src/main/index.ts
index 421d22ab44a..167711a9444 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/index.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/index.ts
@@ -34,7 +34,7 @@
 import * as models from './models/index.js';
 import * as correction from './correction/index.js';
 import * as wordBreakers from '@keymanapp/models-wordbreakers';
-import { KMWString } from "@keymanapp/web-utils";
+import { KMWString } from "keyman/common/web-utils";
 
 import ModelCompositor from './model-compositor.js';
 import { ImportScripts, IncomingMessage, LMLayerWorkerState, LoadMessage, ModelEval, ModelFile, ModelSourceSpec, PostMessage } from './worker-interfaces.js';
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts b/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts
index 2a5a4ef60be..fff11f05b68 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts
@@ -1,5 +1,5 @@
 import * as models from '@keymanapp/models-templates';
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
 import * as correction from './correction/index.js'
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/model-helpers.ts b/web/src/engine/predictive-text/worker-thread/src/main/model-helpers.ts
index 071cad588c5..7008a74be55 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/model-helpers.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/model-helpers.ts
@@ -6,7 +6,7 @@ import LexicalModelPunctuation = LexicalModelTypes.LexicalModelPunctuation;
 import * as models from '@keymanapp/models-templates';
 import * as wordBreakers from '@keymanapp/models-wordbreakers';
 
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 
 /**
  * The default punctuation and spacing produced by the model.
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts b/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts
index 8bd8dda359b..34383464e86 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts
@@ -1,5 +1,5 @@
 import * as models from '@keymanapp/models-templates';
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
 import TransformUtils from './transformUtils.js';
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/transform-subsets.ts b/web/src/engine/predictive-text/worker-thread/src/main/transform-subsets.ts
index cf5dcaca572..fba3faed5c3 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/transform-subsets.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/transform-subsets.ts
@@ -9,7 +9,7 @@
  */
 
 import { LexicalModelTypes } from '@keymanapp/common-types';
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 
 import Distribution = LexicalModelTypes.Distribution;
 import Transform = LexicalModelTypes.Transform;
diff --git a/web/src/engine/predictive-text/worker-thread/tsconfig.json b/web/src/engine/predictive-text/worker-thread/tsconfig.json
index 252ec84cebc..4bea957b249 100644
--- a/web/src/engine/predictive-text/worker-thread/tsconfig.json
+++ b/web/src/engine/predictive-text/worker-thread/tsconfig.json
@@ -2,7 +2,6 @@
   "extends": "../../../../tsconfig.base.json",
 
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "build/obj",
     "tsBuildInfoFile": "build/obj/tsconfig.tsbuildinfo",
     "rootDir": "./src/main",
@@ -22,7 +21,7 @@
     { "path": "../types" },
     // modules
     { "path": "../../../../../common/web/keyman-version" },
-    { "path": "../../common/web-utils" },
+    { "path": "../../../common/web-utils" },
     { "path": "../templates" },
     { "path": "../wordbreakers" },
   ],
diff --git a/web/src/engine/sentry-manager/src/tsconfig.json b/web/src/engine/sentry-manager/src/tsconfig.json
index c15e3394574..7bb42bdb400 100644
--- a/web/src/engine/sentry-manager/src/tsconfig.json
+++ b/web/src/engine/sentry-manager/src/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
-    "baseUrl": "./",
     "lib": ["es6", "dom"],
     "outDir": "../build/obj",
     "rootDir": "./",
diff --git a/web/src/engine/src/dom-utils/stylesheets.ts b/web/src/engine/src/dom-utils/stylesheets.ts
index eb6bbae2bbf..a7eb6c88dea 100644
--- a/web/src/engine/src/dom-utils/stylesheets.ts
+++ b/web/src/engine/src/dom-utils/stylesheets.ts
@@ -1,4 +1,4 @@
-import { DeviceSpec, ManagedPromise } from '@keymanapp/web-utils';
+import { DeviceSpec, ManagedPromise } from 'keyman/common/web-utils';
 import { type InternalKeyboardFont as KeyboardFont } from 'keyman/engine/keyboard';
 
 type FontFamilyStyleMap = {[family: string]: HTMLStyleElement};
@@ -172,7 +172,7 @@ export class StylesheetManager {
       if(!source) {
         return null;
       }
-  
+
       s += 'src:'+source+';';
     }
 
diff --git a/web/src/engine/src/element-wrappers/contentEditable.ts b/web/src/engine/src/element-wrappers/contentEditable.ts
index 5b3169bc1a3..e2ffbdd3e81 100644
--- a/web/src/engine/src/element-wrappers/contentEditable.ts
+++ b/web/src/engine/src/element-wrappers/contentEditable.ts
@@ -1,5 +1,5 @@
 import { OutputTargetElementWrapper } from './outputTargetElementWrapper.js';
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 
 class SelectionCaret {
   node: Node;
diff --git a/web/src/engine/src/element-wrappers/designIFrame.ts b/web/src/engine/src/element-wrappers/designIFrame.ts
index edf9b450cfa..d6cbfb70f5d 100644
--- a/web/src/engine/src/element-wrappers/designIFrame.ts
+++ b/web/src/engine/src/element-wrappers/designIFrame.ts
@@ -1,5 +1,5 @@
 import { OutputTargetElementWrapper } from './outputTargetElementWrapper.js';
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 
 class SelectionCaret {
   node: Node;
diff --git a/web/src/engine/src/element-wrappers/input.ts b/web/src/engine/src/element-wrappers/input.ts
index cae3b433985..45b15630a70 100644
--- a/web/src/engine/src/element-wrappers/input.ts
+++ b/web/src/engine/src/element-wrappers/input.ts
@@ -1,5 +1,5 @@
 import { OutputTargetElementWrapper } from './outputTargetElementWrapper.js';
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 
 interface EventMap  {
   /**
diff --git a/web/src/engine/src/element-wrappers/textarea.ts b/web/src/engine/src/element-wrappers/textarea.ts
index eeb86fbd82c..8500da386ba 100644
--- a/web/src/engine/src/element-wrappers/textarea.ts
+++ b/web/src/engine/src/element-wrappers/textarea.ts
@@ -1,5 +1,5 @@
 import { OutputTargetElementWrapper } from './outputTargetElementWrapper.js';
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 
 export class TextArea extends OutputTargetElementWrapper<{}> {
   root: HTMLTextAreaElement;
diff --git a/web/src/engine/src/gesture-processor/headless/asyncClosureDispatchQueue.ts b/web/src/engine/src/gesture-processor/headless/asyncClosureDispatchQueue.ts
index a15265cb928..fa83b32a839 100644
--- a/web/src/engine/src/gesture-processor/headless/asyncClosureDispatchQueue.ts
+++ b/web/src/engine/src/gesture-processor/headless/asyncClosureDispatchQueue.ts
@@ -1,4 +1,4 @@
-import { timedPromise } from "@keymanapp/web-utils";
+import { timedPromise } from "keyman/common/web-utils";
 import { reportError } from "../reportError.js";
 
 export type QueueClosure = () => (Promise<any> | void);
diff --git a/web/src/engine/src/gesture-processor/headless/gestures/matchers/gestureMatcher.ts b/web/src/engine/src/gesture-processor/headless/gestures/matchers/gestureMatcher.ts
index 9c51d1fed67..dad7fa87526 100644
--- a/web/src/engine/src/gesture-processor/headless/gestures/matchers/gestureMatcher.ts
+++ b/web/src/engine/src/gesture-processor/headless/gestures/matchers/gestureMatcher.ts
@@ -2,7 +2,7 @@ import { GestureSource, GestureSourceSubview } from "../../gestureSource.js";
 
 import { GestureModel, GestureResolution, GestureResolutionSpec, RejectionDefault, RejectionReplace, ResolutionItemSpec } from "../specs/gestureModel.js";
 
-import { ManagedPromise, TimeoutPromise } from "@keymanapp/web-utils";
+import { ManagedPromise, TimeoutPromise } from "keyman/common/web-utils";
 import { FulfillmentCause, PathMatcher } from "./pathMatcher.js";
 import { CumulativePathStats } from "../../cumulativePathStats.js";
 import { processSampleClientCoords } from "../../../inputEventEngine.js";
diff --git a/web/src/engine/src/gesture-processor/headless/gestures/matchers/gestureSequence.ts b/web/src/engine/src/gesture-processor/headless/gestures/matchers/gestureSequence.ts
index a74e984723a..ac3f7bb4549 100644
--- a/web/src/engine/src/gesture-processor/headless/gestures/matchers/gestureSequence.ts
+++ b/web/src/engine/src/gesture-processor/headless/gestures/matchers/gestureSequence.ts
@@ -6,7 +6,7 @@ import { MatchResult } from "./gestureMatcher.js";
 import { GestureModel, GestureResolution } from "../specs/gestureModel.js";
 import { MatcherSelection, MatcherSelector } from "./matcherSelector.js";
 import { GestureRecognizerConfiguration, TouchpointCoordinator } from "../../../index.js";
-import { ManagedPromise, timedPromise } from "@keymanapp/web-utils";
+import { ManagedPromise, timedPromise } from "keyman/common/web-utils";
 
 export class GestureStageReport<Type, StateToken = any> {
   /**
diff --git a/web/src/engine/src/gesture-processor/headless/gestures/matchers/matcherSelector.ts b/web/src/engine/src/gesture-processor/headless/gestures/matchers/matcherSelector.ts
index 833419defda..bf7d1fb5b4c 100644
--- a/web/src/engine/src/gesture-processor/headless/gestures/matchers/matcherSelector.ts
+++ b/web/src/engine/src/gesture-processor/headless/gestures/matchers/matcherSelector.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from "eventemitter3";
 
-import { ManagedPromise, timedPromise } from "@keymanapp/web-utils";
+import { ManagedPromise, timedPromise } from "keyman/common/web-utils";
 
 import { GestureSource, GestureSourceSubview } from "../../gestureSource.js";
 import { GestureMatcher, MatchResult, PredecessorMatch } from "./gestureMatcher.js";
diff --git a/web/src/engine/src/gesture-processor/headless/gestures/matchers/pathMatcher.ts b/web/src/engine/src/gesture-processor/headless/gestures/matchers/pathMatcher.ts
index b87d84dafb6..1d38942dbed 100644
--- a/web/src/engine/src/gesture-processor/headless/gestures/matchers/pathMatcher.ts
+++ b/web/src/engine/src/gesture-processor/headless/gestures/matchers/pathMatcher.ts
@@ -1,7 +1,7 @@
 import { CumulativePathStats } from "../../cumulativePathStats.js";
 import { GestureSource, GestureSourceSubview } from "../../gestureSource.js";
 import { ContactModel } from "../specs/contactModel.js";
-import { ManagedPromise, TimeoutPromise } from "@keymanapp/web-utils";
+import { ManagedPromise, TimeoutPromise } from "keyman/common/web-utils";
 
 export type FulfillmentCause = 'path' | 'timer' | 'item' | 'cancelled';
 
diff --git a/web/src/engine/src/gesture-processor/touchEventEngine.ts b/web/src/engine/src/gesture-processor/touchEventEngine.ts
index 37ac9cdeb10..52529de3a06 100644
--- a/web/src/engine/src/gesture-processor/touchEventEngine.ts
+++ b/web/src/engine/src/gesture-processor/touchEventEngine.ts
@@ -3,7 +3,7 @@ import { InputEventEngine } from "./inputEventEngine.js";
 import { Nonoptional } from "./nonoptional.js";
 import { ZoneBoundaryChecker } from "./configuration/zoneBoundaryChecker.js";
 import { GestureSource } from "./headless/gestureSource.js";
-import { ManagedPromise } from "@keymanapp/web-utils";
+import { ManagedPromise } from "keyman/common/web-utils";
 import { AsyncClosureDispatchQueue } from "./headless/asyncClosureDispatchQueue.js";
 import { GesturePath } from "./index.js";
 
diff --git a/web/src/engine/src/js-processor/jsKeyboardInterface.ts b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
index b365ecf4bc4..782b92e1f36 100644
--- a/web/src/engine/src/js-processor/jsKeyboardInterface.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
@@ -5,7 +5,7 @@
 
 //#region Imports
 
-import { type DeviceSpec, KMWString } from "@keymanapp/web-utils";
+import { type DeviceSpec, KMWString } from "keyman/common/web-utils";
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 import {
   Codes,
diff --git a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
index a3cac3aec95..81cc7ccadf4 100644
--- a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
@@ -16,12 +16,10 @@ import {
 import { Mock } from "./mock.js";
 import { type OutputTargetBase }  from "./outputTargetBase.js";
 import { JSKeyboardInterface }  from './jsKeyboardInterface.js';
-import { DeviceSpec, globalObject, KMWString } from "@keymanapp/web-utils";
+import { DeviceSpec, globalObject, KMWString } from "keyman/common/web-utils";
 
 // #endregion
 
-// Also relies on @keymanapp/web-utils, which is included via tsconfig.json.
-
 export type BeepHandler = (outputTarget: OutputTargetInterface) => void;
 export type LogMessageHandler = (str: string) => void;
 
diff --git a/web/src/engine/src/js-processor/mock.ts b/web/src/engine/src/js-processor/mock.ts
index fb8cc607c70..c4a741b891f 100644
--- a/web/src/engine/src/js-processor/mock.ts
+++ b/web/src/engine/src/js-processor/mock.ts
@@ -1,6 +1,6 @@
 import { OutputTargetInterface } from 'keyman/engine/keyboard';
 import { OutputTargetBase } from './outputTargetBase.js';
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 
 export class Mock extends OutputTargetBase {
   text: string;
diff --git a/web/src/engine/src/js-processor/outputTargetBase.ts b/web/src/engine/src/js-processor/outputTargetBase.ts
index eca7c6766a9..e8c3f33f9a3 100644
--- a/web/src/engine/src/js-processor/outputTargetBase.ts
+++ b/web/src/engine/src/js-processor/outputTargetBase.ts
@@ -1,4 +1,4 @@
-import { KMWString } from "@keymanapp/web-utils";
+import { KMWString } from "keyman/common/web-utils";
 import { Alternate, OutputTargetInterface, TextTransform, Transcription } from 'keyman/engine/keyboard';
 import { findCommonSubstringEndIndex } from "./stringDivergence.js";
 import { Mock } from "./mock.js";
diff --git a/web/src/engine/src/keyboard/index.ts b/web/src/engine/src/keyboard/index.ts
index f0ad1a69a25..6413a7e3ddf 100644
--- a/web/src/engine/src/keyboard/index.ts
+++ b/web/src/engine/src/keyboard/index.ts
@@ -35,7 +35,8 @@ export { type VariableStore, VariableStoreSerializer, VariableStoreDictionary }
 
 export { DOMKeyboardLoader } from './keyboards/loaders/domKeyboardLoader.js';
 
-export * from "@keymanapp/web-utils";
+// TODO-web-core: why do we export these here?
+export * from "keyman/common/web-utils";
 
 // At the top level, there should be no default export.
 
diff --git a/web/src/engine/src/keyboard/keyEvent.ts b/web/src/engine/src/keyboard/keyEvent.ts
index 8c25c964baf..aaed7904b8b 100644
--- a/web/src/engine/src/keyboard/keyEvent.ts
+++ b/web/src/engine/src/keyboard/keyEvent.ts
@@ -7,7 +7,7 @@
 // other platforms recognize and utilize this type.
 
 import { type JSKeyboard } from "./keyboards/jsKeyboard.js";
-import { type DeviceSpec } from "@keymanapp/web-utils";
+import { type DeviceSpec } from "keyman/common/web-utils";
 
 import { Codes } from './codes.js';
 import DefaultRules from "./defaultRules.js";
diff --git a/web/src/engine/src/keyboard/keyboards/activeLayout.ts b/web/src/engine/src/keyboard/keyboards/activeLayout.ts
index 44b77670d91..091d180d150 100644
--- a/web/src/engine/src/keyboard/keyboards/activeLayout.ts
+++ b/web/src/engine/src/keyboard/keyboards/activeLayout.ts
@@ -11,7 +11,7 @@ import TouchLayoutFlick = TouchLayout.TouchLayoutFlick;
 import TouchLayoutSpec = TouchLayout.TouchLayoutPlatform;
 import TouchLayerSpec = TouchLayout.TouchLayoutLayer;
 import TouchLayoutKeySp = TouchLayout.TouchLayoutKeySp;
-import { type DeviceSpec } from "@keymanapp/web-utils";
+import { type DeviceSpec } from "keyman/common/web-utils";
 
 // TS 3.9 changed behavior of getters to make them
 // non-enumerable by default. This broke our 'polyfill'
diff --git a/web/src/engine/src/keyboard/keyboards/defaultLayouts.ts b/web/src/engine/src/keyboard/keyboards/defaultLayouts.ts
index 4231d1d5e82..263e188cc5a 100644
--- a/web/src/engine/src/keyboard/keyboards/defaultLayouts.ts
+++ b/web/src/engine/src/keyboard/keyboards/defaultLayouts.ts
@@ -3,7 +3,7 @@
    Copyright 2017 SIL International
 ***/
 
-import { Version, deepCopy } from "@keymanapp/web-utils";
+import { Version, deepCopy } from "keyman/common/web-utils";
 import { KeymanWebKeyboard, ModifierKeyConstants, TouchLayout } from "@keymanapp/common-types";
 
 import EncodedVisualKeyboard = KeymanWebKeyboard.EncodedVisualKeyboard;
diff --git a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
index 3bdcb0ed2fb..631721f9a58 100644
--- a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
@@ -12,7 +12,7 @@ import LayoutSpec = KeymanWebKeyboard.LayoutSpec;
 
 type TouchLayoutSpec = TouchLayout.TouchLayoutPlatform & { isDefault?: boolean};
 
-import { Version, DeviceSpec } from "@keymanapp/web-utils";
+import { Version, DeviceSpec } from "keyman/common/web-utils";
 import { StateKeyMap } from "./stateKeyMap.js";
 
 /**
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardHarness.ts b/web/src/engine/src/keyboard/keyboards/keyboardHarness.ts
index 117b348e9ee..c952dff5502 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardHarness.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardHarness.ts
@@ -1,6 +1,6 @@
 import { JSKeyboard } from "./jsKeyboard.js";
 import { Codes } from "../codes.js";
-import { DeviceSpec } from '@keymanapp/web-utils';
+import { DeviceSpec } from 'keyman/common/web-utils';
 
 /**
  * Defines members of the top-level `keyman` global object necessary to guarantee
diff --git a/web/src/engine/src/main/headless/contextWindow.ts b/web/src/engine/src/main/headless/contextWindow.ts
index 4829263c7a3..d417cbbfa37 100644
--- a/web/src/engine/src/main/headless/contextWindow.ts
+++ b/web/src/engine/src/main/headless/contextWindow.ts
@@ -1,6 +1,6 @@
 import { LexicalModelTypes } from '@keymanapp/common-types';
 import { Mock } from "keyman/engine/js-processor";
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 
 export default class ContextWindow implements LexicalModelTypes.Context {
   // Used to limit the range of context replicated for use of keyboard rules within
diff --git a/web/src/engine/src/main/headless/deviceDetector.ts b/web/src/engine/src/main/headless/deviceDetector.ts
index 18fa005e12c..d2a694b693f 100644
--- a/web/src/engine/src/main/headless/deviceDetector.ts
+++ b/web/src/engine/src/main/headless/deviceDetector.ts
@@ -4,7 +4,7 @@
  * Detect the user's device.
  */
 import StyleConstants from './utils/styleConstants.js';
-import { DeviceSpec, Version } from "@keymanapp/web-utils";
+import { DeviceSpec, Version } from "keyman/common/web-utils";
 
 export class DeviceDetector {
   // These correspond directly to the properties & parameters for `DeviceSpec`.
diff --git a/web/src/engine/src/main/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
index 90ce1787b2e..d3a180e56ed 100644
--- a/web/src/engine/src/main/headless/inputProcessor.ts
+++ b/web/src/engine/src/main/headless/inputProcessor.ts
@@ -3,7 +3,7 @@
 import ContextWindow from "./contextWindow.js";
 import { LanguageProcessor }  from "./languageProcessor.js";
 import type { ModelSpec, PathConfiguration }  from "keyman/engine/interfaces";
-import { globalObject, DeviceSpec } from "@keymanapp/web-utils";
+import { globalObject, DeviceSpec } from "keyman/common/web-utils";
 
 import { KM_Core } from 'keyman/engine/core-processor';
 
diff --git a/web/src/engine/src/main/headless/utils/styleConstants.ts b/web/src/engine/src/main/headless/utils/styleConstants.ts
index ce64c16959c..e948957a741 100644
--- a/web/src/engine/src/main/headless/utils/styleConstants.ts
+++ b/web/src/engine/src/main/headless/utils/styleConstants.ts
@@ -1,4 +1,4 @@
-import { DeviceSpec } from "@keymanapp/web-utils";
+import { DeviceSpec } from "keyman/common/web-utils";
 
 /*
  * This file is intended for CSS-styling constants that see use with the OSK.
diff --git a/web/src/engine/src/main/keymanEngineBase.ts b/web/src/engine/src/main/keymanEngineBase.ts
index be7a2109f8c..cf18d852674 100644
--- a/web/src/engine/src/main/keymanEngineBase.ts
+++ b/web/src/engine/src/main/keymanEngineBase.ts
@@ -16,7 +16,7 @@ import { HardKeyboardBase } from "./hardKeyboardBase.js";
 import { LegacyAPIEvents } from "./legacyAPIEvents.js";
 import { EventNames, EventListener, LegacyEventEmitter } from "keyman/engine/events";
 import KEYMAN_VERSION from "@keymanapp/keyman-version";
-import { KMWString } from "@keymanapp/web-utils";
+import { KMWString } from "keyman/common/web-utils";
 
 // From https://stackoverflow.com/a/69328045
 type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] };
diff --git a/web/src/engine/src/osk/banner/bannerController.ts b/web/src/engine/src/osk/banner/bannerController.ts
index aae9b643b8d..672937ca684 100644
--- a/web/src/engine/src/osk/banner/bannerController.ts
+++ b/web/src/engine/src/osk/banner/bannerController.ts
@@ -1,4 +1,4 @@
-import { DeviceSpec } from '@keymanapp/web-utils';
+import { DeviceSpec } from 'keyman/common/web-utils';
 import type { PredictionContext, StateChangeEnum } from 'keyman/engine/interfaces';
 import { ImageBanner } from './imageBanner.js';
 import { SuggestionBanner } from './suggestionBanner.js';
diff --git a/web/src/engine/src/osk/banner/bannerGestureSet.ts b/web/src/engine/src/osk/banner/bannerGestureSet.ts
index 585f42360cf..99d78758fc8 100644
--- a/web/src/engine/src/osk/banner/bannerGestureSet.ts
+++ b/web/src/engine/src/osk/banner/bannerGestureSet.ts
@@ -1,4 +1,4 @@
-import { deepCopy } from '@keymanapp/web-utils';
+import { deepCopy } from 'keyman/common/web-utils';
 
 import {
   gestures,
diff --git a/web/src/engine/src/osk/config/commonConfiguration.ts b/web/src/engine/src/osk/config/commonConfiguration.ts
index 36d06f29749..b56f1e027b5 100644
--- a/web/src/engine/src/osk/config/commonConfiguration.ts
+++ b/web/src/engine/src/osk/config/commonConfiguration.ts
@@ -1,4 +1,4 @@
-import { DeviceSpec } from "@keymanapp/web-utils";
+import { DeviceSpec } from "keyman/common/web-utils";
 
 import EmbeddedGestureConfig from './embeddedGestureConfig.js';
 import { OSKResourcePathConfiguration } from "keyman/engine/interfaces";
diff --git a/web/src/engine/src/osk/fontSizeUtils.ts b/web/src/engine/src/osk/fontSizeUtils.ts
index 072d9a5f1a5..eb4e7084af9 100644
--- a/web/src/engine/src/osk/fontSizeUtils.ts
+++ b/web/src/engine/src/osk/fontSizeUtils.ts
@@ -1,4 +1,4 @@
-import { DeviceSpec } from "@keymanapp/web-utils";
+import { DeviceSpec } from "keyman/common/web-utils";
 import { ParsedLengthStyle } from "./lengthStyle.js";
 
 export function getFontSizeStyle(e: HTMLElement|string): {val: number, absolute: boolean} {
diff --git a/web/src/engine/src/osk/screenUtils.ts b/web/src/engine/src/osk/screenUtils.ts
index 9608a01e0e1..516f80c82cb 100644
--- a/web/src/engine/src/osk/screenUtils.ts
+++ b/web/src/engine/src/osk/screenUtils.ts
@@ -1,5 +1,5 @@
 import { landscapeView } from "keyman/engine/dom-utils";
-import { DeviceSpec } from "@keymanapp/web-utils";
+import { DeviceSpec } from "keyman/common/web-utils";
 
 /**
  * Get viewport scale factor for this document
diff --git a/web/src/engine/src/osk/views/touchEventPromiseMap.ts b/web/src/engine/src/osk/views/touchEventPromiseMap.ts
index 32531e67166..939f3668bb4 100644
--- a/web/src/engine/src/osk/views/touchEventPromiseMap.ts
+++ b/web/src/engine/src/osk/views/touchEventPromiseMap.ts
@@ -1,4 +1,4 @@
-import { ManagedPromise } from "@keymanapp/web-utils";
+import { ManagedPromise } from "keyman/common/web-utils";
 
 export default class TouchEventPromiseMap {
   private map: Map<number, ManagedPromise<void>> = new Map();
diff --git a/web/src/engine/tsconfig.json b/web/src/engine/tsconfig.json
index d475e297af9..bf7f732dcb9 100644
--- a/web/src/engine/tsconfig.json
+++ b/web/src/engine/tsconfig.json
@@ -2,14 +2,14 @@
   "extends": "../tsconfig.dom.json",
 
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "../../build/engine/obj/",
     "tsBuildInfoFile": "../../build/engine/obj/tsconfig.tsbuildinfo",
     "rootDir": "./src",
-    "paths": {
-      "keyman/engine/*": ["./src/*/index.js"]
-    },
   },
 
   "include": [ "src/**/*.ts", "src/core-processor/import/*.js" ],
+
+  "references": [
+    { "path": "../common/web-utils" }
+  ]
 }
diff --git a/web/src/test/auto/dom/cases/attachment/outputTargetForElement.def.ts b/web/src/test/auto/dom/cases/attachment/outputTargetForElement.def.ts
index e90e0021b23..3ff6577a5d8 100644
--- a/web/src/test/auto/dom/cases/attachment/outputTargetForElement.def.ts
+++ b/web/src/test/auto/dom/cases/attachment/outputTargetForElement.def.ts
@@ -11,7 +11,7 @@ import {
   PageAttachmentOptions,
 } from 'keyman/engine/attachment';
 
-import { timedPromise } from '@keymanapp/web-utils';
+import { timedPromise } from 'keyman/common/web-utils';
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
 import sinon from 'sinon';
 
diff --git a/web/src/test/auto/dom/cases/attachment/pageContextAttachment.tests.ts b/web/src/test/auto/dom/cases/attachment/pageContextAttachment.tests.ts
index dd393aab66a..9ea5e97bb9c 100644
--- a/web/src/test/auto/dom/cases/attachment/pageContextAttachment.tests.ts
+++ b/web/src/test/auto/dom/cases/attachment/pageContextAttachment.tests.ts
@@ -1,5 +1,5 @@
 import { PageContextAttachment } from 'keyman/engine/attachment';
-import { DeviceSpec, timedPromise } from '@keymanapp/web-utils';
+import { DeviceSpec, timedPromise } from 'keyman/common/web-utils';
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
 
 import { assert } from 'chai';
diff --git a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
index fa397f8e154..7aa059c8626 100644
--- a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
+++ b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
@@ -9,7 +9,7 @@ import { KeyboardHarness, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { DOMKeyboardLoader } from 'keyman/engine/keyboard';
 import { loadKeyboardsFromStubs } from '../../kbdLoader.js';
 
-import { DeviceSpec, ManagedPromise, timedPromise } from '@keymanapp/web-utils';
+import { DeviceSpec, ManagedPromise, timedPromise } from 'keyman/common/web-utils';
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
 import sinon from 'sinon';
 
diff --git a/web/src/test/auto/dom/cases/keyboard-storage/cloudQueries.tests.ts b/web/src/test/auto/dom/cases/keyboard-storage/cloudQueries.tests.ts
index 441ec9f992a..7174d6e4821 100644
--- a/web/src/test/auto/dom/cases/keyboard-storage/cloudQueries.tests.ts
+++ b/web/src/test/auto/dom/cases/keyboard-storage/cloudQueries.tests.ts
@@ -3,7 +3,7 @@ import sinon from 'sinon';
 
 import { CloudQueryEngine, type KeyboardStub, DOMCloudRequester } from 'keyman/engine/keyboard-storage';
 import { PathConfiguration } from 'keyman/engine/interfaces';
-import { ManagedPromise } from '@keymanapp/web-utils';
+import { ManagedPromise } from 'keyman/common/web-utils';
 
 const pathConfig = new PathConfiguration({
   root: '',
diff --git a/web/src/test/auto/dom/cases/osk/activation.tests.ts b/web/src/test/auto/dom/cases/osk/activation.tests.ts
index a78c5f0d4a5..c567e143158 100644
--- a/web/src/test/auto/dom/cases/osk/activation.tests.ts
+++ b/web/src/test/auto/dom/cases/osk/activation.tests.ts
@@ -2,7 +2,7 @@ import * as KeymanOSK from 'keyman/engine/osk';
 import { DeviceDetector } from 'keyman/engine/main';
 
 import { loadKeyboardsFromStubs } from '../../kbdLoader.js';
-import { timedPromise } from '@keymanapp/web-utils';
+import { timedPromise } from 'keyman/common/web-utils';
 
 import { assert } from 'chai';
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
diff --git a/web/src/test/auto/dom/cases/osk/events.tests.ts b/web/src/test/auto/dom/cases/osk/events.tests.ts
index c0a5932c0b2..2453e8213d4 100644
--- a/web/src/test/auto/dom/cases/osk/events.tests.ts
+++ b/web/src/test/auto/dom/cases/osk/events.tests.ts
@@ -2,7 +2,7 @@ import * as KeymanOSK from 'keyman/engine/osk';
 import { DeviceDetector } from 'keyman/engine/main';
 
 import { loadKeyboardsFromStubs } from '../../kbdLoader.js';
-import { timedPromise } from '@keymanapp/web-utils';
+import { timedPromise } from 'keyman/common/web-utils';
 
 import sinon from 'sinon';
 
diff --git a/web/src/test/auto/headless/app/browser/hardware-event-processing.tests.ts b/web/src/test/auto/headless/app/browser/hardware-event-processing.tests.ts
index 0643c88a862..0da4588a085 100644
--- a/web/src/test/auto/headless/app/browser/hardware-event-processing.tests.ts
+++ b/web/src/test/auto/headless/app/browser/hardware-event-processing.tests.ts
@@ -3,7 +3,7 @@ import { assert } from 'chai';
 import { preprocessKeyboardEvent } from 'keyman/app/browser';
 import { processForMnemonicsAndLegacy } from 'keyman/engine/main';
 import { PhysicalInputEventSpec } from '@keymanapp/recorder-core';
-import { DeviceSpec } from '@keymanapp/web-utils';
+import { DeviceSpec } from 'keyman/common/web-utils';
 import { Codes, JSKeyboard, KeyEvent } from 'keyman/engine/keyboard';
 
 const ModifierCodes = Codes.modifierCodes;
diff --git a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
index 591065102d0..792f60bb670 100644
--- a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
@@ -4,7 +4,7 @@ import fs from 'fs';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 import { Codes, KeyEvent, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, JSKeyboardProcessor, Mock } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
diff --git a/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js b/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js
index d21cc54c442..82fbdfb950a 100644
--- a/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 
 import { Mock, findCommonSubstringEndIndex } from 'keyman/engine/js-processor';
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 
 // A unicode-coding like alias for use in constructing non-BMP strings.
 const u = String.fromCodePoint;
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js
index b6c5f2f4cc9..7892178dfc0 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 import sinon from 'sinon';
 
-import { ManagedPromise } from '@keymanapp/web-utils';
+import { ManagedPromise } from 'keyman/common/web-utils';
 import { CloudQueryEngine, StubAndKeyboardCache, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage';
 import { PathConfiguration } from 'keyman/engine/interfaces';
 import NodeCloudRequester from '../../../resources/loader/nodeCloudRequester.js';
diff --git a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
index c5226137a86..4d9e2807cb8 100644
--- a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
@@ -11,7 +11,7 @@ import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader
 import { KeyboardTest } from '@keymanapp/recorder-core';
 
 import { Worker } from '@keymanapp/lexical-model-layer/node';
-import * as utils from '@keymanapp/web-utils';
+import * as utils from 'keyman/common/web-utils';
 const KMWString = utils.KMWString;
 
 // Required initialization setup.
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/asyncClosureDispatchQueue.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/asyncClosureDispatchQueue.tests.ts
index 553322f7032..469642451f5 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/asyncClosureDispatchQueue.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/asyncClosureDispatchQueue.tests.ts
@@ -1,7 +1,7 @@
 import { assert } from 'chai'
 import { default as sinon, type SinonSpy } from 'sinon';
 import { AsyncClosureDispatchQueue, type QueueClosure } from 'keyman/engine/gesture-processor';
-import { ManagedPromise, timedPromise } from '@keymanapp/web-utils';
+import { ManagedPromise, timedPromise } from 'keyman/common/web-utils';
 
 type ClosureSpy = SinonSpy<[], ReturnType<QueueClosure>>;
 
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gesturePath.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gesturePath.tests.ts
index a878c5fbd68..9df87a7b68e 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gesturePath.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gesturePath.tests.ts
@@ -5,7 +5,7 @@ import url from 'url';
 import fs from 'fs';
 
 import { GestureDebugPath } from 'keyman/engine/gesture-processor';
-import { timedPromise } from '@keymanapp/web-utils';
+import { timedPromise } from 'keyman/common/web-utils';
 import { TouchpathTurtle } from '#gesture-tools';
 
 // Ensures that the resources are resolved relative to this script's source, not
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureSequence.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureSequence.tests.ts
index 527c6427684..2b0fbd32ded 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureSequence.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureSequence.tests.ts
@@ -17,7 +17,7 @@ const getGestureModelSet = gestures.specs.getGestureModelSet;
 const modelSetForAction = gestures.matchers.modelSetForAction;
 
 import { HeadlessInputEngine, TouchpathTurtle } from '#gesture-tools';
-import { ManagedPromise, timedPromise } from '@keymanapp/web-utils';
+import { ManagedPromise, timedPromise } from 'keyman/common/web-utils';
 
 import { assertGestureSequence, SequenceAssertion } from "../../../../../resources/sequenceAssertions.js";
 
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/matcherSelector.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/matcherSelector.tests.ts
index cdc7e3e7af0..9ed3b846a07 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/matcherSelector.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/matcherSelector.tests.ts
@@ -7,7 +7,7 @@ import { assertingPromiseStatus as promiseStatus } from '../../../../../resource
 
 import { simulateMultiSourceMatcherInput, simulateSelectorInput } from "../../../../../resources/simulateMultiSourceInput.js";
 
-import { timedPromise } from '@keymanapp/web-utils';
+import { timedPromise } from 'keyman/common/web-utils';
 import { gestures } from 'keyman/engine/gesture-processor';
 
 import { TouchpathTurtle } from '#gesture-tools';
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/pathMatcher.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/pathMatcher.tests.ts
index 2b6e6d5b1a0..703057edb1e 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/pathMatcher.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/pathMatcher.tests.ts
@@ -6,7 +6,7 @@ const PromiseStatuses     = PromiseStatusModule.PromiseStatuses;
 import { assertingPromiseStatus as promiseStatus } from '../../../../../resources/assertingPromiseStatus.js';
 
 import { InputSample, GestureSource, gestures, CumulativePathStats } from 'keyman/engine/gesture-processor';
-import { timedPromise } from '@keymanapp/web-utils';
+import { timedPromise } from 'keyman/common/web-utils';
 
 import {
   InstantRejectionModel,
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts
index 221c607406a..0deb01224cf 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts
@@ -12,7 +12,7 @@ const { GestureSequence } = matchers;
 type GestureSequence<Type> = gestures.matchers.GestureSequence<Type>;
 
 import { HeadlessInputEngine, TouchpathTurtle } from '#gesture-tools';
-import { ManagedPromise, timedPromise } from '@keymanapp/web-utils';
+import { ManagedPromise, timedPromise } from 'keyman/common/web-utils';
 
 import { assertGestureSequence, SequenceAssertion } from "../../../../../resources/sequenceAssertions.js";
 
diff --git a/web/src/test/auto/headless/engine/osk/visualKeyboard.tests.ts b/web/src/test/auto/headless/engine/osk/visualKeyboard.tests.ts
index 80788976c64..7da977c6855 100644
--- a/web/src/test/auto/headless/engine/osk/visualKeyboard.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/visualKeyboard.tests.ts
@@ -9,7 +9,7 @@ import { JSDOM } from 'jsdom';
 import { VisualKeyboard } from 'keyman/engine/osk';
 import { ActiveLayout, JSKeyboard, KeyboardProperties } from 'keyman/engine/keyboard';
 import { StylesheetManager } from 'keyman/engine/dom-utils';
-import { DeviceSpec } from "@keymanapp/web-utils";
+import { DeviceSpec } from "keyman/common/web-utils";
 
 describe('VisualKeyboard', () => {
   let dom: JSDOM;
diff --git a/web/src/test/auto/headless/engine/predictive-text/templates/helpers.ts b/web/src/test/auto/headless/engine/predictive-text/templates/helpers.ts
index 9ac77233d2b..f39cde9fa11 100644
--- a/web/src/test/auto/headless/engine/predictive-text/templates/helpers.ts
+++ b/web/src/test/auto/headless/engine/predictive-text/templates/helpers.ts
@@ -8,7 +8,7 @@ import { LexicalModelTypes } from '@keymanapp/common-types';
 // TODO: then mocha invocation is as follows:
 // TODO:     mocha -r @keymanapp/models-test-helpers test/
 
-import { KMWString } from '@keymanapp/web-utils';
+import { KMWString } from 'keyman/common/web-utils';
 
 // The predictive-text engine always keeps these enabled.
 KMWString.enableSupplementaryPlane(true);
diff --git a/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-tracker.tests.ts b/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-tracker.tests.ts
index 22171c92a13..c8bdd170976 100644
--- a/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-tracker.tests.ts
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-tracker.tests.ts
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 
 import { default as defaultBreaker } from '@keymanapp/models-wordbreakers';
-import { deepCopy } from '@keymanapp/web-utils';
+import { deepCopy } from 'keyman/common/web-utils';
 import { jsonFixture } from '@keymanapp/common-test-resources/model-helpers.mjs';
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
diff --git a/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/distance-modeler.tests.ts b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/distance-modeler.tests.ts
index da9ce9acef3..8eede09ea4d 100644
--- a/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/distance-modeler.tests.ts
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/distance-modeler.tests.ts
@@ -9,7 +9,7 @@
 
 import { assert } from 'chai';
 
-import { PriorityQueue } from '@keymanapp/web-utils';
+import { PriorityQueue } from 'keyman/common/web-utils';
 import { jsonFixture } from '@keymanapp/common-test-resources/model-helpers.mjs';
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
diff --git a/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/predict-from-corrections.tests.ts b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/predict-from-corrections.tests.ts
index 54eec729554..2351ff99320 100644
--- a/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/predict-from-corrections.tests.ts
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/predict-from-corrections.tests.ts
@@ -1,7 +1,7 @@
 
 import { assert } from 'chai';
 
-import { deepCopy } from "@keymanapp/web-utils";
+import { deepCopy } from "keyman/common/web-utils";
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
 import { models, predictFromCorrections, tupleDisplayOrderSort } from "@keymanapp/lm-worker/test-index";
diff --git a/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-deduplication.tests.ts b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-deduplication.tests.ts
index eea66d8ad0a..bfd2eeefafc 100644
--- a/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-deduplication.tests.ts
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-deduplication.tests.ts
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 
 import * as wordBreakers from '@keymanapp/models-wordbreakers';
-import { deepCopy } from '@keymanapp/web-utils';
+import { deepCopy } from 'keyman/common/web-utils';
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
 import { CorrectionPredictionTuple, dedupeSuggestions, models } from "@keymanapp/lm-worker/test-index";
diff --git a/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-finalization.tests.ts b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-finalization.tests.ts
index e79af94304b..74a394463f4 100644
--- a/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-finalization.tests.ts
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-finalization.tests.ts
@@ -1,7 +1,7 @@
 
 import { assert } from 'chai';
 
-import { deepCopy } from '@keymanapp/web-utils';
+import { deepCopy } from 'keyman/common/web-utils';
 import * as wordBreakers from '@keymanapp/models-wordbreakers';
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
diff --git a/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-similarity.tests.ts b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-similarity.tests.ts
index ae5133cf4b2..f1ab68c0b45 100644
--- a/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-similarity.tests.ts
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-similarity.tests.ts
@@ -2,7 +2,7 @@ import { assert } from 'chai';
 
 import { QuoteBehavior } from "@keymanapp/models-templates";
 import * as wordBreakers from '@keymanapp/models-wordbreakers';
-import { deepCopy } from '@keymanapp/web-utils';
+import { deepCopy } from 'keyman/common/web-utils';
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
 import { CorrectionPredictionTuple, models, processSimilarity, SuggestionSimilarity, toAnnotatedSuggestion } from "@keymanapp/lm-worker/test-index";
diff --git a/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict.tests.ts b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict.tests.ts
index 8099215bdf5..ffe25f1120c 100644
--- a/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict.tests.ts
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict.tests.ts
@@ -5,7 +5,7 @@ import sinon from 'sinon';
 import { LexicalModelTypes } from '@keymanapp/common-types';
 import { configWorker, createMessageEventWithData, emptyContext, iGotDistractedByHazel,
          importScriptsWith, randomToken, zeroTransform } from '@keymanapp/common-test-resources/model-helpers.mjs';
-import { timedPromise } from '@keymanapp/web-utils';
+import { timedPromise } from 'keyman/common/web-utils';
 
 import { LMLayerWorker } from '@keymanapp/lm-worker/test-index';
 import { OutgoingMessage } from '@keymanapp/lm-message-types';
diff --git a/web/src/test/auto/integrated/cases/events.tests.ts b/web/src/test/auto/integrated/cases/events.tests.ts
index 952b87347a1..29a9e24d1b5 100644
--- a/web/src/test/auto/integrated/cases/events.tests.ts
+++ b/web/src/test/auto/integrated/cases/events.tests.ts
@@ -9,7 +9,7 @@ import {
 import * as KMWRecorder from '#recorder';
 import OSKInputEventSpec = KMWRecorder.OSKInputEventSpec;
 
-import { timedPromise } from '@keymanapp/web-utils';
+import { timedPromise } from 'keyman/common/web-utils';
 import { type KeymanEngine } from 'keyman/app/browser';
 
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
diff --git a/web/src/test/auto/integrated/cases/text_selection.tests.ts b/web/src/test/auto/integrated/cases/text_selection.tests.ts
index 2fde53bc3cb..9bc9de9cd4b 100644
--- a/web/src/test/auto/integrated/cases/text_selection.tests.ts
+++ b/web/src/test/auto/integrated/cases/text_selection.tests.ts
@@ -7,7 +7,7 @@ import {
   teardownKMW
 } from "../test_utils.js";
 import * as KMWRecorder from '#recorder';
-import { timedPromise } from '@keymanapp/web-utils';
+import { timedPromise } from 'keyman/common/web-utils';
 import { type KeymanEngine } from 'keyman/app/browser';
 
 type WindowKey = keyof typeof window;
diff --git a/web/src/test/auto/integrated/tsconfig.json b/web/src/test/auto/integrated/tsconfig.json
index e0de4828c42..adf40830d63 100644
--- a/web/src/test/auto/integrated/tsconfig.json
+++ b/web/src/test/auto/integrated/tsconfig.json
@@ -2,7 +2,6 @@
   "extends": "../../../tsconfig.dom.json",
 
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "../../../build/test",
     "rootDir": "."
   },
diff --git a/web/src/test/auto/resources/loader/nodeKeyboardLoader.ts b/web/src/test/auto/resources/loader/nodeKeyboardLoader.ts
index 9956c1ca265..ee737eb206c 100644
--- a/web/src/test/auto/resources/loader/nodeKeyboardLoader.ts
+++ b/web/src/test/auto/resources/loader/nodeKeyboardLoader.ts
@@ -1,7 +1,7 @@
 import vm from 'node:vm';
 import { readFile } from 'node:fs/promises';
 
-import { globalObject } from '@keymanapp/web-utils';
+import { globalObject } from 'keyman/common/web-utils';
 
 import { JSKeyboard, KeyboardHarness, MinimalKeymanGlobal, KeyboardLoaderBase, KeyboardLoadErrorBuilder } from 'keyman/engine/keyboard';
 
diff --git a/web/src/test/auto/resources/loader/tsconfig.node.json b/web/src/test/auto/resources/loader/tsconfig.node.json
index 4a06decf4c4..0f657843ac3 100644
--- a/web/src/test/auto/resources/loader/tsconfig.node.json
+++ b/web/src/test/auto/resources/loader/tsconfig.node.json
@@ -2,7 +2,6 @@
   "extends": "../../../../../../tsconfig.base.json",
   "compilerOptions": {
     "types": [ "node" ],
-    "baseUrl": "../../../",
     "outDir": "../../../../../../build/engine/keyboard/obj/keyboards/loaders/",
     "tsBuildInfoFile": "../../../../../../build/engine/keyboard/obj/keyboards/loaders/tsconfig.node.tsbuildinfo",
     "rootDir": "."
diff --git a/web/src/test/auto/resources/sequenceAssertions.ts b/web/src/test/auto/resources/sequenceAssertions.ts
index 7a5414d8ff8..6c349f72fed 100644
--- a/web/src/test/auto/resources/sequenceAssertions.ts
+++ b/web/src/test/auto/resources/sequenceAssertions.ts
@@ -13,7 +13,7 @@ const { GestureSequence, GestureStageReport } = matchers;
 type GestureSequence<Type> = gestures.matchers.GestureSequence<Type>;
 type GestureStageReport<Type> = gestures.matchers.GestureStageReport<Type>;
 
-import { ManagedPromise } from '@keymanapp/web-utils';
+import { ManagedPromise } from 'keyman/common/web-utils';
 
 export interface StageReportAssertion<Type> {
   matchedId: string,
diff --git a/web/src/test/auto/resources/simulateMultiSourceInput.ts b/web/src/test/auto/resources/simulateMultiSourceInput.ts
index 2d450498f5f..cf7c2516cdc 100644
--- a/web/src/test/auto/resources/simulateMultiSourceInput.ts
+++ b/web/src/test/auto/resources/simulateMultiSourceInput.ts
@@ -1,5 +1,5 @@
 import { InputSample, buildGestureMatchInspector, GestureSource, GestureSourceSubview, gestures } from 'keyman/engine/gesture-processor';
-import { ManagedPromise, timedPromise } from '@keymanapp/web-utils';
+import { ManagedPromise, timedPromise } from 'keyman/common/web-utils';
 
 type GestureMatcher<Type> = gestures.matchers.GestureMatcher<Type>;
 type MatcherSelection<Type> = gestures.matchers.MatcherSelection<Type>;
diff --git a/web/src/test/auto/tsconfig.json b/web/src/test/auto/tsconfig.json
index 36c43d22d0b..506b0610d46 100644
--- a/web/src/test/auto/tsconfig.json
+++ b/web/src/test/auto/tsconfig.json
@@ -2,13 +2,9 @@
   "extends": "../../tsconfig.dom.json",
 
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "../../../build/test",
     "tsBuildInfoFile": "../../../build/test/tsconfig.tsbuildinfo",
     "rootDir": ".",
-    "paths": {
-      "keyman/engine/*": ["../../engine/src/*/index.js"],
-    },
   },
 
   "include": [
diff --git a/web/src/tools/building/sourcemap-root/tsconfig.json b/web/src/tools/building/sourcemap-root/tsconfig.json
index c5683503221..e7df68d733a 100644
--- a/web/src/tools/building/sourcemap-root/tsconfig.json
+++ b/web/src/tools/building/sourcemap-root/tsconfig.json
@@ -3,7 +3,6 @@
   "compilerOptions": {
     "outDir": "../../../../build/tools/building/sourcemap-root",
     "tsBuildInfoFile": "../../../../build/tools/building/sourcemap-root/tsconfig.tsbuildinfo",
-    "baseUrl": "./",
     "rootDir": "./",
 
     // override for now, see #11716
diff --git a/web/src/tools/es-bundling/tsconfig.json b/web/src/tools/es-bundling/tsconfig.json
index 1c317aabec6..b0338768aac 100644
--- a/web/src/tools/es-bundling/tsconfig.json
+++ b/web/src/tools/es-bundling/tsconfig.json
@@ -2,7 +2,6 @@
   "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "allowSyntheticDefaultImports": true,
-    "baseUrl": "./",
     "outDir": "build/",
     "tsBuildInfoFile": "build/tsconfig.tsbuildinfo",
     "rootDir": "./src"
diff --git a/web/src/tools/testing/bulk_rendering/renderer_core.ts b/web/src/tools/testing/bulk_rendering/renderer_core.ts
index 5bdd1527d1d..9086c7b4ec5 100644
--- a/web/src/tools/testing/bulk_rendering/renderer_core.ts
+++ b/web/src/tools/testing/bulk_rendering/renderer_core.ts
@@ -1,6 +1,6 @@
 // Includes KeymanWeb's Device class, as it's quite a useful resource for KMW-related projects.
 import { DeviceDetector } from 'keyman/engine/main';
-import { type DeviceSpec } from '@keymanapp/web-utils';
+import { type DeviceSpec } from 'keyman/common/web-utils';
 
 import type { KeymanEngine } from 'keyman/app/browser';
 import { JSKeyboard, type FloatingOSKView } from 'keyman/engine/osk';
diff --git a/web/src/tools/testing/bulk_rendering/tsconfig.json b/web/src/tools/testing/bulk_rendering/tsconfig.json
index f1cac77f87b..65b54a0a647 100644
--- a/web/src/tools/testing/bulk_rendering/tsconfig.json
+++ b/web/src/tools/testing/bulk_rendering/tsconfig.json
@@ -2,13 +2,9 @@
   "extends": "../../../tsconfig.dom.json",
 
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "../../../../build/tools/testing/bulk_rendering/obj/",
     "tsBuildInfoFile": "../../../../build/tools/testing/bulk_rendering/obj/tsconfig.tsbuildinfo",
     "rootDir": ".",
-    "paths": {
-      "keyman/engine/*": ["../../../engine/src/*/index.js"],
-    },
   },
 
   "files": [
diff --git a/web/src/tools/testing/gesture-processor/unit-test-resources/src/headlessInputEngine.ts b/web/src/tools/testing/gesture-processor/unit-test-resources/src/headlessInputEngine.ts
index c0d67fe740b..adec117ec1e 100644
--- a/web/src/tools/testing/gesture-processor/unit-test-resources/src/headlessInputEngine.ts
+++ b/web/src/tools/testing/gesture-processor/unit-test-resources/src/headlessInputEngine.ts
@@ -5,7 +5,7 @@ import {
 } from 'keyman/engine/gesture-processor';
 
 import { RecordedCoordSequenceSet } from './inputRecording.js';
-import { timedPromise } from '@keymanapp/web-utils';
+import { timedPromise } from 'keyman/common/web-utils';
 
 export class HeadlessInputEngine<Type = any> extends InputEngineBase<Type> {
   private PATH_ID_SEED = 1;
diff --git a/web/src/tools/testing/gesture-processor/unit-test-resources/tsconfig.json b/web/src/tools/testing/gesture-processor/unit-test-resources/tsconfig.json
index 1b878f20402..ad1b766227c 100644
--- a/web/src/tools/testing/gesture-processor/unit-test-resources/tsconfig.json
+++ b/web/src/tools/testing/gesture-processor/unit-test-resources/tsconfig.json
@@ -1,14 +1,10 @@
 {
   "extends": "../../../../../../tsconfig.base.json",
   "compilerOptions": {
-    "baseUrl": "./",
     "lib": [ "dom", "es6" ],
     "outDir": "../../../../../build/tools/testing/gesture-processor/unit-test-resources/obj",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../../../../build/tools/testing/gesture-processor/unit-test-resources/tsconfig.tsbuildinfo",
-    "paths": {
-      "keyman/engine/*": [ "../../../../engine/src/*/index.js" ],
-    },
   },
   "references": [
     { "path": "../../../../engine/" }
diff --git a/web/src/tools/testing/recorder-core/package.json b/web/src/tools/testing/recorder-core/package.json
index 6bec4354ae3..ad059271e43 100644
--- a/web/src/tools/testing/recorder-core/package.json
+++ b/web/src/tools/testing/recorder-core/package.json
@@ -20,8 +20,7 @@
   "homepage": "https://github.com/keymanapp/keyman#readme",
   "dependencies": {
     "@keymanapp/common-types": "*",
-    "@keymanapp/keyman-version": "*",
-    "@keymanapp/web-utils": "*"
+    "@keymanapp/keyman-version": "*"
   },
   "devDependencies": {
     "typescript": "^5.4.5"
diff --git a/web/src/tools/testing/recorder-core/src/index.ts b/web/src/tools/testing/recorder-core/src/index.ts
index 60ab11a8431..fead195e9fc 100644
--- a/web/src/tools/testing/recorder-core/src/index.ts
+++ b/web/src/tools/testing/recorder-core/src/index.ts
@@ -6,7 +6,7 @@ import Proctor from "./proctor.js";
 export { default as Proctor } from "./proctor.js";
 export { default as NodeProctor } from "./nodeProctor.js";
 
-import * as utils from "@keymanapp/web-utils";
+import * as utils from "keyman/common/web-utils";
 
 type EventTypeTag = 'key' | 'osk';
 type TaggedEventObject = { type: EventTypeTag }
diff --git a/web/src/tools/testing/recorder-core/src/nodeProctor.ts b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
index 72980a528f5..87acea7f57f 100644
--- a/web/src/tools/testing/recorder-core/src/nodeProctor.ts
+++ b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
@@ -11,7 +11,7 @@ import {
 import { KeyEvent, KeyEventSpec, KeyboardHarness, type OutputTargetInterface } from "keyman/engine/keyboard";
 // TODO-web-core: remove usage of OutputTargetBase, use OutputTargetInterface instead
 import { Mock, OutputTargetBase } from 'keyman/engine/js-processor';
-import { DeviceSpec } from "@keymanapp/web-utils";
+import { DeviceSpec } from "keyman/common/web-utils";
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 
 export default class NodeProctor extends Proctor {
diff --git a/web/src/tools/testing/recorder-core/src/proctor.ts b/web/src/tools/testing/recorder-core/src/proctor.ts
index 533648e88cf..76fe1b24d0a 100644
--- a/web/src/tools/testing/recorder-core/src/proctor.ts
+++ b/web/src/tools/testing/recorder-core/src/proctor.ts
@@ -1,4 +1,4 @@
-import { type DeviceSpec } from "@keymanapp/web-utils";
+import { type DeviceSpec } from "keyman/common/web-utils";
 import { type OutputTargetInterface } from "keyman/engine/keyboard";
 
 import type { KeyboardTest, TestSet, TestSequence } from "./index.js";
diff --git a/web/src/tools/testing/recorder-core/tsconfig.json b/web/src/tools/testing/recorder-core/tsconfig.json
index edff4282dc7..e5b2d6ca5dc 100644
--- a/web/src/tools/testing/recorder-core/tsconfig.json
+++ b/web/src/tools/testing/recorder-core/tsconfig.json
@@ -3,13 +3,9 @@
 
   "compilerOptions": {
     "types": ["node"],
-    "baseUrl": "./",
     "outDir": "./build/obj/",
     "tsBuildInfoFile": "./build/obj/tsconfig.tsbuildinfo",
     "rootDir": "./src",
-    "paths": {
-      "keyman/engine/*": ["../../../engine/src/*/index.js"],
-    },
   },
 
   "include": [
@@ -18,7 +14,7 @@
 
   "references": [
     { "path": "../../../../../common/web/keyman-version" },
-    { "path": "../../../engine/common/web-utils/" },
+    { "path": "../../../common/web-utils/" },
     { "path": "../../../engine/predictive-text/types" },
     { "path": "../../../engine" },
   ],
diff --git a/web/src/tools/testing/recorder/browserDriver.ts b/web/src/tools/testing/recorder/browserDriver.ts
index a0255ae0e04..7be0caed6d7 100644
--- a/web/src/tools/testing/recorder/browserDriver.ts
+++ b/web/src/tools/testing/recorder/browserDriver.ts
@@ -4,7 +4,7 @@ import {
   OSKInputEventSpec,
   PhysicalInputEventSpec
 } from "@keymanapp/recorder-core";
-import { ManagedPromise, timedPromise } from "@keymanapp/web-utils";
+import { ManagedPromise, timedPromise } from "keyman/common/web-utils";
 
 import { type KeymanEngine } from 'keyman/app/browser';
 
diff --git a/web/src/tools/testing/recorder/browserProctor.ts b/web/src/tools/testing/recorder/browserProctor.ts
index cc81b89ceac..159a9460017 100644
--- a/web/src/tools/testing/recorder/browserProctor.ts
+++ b/web/src/tools/testing/recorder/browserProctor.ts
@@ -2,7 +2,7 @@
 // Only BrowserDriver.ts and its prerequisites are needed during actual integrated unit testing.
 /// <reference path="scribe.ts" />
 
-import { type DeviceSpec } from "@keymanapp/web-utils";
+import { type DeviceSpec } from "keyman/common/web-utils";
 
 import { type OutputTargetInterface } from "keyman/engine/keyboard";
 
diff --git a/web/src/tools/testing/recorder/tsconfig.json b/web/src/tools/testing/recorder/tsconfig.json
index bbe5ae58bc0..d6e23c6a9af 100644
--- a/web/src/tools/testing/recorder/tsconfig.json
+++ b/web/src/tools/testing/recorder/tsconfig.json
@@ -1,20 +1,16 @@
 {
   "extends": "../../../tsconfig.dom.json",
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "../../../../build/tools/testing/recorder/obj/",
     "rootDir": ".",
     "tsBuildInfoFile": "../../../../build/tools/testing/recorder/obj/tsconfig.tsbuildinfo",
-    "paths": {
-      "keyman/engine/*": ["../../../engine/src/*/index.js"],
-    },
   },
 
   "include": [ "*.ts" ],
 
   "references": [
     { "path": "../../../../../common/web/keyman-version" },
-    { "path": "../../../engine/common/web-utils" },
+    { "path": "../../../common/web-utils" },
     { "path": "../../../engine/predictive-text/types" },
     { "path": "../../../app/browser" },
     { "path": "../recorder-core" },
diff --git a/web/src/tools/testing/test-utils/tsconfig.json b/web/src/tools/testing/test-utils/tsconfig.json
index 65dfe3a9bfd..190dfc710cf 100644
--- a/web/src/tools/testing/test-utils/tsconfig.json
+++ b/web/src/tools/testing/test-utils/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../../tsconfig.dom.json",
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "../../../../build/tools/testing/test-utils/obj/",
     "rootDir": ".",
     "tsBuildInfoFile": "../../../../build/tools/testing/test-utils/obj/tsconfig.tsbuildinfo"
diff --git a/web/src/tsconfig.all.json b/web/src/tsconfig.all.json
index 0a9ab828dd7..fa882d6f2d5 100644
--- a/web/src/tsconfig.all.json
+++ b/web/src/tsconfig.all.json
@@ -1,18 +1,23 @@
-// Is not `extend`ed by any tsconfigs; this is solely to build all app/ targets.
-// Doesn't bundle them, though, so there are limits to the usefulness of this file.
+// This file lists all the child modules, for completeness. However, there are
+// steps like bundling and sourcing external resources that are not performed by
+// tsc, so there are limits to the usefulness of this file.
 {
-  "extends": "../tsconfig.base.json",
-
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "../build",
-    "tsBuildInfoFile": "../build/tsconfig.all.tsbuildinfo",
-    "rootDir": "./"
-  },
-  "files": [],
   "references": [
     { "path": "app/browser" },
     { "path": "app/webview" },
-    { "path": "app/ui" }
+    { "path": "app/ui" },
+
+    { "path": "common/web-utils" },
+    { "path": "engine/" },
+    { "path": "engine/predictive-text/types/" },
+    { "path": "engine/predictive-text/templates" },
+    { "path": "engine/predictive-text/wordbreakers" },
+    { "path": "engine/predictive-text/worker-main/tsconfig.all.json" },
+    { "path": "engine/predictive-text/worker-thread" },
+    { "path": "tools/testing/gesture-processor/unit-test-resources" },
+    { "path": "engine/sentry-manager/src" },
+
+    { "path": "tools/testing/recorder" },
+    // { "path": "tools/sourcemap-root/tsconfig.json" },
   ],
 }
\ No newline at end of file
diff --git a/web/tsconfig.base.json b/web/tsconfig.base.json
index d1deafecb60..95acf6658af 100644
--- a/web/tsconfig.base.json
+++ b/web/tsconfig.base.json
@@ -16,5 +16,14 @@
     "importHelpers": true,
     "inlineSources": true,
     "sourceMap": true,
+
+    "baseUrl": "./",
+
+    "paths": {
+      // Note: this overrides paths in ../tsconfig.base.json
+      "keyman/common/web-utils": ["./src/common/web-utils/src/index.js"],
+      "keyman/engine/*": ["./src/engine/src/*/index.js"],
+    },
+
   }
 }

From 6cf378daf834331f0a2e2dd040d3d856abef76fb Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 6 Nov 2025 07:51:43 +0100
Subject: [PATCH 121/254] chore(web): address review comments

---
 web/src/engine/{readme.md => src/attachment/README.md} |  0
 web/src/engine/src/events/.c8rc.json                   | 10 ----------
 web/src/engine/src/index.ts                            | 10 +++++++++-
 3 files changed, 9 insertions(+), 11 deletions(-)
 rename web/src/engine/{readme.md => src/attachment/README.md} (100%)
 delete mode 100644 web/src/engine/src/events/.c8rc.json

diff --git a/web/src/engine/readme.md b/web/src/engine/src/attachment/README.md
similarity index 100%
rename from web/src/engine/readme.md
rename to web/src/engine/src/attachment/README.md
diff --git a/web/src/engine/src/events/.c8rc.json b/web/src/engine/src/events/.c8rc.json
deleted file mode 100644
index 65dd2858d45..00000000000
--- a/web/src/engine/src/events/.c8rc.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "check-coverage": false,
-  "clean": true,
-  "exclude-after-remap": true,
-  "reporter": ["text", "text-summary"],
-  "reports-dir": "../../../build/coverage/raw/engine/events",
-  "src": [
-    "src/"
-  ]
-}
\ No newline at end of file
diff --git a/web/src/engine/src/index.ts b/web/src/engine/src/index.ts
index 3fecc8c5a6f..af4fdeb984d 100644
--- a/web/src/engine/src/index.ts
+++ b/web/src/engine/src/index.ts
@@ -1 +1,9 @@
-export * from './main/index.js';
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
+ * This file is present in order to provide a consistent file layout for
+ * bundling; the export is not actually used by other modules; and has just been
+ * chosen as a representative.
+ */
+
+export { KeymanEngineBase } from './main/index.js';

From 5a324c2d4284c82b93c37ffeae44ba009b58e582 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 5 Nov 2025 17:12:50 +0100
Subject: [PATCH 122/254] refactor(web): change default export of
 ContextManager

This change replaces the default export of ContextManager with a regular
export.

Test-bot: skip
---
 web/src/app/browser/src/contextManager.ts        | 2 +-
 web/src/app/browser/src/defaultBrowserRules.ts   | 2 +-
 web/src/app/browser/src/hardwareEventKeyboard.ts | 2 +-
 web/src/app/browser/src/keyboardInterface.ts     | 2 +-
 web/src/app/browser/src/keymanEngine.ts          | 2 +-
 web/src/app/browser/src/oskConfiguration.ts      | 2 +-
 web/src/app/browser/src/test-index.ts            | 2 +-
 web/src/app/webview/src/contextManager.ts        | 2 +-
 web/src/app/webview/src/keymanEngine.ts          | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index d079ea6d9de..a7c3708a267 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -42,7 +42,7 @@ function _SetTargDir(Ptarg: HTMLElement, activeKeyboard: Keyboard) {
   }
 }
 
-export default class ContextManager extends ContextManagerBase<BrowserConfiguration> {
+export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
   private _activeKeyboard: {keyboard: JSKeyboard, metadata: KeyboardStub};
   private cookieManager = new CookieSerializer<KeyboardCookie>('KeymanWeb_Keyboard');
   readonly focusAssistant = new FocusAssistant(() => this.activeTarget?.isForcingScroll());
diff --git a/web/src/app/browser/src/defaultBrowserRules.ts b/web/src/app/browser/src/defaultBrowserRules.ts
index f85baac16de..d6740978d61 100644
--- a/web/src/app/browser/src/defaultBrowserRules.ts
+++ b/web/src/app/browser/src/defaultBrowserRules.ts
@@ -6,7 +6,7 @@ import {
   type TextStore
 } from 'keyman/engine/keyboard';
 
-import ContextManager from './contextManager.js';
+import { ContextManager } from './contextManager.js';
 
 export default class DefaultBrowserRules extends DefaultRules {
   private contextManager: ContextManager;
diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts
index 1ce88937449..4db23cc0d5a 100644
--- a/web/src/app/browser/src/hardwareEventKeyboard.ts
+++ b/web/src/app/browser/src/hardwareEventKeyboard.ts
@@ -7,7 +7,7 @@ import { DomEventTracker } from 'keyman/engine/events';
 import { DesignIFrameElementTextStore, nestedInstanceOf } from 'keyman/engine/element-text-stores';
 import { textStoreForEvent, textStoreForElement } from 'keyman/engine/attachment';
 
-import ContextManager from './contextManager.js';
+import { ContextManager } from './contextManager.js';
 
 type KeyboardState = {
   activeKeyboard: JSKeyboard,
diff --git a/web/src/app/browser/src/keyboardInterface.ts b/web/src/app/browser/src/keyboardInterface.ts
index ded3a1d71ce..dc9a8cbe80d 100644
--- a/web/src/app/browser/src/keyboardInterface.ts
+++ b/web/src/app/browser/src/keyboardInterface.ts
@@ -2,7 +2,7 @@ import { type AbstractElementTextStore } from 'keyman/engine/element-text-stores
 import { FloatingOSKView } from 'keyman/engine/osk';
 import { KeyboardInterfaceBase } from 'keyman/engine/main';
 
-import ContextManager from './contextManager.js';
+import { ContextManager }  from './contextManager.js';
 import { KeymanEngine } from './keymanEngine.js';
 
 export class KeyboardInterface extends KeyboardInterfaceBase<ContextManager> {
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 1479f9be79a..200b205a0a2 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -12,7 +12,7 @@ import KeyboardObject = KeymanWebKeyboard.KeyboardObject;
 
 import * as views from './viewsAnchorpoint.js';
 import { BrowserConfiguration, BrowserInitOptionDefaults, BrowserInitOptionSpec } from './configuration.js';
-import { default as ContextManager } from './contextManager.js';
+import { ContextManager } from './contextManager.js';
 import DefaultBrowserRules from './defaultBrowserRules.js';
 import HardwareEventKeyboard from './hardwareEventKeyboard.js';
 import { FocusStateAPIObject } from './context/focusAssistant.js';
diff --git a/web/src/app/browser/src/oskConfiguration.ts b/web/src/app/browser/src/oskConfiguration.ts
index d9f5764671d..f8ee6360d90 100644
--- a/web/src/app/browser/src/oskConfiguration.ts
+++ b/web/src/app/browser/src/oskConfiguration.ts
@@ -1,6 +1,6 @@
 import { OSKView } from "keyman/engine/osk";
 import { KEYMAN_VERSION } from "@keymanapp/keyman-version";
-import ContextManager from "./contextManager.js";
+import { ContextManager } from "./contextManager.js";
 import { KeymanEngine } from "./keymanEngine.js";
 import { LanguageMenu } from "./languageMenu.js";
 
diff --git a/web/src/app/browser/src/test-index.ts b/web/src/app/browser/src/test-index.ts
index 83df5dc8e76..d094fe7c258 100644
--- a/web/src/app/browser/src/test-index.ts
+++ b/web/src/app/browser/src/test-index.ts
@@ -1,5 +1,5 @@
 export { BrowserConfiguration, BrowserInitOptionSpec } from './configuration.js';
-export { default as ContextManager, KeyboardCookie } from "./contextManager.js";
+export { ContextManager, KeyboardCookie } from "./contextManager.js";
 export { preprocessKeyboardEvent, default as HardwareEventKeyboard } from './hardwareEventKeyboard.js';
 
 export { KeymanEngine } from './keymanEngine.js';
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index dfb6c2fd308..e2057035f38 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -116,7 +116,7 @@ export class HostTextStore extends SyntheticTextStore {
   }
 }
 
-export default class ContextManager extends ContextManagerBase<WebviewConfiguration> {
+export class ContextManager extends ContextManagerBase<WebviewConfiguration> {
   // Change of context?  Just replace the SyntheticTextStore.  Context will be ENTIRELY controlled
   // by whatever is hosting the WebView.  (Some aspects of this context replacement have
   // yet to be modularized at this time, though.)
diff --git a/web/src/app/webview/src/keymanEngine.ts b/web/src/app/webview/src/keymanEngine.ts
index e7d98ee987d..14b63dcc51b 100644
--- a/web/src/app/webview/src/keymanEngine.ts
+++ b/web/src/app/webview/src/keymanEngine.ts
@@ -5,7 +5,7 @@ import { getAbsoluteX, getAbsoluteY } from 'keyman/engine/dom-utils';
 import { toPrefixedKeyboardId, toUnprefixedKeyboardId } from 'keyman/engine/keyboard-storage';
 
 import { WebviewConfiguration, WebviewInitOptionDefaults, WebviewInitOptionSpec } from './configuration.js';
-import ContextManager, { HostTextStore } from './contextManager.js';
+import { ContextManager, HostTextStore } from './contextManager.js';
 import PassthroughKeyboard from './passthroughKeyboard.js';
 import { buildEmbeddedGestureConfig, setupEmbeddedListeners } from './oskConfiguration.js';
 import { WorkerFactory } from '@keymanapp/lexical-model-layer';

From 86a903dcf5636c13a2d450d2165a59dda28b2508 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 6 Nov 2025 15:20:00 +0100
Subject: [PATCH 123/254] refactor(web): move sentry-manager and es-bundling to
 common

sentry-manager is used by Keyman Engine for Android and Keyman Engine
for iOS, but not directly by KeymanWeb, nor does it have any
dependencies on /web. So it does not make sense to keep it under /web.

es-bundling is used by sentry-manager and potentially other /common/web
tools in the future, so moving it under /common/tools makes it more
consistent in the future.

This is part of simplifying the web source tree; these changes do not
make significant build performance differences at this time.

Test-bot: skip
---
 android/KMEA/build.sh                         |   4 +-
 common/tools/es-bundling/.gitignore           |   1 +
 .../tools/es-bundling/README.md               |   0
 .../src => common}/tools/es-bundling/build.sh |   8 +-
 .../tools/es-bundling/src/classTreeshaker.mts |   0
 .../tools/es-bundling/src/common-bundle.mts   |   0
 .../tools/es-bundling/src/configuration.mts   |   0
 .../tools/es-bundling/src/index.mts           |   0
 .../es-bundling/src/tslibTreeshaking.mts      |   0
 .../tools/es-bundling/tsconfig.json           |   2 +-
 common/web/sentry-manager/build.sh            |  35 ++++++
 .../web}/sentry-manager/package.json          |   0
 .../web}/sentry-manager/src/index.ts          |   0
 common/web/sentry-manager/tsconfig.json       |  14 +++
 ios/engine/build.sh                           |   4 +-
 package-lock.json                             | 111 ++++++------------
 package.json                                  |   1 +
 resources/build/node.inc.sh                   |   4 +
 tsconfig.json                                 |   1 +
 web/build.sh                                  |   6 +-
 web/ci.sh                                     |   5 +-
 web/common.inc.sh                             |   2 -
 web/src/app/browser/build.sh                  |   7 +-
 web/src/app/ui/build.sh                       |   6 +-
 web/src/app/webview/build.sh                  |   5 +-
 web/src/app/webview/map-polyfill-bundler.js   |   2 +-
 web/src/common/web-utils/build.sh             |   6 +-
 web/src/engine/build.sh                       |   6 +-
 web/src/engine/predictive-text/build.sh       |   7 --
 .../engine/predictive-text/templates/build.sh |   1 -
 .../predictive-text/worker-main/build.sh      |   6 +-
 .../predictive-text/worker-thread/build.sh    |  11 +-
 web/src/engine/sentry-manager/.gitignore      |  17 ---
 web/src/engine/sentry-manager/build.sh        |  47 --------
 .../engine/sentry-manager/src/tsconfig.json   |  13 --
 web/src/test/manual/build.sh                  |   8 +-
 .../manual/embed/android-harness/build.sh     |   4 +-
 web/src/tools/build.sh                        |   1 -
 web/src/tools/testing/bulk_rendering/build.sh |   3 +-
 .../tools/testing/gesture-processor/build.sh  |   6 +-
 .../unit-test-resources/build-bundler.js      |   7 --
 web/src/tools/testing/recorder/build.sh       |   3 +-
 web/src/tsconfig.all.json                     |   1 -
 43 files changed, 143 insertions(+), 222 deletions(-)
 create mode 100644 common/tools/es-bundling/.gitignore
 rename {web/src => common}/tools/es-bundling/README.md (100%)
 rename {web/src => common}/tools/es-bundling/build.sh (68%)
 rename {web/src => common}/tools/es-bundling/src/classTreeshaker.mts (100%)
 rename {web/src => common}/tools/es-bundling/src/common-bundle.mts (100%)
 rename {web/src => common}/tools/es-bundling/src/configuration.mts (100%)
 rename {web/src => common}/tools/es-bundling/src/index.mts (100%)
 rename {web/src => common}/tools/es-bundling/src/tslibTreeshaking.mts (100%)
 rename {web/src => common}/tools/es-bundling/tsconfig.json (81%)
 create mode 100755 common/web/sentry-manager/build.sh
 rename {web/src/engine => common/web}/sentry-manager/package.json (100%)
 rename {web/src/engine => common/web}/sentry-manager/src/index.ts (100%)
 create mode 100644 common/web/sentry-manager/tsconfig.json
 delete mode 100644 web/src/engine/sentry-manager/.gitignore
 delete mode 100755 web/src/engine/sentry-manager/build.sh
 delete mode 100644 web/src/engine/sentry-manager/src/tsconfig.json
 delete mode 100644 web/src/tools/testing/gesture-processor/unit-test-resources/build-bundler.js

diff --git a/android/KMEA/build.sh b/android/KMEA/build.sh
index f4d77058155..28d9877285c 100755
--- a/android/KMEA/build.sh
+++ b/android/KMEA/build.sh
@@ -23,7 +23,7 @@ JUNIT_RESULTS="##teamcity[importData type='junit' path='keyman\android\KMEA\app\
 
 builder_describe "Builds Keyman Engine for Android." \
   "@/web/src/app/webview" \
-  "@/web/src/engine/sentry-manager" \
+  "@/common/web/sentry-manager" \
   "clean" \
   "configure" \
   "build" \
@@ -81,7 +81,7 @@ if builder_start_action build:engine; then
   cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/kmwosk.css" "$ENGINE_ASSETS/kmwosk.css"
   cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/globe-hint.css" "$ENGINE_ASSETS/globe-hint.css"
   cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/keymanweb-osk.ttf" "$ENGINE_ASSETS/keymanweb-osk.ttf"
-  cp "$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/index.js" "$ENGINE_ASSETS/keyman-sentry.js"
+  cp "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js" "$ENGINE_ASSETS/keyman-sentry.js"
 
   echo "Copying es6-shim polyfill"
   cp "$KEYMAN_ROOT/node_modules/es6-shim/es6-shim.min.js" "$ENGINE_ASSETS/es6-shim.min.js"
diff --git a/common/tools/es-bundling/.gitignore b/common/tools/es-bundling/.gitignore
new file mode 100644
index 00000000000..07ed7069a24
--- /dev/null
+++ b/common/tools/es-bundling/.gitignore
@@ -0,0 +1 @@
+build/*
\ No newline at end of file
diff --git a/web/src/tools/es-bundling/README.md b/common/tools/es-bundling/README.md
similarity index 100%
rename from web/src/tools/es-bundling/README.md
rename to common/tools/es-bundling/README.md
diff --git a/web/src/tools/es-bundling/build.sh b/common/tools/es-bundling/build.sh
similarity index 68%
rename from web/src/tools/es-bundling/build.sh
rename to common/tools/es-bundling/build.sh
index 3a05714120c..8ff7f035f40 100755
--- a/web/src/tools/es-bundling/build.sh
+++ b/common/tools/es-bundling/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
@@ -11,17 +11,17 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 ################################ Main script ################################
 
-builder_describe "Builds KMW's esbuild-oriented common configuration & tooling" \
+builder_describe "esbuild style bundling tooling for web and common/web" \
   "clean" \
   "configure" \
   "build"
 
 builder_describe_outputs \
   configure          /node_modules \
-  build              /web/src/tools/es-bundling/build/index.mjs
+  build              /common/tools/es-bundling/build/index.mjs
 
 builder_parse "$@"
 
 builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action clean      rm -rf build/
-builder_run_action build      tsc -b tsconfig.json
+builder_run_action build      tsc -b
diff --git a/web/src/tools/es-bundling/src/classTreeshaker.mts b/common/tools/es-bundling/src/classTreeshaker.mts
similarity index 100%
rename from web/src/tools/es-bundling/src/classTreeshaker.mts
rename to common/tools/es-bundling/src/classTreeshaker.mts
diff --git a/web/src/tools/es-bundling/src/common-bundle.mts b/common/tools/es-bundling/src/common-bundle.mts
similarity index 100%
rename from web/src/tools/es-bundling/src/common-bundle.mts
rename to common/tools/es-bundling/src/common-bundle.mts
diff --git a/web/src/tools/es-bundling/src/configuration.mts b/common/tools/es-bundling/src/configuration.mts
similarity index 100%
rename from web/src/tools/es-bundling/src/configuration.mts
rename to common/tools/es-bundling/src/configuration.mts
diff --git a/web/src/tools/es-bundling/src/index.mts b/common/tools/es-bundling/src/index.mts
similarity index 100%
rename from web/src/tools/es-bundling/src/index.mts
rename to common/tools/es-bundling/src/index.mts
diff --git a/web/src/tools/es-bundling/src/tslibTreeshaking.mts b/common/tools/es-bundling/src/tslibTreeshaking.mts
similarity index 100%
rename from web/src/tools/es-bundling/src/tslibTreeshaking.mts
rename to common/tools/es-bundling/src/tslibTreeshaking.mts
diff --git a/web/src/tools/es-bundling/tsconfig.json b/common/tools/es-bundling/tsconfig.json
similarity index 81%
rename from web/src/tools/es-bundling/tsconfig.json
rename to common/tools/es-bundling/tsconfig.json
index b0338768aac..5870280035f 100644
--- a/web/src/tools/es-bundling/tsconfig.json
+++ b/common/tools/es-bundling/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "allowSyntheticDefaultImports": true,
     "outDir": "build/",
diff --git a/common/web/sentry-manager/build.sh b/common/web/sentry-manager/build.sh
new file mode 100755
index 00000000000..4e725290e49
--- /dev/null
+++ b/common/web/sentry-manager/build.sh
@@ -0,0 +1,35 @@
+#!/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/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/node.inc.sh"
+
+builder_describe "Sentry error reporting module for embedded Keyman Engine for Web" \
+  "@/common/tools/es-bundling" \
+  "@/common/web/keyman-version" \
+  clean configure build
+
+builder_describe_outputs \
+  configure          /node_modules \
+  build              /common/web/sentry-manager/build/lib/index.js
+
+builder_parse "$@"
+
+# ---------------------------------------------------------------------------------
+
+function do_build() {
+  tsc --build "./tsconfig.json"
+
+  node_es_bundle "${KEYMAN_ROOT}/common/web/sentry-manager/build/obj/src/index.js" \
+    --out        "${KEYMAN_ROOT}/common/web/sentry-manager/build/lib/index.js" \
+    --sourceRoot "@keymanapp/keyman/common/web/sentry-manager/build/lib/"
+}
+
+builder_run_action clean     rm -rf build/
+builder_run_action configure node_select_version_and_npm_ci
+builder_run_action build     do_build
+
diff --git a/web/src/engine/sentry-manager/package.json b/common/web/sentry-manager/package.json
similarity index 100%
rename from web/src/engine/sentry-manager/package.json
rename to common/web/sentry-manager/package.json
diff --git a/web/src/engine/sentry-manager/src/index.ts b/common/web/sentry-manager/src/index.ts
similarity index 100%
rename from web/src/engine/sentry-manager/src/index.ts
rename to common/web/sentry-manager/src/index.ts
diff --git a/common/web/sentry-manager/tsconfig.json b/common/web/sentry-manager/tsconfig.json
new file mode 100644
index 00000000000..0967154d905
--- /dev/null
+++ b/common/web/sentry-manager/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "./",
+    "lib": ["es6", "dom"],
+    "outDir": "./build/obj",
+    "rootDir": "./",
+    "tsBuildInfoFile": "./build/obj/tsconfig.tsbuildinfo",
+  },
+
+  "include": [
+    "src/*.ts"
+  ]
+}
\ No newline at end of file
diff --git a/ios/engine/build.sh b/ios/engine/build.sh
index 39bd26118c0..9b98249b9b0 100755
--- a/ios/engine/build.sh
+++ b/ios/engine/build.sh
@@ -12,7 +12,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 builder_describe "Builds Keyman Engine for use on iOS devices - iPhone and iPad." \
   "@/web/src/app/webview        build" \
-  "@/web/src/engine/sentry-manager  build" \
+  "@/common/web/sentry-manager  build" \
   "clean" \
   "configure" \
   "build" \
@@ -106,7 +106,7 @@ function update_bundle ( ) {
   cp "$KMW_RESOURCES/osk/kmwosk.css"            "$BUNDLE_PATH/kmwosk.css"
   cp "$KMW_RESOURCES/osk/keymanweb-osk.ttf"     "$BUNDLE_PATH/keymanweb-osk.ttf"
   cp "$KMW_PRODUCT/keymanweb-webview.js"        "$BUNDLE_PATH/keymanweb-webview.js"
-  cp "$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/index.js"     "$BUNDLE_PATH/keyman-sentry.js"
+  cp "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js"     "$BUNDLE_PATH/keyman-sentry.js"
 }
 
 # First things first - update our dependencies.
diff --git a/package-lock.json b/package-lock.json
index 06ae6b6c600..6d78fc0aec7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,6 +27,7 @@
         "common/test/resources",
         "common/web/keyman-version",
         "common/web/langtags",
+        "common/web/sentry-manager",
         "common/web/types",
         "common/tools/sourcemap-path-remapper",
         "common/tools/hextobin",
@@ -139,6 +140,16 @@
         "typescript": "^5.4.5"
       }
     },
+    "common/web/sentry-manager": {
+      "license": "MIT",
+      "dependencies": {
+        "@keymanapp/keyman-version": "*",
+        "@sentry/browser": "^8.55.0"
+      },
+      "devDependencies": {
+        "typescript": "^5.4.5"
+      }
+    },
     "common/web/types": {
       "name": "@keymanapp/common-types",
       "license": "MIT",
@@ -1766,7 +1777,7 @@
       "link": true
     },
     "node_modules/@keymanapp/web-sentry-manager": {
-      "resolved": "web/src/engine/sentry-manager",
+      "resolved": "common/web/sentry-manager",
       "link": true
     },
     "node_modules/@mdn/browser-compat-data": {
@@ -2901,7 +2912,6 @@
       "version": "8.55.0",
       "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.55.0.tgz",
       "integrity": "sha512-ROgqtQfpH/82AQIpESPqPQe0UyWywKJsmVIqi3c5Fh+zkds5LUxnssTj3yNd1x+kxaPDVB023jAP+3ibNgeNDw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@sentry/core": "8.55.0"
@@ -2910,21 +2920,10 @@
         "node": ">=14.18"
       }
     },
-    "node_modules/@sentry-internal/browser-utils/node_modules/@sentry/core": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.55.0.tgz",
-      "integrity": "sha512-6g7jpbefjHYs821Z+EBJ8r4Z7LT5h80YSWRJaylGS4nW5W5Z2KXzpdnyFarv37O7QjauzVC2E+PABmpkw5/JGA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.18"
-      }
-    },
     "node_modules/@sentry-internal/feedback": {
       "version": "8.55.0",
       "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.55.0.tgz",
       "integrity": "sha512-cP3BD/Q6pquVQ+YL+rwCnorKuTXiS9KXW8HNKu4nmmBAyf7urjs+F6Hr1k9MXP5yQ8W3yK7jRWd09Yu6DHWOiw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@sentry/core": "8.55.0"
@@ -2933,21 +2932,10 @@
         "node": ">=14.18"
       }
     },
-    "node_modules/@sentry-internal/feedback/node_modules/@sentry/core": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.55.0.tgz",
-      "integrity": "sha512-6g7jpbefjHYs821Z+EBJ8r4Z7LT5h80YSWRJaylGS4nW5W5Z2KXzpdnyFarv37O7QjauzVC2E+PABmpkw5/JGA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.18"
-      }
-    },
     "node_modules/@sentry-internal/replay": {
       "version": "8.55.0",
       "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.55.0.tgz",
       "integrity": "sha512-roCDEGkORwolxBn8xAKedybY+Jlefq3xYmgN2fr3BTnsXjSYOPC7D1/mYqINBat99nDtvgFvNfRcZPiwwZ1hSw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@sentry-internal/browser-utils": "8.55.0",
@@ -2961,7 +2949,6 @@
       "version": "8.55.0",
       "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.55.0.tgz",
       "integrity": "sha512-nIkfgRWk1091zHdu4NbocQsxZF1rv1f7bbp3tTIlZYbrH62XVZosx5iHAuZG0Zc48AETLE7K4AX9VGjvQj8i9w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@sentry-internal/replay": "8.55.0",
@@ -2971,26 +2958,6 @@
         "node": ">=14.18"
       }
     },
-    "node_modules/@sentry-internal/replay-canvas/node_modules/@sentry/core": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.55.0.tgz",
-      "integrity": "sha512-6g7jpbefjHYs821Z+EBJ8r4Z7LT5h80YSWRJaylGS4nW5W5Z2KXzpdnyFarv37O7QjauzVC2E+PABmpkw5/JGA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.18"
-      }
-    },
-    "node_modules/@sentry-internal/replay/node_modules/@sentry/core": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.55.0.tgz",
-      "integrity": "sha512-6g7jpbefjHYs821Z+EBJ8r4Z7LT5h80YSWRJaylGS4nW5W5Z2KXzpdnyFarv37O7QjauzVC2E+PABmpkw5/JGA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.18"
-      }
-    },
     "node_modules/@sentry-internal/tracing": {
       "version": "7.108.0",
       "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.108.0.tgz",
@@ -3035,6 +3002,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/@sentry/browser": {
+      "version": "8.55.0",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.55.0.tgz",
+      "integrity": "sha512-1A31mCEWCjaMxJt6qGUK+aDnLDcK6AwLAZnqpSchNysGni1pSn1RWSmk9TBF8qyTds5FH8B31H480uxMPUJ7Cw==",
+      "license": "MIT",
+      "dependencies": {
+        "@sentry-internal/browser-utils": "8.55.0",
+        "@sentry-internal/feedback": "8.55.0",
+        "@sentry-internal/replay": "8.55.0",
+        "@sentry-internal/replay-canvas": "8.55.0",
+        "@sentry/core": "8.55.0"
+      },
+      "engines": {
+        "node": ">=14.18"
+      }
+    },
     "node_modules/@sentry/cli": {
       "version": "2.31.0",
       "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.31.0.tgz",
@@ -3179,6 +3162,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/@sentry/core": {
+      "version": "8.55.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.55.0.tgz",
+      "integrity": "sha512-6g7jpbefjHYs821Z+EBJ8r4Z7LT5h80YSWRJaylGS4nW5W5Z2KXzpdnyFarv37O7QjauzVC2E+PABmpkw5/JGA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.18"
+      }
+    },
     "node_modules/@sentry/node": {
       "version": "7.108.0",
       "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.108.0.tgz",
@@ -14180,33 +14172,6 @@
         "tsx": "^4.19.0"
       }
     },
-    "web/node_modules/@sentry/browser": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.55.0.tgz",
-      "integrity": "sha512-1A31mCEWCjaMxJt6qGUK+aDnLDcK6AwLAZnqpSchNysGni1pSn1RWSmk9TBF8qyTds5FH8B31H480uxMPUJ7Cw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@sentry-internal/browser-utils": "8.55.0",
-        "@sentry-internal/feedback": "8.55.0",
-        "@sentry-internal/replay": "8.55.0",
-        "@sentry-internal/replay-canvas": "8.55.0",
-        "@sentry/core": "8.55.0"
-      },
-      "engines": {
-        "node": ">=14.18"
-      }
-    },
-    "web/node_modules/@sentry/core": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.55.0.tgz",
-      "integrity": "sha512-6g7jpbefjHYs821Z+EBJ8r4Z7LT5h80YSWRJaylGS4nW5W5Z2KXzpdnyFarv37O7QjauzVC2E+PABmpkw5/JGA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.18"
-      }
-    },
     "web/src/common/web-utils": {
       "name": "@keymanapp/web-utils",
       "extraneous": true,
@@ -14315,7 +14280,7 @@
     },
     "web/src/engine/sentry-manager": {
       "name": "@keymanapp/web-sentry-manager",
-      "dev": true,
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@keymanapp/keyman-version": "*",
diff --git a/package.json b/package.json
index ac19bf5cdb8..1245931bec6 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
     "common/test/resources",
     "common/web/keyman-version",
     "common/web/langtags",
+    "common/web/sentry-manager",
     "common/web/types",
     "common/tools/sourcemap-path-remapper",
     "common/tools/hextobin",
diff --git a/resources/build/node.inc.sh b/resources/build/node.inc.sh
index 15e66da78c9..f338718cdfc 100644
--- a/resources/build/node.inc.sh
+++ b/resources/build/node.inc.sh
@@ -77,3 +77,7 @@ _node_select_version_with_nvm() {
     builder_die "Attempted to select node.js version $REQUIRED_NODE_VERSION but found $CURRENT_NODE_VERSION instead"
   fi
 }
+
+node_es_bundle() {
+  node "${KEYMAN_ROOT}/common/tools/es-bundling/build/common-bundle.mjs" "$@"
+}
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index c9e8f3dc60e..c28cddb80f0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,6 +4,7 @@
 
     { "path": "./common/tools/hextobin/" },
 
+    { "path": "./common/web/sentry-manager" },
     { "path": "./common/web/keyman-version" },
     { "path": "./common/web/langtags" },
     { "path": "./common/web/types" },
diff --git a/web/build.sh b/web/build.sh
index e1dee7d941e..022e2c27818 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -9,12 +9,14 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
 builder_set_child_base src
 builder_describe "Builds engine modules for Keyman Engine for Web (KMW)." \
   \
+  "@/common/tools/es-bundling" \
   "@/resources/tools/check-markdown  test:help" \
   \
   "clean" \
@@ -58,8 +60,6 @@ builder_describe_outputs \
   build:tools                   "/web/build/tools/building/sourcemap-root/index.js" \
   build:test-pages              "/web/build/test-resources/sentry-manager.js"
 
-BUNDLE_CMD="node ${KEYMAN_ROOT}/web/src/tools/es-bundling/build/common-bundle.mjs"
-
 #### Build action definitions ####
 
 # We can run all clean & configure actions at once without much issue.
@@ -84,7 +84,7 @@ precompile() {
   # types built-in to Node aren't available, and @web/test-runner doesn't do
   # treeshaking when loading the imports. We work around by pre-compiling.
   for f in "${DIR}"/*.js; do
-    ${BUNDLE_CMD}   "${f}" \
+    node_es_bundle  "${f}" \
       --out         "${f%.js}".mjs \
       --format esm
   done
diff --git a/web/ci.sh b/web/ci.sh
index 02545cf4477..25001c3d02b 100755
--- a/web/ci.sh
+++ b/web/ci.sh
@@ -24,6 +24,7 @@ cd "${THIS_SCRIPT_PATH}"
 S_KEYMAN_COM=
 
 builder_describe "CI processes for Keyman Engine for Web releases (KMW)." \
+  "@/common/web/sentry-manager" \
   "@/web/src/tools/building/sourcemap-root prepare:s.keyman.com" \
   "build" \
   "test                         Runs all unit tests" \
@@ -69,10 +70,10 @@ function build_action() {
   if builder_is_ci_build && builder_is_ci_build_level_release; then
     # Upload the sentry-configuration engine used by the mobile apps to sentry
     # Also, clean 'em first.
-    for sourcemap in "${KEYMAN_ROOT}/web/src/engine/sentry-manager/build/lib/"*.map; do
+    for sourcemap in "${KEYMAN_ROOT}/common/web/sentry-manager/build/lib/"*.map; do
       node "${KEYMAN_ROOT}/web/build/tools/building/sourcemap-root/index.js" null "${sourcemap}" --clean
     done
-    web_sentry_upload "${KEYMAN_ROOT}/web/src/engine/sentry-manager/build/lib/"
+    web_sentry_upload "${KEYMAN_ROOT}/common/web/sentry-manager/build/lib/"
 
     # And, of course, the main build-products too
     web_sentry_upload "${KEYMAN_ROOT}/web/build/app/webview/release/"
diff --git a/web/common.inc.sh b/web/common.inc.sh
index eafbf29ae2e..b587bf99ab7 100644
--- a/web/common.inc.sh
+++ b/web/common.inc.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 #
 
-BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
-
 # Compiles all build products corresponding to the specified target.
 # This should be called from the working directory of a child project's
 # build script.
diff --git a/web/src/app/browser/build.sh b/web/src/app/browser/build.sh
index fff02369012..13d0f954e45 100755
--- a/web/src/app/browser/build.sh
+++ b/web/src/app/browser/build.sh
@@ -14,6 +14,7 @@ SUBPROJECT_NAME=app/browser
 # ################################ Main script ################################
 
 builder_describe "Builds the Keyman Engine for Web's website-integrating version for use in non-puppeted browsers." \
+  "@/common/tools/es-bundling" \
   "@/web/src/engine build" \
   "@/web/src/tools/building/sourcemap-root" \
   "clean" \
@@ -48,13 +49,13 @@ compile_and_copy() {
   BUILD_ROOT="${KEYMAN_ROOT}/web/build/app/browser"
   SRC_ROOT="${KEYMAN_ROOT}/web/src/app/browser/src"
 
-  $BUNDLE_CMD    "${SRC_ROOT}/debug-main.js" \
+  node_es_bundle "${SRC_ROOT}/debug-main.js" \
     --out        "${BUILD_ROOT}/debug/keymanweb.js" \
     --charset    "utf8" \
     --sourceRoot "@keymanapp/keyman/web/build/app/browser/debug" \
     --target     "es6"
 
-  $BUNDLE_CMD    "${SRC_ROOT}/release-main.js" \
+  node_es_bundle "${SRC_ROOT}/release-main.js" \
     --out        "${BUILD_ROOT}/release/keymanweb.js" \
     --charset    "utf8" \
     --profile    "${BUILD_ROOT}/filesize-profile.log" \
@@ -62,7 +63,7 @@ compile_and_copy() {
     --minify \
     --target     "es6"
 
-  $BUNDLE_CMD    "${BUILD_ROOT}/obj/test-index.js" \
+  node_es_bundle "${BUILD_ROOT}/obj/test-index.js" \
     --out        "${BUILD_ROOT}/lib/index.mjs" \
     --charset    "utf8" \
     --sourceRoot "@keymanapp/keyman/web/build/app/browser/lib" \
diff --git a/web/src/app/ui/build.sh b/web/src/app/ui/build.sh
index 36c6f3d4e5f..72c6377c094 100755
--- a/web/src/app/ui/build.sh
+++ b/web/src/app/ui/build.sh
@@ -48,14 +48,14 @@ compile_and_copy() {
   BUILD_ROOT="${KEYMAN_ROOT}/web/build/app/ui"
 
   types=(button float toggle toolbar)
-  for type in ${types[@]}
+  for type in "${types[@]}"
   do
     filename="kmwui${type}"
-    $BUNDLE_CMD    "${BUILD_ROOT}/obj/$filename.js" \
+    node_es_bundle "${BUILD_ROOT}/obj/$filename.js" \
       --out        "${BUILD_ROOT}/debug/$filename.js" \
       --sourceRoot "@keymanapp/keyman/web/build/app/ui/debug"
 
-    $BUNDLE_CMD    "${BUILD_ROOT}/obj/$filename.js" \
+    node_es_bundle "${BUILD_ROOT}/obj/$filename.js" \
       --out        "${BUILD_ROOT}/release/$filename.js" \
       --sourceRoot "@keymanapp/keyman/web/build/app/ui/release" \
       --minify
diff --git a/web/src/app/webview/build.sh b/web/src/app/webview/build.sh
index 9735d816c2b..790e8d2aef8 100755
--- a/web/src/app/webview/build.sh
+++ b/web/src/app/webview/build.sh
@@ -14,6 +14,7 @@ SUBPROJECT_NAME=app/webview
 # ################################ Main script ################################
 
 builder_describe "Builds the Keyman Engine for Web's puppetable version designed for use within WebViews." \
+  "@/common/tools/es-bundling" \
   "@/web/src/engine build" \
   "@/web/src/tools/building/sourcemap-root" \
   "clean" \
@@ -43,13 +44,13 @@ compile_and_copy() {
   BUILD_ROOT="${KEYMAN_ROOT}/web/build/app/webview"
   SRC_ROOT="${KEYMAN_ROOT}/web/src/app/webview/src"
 
-  $BUNDLE_CMD    "${SRC_ROOT}/debug-main.js" \
+  node_es_bundle "${SRC_ROOT}/debug-main.js" \
     --out        "${BUILD_ROOT}/debug/keymanweb-webview.js" \
     --charset    "utf8" \
     --sourceRoot "@keymanapp/keyman/web/build/app/webview/debug" \
     --target     "es6"
 
-  $BUNDLE_CMD    "${SRC_ROOT}/release-main.js" \
+  node_es_bundle "${SRC_ROOT}/release-main.js" \
     --out        "${BUILD_ROOT}/release/keymanweb-webview.js" \
     --charset    "utf8" \
     --profile    "${BUILD_ROOT}/filesize-profile.log" \
diff --git a/web/src/app/webview/map-polyfill-bundler.js b/web/src/app/webview/map-polyfill-bundler.js
index 72b7a832432..257f897e70f 100644
--- a/web/src/app/webview/map-polyfill-bundler.js
+++ b/web/src/app/webview/map-polyfill-bundler.js
@@ -6,7 +6,7 @@
  */
 
 import esbuild from 'esbuild';
-import { iifeConfiguration, prepareTslibTreeshaking  } from '../../tools/es-bundling/build/index.mjs';
+import { iifeConfiguration, prepareTslibTreeshaking  } from '../../../../common/tools/es-bundling/build/index.mjs';
 
 const commonConfig = {
   ...iifeConfiguration,
diff --git a/web/src/common/web-utils/build.sh b/web/src/common/web-utils/build.sh
index 1106ace477b..f569e379b7e 100755
--- a/web/src/common/web-utils/build.sh
+++ b/web/src/common/web-utils/build.sh
@@ -15,15 +15,13 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 SUBPROJECT_NAME=common/web-utils
 BUILD_DIR="/web/build/common/web-utils"
 
-BUNDLE_CMD="node ${KEYMAN_ROOT}/web/src/tools/es-bundling/build/common-bundle.mjs"
-
 ################################ Main script ################################
 
 builder_describe \
   "Compiles the web-oriented utility function module." \
+  "@/common/tools/es-bundling" \
   "@/common/web/keyman-version" \
   "@/common/web/types" \
-  "@/web/src/tools/es-bundling" \
   clean configure build test
 
 builder_describe_outputs \
@@ -41,7 +39,7 @@ function do_build() {
 
   # One of the functions (timedPromise) is quite helpful for automated testing, even in the DOM.
   # So, to make sure it's easily-accessible for the DOM-based tests...
-  ${BUNDLE_CMD}  "${KEYMAN_ROOT}/${BUILD_DIR}/obj/index.js" \
+  node_es_bundle "${KEYMAN_ROOT}/${BUILD_DIR}/obj/index.js" \
     --out        "${KEYMAN_ROOT}/${BUILD_DIR}/lib/index.mjs" \
     --format esm
 }
diff --git a/web/src/engine/build.sh b/web/src/engine/build.sh
index 3ff9461c407..fb71c30853c 100755
--- a/web/src/engine/build.sh
+++ b/web/src/engine/build.sh
@@ -16,6 +16,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 builder_describe "Builds Keyman Engine for Web (KMW)" \
   "@/core:wasm" \
+  "@/common/tools/es-bundling" \
   "@/web/src/engine/predictive-text" \
   "@/web/src/common/web-utils" \
   "clean" \
@@ -57,9 +58,8 @@ do_build () {
   # So... tsc does declaration-bundling on its own pretty well, at least for local development.
   tsc --emitDeclarationOnly --outFile "${KEYMAN_ROOT}/web/build/engine/lib/index.d.ts" -p "."
 
-  node "${KEYMAN_ROOT}/web/src/tools/es-bundling/build/common-bundle.mjs" \
-                "${KEYMAN_ROOT}/web/build/engine/obj/index.js" \
-    --out       "${KEYMAN_ROOT}/web/build/engine/lib/index.mjs" \
+  node_es_bundle "${KEYMAN_ROOT}/web/build/engine/obj/index.js" \
+    --out        "${KEYMAN_ROOT}/web/build/engine/lib/index.mjs" \
     --format esm
 
   # TODO-web-core: should this be in test/?
diff --git a/web/src/engine/predictive-text/build.sh b/web/src/engine/predictive-text/build.sh
index f4872bcd7fc..1d48d302cc5 100755
--- a/web/src/engine/predictive-text/build.sh
+++ b/web/src/engine/predictive-text/build.sh
@@ -28,11 +28,6 @@ builder_describe "Builds predictive-text components used within Keyman Engine fo
 
 builder_parse "$@"
 
-config=release
-if builder_is_debug_build; then
-  config=debug
-fi
-
 builder_describe_outputs \
   configure                     "/node_modules" \
   build:templates               "/web/src/engine/predictive-text/build/obj/index.js" \
@@ -40,8 +35,6 @@ builder_describe_outputs \
   build:worker-main             "/web/src/engine/worker-main/build/obj/lmlayer.js" \
   build:worker-thread           "/web/src/engine/worker-thread/build/obj/worker-main.wrapped.js"
 
-BUNDLE_CMD="node ${KEYMAN_ROOT}/web/src/tools/es-bundling/build/common-bundle.mjs"
-
 #### Build action definitions ####
 
 # We can run all clean & configure actions at once without much issue.
diff --git a/web/src/engine/predictive-text/templates/build.sh b/web/src/engine/predictive-text/templates/build.sh
index 8119b5a3652..3fa4b75a29c 100755
--- a/web/src/engine/predictive-text/templates/build.sh
+++ b/web/src/engine/predictive-text/templates/build.sh
@@ -18,7 +18,6 @@ SUBPROJECT_NAME=engine/predictive-text/templates
 
 builder_describe "Builds the predictive-text model template implementation module" \
   "@/web/src/common/web-utils" \
-  "@/web/src/tools/es-bundling" \
   "@../wordbreakers" \
   "clean" \
   "configure" \
diff --git a/web/src/engine/predictive-text/worker-main/build.sh b/web/src/engine/predictive-text/worker-main/build.sh
index 0fc63bfb320..0abb4db7eef 100755
--- a/web/src/engine/predictive-text/worker-main/build.sh
+++ b/web/src/engine/predictive-text/worker-main/build.sh
@@ -14,14 +14,12 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
-BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
-
 ################################ Main script ################################
 
 builder_describe "Builds the lm-layer module" \
+  "@/common/tools/es-bundling" \
   "@/common/web/keyman-version" \
   "@/common/web/types" \
-  "@/web/src/tools/es-bundling" \
   "@/web/src/engine/predictive-text/worker-thread" \
   "clean" \
   "configure" \
@@ -47,7 +45,7 @@ function do_build() {
   tsc -b ./tsconfig.all.json
 
   # esbuild-bundled products at this level are not intended to be used for anything but testing.
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/web/src/engine/predictive-text/worker-main/build/obj/web/index.js" \
+  node_es_bundle "${KEYMAN_ROOT}/web/src/engine/predictive-text/worker-main/build/obj/web/index.js" \
     --out        "${KEYMAN_ROOT}/web/src/engine/predictive-text/worker-main/build/lib/web/index.mjs" \
     --format esm
 }
diff --git a/web/src/engine/predictive-text/worker-thread/build.sh b/web/src/engine/predictive-text/worker-thread/build.sh
index 25276eaa6e2..663088c2986 100755
--- a/web/src/engine/predictive-text/worker-thread/build.sh
+++ b/web/src/engine/predictive-text/worker-thread/build.sh
@@ -13,14 +13,9 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/web/common.inc.sh"
 
-WORKER_OUTPUT=build/obj
-WORKER_OUTPUT_FILENAME=build/lib/worker-main.js
-
 INTERMEDIATE=./build/intermediate
 LIB=./build/lib
 
-bundle_cmd="node ${KEYMAN_ROOT}/web/src/tools/es-bundling/build/common-bundle.mjs"
-
 SRCMAP_CLEANER="node $KEYMAN_ROOT/web/build/tools/building/sourcemap-root/index.js"
 
 ################################ Main script ################################
@@ -29,9 +24,9 @@ SUBPROJECT_NAME=engine/predictive-text/worker-thread
 
 builder_describe \
   "Compiles the Language Modeling Layer for common use in predictive text and autocorrective applications." \
+  "@/common/tools/es-bundling" \
   "@/common/web/keyman-version" \
   "@/web/src/tools/building/sourcemap-root" \
-  "@/web/src/tools/es-bundling" \
   "@../wordbreakers" \
   "@../templates" \
   configure clean build test \
@@ -62,7 +57,7 @@ function do_build() {
 
 
   # The ES6 target needs no polyfills - we go straight to the wrapped version.
-  $bundle_cmd src/main/worker-main.ts \
+  node_es_bundle src/main/worker-main.ts \
     --out $INTERMEDIATE/worker-main.js \
     --charset "utf8" \
     --target "es6" \
@@ -73,7 +68,7 @@ function do_build() {
     $INTERMEDIATE/worker-main.js.map \
     --clean
 
-  $bundle_cmd src/main/worker-main.ts \
+  node_es_bundle src/main/worker-main.ts \
     --out $INTERMEDIATE/worker-main.min.js \
     --minify \
     --charset "utf8" \
diff --git a/web/src/engine/sentry-manager/.gitignore b/web/src/engine/sentry-manager/.gitignore
deleted file mode 100644
index a5025863e33..00000000000
--- a/web/src/engine/sentry-manager/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build products
-src/environment.inc.ts
-
-# Legacy build folders.
-output/
-build/
-embedded/
-
-# Current build output folder (matches standard node publish location).
-dist/
-
-# Other local files.
-node_modules/
-unit_tests/modernizr.js
-**/.idea/**/*.xml
-**/*.iml
-**/*.kpj.user
\ No newline at end of file
diff --git a/web/src/engine/sentry-manager/build.sh b/web/src/engine/sentry-manager/build.sh
deleted file mode 100755
index 1054e152bc4..00000000000
--- a/web/src/engine/sentry-manager/build.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-#
-# Compiles sentry manager
-#
-## START STANDARD BUILD SCRIPT INCLUDE
-# adjust relative paths as necessary
-THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-. "${KEYMAN_ROOT}/web/common.inc.sh"
-. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/node.inc.sh"
-
-builder_describe "Builds the Sentry-reporting module used with Keyman Engine for Web" \
-  "@/common/web/keyman-version" \
-  clean configure build
-
-builder_describe_outputs \
-  configure          /node_modules \
-  build              /web/src/engine/sentry-manager/build/lib/index.js
-
-builder_parse "$@"
-
-### CLEAN ACTIONS
-
-if builder_start_action clean; then
-  rm -rf build/
-  builder_finish_action success clean
-fi
-
-### CONFIGURE ACTIONS
-
-if builder_start_action configure; then
-  node_select_version_and_npm_ci
-  builder_finish_action success configure
-fi
-
-if builder_start_action build; then
-  tsc --build "$THIS_SCRIPT_PATH/src/tsconfig.json"
-
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/web/src/engine/sentry-manager/build/obj/index.js" \
-    --out        "${KEYMAN_ROOT}/web/src/engine/sentry-manager/build/lib/index.js" \
-    --sourceRoot "@keymanapp/keyman/web/src/engine/sentry-manager/build/lib/"
-
-  builder_finish_action success build
-fi
diff --git a/web/src/engine/sentry-manager/src/tsconfig.json b/web/src/engine/sentry-manager/src/tsconfig.json
deleted file mode 100644
index 7bb42bdb400..00000000000
--- a/web/src/engine/sentry-manager/src/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../../../../tsconfig.base.json",
-  "compilerOptions": {
-    "lib": ["es6", "dom"],
-    "outDir": "../build/obj",
-    "rootDir": "./",
-    "tsBuildInfoFile": "../build/obj/tsconfig.tsbuildinfo",
-  },
-
-  "include": [
-    "*.ts"
-  ]
-}
\ No newline at end of file
diff --git a/web/src/test/manual/build.sh b/web/src/test/manual/build.sh
index 210c200d3ce..a468f5de5f3 100755
--- a/web/src/test/manual/build.sh
+++ b/web/src/test/manual/build.sh
@@ -11,7 +11,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 # ################################ Main script ################################
 
 builder_describe "Builds the Keyman Engine for Web's sample page setups." \
-  "@/web/src/engine/sentry-manager build" \
+  "@/common/web/sentry-manager build" \
   "@/web/src/app/browser build" \
   "@/web/src/app/ui build" \
   "@/web/src/tools build" \
@@ -32,8 +32,8 @@ builder_describe_outputs \
 
 #### Resource paths ####
 
-SENTRY_MANAGER_SRC="$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/index.js"
-SENTRY_MANAGER_MAP="$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/index.js.map"
+SENTRY_MANAGER_SRC="$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js"
+SENTRY_MANAGER_MAP="$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js.map"
 
 #### Build action definitions ####
 
@@ -43,7 +43,7 @@ SENTRY_MANAGER_MAP="$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/index.j
 function do_copy() {
   mkdir -p "$KEYMAN_ROOT/$DEST"
 
-  # The next four lines are needed for the sentry-integration manual test page.
+  # The next two lines are needed for the sentry-integration manual test page.
   cp "$SENTRY_MANAGER_SRC"  "$KEYMAN_ROOT/$DEST/sentry-manager.js"
   cp "$SENTRY_MANAGER_MAP"  "$KEYMAN_ROOT/$DEST/sentry-manager.js.map"
 
diff --git a/web/src/test/manual/embed/android-harness/build.sh b/web/src/test/manual/embed/android-harness/build.sh
index d672fd4489d..81d141bc232 100755
--- a/web/src/test/manual/embed/android-harness/build.sh
+++ b/web/src/test/manual/embed/android-harness/build.sh
@@ -10,8 +10,8 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 builder_describe "Builds a debug-host page simulating Keyman Android's WebView setup for KMW use" \
   "@/common/web/keyman-version" \
+  "@/common/web/sentry-manager" \
   "@/web/src/app/webview" \
-  "@/web/src/engine/sentry-manager" \
   clean configure build
 
 builder_describe_outputs \
@@ -45,7 +45,7 @@ if builder_start_action build; then
   cp "$KEYMAN_ROOT/web/build/app/resources/osk/keymanweb-osk.ttf" "host/keymanweb-osk.ttf"
 
   # We shouldn't rely on a prior Android build for these files!  We can retrieve them separately.
-  cp "$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/index.js" "host/keyman-sentry.js"
+  cp "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js" "host/keyman-sentry.js"
   cp "$KEYMAN_ROOT/node_modules/es6-shim/es6-shim.min.js" "host/es6-shim.min.js"
 
   # Test keyboards
diff --git a/web/src/tools/build.sh b/web/src/tools/build.sh
index 246b013803d..c057a75093a 100755
--- a/web/src/tools/build.sh
+++ b/web/src/tools/build.sh
@@ -20,7 +20,6 @@ builder_describe "Builds the Keyman Engine for Web's development & unit-testing
   "build" \
   "test" \
   ":bulk_rendering=testing/bulk_rendering   Builds the bulk-rendering tool used to validate changes to OSK display code" \
-  ":es-bundling                             Builds code used to esbundle Web engine artifacts for browser consumption" \
   ":recorder=testing/recorder               Builds the KMW recorder tool used for development of unit-test resources" \
   ":sourcemap-root=building/sourcemap-root  Builds the sourcemap-cleaning tool used during minification of app/ builds" \
   ":test-utils=testing/test-utils           Builds the test-utils module" \
diff --git a/web/src/tools/testing/bulk_rendering/build.sh b/web/src/tools/testing/bulk_rendering/build.sh
index 3ed494c73bd..c2e42dd96fb 100755
--- a/web/src/tools/testing/bulk_rendering/build.sh
+++ b/web/src/tools/testing/bulk_rendering/build.sh
@@ -16,6 +16,7 @@ SUBPROJECT_NAME=tools/testing/bulk_rendering
 ################################ Main script ################################
 
 builder_describe "Builds a 'bulk renderer' that loads all the cloud keyboards from api.keyman.com and renders each of them to a document." \
+  "@/common/tools/es-bundling" \
   "@/web/src/common/web-utils build" \
   "@/web/src/app/browser build" \
   "@/web/src/app/ui build" \
@@ -32,7 +33,7 @@ builder_parse "$@"
 function do_build ( ) {
   tsc --build "$THIS_SCRIPT_PATH/tsconfig.json" $builder_verbose
 
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/web/build/$SUBPROJECT_NAME/obj/renderer_core.js" \
+  node_es_bundle "${KEYMAN_ROOT}/web/build/$SUBPROJECT_NAME/obj/renderer_core.js" \
     --out        "${KEYMAN_ROOT}/web/build/$SUBPROJECT_NAME/lib/bulk_render.js" \
     --sourceRoot "@keymanapp/keyman/web/build/$SUBPROJECT_NAME/lib/"
 
diff --git a/web/src/tools/testing/gesture-processor/build.sh b/web/src/tools/testing/gesture-processor/build.sh
index 30d7ea32979..a5572456742 100755
--- a/web/src/tools/testing/gesture-processor/build.sh
+++ b/web/src/tools/testing/gesture-processor/build.sh
@@ -8,8 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 . "$KEYMAN_ROOT/web/common.inc.sh"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-
-BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # BASE_DIR="/web/src/engine/osk/gesture-processor"
 BUILD_DIR=/web/build/tools/testing/gesture-processor
@@ -17,6 +16,7 @@ BUILD_DIR=/web/build/tools/testing/gesture-processor
 ################################ Main script ################################
 
 builder_describe "Testing-oriented tools for the Gesture Processor module of web-based Keyman OSKs" \
+  "@/common/tools/es-bundling" \
   "clean" \
   "build" \
   ":fixture       The HTML-element fixture and CSS fixture used for both user-testing and unit-testing" \
@@ -69,7 +69,7 @@ function do_build_fixture() {
 function do_build_testmodule() {
   compile "" "${THIS_SCRIPT_PATH}/unit-test-resources" "${KEYMAN_ROOT}/${BUILD_DIR}/unit-test-resources"
 
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/${BUILD_DIR}/unit-test-resources/obj/index.js" \
+  node_es_bundle "${KEYMAN_ROOT}/${BUILD_DIR}/unit-test-resources/obj/index.js" \
     --out        "${KEYMAN_ROOT}/${BUILD_DIR}/unit-test-resources/lib/index.mjs" \
     --format "esm"
 }
diff --git a/web/src/tools/testing/gesture-processor/unit-test-resources/build-bundler.js b/web/src/tools/testing/gesture-processor/unit-test-resources/build-bundler.js
deleted file mode 100644
index 4603b338ad7..00000000000
--- a/web/src/tools/testing/gesture-processor/unit-test-resources/build-bundler.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import esbuild from 'esbuild';
-import { esmConfiguration, bundleObjEntryPoints } from '../../../../../../tools/es-bundling/build/index.mjs';
-
-await esbuild.build({
-  ...esmConfiguration,
-  ...bundleObjEntryPoints('lib', '../../../build/tools/obj/index.js')
-});
\ No newline at end of file
diff --git a/web/src/tools/testing/recorder/build.sh b/web/src/tools/testing/recorder/build.sh
index c8ac22380f4..92db811915c 100755
--- a/web/src/tools/testing/recorder/build.sh
+++ b/web/src/tools/testing/recorder/build.sh
@@ -16,6 +16,7 @@ SUBPROJECT_NAME=tools/testing/recorder
 ################################ Main script ################################
 
 builder_describe "Builds the Keyman Engine for Web's test-sequence recording tool" \
+  "@/common/tools/es-bundling" \
   "@/common/web/keyman-version" \
   "@/web/src/engine" \
   "@../recorder-core" \
@@ -33,7 +34,7 @@ do_build ( ) {
   compile $SUBPROJECT_NAME
 
   # Base product - the main keyboard processor
-  $BUNDLE_CMD    "${KEYMAN_ROOT}/web/build/$SUBPROJECT_NAME/obj/index.js" \
+  node_es_bundle "${KEYMAN_ROOT}/web/build/$SUBPROJECT_NAME/obj/index.js" \
     --out        "${KEYMAN_ROOT}/web/build/$SUBPROJECT_NAME/lib/index.mjs" \
     --format esm
 }
diff --git a/web/src/tsconfig.all.json b/web/src/tsconfig.all.json
index fa882d6f2d5..5c67a919c43 100644
--- a/web/src/tsconfig.all.json
+++ b/web/src/tsconfig.all.json
@@ -15,7 +15,6 @@
     { "path": "engine/predictive-text/worker-main/tsconfig.all.json" },
     { "path": "engine/predictive-text/worker-thread" },
     { "path": "tools/testing/gesture-processor/unit-test-resources" },
-    { "path": "engine/sentry-manager/src" },
 
     { "path": "tools/testing/recorder" },
     // { "path": "tools/sourcemap-root/tsconfig.json" },

From fb728d922d2e285a881d09dab5addc5757d619dd Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 6 Nov 2025 18:55:22 +0100
Subject: [PATCH 124/254] refactor(web): remove duplicate element-text-stores
 folder

Test-bot: skip
---
 .../abstractElementTextStore.ts               |  52 ---
 .../contentEditableElementTextStore.ts        | 273 -------------
 .../createTextStoreForElement.ts              |  42 --
 .../designIFrameElementTextStore.ts           | 358 ------------------
 web/src/engine/element-text-stores/index.ts   |  11 -
 .../inputElementTextStore.ts                  | 233 ------------
 web/src/engine/element-text-stores/readme.md  |   9 -
 .../textAreaElementTextStore.ts               | 201 ----------
 web/src/engine/element-text-stores/utils.ts   |  38 --
 .../engine/src/element-text-stores/readme.md  |   2 +-
 10 files changed, 1 insertion(+), 1218 deletions(-)
 delete mode 100644 web/src/engine/element-text-stores/abstractElementTextStore.ts
 delete mode 100644 web/src/engine/element-text-stores/contentEditableElementTextStore.ts
 delete mode 100644 web/src/engine/element-text-stores/createTextStoreForElement.ts
 delete mode 100644 web/src/engine/element-text-stores/designIFrameElementTextStore.ts
 delete mode 100644 web/src/engine/element-text-stores/index.ts
 delete mode 100644 web/src/engine/element-text-stores/inputElementTextStore.ts
 delete mode 100644 web/src/engine/element-text-stores/readme.md
 delete mode 100644 web/src/engine/element-text-stores/textAreaElementTextStore.ts
 delete mode 100644 web/src/engine/element-text-stores/utils.ts

diff --git a/web/src/engine/element-text-stores/abstractElementTextStore.ts b/web/src/engine/element-text-stores/abstractElementTextStore.ts
deleted file mode 100644
index e22d6588aeb..00000000000
--- a/web/src/engine/element-text-stores/abstractElementTextStore.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { TextStore } from "keyman/engine/keyboard";
-import { EventEmitter } from 'eventemitter3';
-
-export abstract class AbstractElementTextStore<EventMap extends EventEmitter.ValidEventTypes> extends TextStore {
-  // JS/TS can't do true multiple inheritance, so we maintain class events on a readonly field.
-  public readonly events: EventEmitter<EventMap, this> = new EventEmitter<EventMap, this>();
-
-  /**
-   * A field that may be used to track whether or not the represented context has changed over an
-   * arbitrary period of time.
-   */
-  public changed = false;
-
-  /**
-   * Returns the underlying element / document modeled by the wrapper.
-   */
-  abstract getElement(): HTMLElement;
-
-  public focus(): void {
-    const ele = this.getElement();
-    if(ele.focus) {
-      ele.focus();
-    }
-  }
-
-  /**
-   * Denotes when the represented element is forcing a text scroll via focus manipulation.
-   * As the intent is not to change the focused element, but just to have the browser update
-   * the scroll location, standard focus handlers (for updating the active context) should
-   * not deactivate the element while this state is active.
-   */
-  isForcingScroll(): boolean {
-    return false;
-  }
-
-  /**
-   * A helper method for doInputEvent; creates a simple common event and default dispatching.
-   * @param elem
-   */
-  protected dispatchInputEventOn(elem: HTMLElement) {
-    let event: InputEvent;
-
-    // `undefined` in pre-Chrome Edge and Chrome for Android before version 60.
-    if(window['InputEvent']) { // can't condition on the type directly; TS optimizes that out.
-      event = new InputEvent('input', {"bubbles": true, "cancelable": false});
-    }
-
-    if(elem && event) {
-      elem.dispatchEvent(event);
-    }
-  }
-}
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/contentEditableElementTextStore.ts b/web/src/engine/element-text-stores/contentEditableElementTextStore.ts
deleted file mode 100644
index bd2aebcf1f8..00000000000
--- a/web/src/engine/element-text-stores/contentEditableElementTextStore.ts
+++ /dev/null
@@ -1,273 +0,0 @@
-import { AbstractElementTextStore } from './abstractElementTextStore.js';
-import { KMWString } from '@keymanapp/web-utils';
-
-class SelectionCaret {
-  node: Node;
-  offset: number;
-
-  constructor(node: Node, offset: number) {
-    this.node = node;
-    this.offset = offset;
-  }
-}
-
-class SelectionRange {
-  start: SelectionCaret;
-  end: SelectionCaret;
-
-  constructor(start: SelectionCaret, end: SelectionCaret) {
-    this.start = start;
-    this.end = end;
-  }
-}
-
-export class ContentEditableElementTextStore extends AbstractElementTextStore<{}> {
-  root: HTMLElement;
-
-  constructor(ele: HTMLElement) {
-    if(ele.isContentEditable) {
-      super();
-      this.root = ele;
-    } else {
-      throw "Specified element is not already content-editable!";
-    }
-  }
-
-  get isSynthetic(): boolean {
-    return false;
-  }
-
-  getElement(): HTMLElement {
-    return this.root;
-  }
-
-  isSelectionEmpty(): boolean {
-    if(!this.hasSelection()) {
-      return true;
-    }
-
-    return this.root.ownerDocument.getSelection().isCollapsed;
-  }
-
-  hasSelection(): boolean {
-    const Lsel = this.root.ownerDocument.getSelection();
-
-    if(this.root != Lsel.anchorNode && !this.root.contains(Lsel.anchorNode)) {
-      return false;
-    }
-
-    if(this.root != Lsel.focusNode && !this.root.contains(Lsel.focusNode)) {
-      return false;
-    }
-
-    return true;
-  }
-
-  clearSelection(): void {
-    if(this.hasSelection()) {
-      const Lsel = this.root.ownerDocument.getSelection();
-
-      if(!Lsel.isCollapsed) {
-        Lsel.deleteFromDocument();  // I2134, I2192
-      }
-    } else {
-      console.warn("Attempted to clear an unowned Selection!");
-    }
-  }
-
-  invalidateSelection(): void { /* No cache maintenance needed here, partly because
-                                  * it's impossible to cache a Selection; it mutates.
-                                  */  }
-
-  getCarets(): SelectionRange {
-    const Lsel = this.root.ownerDocument.getSelection();
-    let code = Lsel.anchorNode.compareDocumentPosition(Lsel.focusNode);
-
-    if(Lsel.isCollapsed) {
-      const caret = new SelectionCaret(Lsel.anchorNode, Lsel.anchorOffset);
-      return new SelectionRange(caret, caret);
-    } else {
-      const anchor = new SelectionCaret(Lsel.anchorNode, Lsel.anchorOffset);
-      const focus = new SelectionCaret(Lsel.focusNode, Lsel.focusOffset);
-
-      if(anchor.node == focus.node) {
-        code = (focus.offset - anchor.offset > 0) ? 2 : 4;
-      }
-
-      if(code & 2) {
-        return new SelectionRange(anchor, focus);
-      } else { // Default
-        // can test against code & 4 to ensure Focus is before anchor, though.
-        return new SelectionRange(focus, anchor);
-      }
-    }
-  }
-
-  getDeadkeyCaret(): number {
-    return KMWString.length(this.getTextBeforeCaret());
-  }
-
-  getTextBeforeCaret(): string {
-    if(!this.hasSelection()) {
-      return this.getText();
-    }
-
-    const caret = this.getCarets().start;
-
-    if(caret.node.nodeType != 3) {
-      return ''; // Must be a text node to provide a context.
-    }
-
-    return caret.node.textContent.substr(0, caret.offset);
-  }
-
-  getSelectedText(): string {
-    // TODO:  figure out the proper implementation.
-    // KMW 16 and before behavior may be maintained by just returning the empty string.
-    return '';
-  }
-
-  getTextAfterCaret(): string {
-    if(!this.hasSelection()) {
-      return '';
-    }
-
-    const caret = this.getCarets().end;
-
-    if(caret.node.nodeType != 3) {
-      return ''; // Must be a text node to provide a context.
-    }
-
-    return caret.node.textContent.substr(caret.offset);
-  }
-
-  getText(): string {
-    return this.root.innerText;
-  }
-
-  deleteCharsBeforeCaret(dn: number) {
-    if(!this.hasSelection() || dn <= 0) {
-      return;
-    }
-
-    const start = this.getCarets().start;
-
-    // Bounds-check on the number of chars to delete.
-    if(dn > start.offset) {
-      dn = start.offset;
-    }
-
-    if(start.node.nodeType != 3) {
-      console.warn("Deletion of characters requested without available context!");
-      return; // No context to delete characters from.
-    }
-
-    const range = this.root.ownerDocument.createRange();
-    const dnOffset = start.offset - KMWString.substr(start.node.nodeValue.substr(0, start.offset), -dn).length;
-
-    range.setStart(start.node, dnOffset);
-    range.setEnd(start.node, start.offset);
-
-    this.adjustDeadkeys(-dn);
-    range.deleteContents();
-    // No need to reposition the caret - the DOM will auto-move the selection accordingly, since
-    // we didn't use the selection to delete anything.
-  }
-
-  insertTextBeforeCaret(s: string) {
-    if(!this.hasSelection()) {
-      return;
-    }
-
-    const start = this.getCarets().start;
-    const delta = KMWString.length(s);
-    const Lsel = this.root.ownerDocument.getSelection();
-
-    if(delta == 0) {
-      return;
-    }
-
-    this.adjustDeadkeys(delta);
-
-    // While Selection.extend() was really nice for this, IE didn't support it whatsoever.
-    // However, IE (11, at least) DID support setting selections via ranges, so we were still
-    // able to manage the caret properly.
-    //
-    // TODO:  double-check that it was only IE-motivated, re-implement with Selection.extend().
-    const finalCaret = this.root.ownerDocument.createRange();
-
-    if(start.node.nodeType == 3) {
-      const textStart = <Text> start.node;
-      textStart.insertData(start.offset, s);
-      finalCaret.setStart(textStart, start.offset + s.length);
-    } else {
-      // Create a new text node - empty control
-      const n = start.node.ownerDocument.createTextNode(s);
-
-      const range = this.root.ownerDocument.createRange();
-      range.setStart(start.node, start.offset);
-      range.collapse(true);
-      range.insertNode(n);
-      finalCaret.setStart(n, s.length);
-    }
-
-    finalCaret.collapse(true);
-    Lsel.removeAllRanges();
-    try {
-      Lsel.addRange(finalCaret);
-    } catch(e) {
-      // Chrome (through 4.0 at least) throws an exception because it has not synchronised its content with the selection.
-      // scrollIntoView synchronises the content for selection
-      start.node.parentElement.scrollIntoView();
-      Lsel.addRange(finalCaret);
-    }
-    Lsel.collapseToEnd();
-  }
-
-  handleNewlineAtCaret(): void {
-    // TODO:  Implement.
-    //
-    // As it turns out, we never had an implementation for handling newline inputs from the OSK for this element type.
-    // At least this way, it's more explicit.
-    //
-    // Note:  consult "// Create a new text node - empty control" case in insertTextBeforeCaret -
-    // this helps to handle the browser-default implementation of newline handling.  In particular,
-    // entry of the first character after a newline.
-    //
-    // If raw newlines are entered into the HTML, but as with usual HTML, they're interpreted as excess whitespace and
-    // have no effect.  We need to add DOM elements for a functional newline.
-  }
-
-  protected setTextAfterCaret(s: string) {
-    if(!this.hasSelection()) {
-      return;
-    }
-
-    const caret = this.getCarets().end;
-    const delta = KMWString.length(s);
-
-    if(delta == 0) {
-      return;
-    }
-
-    // This is designed explicitly for use in direct-setting operations; deadkeys
-    // will be handled after this method.
-
-    if(caret.node.nodeType == 3) {
-      const textStart = <Text> caret.node;
-      textStart.replaceData(caret.offset, textStart.length, s);
-    } else {
-      // Create a new text node - empty control
-      const n = caret.node.ownerDocument.createTextNode(s);
-
-      const range = this.root.ownerDocument.createRange();
-      range.setStart(caret.node, caret.offset);
-      range.collapse(true);
-      range.insertNode(n);
-    }
-  }
-
-  doInputEvent() {
-    this.dispatchInputEventOn(this.root);
-  }
-}
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/createTextStoreForElement.ts b/web/src/engine/element-text-stores/createTextStoreForElement.ts
deleted file mode 100644
index a591ae32f92..00000000000
--- a/web/src/engine/element-text-stores/createTextStoreForElement.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Keyman is copyright (C) SIL Global. MIT License.
- */
-
-import { type AbstractElementTextStore }  from './abstractElementTextStore.js';
-import { InputElementTextStore } from './inputElementTextStore.js';
-import { TextAreaElementTextStore } from './textAreaElementTextStore.js';
-import { DesignIFrameElementTextStore } from './designIFrameElementTextStore.js';
-import { ContentEditableElementTextStore } from './contentEditableElementTextStore.js';
-import { nestedInstanceOf } from './utils.js';
-
-/**
- * Wraps an HTMLElement in a concrete text-store implementation.
- *
- * @param e - The HTMLElement to create a text-store for.
- * @returns A concrete AbstractElementTextStore for the element, or null if the element
- *          type is not supported or no suitable store can be created.
- */
-export function createTextStoreForElement(e: HTMLElement): AbstractElementTextStore<any> {
-  // Complex type scoping is implemented here so that kmwutils.ts is not a dependency for test compilations.
-
-  if(nestedInstanceOf(e, "HTMLInputElement")) {
-    return new InputElementTextStore(<HTMLInputElement> e);
-  } else if(nestedInstanceOf(e, "HTMLTextAreaElement")) {
-    return new TextAreaElementTextStore(<HTMLTextAreaElement> e);
-  } else if(nestedInstanceOf(e, "HTMLIFrameElement")) {
-    const iframe = <HTMLIFrameElement> e;
-
-    if(iframe.contentWindow && iframe.contentWindow.document && iframe.contentWindow.document.designMode == "on") {
-      return new DesignIFrameElementTextStore(iframe);
-    } else if (e.isContentEditable) {
-      // Do content-editable <iframe>s make sense?
-      return new ContentEditableElementTextStore(e);
-    } else {
-      return null;
-    }
-  } else if(e.isContentEditable) {
-    return new ContentEditableElementTextStore(e);
-  }
-
-  return null;
-}
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/designIFrameElementTextStore.ts b/web/src/engine/element-text-stores/designIFrameElementTextStore.ts
deleted file mode 100644
index e9a0fc1eff8..00000000000
--- a/web/src/engine/element-text-stores/designIFrameElementTextStore.ts
+++ /dev/null
@@ -1,358 +0,0 @@
-import { AbstractElementTextStore } from './abstractElementTextStore.js';
-import { KMWString } from '@keymanapp/web-utils';
-
-class SelectionCaret {
-  node: Node;
-  offset: number;
-
-  constructor(node: Node, offset: number) {
-    this.node = node;
-    this.offset = offset;
-  }
-}
-
-class SelectionRange {
-  start: SelectionCaret;
-  end: SelectionCaret;
-
-  constructor(start: SelectionCaret, end: SelectionCaret) {
-    this.start = start;
-    this.end = end;
-  }
-}
-
-class StyleCommand {
-  cmd: string;
-  stateType: number;
-  cache: string|boolean;
-
-  constructor(c: string, s:number) {
-    this.cmd = c;
-    this.stateType = s;
-  }
-}
-
-export class DesignIFrameElementTextStore extends AbstractElementTextStore<{}> {
-  root: HTMLIFrameElement;
-  doc: Document;
-  docRoot: HTMLElement;
-
-  commandCache: StyleCommand[];
-
-  constructor(ele: HTMLIFrameElement) {
-    super();
-    this.root = ele;
-
-    if(ele.contentWindow && ele.contentWindow.document && ele.contentWindow.document.designMode == 'on') {
-      this.doc = ele.contentWindow.document;
-      this.docRoot = ele.contentWindow.document.documentElement;
-    } else {
-      throw "Specified IFrame is not in design-mode!";
-    }
-  }
-
-  get isSynthetic(): boolean {
-    return false;
-  }
-
-  getElement(): HTMLIFrameElement {
-    return this.root;
-  }
-
-  focus(): void {
-    this.doc.defaultView.focus(); // I3363 (Build 301)
-  }
-
-  isSelectionEmpty(): boolean {
-    if(!this.hasSelection()) {
-      return true;
-    }
-
-    return this.doc.getSelection().isCollapsed;
-  }
-
-  hasSelection(): boolean {
-    const Lsel = this.doc.getSelection();
-    const outerSel = document.getSelection();
-
-    // If the outer doc's selection matches, we're active.
-    if(outerSel.anchorNode == Lsel.anchorNode && outerSel.focusNode == Lsel.focusNode) {
-      return true;
-    } else {
-      // Problem:  for testing, we can't enforce the ideal (ie: first) condition.
-      // Technically, the IFrame _will_ always have its own internal selection, though... so... it kinda works?
-      return true;
-    }
-  }
-
-  clearSelection(): void {
-    if(this.hasSelection()) {
-      const Lsel = this.doc.getSelection();
-
-      if(!Lsel.isCollapsed) {
-        Lsel.deleteFromDocument();  // I2134, I2192
-      }
-    } else {
-      console.warn("Attempted to clear an unowned Selection!");
-    }
-  }
-
-  invalidateSelection(): void { /* No cache maintenance needed here, partly because
-                                  * it's impossible to cache a Selection; it mutates.
-                                  */  }
-
-  getCarets(): SelectionRange {
-    const Lsel = this.doc.getSelection();
-    let code = Lsel.anchorNode.compareDocumentPosition(Lsel.focusNode);
-
-    if(Lsel.isCollapsed) {
-      const caret = new SelectionCaret(Lsel.anchorNode, Lsel.anchorOffset);
-      return new SelectionRange(caret, caret);
-    } else {
-      const anchor = new SelectionCaret(Lsel.anchorNode, Lsel.anchorOffset);
-      const focus = new SelectionCaret(Lsel.focusNode, Lsel.focusOffset);
-
-      if(anchor.node == focus.node) {
-        code = (focus.offset - anchor.offset > 0) ? 2 : 4;
-      }
-
-      if(code & 2) {
-        return new SelectionRange(anchor, focus);
-      } else { // Default
-        // can test against code & 4 to ensure Focus is before anchor, though.
-        return new SelectionRange(focus, anchor);
-      }
-    }
-  }
-
-  getDeadkeyCaret(): number {
-    return KMWString.length(this.getTextBeforeCaret());
-  }
-
-  getTextBeforeCaret(): string {
-    if(!this.hasSelection()) {
-      return this.getText();
-    }
-
-    const caret = this.getCarets().start;
-
-    if(caret.node.nodeType != 3) {
-      return ''; // Must be a text node to provide a context.
-    }
-
-    return caret.node.textContent.substr(0, caret.offset);
-  }
-
-  getSelectedText(): string {
-    // TODO:  figure out the proper implementation.
-    // KMW 16 and before behavior may be maintained by just returning the empty string.
-    return '';
-  }
-
-  getTextAfterCaret(): string {
-    if(!this.hasSelection()) {
-      return '';
-    }
-
-    const caret = this.getCarets().end;
-
-    if(caret.node.nodeType != 3) {
-      return ''; // Must be a text node to provide a context.
-    }
-
-    return caret.node.textContent.substr(caret.offset);
-  }
-
-  getText(): string {
-    return this.docRoot.innerText;
-  }
-
-  deleteCharsBeforeCaret(dn: number) {
-    if(!this.hasSelection() || dn <= 0) {
-      return;
-    }
-
-    const start = this.getCarets().start;
-
-    // Bounds-check on the number of chars to delete.
-    if(dn > start.offset) {
-      dn = start.offset;
-    }
-
-    if(start.node.nodeType != 3) {
-      console.warn("Deletion of characters requested without available context!");
-      return; // No context to delete characters from.
-    }
-
-    const range = this.doc.createRange();
-    const dnOffset = start.offset - KMWString.substr(start.node.nodeValue.substr(0, start.offset), -dn).length;
-
-    range.setStart(start.node, dnOffset);
-    range.setEnd(start.node, start.offset);
-
-    this.adjustDeadkeys(-dn);
-    range.deleteContents();
-    // No need to reposition the caret - the DOM will auto-move the selection accordingly, since
-    // we didn't use the selection to delete anything.
-  }
-
-  insertTextBeforeCaret(s: string) {
-    if(!this.hasSelection()) {
-      return;
-    }
-
-    const start = this.getCarets().start;
-    const delta = KMWString.length(s);
-    const Lsel = this.doc.getSelection();
-
-    if(delta == 0) {
-      return;
-    }
-
-    this.adjustDeadkeys(delta);
-
-    // While Selection.extend() was really nice for this, IE didn't support it whatsoever.
-    // However, IE (11, at least) DID support setting selections via ranges, so we were still
-    // able to manage the caret properly.
-    //
-    // TODO:  double-check that it was only IE-motivated, re-implement with Selection.extend().
-    const finalCaret = this.root.ownerDocument.createRange();
-
-    if(start.node.nodeType == 3) {
-      const textStart = <Text> start.node;
-      textStart.insertData(start.offset, s);
-      finalCaret.setStart(textStart, start.offset + s.length);
-    } else {
-      // Create a new text node - empty control
-      const n = this.doc.createTextNode(s);
-
-      const range = this.doc.createRange();
-      range.setStart(start.node, start.offset);
-      range.collapse(true);
-      range.insertNode(n);
-      finalCaret.setStart(n, s.length);
-    }
-
-    finalCaret.collapse(true);
-    Lsel.removeAllRanges();
-    try {
-      Lsel.addRange(finalCaret);
-    } catch(e) {
-      // Chrome (through 4.0 at least) throws an exception because it has not synchronised its content with the selection.
-      // scrollIntoView synchronises the content for selection
-      start.node.parentElement.scrollIntoView();
-      Lsel.addRange(finalCaret);
-    }
-    Lsel.collapseToEnd();
-  }
-
-  handleNewlineAtCaret(): void {
-    // TODO:  Implement.
-    //
-    // As it turns out, we never had an implementation for handling newline inputs from the OSK for this element type.
-    // At least this way, it's more explicit.
-    //
-    // Note:  consult "// Create a new text node - empty control" case in insertTextBeforeCaret -
-    // this helps to handle the browser-default implementation of newline handling.  In particular,
-    // entry of the first character after a newline.
-    //
-    // If raw newlines are entered into the HTML, but as with usual HTML, they're interpreted as excess whitespace and
-    // have no effect.  We need to add DOM elements for a functional newline.
-  }
-
-  protected setTextAfterCaret(s: string) {
-    if(!this.hasSelection()) {
-      return;
-    }
-
-    const caret = this.getCarets().end;
-    const delta = KMWString.length(s);
-
-    if(delta == 0) {
-      return;
-    }
-
-    // This is designed explicitly for use in direct-setting operations; deadkeys
-    // will be handled after this method.
-
-    if(caret.node.nodeType == 3) {
-      const textStart = <Text> caret.node;
-      textStart.replaceData(caret.offset, textStart.length, s);
-    } else {
-      // Create a new text node - empty control
-      const n = caret.node.ownerDocument.createTextNode(s);
-
-      const range = this.root.ownerDocument.createRange();
-      range.setStart(caret.node, caret.offset);
-      range.collapse(true);
-      range.insertNode(n);
-    }
-  }
-
-  /**
-   * Function     saveProperties
-   * Scope        Private
-   * Description  Build and create list of styles that can be applied in iframes
-   */
-  saveProperties() {
-    // Formerly _CacheCommands.
-    const _CacheableCommands=[
-      new StyleCommand('backcolor',1), new StyleCommand('fontname',1), new StyleCommand('fontsize',1),
-      new StyleCommand('forecolor',1), new StyleCommand('bold',0), new StyleCommand('italic',0),
-      new StyleCommand('strikethrough',0), new StyleCommand('subscript',0),
-      new StyleCommand('superscript',0), new StyleCommand('underline',0)
-    ];
-
-    if(this.doc.defaultView) {
-      _CacheableCommands.push(new StyleCommand('hilitecolor',1));
-    }
-
-    for(let n=0; n < _CacheableCommands.length; n++) { // I1511 - array prototype extended
-      const cmd = _CacheableCommands[n];
-      //KeymanWeb._Debug('Command:'+_CacheableCommands[n][0]);
-      if(cmd.stateType == 1) {
-        cmd.cache = this.doc.queryCommandValue(cmd.cmd);
-      } else {
-        cmd.cache = this.doc.queryCommandState(cmd.cmd);
-      }
-    }
-    this.commandCache = _CacheableCommands;
-  }
-
-  /**
-   * Function     restoreProperties
-   * Scope        Private
-   * Description  Restore styles in IFRAMEs (??)
-   */
-  restoreProperties(_func?: () => void): void {
-    // Formerly _CacheCommandsReset.
-    if(!this.commandCache) {
-      console.error("No command cache exists to restore!");
-    }
-
-    for(let n=0; n < this.commandCache.length; n++) { // I1511 - array prototype extended
-      const cmd = this.commandCache[n];
-
-      //KeymanWeb._Debug('ResetCacheCommand:'+_CacheableCommands[n][0]+'='+_CacheableCommands[n][2]);
-      if(cmd.stateType == 1) {
-        if(this.doc.queryCommandValue(cmd.cmd) != cmd.cache) {
-          if(_func) {
-            _func();
-          }
-          this.doc.execCommand(cmd.cmd, false, <string> cmd.cache);
-        }
-      } else if(this.doc.queryCommandState(cmd.cmd) != cmd.cache) {
-        if(_func) {
-          _func();
-        }
-        //KeymanWeb._Debug('executing command '+_CacheableCommand[n][0]);
-        this.doc.execCommand(cmd.cmd, false, null);
-      }
-    }
-  }
-
-  doInputEvent() {
-    // Root = the iframe, the outermost component and the one we were originally told to attach to.
-    this.dispatchInputEventOn(this.root);
-  }
-}
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/index.ts b/web/src/engine/element-text-stores/index.ts
deleted file mode 100644
index 4a5dfe6e615..00000000000
--- a/web/src/engine/element-text-stores/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Keyman is copyright (C) SIL Global. MIT License.
- */
-
-export { createTextStoreForElement } from './createTextStoreForElement.js';
-export { ContentEditableElementTextStore } from './contentEditableElementTextStore.js';
-export { DesignIFrameElementTextStore } from './designIFrameElementTextStore.js';
-export { InputElementTextStore } from './inputElementTextStore.js';
-export { AbstractElementTextStore } from './abstractElementTextStore.js';
-export { TextAreaElementTextStore } from './textAreaElementTextStore.js';
-export { nestedInstanceOf } from './utils.js';
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/inputElementTextStore.ts b/web/src/engine/element-text-stores/inputElementTextStore.ts
deleted file mode 100644
index 24235626ed8..00000000000
--- a/web/src/engine/element-text-stores/inputElementTextStore.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-import { AbstractElementTextStore } from './abstractElementTextStore.js';
-import { KMWString } from '@keymanapp/web-utils';
-
-interface EventMap  {
-  /**
-   * This event will be raised when a newline is received by wrapped elements not of
-   * the 'search' or 'submit' types.
-   *
-   * Original code this is replacing:
-   ```
-      // Allows compiling this separately from the main body of KMW.
-      // TODO:  rework class to accept a class-static 'callback' from the DOM module that this can call.
-      //        Would eliminate the need for this 'static' reference.
-      //        Only strongly matters once we better modularize KMW, with web-dom vs web-dom-targets vs web-core, etc.
-      if(com.keyman["singleton"]) {
-        com.keyman["singleton"].domManager.moveToNext(false);
-      }
-   ```
-   * This does not belong in a modularized version of this class; it must be supplied
-   * by the consuming top-level products instead.
-   */
-  'unhandlednewline': (element: HTMLInputElement) => void
-}
-
-export class InputElementTextStore extends AbstractElementTextStore<EventMap> {
-  root: HTMLInputElement;
-
-  /**
-   * Tracks the most recently-cached selection start index.
-   */
-  private _cachedSelectionStart: number
-
-  /**
-   * Tracks the most recently processed, extended-string-based selection start index.
-   * When the element's selectionStart value changes, this should be invalidated.
-   */
-  private processedSelectionStart: number;
-
-  /**
-   * Tracks the most recently processed, extended-string-based selection end index.
-   * When the element's selectionEnd value changes, this should be invalidated.
-   */
-  private processedSelectionEnd: number;
-
-  /**
-   * Set, then unset within the `forceScroll` method in order to facilitate the
-   * `isForcingScroll` flag.
-   */
-  private _activeForcedScroll: boolean;
-
-  constructor(ele: HTMLInputElement) {
-    super();
-
-    this.root = ele;
-    this._cachedSelectionStart = -1;
-  }
-
-  get isSynthetic(): boolean {
-    return false;
-  }
-
-  static isSupportedType(type: string): boolean {
-    return type == 'email' || type == 'search' || type == 'text' || type == 'url';
-  }
-
-  getElement(): HTMLInputElement {
-    return this.root;
-  }
-
-  clearSelection(): void {
-    // Processes our codepoint-based variants of selectionStart and selectionEnd.
-    this.getCaret(); // updates processedSelectionStart if required
-    this.root.value = KMWString.substr(this.root.value, 0, this.processedSelectionStart) + KMWString.substr(this.root.value, this.processedSelectionEnd); //I3319
-
-    this.setCaret(this.processedSelectionStart);
-  }
-
-  isSelectionEmpty(): boolean {
-    return this.root.selectionStart == this.root.selectionEnd;
-  }
-
-  hasSelection(): boolean {
-    return true;
-  }
-
-  invalidateSelection() {
-    // Since .selectionStart will never return this value, we use it to indicate
-    // the need to refresh our processed indices.
-    this._cachedSelectionStart = -1;
-  }
-
-  getCaret(): number {
-    if(this.root.selectionStart != this._cachedSelectionStart) {
-      this._cachedSelectionStart = this.root.selectionStart; // KMW-1
-      this.processedSelectionStart = KMWString.codeUnitToCodePoint(this.root.value, this.root.selectionStart); // I3319
-      this.processedSelectionEnd = KMWString.codeUnitToCodePoint(this.root.value, this.root.selectionEnd);     // I3319
-    }
-    return this.root.selectionDirection == 'forward' ? this.processedSelectionEnd : this.processedSelectionStart;
-  }
-
-  getDeadkeyCaret(): number {
-    return this.getCaret();
-  }
-
-  setCaret(caret: number) {
-    this.setSelection(caret, caret, "none");
-  }
-
-  setSelection(start: number, end: number, direction: "forward" | "backward" | "none") {
-    const domStart = KMWString.codePointToCodeUnit(this.root.value, start);
-    const domEnd = KMWString.codePointToCodeUnit(this.root.value, end);
-    this.root.setSelectionRange(domStart, domEnd, direction);
-
-    this.processedSelectionStart = start;
-    this.processedSelectionEnd = end;
-
-    this.forceScroll();
-
-    this.root.setSelectionRange(domStart, domEnd, direction);
-  }
-
-  forceScroll() {
-    // Only executes when com.keyman.DOMEventHandlers is defined.
-    //
-    // We bypass this whenever operating in the embedded format.
-    const element = this.getElement();
-
-    const selectionStart = element.selectionStart;
-    const selectionEnd = element.selectionEnd;
-
-    this._activeForcedScroll = true;
-
-    try {
-      //Forces scrolling; the re-focus triggers the scroll, at least.
-      element.blur();
-      element.focus();
-    } finally {
-      // On Edge, it appears that the blur/focus combination will reset the caret position
-      // under certain scenarios during unit tests.  So, we re-set it afterward.
-      element.selectionStart = selectionStart;
-      element.selectionEnd = selectionEnd;
-      this._activeForcedScroll = false;
-    }
-  }
-
-  isForcingScroll(): boolean {
-    return this._activeForcedScroll;
-  }
-
-  getSelectionDirection(): "forward" | "backward" | "none" {
-    return this.root.selectionDirection;
-  }
-
-  getTextBeforeCaret(): string {
-    this.getCaret();
-    return KMWString.substring(this.getText(), 0, this.processedSelectionStart);
-  }
-
-  getSelectedText(): string {
-    this.getCaret();
-    return KMWString.substring(this.getText(), this.processedSelectionStart, this.processedSelectionEnd);
-  }
-
-  setTextBeforeCaret(text: string) {
-    this.getCaret();
-    const selectionLength = this.processedSelectionEnd - this.processedSelectionStart;
-    const direction = this.getSelectionDirection();
-    const newCaret = KMWString.length(text);
-    this.root.value = text + KMWString.substring(this.getText(), this.processedSelectionStart);
-
-    this.setSelection(newCaret, newCaret + selectionLength, direction);
-  }
-
-  protected setTextAfterCaret(s: string) {
-    const direction = this.getSelectionDirection();
-
-    this.root.value = this.getTextBeforeCaret() + s;
-    this.setSelection(this.processedSelectionStart, this.processedSelectionEnd, direction);
-  }
-
-  getTextAfterCaret(): string {
-    this.getCaret();
-    return KMWString.substring(this.getText(), this.processedSelectionEnd);
-  }
-
-  getText(): string {
-    return this.root.value;
-  }
-
-  deleteCharsBeforeCaret(dn: number) {
-    if(dn > 0) {
-      const curText = this.getTextBeforeCaret();
-      const caret = this.processedSelectionStart;
-
-      if(dn > caret) {
-        dn = caret;
-      }
-
-      this.adjustDeadkeys(-dn);
-      this.setTextBeforeCaret(KMWString.substring(curText, 0, caret - dn));
-      this.setCaret(caret - dn);
-    }
-  }
-
-  insertTextBeforeCaret(s: string) {
-    if(!s) {
-      return;
-    }
-
-    const caret = this.getCaret();
-    const front = this.getTextBeforeCaret();
-    const back = KMWString.substring(this.getText(), this.processedSelectionStart);
-
-    this.adjustDeadkeys(KMWString.length(s));
-    this.root.value = front + s + back;
-    this.setCaret(caret + KMWString.length(s));
-  }
-
-  handleNewlineAtCaret(): void {
-    const inputEle = this.root;
-    // Can't occur for Mocks - just Input types.
-    if (inputEle && (inputEle.type == 'search' || inputEle.type == 'submit')) {
-      inputEle.disabled=false;
-      inputEle.form.submit();
-    } else {
-      this.events.emit('unhandlednewline', inputEle);
-    }
-  }
-
-  doInputEvent() {
-    this.dispatchInputEventOn(this.root);
-  }
-}
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/readme.md b/web/src/engine/element-text-stores/readme.md
deleted file mode 100644
index 4e40b461781..00000000000
--- a/web/src/engine/element-text-stores/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-## engine/element-wrappers
-
-This submodule provides a subset of the main engine's Web-oriented code that's used to 'wrap' webpage
-elements as part of KMW attachment and interface the element with the `keyboard` submodule.
-
-
-Please keep any code in this folder / namespace as free as possible from dependencies on other parts of KMW.  Some of our unit tests wish to run against these types without requiring KMW to be active.
-
-Note that with a little work, we _could_ completely spin this into its own separate module - this could be useful for development and testing purposes, especially now that we've dropped the old `TouchAlias` type that was a bit entangled with main engine code.
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/textAreaElementTextStore.ts b/web/src/engine/element-text-stores/textAreaElementTextStore.ts
deleted file mode 100644
index 02423b261d4..00000000000
--- a/web/src/engine/element-text-stores/textAreaElementTextStore.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import { AbstractElementTextStore } from './abstractElementTextStore.js';
-import { KMWString } from '@keymanapp/web-utils';
-
-export class TextAreaElementTextStore extends AbstractElementTextStore<{}> {
-  root: HTMLTextAreaElement;
-
-  /**
-   * Tracks the most recently-cached selection start index.
-   */
-  private _cachedSelectionStart: number
-
-  /**
-   * Tracks the most recently processed, extended-string-based selection start index.
-   * When the element's selectionStart value changes, this should be invalidated.
-   */
-  private processedSelectionStart: number;
-
-  /**
-   * Tracks the most recently processed, extended-string-based selection end index.
-   * When the element's selectionEnd value changes, this should be invalidated.
-   */
-  private processedSelectionEnd: number;
-
-  /**
-   * Set, then unset within the `forceScroll` method in order to facilitate the
-   * `isForcingScroll` flag.
-   */
-  private _activeForcedScroll: boolean;
-
-  constructor(ele: HTMLTextAreaElement) {
-    super();
-
-    this.root = ele;
-    this._cachedSelectionStart = -1;
-  }
-
-  get isSynthetic(): boolean {
-    return false;
-  }
-
-  getElement(): HTMLTextAreaElement {
-    return this.root;
-  }
-
-  clearSelection(): void {
-    // Processes our codepoint-based variants of selectionStart and selectionEnd.
-    this.getCaret(); // updates processedSelectionStart if required
-    this.root.value = KMWString.substr(this.root.value, 0, this.processedSelectionStart) + KMWString.substr(this.root.value, this.processedSelectionEnd); //I3319
-
-    this.setCaret(this.processedSelectionStart);
-  }
-
-  isSelectionEmpty(): boolean {
-    return this.root.selectionStart == this.root.selectionEnd;
-  }
-
-  hasSelection(): boolean {
-    return true;
-  }
-
-  invalidateSelection() {
-    // Since .selectionStart will never return this value, we use it to indicate
-    // the need to refresh our processed indices.
-    this._cachedSelectionStart = -1;
-  }
-
-  getCaret(): number {
-    if(this.root.selectionStart != this._cachedSelectionStart) {
-      this._cachedSelectionStart = this.root.selectionStart; // KMW-1
-      this.processedSelectionStart = KMWString.codeUnitToCodePoint(this.root.value, this.root.selectionStart); // I3319
-      this.processedSelectionEnd = KMWString.codeUnitToCodePoint(this.root.value, this.root.selectionEnd);     // I3319
-    }
-    return this.root.selectionDirection == 'forward' ? this.processedSelectionEnd : this.processedSelectionStart;
-  }
-
-  getDeadkeyCaret(): number {
-    return this.getCaret();
-  }
-
-  setCaret(caret: number) {
-    this.setSelection(caret, caret, "none");
-  }
-
-  setSelection(start: number, end: number, direction: "forward" | "backward" | "none") {
-    const domStart = KMWString.codePointToCodeUnit(this.root.value, start);
-    const domEnd = KMWString.codePointToCodeUnit(this.root.value, end);
-    this.root.setSelectionRange(domStart, domEnd, direction);
-
-    this.processedSelectionStart = start;
-    this.processedSelectionEnd = end;
-
-    this.forceScroll();
-
-    this.root.setSelectionRange(domStart, domEnd, direction);
-  }
-
-  forceScroll() {
-    // Only executes when com.keyman.DOMEventHandlers is defined.
-    //
-    // We bypass this whenever operating in the embedded format.
-    const element = this.getElement();
-
-    const selectionStart = element.selectionStart;
-    const selectionEnd = element.selectionEnd;
-
-    this._activeForcedScroll = true;
-
-    try {
-      //Forces scrolling; the re-focus triggers the scroll, at least.
-      element.blur();
-      element.focus();
-    } finally {
-      // On Edge, it appears that the blur/focus combination will reset the caret position
-      // under certain scenarios during unit tests.  So, we re-set it afterward.
-      element.selectionStart = selectionStart;
-      element.selectionEnd = selectionEnd;
-      this._activeForcedScroll = false;
-    }
-  }
-
-  isForcingScroll(): boolean {
-    return this._activeForcedScroll;
-  }
-
-  getSelectionDirection(): "forward" | "backward" | "none" {
-    return this.root.selectionDirection;
-  }
-
-  getTextBeforeCaret(): string {
-    this.getCaret();
-    return KMWString.substring(this.getText(), 0, this.processedSelectionStart);
-  }
-
-  setTextBeforeCaret(text: string) {
-    this.getCaret();
-    const selectionLength = this.processedSelectionEnd - this.processedSelectionStart;
-    const direction = this.getSelectionDirection();
-    const newCaret = KMWString.length(text);
-    this.root.value = text + KMWString.substring(this.getText(), this.processedSelectionStart);
-
-    this.setSelection(newCaret, newCaret + selectionLength, direction);
-  }
-
-  protected setTextAfterCaret(s: string) {
-    const direction = this.getSelectionDirection();
-
-    this.root.value = this.getTextBeforeCaret() + s;
-    this.setSelection(this.processedSelectionStart, this.processedSelectionEnd, direction);
-  }
-
-  getTextAfterCaret(): string {
-    this.getCaret();
-    return KMWString.substring(this.getText(), this.processedSelectionEnd);
-  }
-
-  getSelectedText(): string {
-    this.getCaret();
-    return KMWString.substring(this.getText(), this.processedSelectionStart, this.processedSelectionEnd);
-  }
-
-  getText(): string {
-    return this.root.value;
-  }
-
-  deleteCharsBeforeCaret(dn: number) {
-    if(dn > 0) {
-      const curText = this.getTextBeforeCaret();
-      const caret = this.processedSelectionStart;
-
-      if(dn > caret) {
-        dn = caret;
-      }
-
-      this.adjustDeadkeys(-dn);
-      this.setTextBeforeCaret(KMWString.substr(curText, 0, caret - dn));
-      this.setCaret(caret - dn);
-    }
-  }
-
-  insertTextBeforeCaret(s: string) {
-    if(!s) {
-      return;
-    }
-
-    const caret = this.getCaret();
-    const front = this.getTextBeforeCaret();
-    const back = KMWString.substring(this.getText(), this.processedSelectionStart);
-
-    this.adjustDeadkeys(KMWString.length(s));
-    this.root.value = front + s + back;
-    this.setCaret(caret + KMWString.length(s));
-  }
-
-  handleNewlineAtCaret(): void {
-    this.insertTextBeforeCaret('\n');
-  }
-
-  doInputEvent() {
-    this.dispatchInputEventOn(this.root);
-  }
-}
\ No newline at end of file
diff --git a/web/src/engine/element-text-stores/utils.ts b/web/src/engine/element-text-stores/utils.ts
deleted file mode 100644
index 739f11a982b..00000000000
--- a/web/src/engine/element-text-stores/utils.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Checks the type of an input DOM-related object while ensuring that it is checked against the correct prototype,
- * as class prototypes are (by specification) scoped upon the owning Window.
- *
- * See https://stackoverflow.com/questions/43587286/why-does-instanceof-return-false-on-chrome-safari-and-edge-and-true-on-firefox
- * for more details.
- *
- * @param {EventTarget}   Pelem       An element of the web page or one of its IFrame-based subdocuments.
- * @param {string}        className   The plain-text name of the expected Element type.
- * @return {boolean}
- */
-export function nestedInstanceOf(Pelem: EventTarget, className: string): boolean {
-  let scopedClass;
-
-  if(!Pelem) {
-    // If we're bothering to check something's type, null references don't match
-    // what we're looking for.
-    return false;
-  }
-  // @ts-ignore
-  if (Pelem['Window']) { // Window objects contain the class definitions for types held within them.  So, we can check for those.
-    return className == 'Window';
-    // @ts-ignore
-  } else if (Pelem['defaultView']) { // Covers Document.
-    // @ts-ignore
-    scopedClass = (Pelem as Document)['defaultView'][className];
-    // @ts-ignore
-  } else if(Pelem['ownerDocument']) {
-    // @ts-ignore
-    scopedClass = (Pelem as Node).ownerDocument.defaultView[className];
-  }
-
-  if(scopedClass) {
-    return Pelem instanceof scopedClass;
-  } else {
-    return false;
-  }
-}
\ No newline at end of file
diff --git a/web/src/engine/src/element-text-stores/readme.md b/web/src/engine/src/element-text-stores/readme.md
index 4e40b461781..d4a5e94da30 100644
--- a/web/src/engine/src/element-text-stores/readme.md
+++ b/web/src/engine/src/element-text-stores/readme.md
@@ -1,4 +1,4 @@
-## engine/element-wrappers
+## engine/element-text-stores
 
 This submodule provides a subset of the main engine's Web-oriented code that's used to 'wrap' webpage
 elements as part of KMW attachment and interface the element with the `keyboard` submodule.

From 7a7dcf887841e105f4d03ab7726b82071dedaed8 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 22 May 2025 19:05:02 +0200
Subject: [PATCH 125/254] chore(web): apply suggestions from code review

Theses changes come out of code review of #12291.

Follow-up-of: #12291
Test-bot: skip
---
 web/src/app/browser/src/keymanEngine.ts     | 2 +-
 web/src/engine/src/main/keymanEngineBase.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 200b205a0a2..a2a3eab486b 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -443,7 +443,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
       kbd = this.core.activeKeyboard;
     }
 
-    // TODO-web-core: implement for KMX keyboards if needed
+    // We only support isCJK on legacy .js keyboards; see #7928
     return kbd && kbd instanceof JSKeyboard && kbd.isCJK;
   }
 
diff --git a/web/src/engine/src/main/keymanEngineBase.ts b/web/src/engine/src/main/keymanEngineBase.ts
index ce41ec7323b..168be7c42a8 100644
--- a/web/src/engine/src/main/keymanEngineBase.ts
+++ b/web/src/engine/src/main/keymanEngineBase.ts
@@ -1,4 +1,4 @@
-import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction } from "keyman/engine/keyboard";
+import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction, KMXKeyboard } from "keyman/engine/keyboard";
 import { ProcessorInitOptions } from 'keyman/engine/js-processor';
 // TODO-web-core: remove alias
 import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard";
@@ -566,7 +566,7 @@ export class KeymanEngineBase<
         const kbdObj = this.keyboardRequisitioner.cache.getKeyboard(k0);
         if (!kbdObj) {
           throw new Error(`Keyboard '${k0}' has not been loaded.`);
-        } else if (!(kbdObj instanceof JSKeyboard)) {
+        } else if (kbdObj instanceof KMXKeyboard) {
           return false; // TODO-web-core: implement for KMX keyboards
         } else {
           k0 = kbdObj;

From 8eb7e6b0d4c003fd445875f2cf9dfb59e13077b5 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 7 Nov 2025 09:36:19 +0100
Subject: [PATCH 126/254] maint(web): cleanup web/**/build.sh for consistency
 and build performance

* Simplify the build dependency / child tree
* Split building and testing tooling so we don't rebuild components
* Fixup expected outputs to avoid repeated builds of components
* Remove unused dependency references
* Move test.sh targets into build.sh, so that testing doesn't lose
  dependency tracking and cause unnecessary rebuilds. (Note that I have
  not yet deleted test.sh.)
* Make predictive-text a direct child of engine, so that we don't build
  it twice (or even more times)

Test-bot: skip
---
 resources/tools/check-markdown/build.sh       |  2 +-
 web/build.sh                                  | 69 +++++++++++++------
 web/src/app/browser/build.sh                  |  6 +-
 web/src/app/ui/build.sh                       |  4 +-
 web/src/app/webview/build.sh                  |  6 +-
 web/src/common/web-utils/build.sh             |  6 +-
 web/src/engine/build.sh                       | 16 +++--
 web/src/engine/predictive-text/build.sh       | 11 ++-
 .../engine/predictive-text/templates/build.sh |  6 +-
 .../predictive-text/wordbreakers/build.sh     |  4 +-
 .../tools/data-compiler/tsconfig.json         |  3 -
 .../predictive-text/worker-main/build.sh      | 10 +--
 .../predictive-text/worker-thread/build.sh    | 10 +--
 web/src/test/manual/build.sh                  | 28 ++------
 web/src/tools/build.sh                        | 20 ++----
 web/src/tools/building/build.sh               | 20 ++++++
 .../tools/building/sourcemap-root/build.sh    |  2 +-
 web/src/tools/testing/build.sh                | 28 ++++++++
 web/src/tools/testing/bulk_rendering/build.sh |  5 +-
 .../testing/bulk_rendering/tsconfig.json      |  1 +
 .../tools/testing/gesture-processor/build.sh  |  6 +-
 web/src/tools/testing/recorder-core/build.sh  |  2 +-
 .../tools/testing/recorder-core/package.json  |  4 --
 .../tools/testing/recorder-core/tsconfig.json |  2 -
 web/src/tools/testing/recorder/build.sh       |  8 +--
 web/src/tools/testing/recorder/tsconfig.json  |  2 -
 26 files changed, 159 insertions(+), 122 deletions(-)
 create mode 100755 web/src/tools/building/build.sh
 create mode 100755 web/src/tools/testing/build.sh

diff --git a/resources/tools/check-markdown/build.sh b/resources/tools/check-markdown/build.sh
index 01dd9d81c92..c6fb2bd35c1 100755
--- a/resources/tools/check-markdown/build.sh
+++ b/resources/tools/check-markdown/build.sh
@@ -16,7 +16,7 @@ builder_describe "Check markdown internal links" \
   "build"
 
 builder_describe_outputs \
-  configure          "${THIS_SCRIPT_PATH}/node_modules" \
+  configure          /node_modules \
   build              build/index.js
 
 builder_parse "$@"
diff --git a/web/build.sh b/web/build.sh
index 022e2c27818..ed61f87537f 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -16,7 +16,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_set_child_base src
 builder_describe "Builds engine modules for Keyman Engine for Web (KMW)." \
   \
-  "@/common/tools/es-bundling" \
+  "@/common/tools/es-bundling        build" \
   "@/resources/tools/check-markdown  test:help" \
   \
   "clean" \
@@ -24,21 +24,23 @@ builder_describe "Builds engine modules for Keyman Engine for Web (KMW)." \
   "build" \
   "start                     Starts the test server" \
   "test" \
-  "coverage                  Create an HTML page with code coverage" \
-  ":app/browser              The form of Keyman Engine for Web for use on websites" \
-  ":app/webview              A puppetable version of KMW designed for use in a host app's WebView" \
-  ":app/ui                   Builds KMW's desktop form-factor keyboard-selection UI modules" \
+  "coverage                  Create an HTML page with code coverage report" \
+  \
+  ":app/browser              KeymanWeb build for use on websites" \
+  ":app/webview              KeymanWeb build for embedding in Keyman for Android and Keyman for iOS" \
+  ":app/ui                   KeymanWeb desktop form-factor keyboard-selection UI modules" \
   ":common/web-utils         Shared utils" \
   ":engine                   Keyman Engine for Web" \
-  ":engine/predictive-text   Builds KMW's predictive text module" \
   ":help                     Online documentation" \
-  ":samples                  Builds all needed resources for the KMW sample-page set" \
-  ":tools                    Builds engine-related development resources" \
+  ":samples                  Resources for the KMW sample-page set" \
+  ":tools/building           Build tools" \
+  ":tools/testing            Test tools" \
   ":test-pages=src/test/manual   Builds resources needed for the KMW manual testing pages" \
-  ":_all                     (Meta build target used when targets are not specified)"
-
-# Possible TODO?
-# "upload-symbols   Uploads build product to Sentry for error report symbolification.  Only defined for $DOC_BUILD_EMBED_WEB" \
+  ":_all                     (Meta build target used when targets are not specified)" \
+  \
+  "--test-dom-only           For test, run only DOM-oriented unit tests (reduced footprint, nothing browser-specific)" \
+  "--test-integrated-only    For test, run only KMW's integration test suite" \
+  "--test-inspect            For test, run browser-based unit tests in an inspectable mode"
 
 builder_parse "$@"
 
@@ -49,15 +51,15 @@ fi
 
 builder_describe_outputs \
   configure                     "/node_modules" \
-  build                         "/web/build/test/dom/cases/attachment/outputTargetForElement.tests.html" \
+  build                         "/web/build/test/dom/cases/attachment/textStoreForElement.tests.html" \
   build:app/browser             "/web/build/app/browser/lib/index.mjs" \
   build:app/webview             "/web/build/app/webview/${config}/keymanweb-webview.js" \
   build:app/ui                  "/web/build/app/ui/${config}/kmwuitoggle.js" \
   build:common/web-utils        "/web/build/common/web-utils/lib/index.mjs" \
   build:engine                  "/web/build/engine/lib/index.mjs" \
-  build:engine/predictive-text  "/web/src/engine/predictive-text/worker-main/build/lib/web/index.mjs" \
   build:samples                 "/web/src/samples/simplest/keymanweb.js" \
-  build:tools                   "/web/build/tools/building/sourcemap-root/index.js" \
+  build:tools/building          "/web/build/tools/building/sourcemap-root/index.js" \
+  build:tools/testing           "/web/build/tools/testing/test-utils/lib/index.d.ts" \
   build:test-pages              "/web/build/test-resources/sentry-manager.js"
 
 #### Build action definitions ####
@@ -90,7 +92,7 @@ precompile() {
   done
 }
 
-build_action() {
+build_tests_action() {
   builder_echo "Building auto tests..."
 
   # The currently-bundled declaration file for gesture-processor generates
@@ -140,12 +142,12 @@ coverage_action() {
   rm -rf build/coverage/tmp
 }
 
-builder_run_child_actions build:tools
+builder_run_child_actions build:tools/building
 
 builder_run_child_actions build:common/web-utils
 
 builder_run_child_actions build:engine
-builder_run_child_actions build:engine/predictive-text
+# builder_run_child_actions build:engine/predictive-text
 
 # Uses all but engine/element-wrappers and engine/attachment
 builder_run_child_actions build:app/webview
@@ -163,11 +165,38 @@ builder_run_child_actions build:samples
 builder_run_child_actions build:test-pages
 
 # Build tests
-builder_run_action build:_all build_action
+builder_run_child_actions build:tools/testing
+builder_run_action build:_all build_tests_action
 
 # Run tests
 builder_run_child_actions test
-builder_run_action test:_all ./test.sh
+
+function do_browser_tests() {
+  # Browser-based tests: common configs & kill-switches
+
+  # Select the right CONFIG file.
+  local WTR_CONFIG=
+  if builder_is_ci_build; then
+    WTR_CONFIG=.CI
+  fi
+
+  # Prepare the flags for the karma command.
+  local WTR_INSPECT=
+  if builder_has_option --test-inspect; then
+    WTR_INSPECT="--manual"
+  fi
+
+  pushd "${KEYMAN_ROOT}"
+  if builder_has_option --test-dom-only || ! builder_has_option --test-integrated-only; then
+    web-test-runner --config "web/src/test/auto/dom/web-test-runner${WTR_CONFIG}.config.mjs" ${WTR_INSPECT}
+  fi
+  if builder_has_option --test-integrated-only || ! builder_has_option --test-dom-only; then
+    web-test-runner --config "web/src/test/auto/integrated/web-test-runner${WTR_CONFIG}.config.mjs" ${WTR_INSPECT}
+  fi
+  popd
+}
+
+builder_run_action test:_all do_browser_tests
 
 function do_test_help() {
   check-markdown  "$KEYMAN_ROOT/web/docs/engine"
diff --git a/web/src/app/browser/build.sh b/web/src/app/browser/build.sh
index 13d0f954e45..e9b702ebe88 100755
--- a/web/src/app/browser/build.sh
+++ b/web/src/app/browser/build.sh
@@ -14,9 +14,9 @@ SUBPROJECT_NAME=app/browser
 # ################################ Main script ################################
 
 builder_describe "Builds the Keyman Engine for Web's website-integrating version for use in non-puppeted browsers." \
-  "@/common/tools/es-bundling" \
-  "@/web/src/engine build" \
-  "@/web/src/tools/building/sourcemap-root" \
+  "@/common/tools/es-bundling              build" \
+  "@/web/src/engine                        build" \
+  "@/web/src/tools/building/sourcemap-root build" \
   "clean" \
   "configure" \
   "build" \
diff --git a/web/src/app/ui/build.sh b/web/src/app/ui/build.sh
index 72c6377c094..298f571479f 100755
--- a/web/src/app/ui/build.sh
+++ b/web/src/app/ui/build.sh
@@ -14,8 +14,8 @@ SUBPROJECT_NAME=app/ui
 # ################################ Main script ################################
 
 builder_describe "Builds the Keyman Engine for Web's desktop form-factor keyboard selection modules." \
-  "@/web/src/app/browser build" \
-  "@/web/src/tools/building/sourcemap-root" \
+  "@/web/src/app/browser                    build" \
+  "@/web/src/tools/building/sourcemap-root  build" \
   "clean" \
   "configure" \
   "build" \
diff --git a/web/src/app/webview/build.sh b/web/src/app/webview/build.sh
index 790e8d2aef8..08d1fe47db0 100755
--- a/web/src/app/webview/build.sh
+++ b/web/src/app/webview/build.sh
@@ -14,9 +14,9 @@ SUBPROJECT_NAME=app/webview
 # ################################ Main script ################################
 
 builder_describe "Builds the Keyman Engine for Web's puppetable version designed for use within WebViews." \
-  "@/common/tools/es-bundling" \
-  "@/web/src/engine build" \
-  "@/web/src/tools/building/sourcemap-root" \
+  "@/common/tools/es-bundling               build" \
+  "@/web/src/engine                         build" \
+  "@/web/src/tools/building/sourcemap-root  build" \
   "clean" \
   "configure" \
   "build" \
diff --git a/web/src/common/web-utils/build.sh b/web/src/common/web-utils/build.sh
index f569e379b7e..95cc361b924 100755
--- a/web/src/common/web-utils/build.sh
+++ b/web/src/common/web-utils/build.sh
@@ -19,9 +19,9 @@ BUILD_DIR="/web/build/common/web-utils"
 
 builder_describe \
   "Compiles the web-oriented utility function module." \
-  "@/common/tools/es-bundling" \
-  "@/common/web/keyman-version" \
-  "@/common/web/types" \
+  "@/common/tools/es-bundling   build" \
+  "@/common/web/keyman-version  build" \
+  "@/common/web/types           build" \
   clean configure build test
 
 builder_describe_outputs \
diff --git a/web/src/engine/build.sh b/web/src/engine/build.sh
index fb71c30853c..996734e8cee 100755
--- a/web/src/engine/build.sh
+++ b/web/src/engine/build.sh
@@ -15,14 +15,14 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 # ################################ Main script ################################
 
 builder_describe "Builds Keyman Engine for Web (KMW)" \
-  "@/core:wasm" \
-  "@/common/tools/es-bundling" \
-  "@/web/src/engine/predictive-text" \
-  "@/web/src/common/web-utils" \
+  "@/core:wasm                 build" \
+  "@/common/tools/es-bundling  build" \
+  "@/web/src/common/web-utils  build" \
   "clean" \
   "configure" \
   "build" \
-  "test"
+  "test" \
+  ":predictive-text"
 
 # Possible TODO?
 # "upload-symbols   Uploads build product to Sentry for error report symbolification.  Only defined for $DOC_BUILD_EMBED_WEB" \
@@ -67,7 +67,11 @@ do_build () {
   node src/osk/validate-gesture-specs.js
 }
 
-builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/engine"
+builder_run_child_actions clean
+builder_run_action configure node_select_version_and_npm_ci
+builder_run_child_actions configure
+builder_run_child_actions build
 builder_run_action build do_build
 builder_run_action test test-headless-typescript engine
+builder_run_child_actions test
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/build.sh b/web/src/engine/predictive-text/build.sh
index 1d48d302cc5..ac6d2a670b0 100755
--- a/web/src/engine/predictive-text/build.sh
+++ b/web/src/engine/predictive-text/build.sh
@@ -20,8 +20,7 @@ builder_describe "Builds predictive-text components used within Keyman Engine fo
   ":templates                Builds the model templates utilized by compiled lexical models" \
   ":wordbreakers             Builds the wordbreakers provided for lexical model use" \
   ":worker-main              Builds the predictive-text worker interface module" \
-  ":worker-thread            Builds the predictive-text worker" \
-  ":_all                     (Meta build target used when targets are not specified)"
+  ":worker-thread            Builds the predictive-text worker"
 
 # Possible TODO?
 # "upload-symbols   Uploads build product to Sentry for error report symbolification.  Only defined for $DOC_BUILD_EMBED_WEB" \
@@ -30,10 +29,10 @@ builder_parse "$@"
 
 builder_describe_outputs \
   configure                     "/node_modules" \
-  build:templates               "/web/src/engine/predictive-text/build/obj/index.js" \
-  build:wordbreakers            "/web/src/engine/wordbreakers/build/main/obj/index.js" \
-  build:worker-main             "/web/src/engine/worker-main/build/obj/lmlayer.js" \
-  build:worker-thread           "/web/src/engine/worker-thread/build/obj/worker-main.wrapped.js"
+  build:templates               "/web/src/engine/predictive-text/templates/build/obj/index.js" \
+  build:wordbreakers            "/web/src/engine/predictive-text/wordbreakers/build/main/obj/index.js" \
+  build:worker-main             "/web/src/engine/predictive-text/worker-main/build/lib/index.mjs" \
+  build:worker-thread           "/web/src/engine/predictive-text/worker-thread/build/lib/worker-main.wrapped.js"
 
 #### Build action definitions ####
 
diff --git a/web/src/engine/predictive-text/templates/build.sh b/web/src/engine/predictive-text/templates/build.sh
index 3fa4b75a29c..ee969e606eb 100755
--- a/web/src/engine/predictive-text/templates/build.sh
+++ b/web/src/engine/predictive-text/templates/build.sh
@@ -17,8 +17,8 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 SUBPROJECT_NAME=engine/predictive-text/templates
 
 builder_describe "Builds the predictive-text model template implementation module" \
-  "@/web/src/common/web-utils" \
-  "@../wordbreakers" \
+  "@/web/src/common/web-utils build" \
+  "@../wordbreakers           build" \
   "clean" \
   "configure" \
   "build" \
@@ -38,7 +38,7 @@ function do_build() {
   tsc --emitDeclarationOnly --outFile ./build/lib/index.d.ts
 }
 
-builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action clean      rm -rf build/
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      do_build
 builder_run_action test       test-headless-typescript $SUBPROJECT_NAME
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/wordbreakers/build.sh b/web/src/engine/predictive-text/wordbreakers/build.sh
index a9f4c429c97..267dffb66b8 100755
--- a/web/src/engine/predictive-text/wordbreakers/build.sh
+++ b/web/src/engine/predictive-text/wordbreakers/build.sh
@@ -19,7 +19,7 @@ SUBPROJECT_NAME=engine/predictive-text/wordbreakers
 # Note:  the raw text files used for data.inc.ts are found within
 # /resources/standards-data/unicode-character-database.
 builder_describe "Builds the predictive-text wordbreaker implementation module" \
-  "@/common/web/types" \
+  "@/common/web/types  build" \
   "clean" \
   "configure" \
   "build" \
@@ -64,7 +64,7 @@ function do_test() {
   fi
 }
 
-builder_run_action configure  do_configure
 builder_run_action clean      rm -rf build/
+builder_run_action configure  do_configure
 builder_run_action build      do_build
 builder_run_action test       test-headless-typescript $SUBPROJECT_NAME
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/wordbreakers/tools/data-compiler/tsconfig.json b/web/src/engine/predictive-text/wordbreakers/tools/data-compiler/tsconfig.json
index dedc9395346..bd7096c88cf 100644
--- a/web/src/engine/predictive-text/wordbreakers/tools/data-compiler/tsconfig.json
+++ b/web/src/engine/predictive-text/wordbreakers/tools/data-compiler/tsconfig.json
@@ -7,9 +7,6 @@
     "module": "node16",
     "moduleResolution": "node16"
   },
-  "references": [
-    { "path": "../../../../../../../common/web/types" }
-  ],
   "include": [
 	  "./**/*"
   ],
diff --git a/web/src/engine/predictive-text/worker-main/build.sh b/web/src/engine/predictive-text/worker-main/build.sh
index 0abb4db7eef..c69aa168942 100755
--- a/web/src/engine/predictive-text/worker-main/build.sh
+++ b/web/src/engine/predictive-text/worker-main/build.sh
@@ -17,10 +17,10 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ################################ Main script ################################
 
 builder_describe "Builds the lm-layer module" \
-  "@/common/tools/es-bundling" \
-  "@/common/web/keyman-version" \
-  "@/common/web/types" \
-  "@/web/src/engine/predictive-text/worker-thread" \
+  "@/common/tools/es-bundling   build" \
+  "@/common/web/keyman-version  build" \
+  "@/common/web/types           build" \
+  "@/web/src/engine/predictive-text/worker-thread  build" \
   "clean" \
   "configure" \
   "build" \
@@ -56,7 +56,7 @@ function do_test() {
   ./unit_tests/test.sh test:headless test:browser
 }
 
-builder_run_action configure  do_configure
 builder_run_action clean      rm -rf build/
+builder_run_action configure  do_configure
 builder_run_action build      do_build
 builder_run_action test       do_test
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-thread/build.sh b/web/src/engine/predictive-text/worker-thread/build.sh
index 663088c2986..1d7d7062dfc 100755
--- a/web/src/engine/predictive-text/worker-thread/build.sh
+++ b/web/src/engine/predictive-text/worker-thread/build.sh
@@ -24,11 +24,11 @@ SUBPROJECT_NAME=engine/predictive-text/worker-thread
 
 builder_describe \
   "Compiles the Language Modeling Layer for common use in predictive text and autocorrective applications." \
-  "@/common/tools/es-bundling" \
-  "@/common/web/keyman-version" \
-  "@/web/src/tools/building/sourcemap-root" \
-  "@../wordbreakers" \
-  "@../templates" \
+  "@/common/tools/es-bundling   build" \
+  "@/common/web/keyman-version  build" \
+  "@/web/src/tools/building/sourcemap-root build" \
+  "@../wordbreakers build" \
+  "@../templates build" \
   configure clean build test \
   "--inspect  Runs browser-based tests in a locally-inspectable mode"
 
diff --git a/web/src/test/manual/build.sh b/web/src/test/manual/build.sh
index a468f5de5f3..1d12fb56e4a 100755
--- a/web/src/test/manual/build.sh
+++ b/web/src/test/manual/build.sh
@@ -1,28 +1,19 @@
 #!/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/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-
 # ################################ Main script ################################
 
 builder_describe "Builds the Keyman Engine for Web's sample page setups." \
   "@/common/web/sentry-manager build" \
-  "@/web/src/app/browser build" \
-  "@/web/src/app/ui build" \
-  "@/web/src/tools build" \
   "configure           Does nothing for this project" \
   "clean" \
   "build" \
   "test                Does nothing for this project"
 
-# Possible TODO?s
-# "upload-symbols   Uploads build product to Sentry for error report symbolification.  Only defined for $DOC_BUILD_EMBED_WEB" \
-
 builder_parse "$@"
 
 DEST="web/build/test-resources"
@@ -30,26 +21,15 @@ DEST="web/build/test-resources"
 builder_describe_outputs \
   build       "/$DEST/sentry-manager.js"
 
-#### Resource paths ####
-
-SENTRY_MANAGER_SRC="$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js"
-SENTRY_MANAGER_MAP="$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js.map"
-
 #### Build action definitions ####
 
-# GESTURE_PROCESSOR_BUILD="$KEYMAN_ROOT/web/src/engine/osk/gesture-processor/build/lib/."
-# GESTURE_PROCESSOR_TARGET="$KEYMAN_ROOT/web/build/engine/gesture-processor/lib/"
-
 function do_copy() {
   mkdir -p "$KEYMAN_ROOT/$DEST"
 
   # The next two lines are needed for the sentry-integration manual test page.
-  cp "$SENTRY_MANAGER_SRC"  "$KEYMAN_ROOT/$DEST/sentry-manager.js"
-  cp "$SENTRY_MANAGER_MAP"  "$KEYMAN_ROOT/$DEST/sentry-manager.js.map"
-
-  # mkdir -p "$GESTURE_PROCESSOR_TARGET"
-  # cp -a "$GESTURE_PROCESSOR_BUILD" "$GESTURE_PROCESSOR_TARGET"
+  cp "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js"      "$KEYMAN_ROOT/$DEST/sentry-manager.js"
+  cp "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js.map"  "$KEYMAN_ROOT/$DEST/sentry-manager.js.map"
 }
 
-builder_run_action clean rm -rf "$KEYMAN_ROOT/$DEST"
-builder_run_action build do_copy
+builder_run_action clean   rm -rf "$KEYMAN_ROOT/$DEST"
+builder_run_action build   do_copy
diff --git a/web/src/tools/build.sh b/web/src/tools/build.sh
index c057a75093a..5a0837de7fb 100755
--- a/web/src/tools/build.sh
+++ b/web/src/tools/build.sh
@@ -12,27 +12,15 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 ################################ Main script ################################
 
-builder_describe "Builds the Keyman Engine for Web's development & unit-testing tools" \
-  "@/common/web/keyman-version" \
-  "@/web/src/engine" \
+builder_describe "KeymanWeb development & unit-testing tools" \
   "configure" \
   "clean" \
   "build" \
-  "test" \
-  ":bulk_rendering=testing/bulk_rendering   Builds the bulk-rendering tool used to validate changes to OSK display code" \
-  ":recorder=testing/recorder               Builds the KMW recorder tool used for development of unit-test resources" \
-  ":sourcemap-root=building/sourcemap-root  Builds the sourcemap-cleaning tool used during minification of app/ builds" \
-  ":test-utils=testing/test-utils           Builds the test-utils module" \
-  ":gesture-processor=testing/gesture-processor      Gesture processor test utilities"
+  ":building" \
+  ":testing"
 
 builder_parse "$@"
 
 builder_run_child_actions clean
-
-# Some of the web/src/test section uses this script as a dependency.  We can skip
-# the configure sections in such a case.
-if ! builder_is_dep_build && ! builder_is_child_build; then
-  builder_run_child_actions configure
-fi
-
+builder_run_child_actions configure
 builder_run_child_actions build
\ No newline at end of file
diff --git a/web/src/tools/building/build.sh b/web/src/tools/building/build.sh
new file mode 100755
index 00000000000..13dc411e8dd
--- /dev/null
+++ b/web/src/tools/building/build.sh
@@ -0,0 +1,20 @@
+#!/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/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+################################ Main script ################################
+
+builder_describe "Keyman Engine for Web development tools" \
+  "configure" \
+  "clean" \
+  "build" \
+  ":sourcemap-root    Sourcemap-cleaning tool used during minification of app/ builds"
+
+builder_parse "$@"
+
+builder_run_child_actions clean
+builder_run_child_actions configure
+builder_run_child_actions build
\ No newline at end of file
diff --git a/web/src/tools/building/sourcemap-root/build.sh b/web/src/tools/building/sourcemap-root/build.sh
index 8e5db5e73f4..c8932f66695 100755
--- a/web/src/tools/building/sourcemap-root/build.sh
+++ b/web/src/tools/building/sourcemap-root/build.sh
@@ -14,7 +14,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ################################ Main script ################################
 
 builder_describe "Builds the sourcemap-sanitizing script used for Keyman Engine for Web builds" \
-  "@/common/tools/sourcemap-path-remapper" \
+  "@/common/tools/sourcemap-path-remapper   build" \
   "clean" \
   "configure" \
   "build" \
diff --git a/web/src/tools/testing/build.sh b/web/src/tools/testing/build.sh
new file mode 100755
index 00000000000..9709177d91e
--- /dev/null
+++ b/web/src/tools/testing/build.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+#
+# Compile KeymanWeb's dev & test tool modules
+#
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+
+################################ Main script ################################
+
+builder_describe "Keyman Engine for Web unit-testing and manual test tools" \
+  "configure" \
+  "clean" \
+  "build" \
+  ":bulk_rendering         Bulk-rendering tool used to validate changes to OSK display code" \
+  ":recorder               KMW recorder tool used for development of unit-test resources" \
+  ":test-utils             Builds the test-utils module" \
+  ":gesture-processor      Gesture processor test utilities"
+
+builder_parse "$@"
+
+builder_run_child_actions clean
+builder_run_child_actions configure
+builder_run_child_actions build
diff --git a/web/src/tools/testing/bulk_rendering/build.sh b/web/src/tools/testing/bulk_rendering/build.sh
index c2e42dd96fb..bb6a2172023 100755
--- a/web/src/tools/testing/bulk_rendering/build.sh
+++ b/web/src/tools/testing/bulk_rendering/build.sh
@@ -16,10 +16,9 @@ SUBPROJECT_NAME=tools/testing/bulk_rendering
 ################################ Main script ################################
 
 builder_describe "Builds a 'bulk renderer' that loads all the cloud keyboards from api.keyman.com and renders each of them to a document." \
-  "@/common/tools/es-bundling" \
+  "@/common/tools/es-bundling build" \
   "@/web/src/common/web-utils build" \
-  "@/web/src/app/browser build" \
-  "@/web/src/app/ui build" \
+  "@/web/src/app/browser      build" \
   "clean" \
   "configure     runs 'npm ci' on root folder" \
   "build         (default) builds bulk_renderer to web/build/$SUBPROJECT_NAME/"
diff --git a/web/src/tools/testing/bulk_rendering/tsconfig.json b/web/src/tools/testing/bulk_rendering/tsconfig.json
index 65b54a0a647..dc736a02b86 100644
--- a/web/src/tools/testing/bulk_rendering/tsconfig.json
+++ b/web/src/tools/testing/bulk_rendering/tsconfig.json
@@ -12,6 +12,7 @@
   ],
 
 	"references": [
+    { "path": "../../../common/web-utils" },
     { "path": "../../../app/browser" },
     { "path": "../../../engine" }
 	]
diff --git a/web/src/tools/testing/gesture-processor/build.sh b/web/src/tools/testing/gesture-processor/build.sh
index a5572456742..b5960899148 100755
--- a/web/src/tools/testing/gesture-processor/build.sh
+++ b/web/src/tools/testing/gesture-processor/build.sh
@@ -16,7 +16,7 @@ BUILD_DIR=/web/build/tools/testing/gesture-processor
 ################################ Main script ################################
 
 builder_describe "Testing-oriented tools for the Gesture Processor module of web-based Keyman OSKs" \
-  "@/common/tools/es-bundling" \
+  "@/common/tools/es-bundling   build" \
   "clean" \
   "build" \
   ":fixture       The HTML-element fixture and CSS fixture used for both user-testing and unit-testing" \
@@ -27,8 +27,8 @@ builder_parse "$@"
 
 builder_describe_outputs \
   configure            /node_modules \
-  build:fixture        "${BUILD_DIR}/host-fixture.html" \
-  build:recorder       "${BUILD_DIR}/recorder/build/recorder.mjs" \
+  build:fixture        "${BUILD_DIR}/unit-test-resources/host-fixture.html" \
+  build:recorder       "/web/tools/testing/gesture-processor/recorder/build/recorder.mjs" \
   build:test-module    "${BUILD_DIR}/unit-test-resources/lib/index.mjs"
 
 # TODO: build if out-of-date if test is specified
diff --git a/web/src/tools/testing/recorder-core/build.sh b/web/src/tools/testing/recorder-core/build.sh
index 4bd56ee2b88..4075ce26f70 100755
--- a/web/src/tools/testing/recorder-core/build.sh
+++ b/web/src/tools/testing/recorder-core/build.sh
@@ -18,7 +18,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 builder_describe \
   "Compiles the web-oriented utility function module." \
-  "@/common/web/keyman-version" \
+  "@/common/web/keyman-version   build" \
   configure \
   clean \
   build
diff --git a/web/src/tools/testing/recorder-core/package.json b/web/src/tools/testing/recorder-core/package.json
index ad059271e43..5bbe584e7e0 100644
--- a/web/src/tools/testing/recorder-core/package.json
+++ b/web/src/tools/testing/recorder-core/package.json
@@ -18,10 +18,6 @@
     "url": "https://github.com/keymanapp/keyman/issues"
   },
   "homepage": "https://github.com/keymanapp/keyman#readme",
-  "dependencies": {
-    "@keymanapp/common-types": "*",
-    "@keymanapp/keyman-version": "*"
-  },
   "devDependencies": {
     "typescript": "^5.4.5"
   }
diff --git a/web/src/tools/testing/recorder-core/tsconfig.json b/web/src/tools/testing/recorder-core/tsconfig.json
index e5b2d6ca5dc..9bed116df25 100644
--- a/web/src/tools/testing/recorder-core/tsconfig.json
+++ b/web/src/tools/testing/recorder-core/tsconfig.json
@@ -13,9 +13,7 @@
   ],
 
   "references": [
-    { "path": "../../../../../common/web/keyman-version" },
     { "path": "../../../common/web-utils/" },
-    { "path": "../../../engine/predictive-text/types" },
     { "path": "../../../engine" },
   ],
 }
diff --git a/web/src/tools/testing/recorder/build.sh b/web/src/tools/testing/recorder/build.sh
index 92db811915c..edada7aeee2 100755
--- a/web/src/tools/testing/recorder/build.sh
+++ b/web/src/tools/testing/recorder/build.sh
@@ -16,10 +16,10 @@ SUBPROJECT_NAME=tools/testing/recorder
 ################################ Main script ################################
 
 builder_describe "Builds the Keyman Engine for Web's test-sequence recording tool" \
-  "@/common/tools/es-bundling" \
-  "@/common/web/keyman-version" \
-  "@/web/src/engine" \
-  "@../recorder-core" \
+  "@/common/tools/es-bundling  build" \
+  "@/common/web/keyman-version build" \
+  "@/web/src/engine            build" \
+  "@../recorder-core           build" \
   "clean" \
   "configure" \
   "build"
diff --git a/web/src/tools/testing/recorder/tsconfig.json b/web/src/tools/testing/recorder/tsconfig.json
index d6e23c6a9af..0d3d3e5bc6e 100644
--- a/web/src/tools/testing/recorder/tsconfig.json
+++ b/web/src/tools/testing/recorder/tsconfig.json
@@ -9,9 +9,7 @@
   "include": [ "*.ts" ],
 
   "references": [
-    { "path": "../../../../../common/web/keyman-version" },
     { "path": "../../../common/web-utils" },
-    { "path": "../../../engine/predictive-text/types" },
     { "path": "../../../app/browser" },
     { "path": "../recorder-core" },
     { "path": "../../../engine" },

From db187e52ad8504837b1ef5e2afec97fc69fa7cbd Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 7 Nov 2025 09:52:45 +0000
Subject: [PATCH 127/254] fix(web): don't clear context when beep happens

After review with @ermshiperete, we decided to remove this. It is
unclear to me why we were ever clearing the context when a beep was
triggered by the keyboard. This is legacy from v2.0 of KeymanWeb, and I
suspect it's an edge case that no one has ever noticed, but I can't see
a reason to keep it.

Test-bot: skip
---
 web/src/app/browser/src/beepHandler.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/web/src/app/browser/src/beepHandler.ts b/web/src/app/browser/src/beepHandler.ts
index 76936c220c6..b520c709ce1 100644
--- a/web/src/app/browser/src/beepHandler.ts
+++ b/web/src/app/browser/src/beepHandler.ts
@@ -1,5 +1,4 @@
-import { type JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { JSKeyboard, type KeyboardMinimalInterface } from 'keyman/engine/keyboard';
+import { type KeyboardMinimalInterface } from 'keyman/engine/keyboard';
 import { DesignIFrameElementTextStore, AbstractElementTextStore } from 'keyman/engine/element-text-stores';
 
 // Utility object used to handle beep (keyboard error response) operations.
@@ -76,11 +75,6 @@ export class BeepHandler {
    * Description  Reset/terminate beep or flash (not currently used: Aug 2011)
    */
   readonly reset = () => {
-    // TODO-web-core: implement for KMX keyboards if needed
-    if (this.keyboardInterface.activeKeyboard instanceof JSKeyboard) {
-      (this.keyboardInterface as JSKeyboardInterface).resetContextCache();
-    }
-
     this._BeepTimeout = 0;
     for(let Lbo=0;Lbo<this._BeepObjects.length;Lbo++) { // I1511 - array prototype extended
       this._BeepObjects[Lbo].reset();

From d07dbfefd6eaea916fa52a494503abc76ed2b087 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 11 Nov 2025 06:31:33 +0100
Subject: [PATCH 128/254] chore(web): npm install and remove unused dep

---
 package-lock.json | 6 +-----
 web/package.json  | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 76485081c24..bd0d3903d12 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -141,6 +141,7 @@
       }
     },
     "common/web/sentry-manager": {
+      "name": "@keymanapp/web-sentry-manager",
       "license": "MIT",
       "dependencies": {
         "@keymanapp/keyman-version": "*",
@@ -14160,7 +14161,6 @@
       },
       "devDependencies": {
         "@keymanapp/resources-gosh": "*",
-        "@keymanapp/web-sentry-manager": "*",
         "@sentry/cli": "^2.31.0",
         "@zip.js/zip.js": "^2.7.32",
         "c8": "^7.12.0",
@@ -14303,10 +14303,6 @@
     "web/src/tools/testing/recorder-core": {
       "name": "@keymanapp/recorder-core",
       "license": "MIT",
-      "dependencies": {
-        "@keymanapp/common-types": "*",
-        "@keymanapp/keyman-version": "*"
-      },
       "devDependencies": {
         "typescript": "^5.4.5"
       }
diff --git a/web/package.json b/web/package.json
index f1eae1b51b4..61c626a6112 100644
--- a/web/package.json
+++ b/web/package.json
@@ -99,7 +99,6 @@
   "homepage": "https://github.com/keymanapp/keyman#readme",
   "devDependencies": {
     "@keymanapp/resources-gosh": "*",
-    "@keymanapp/web-sentry-manager": "*",
     "@sentry/cli": "^2.31.0",
     "@zip.js/zip.js": "^2.7.32",
     "c8": "^7.12.0",

From 081e72b7cae19fb9efecfcdba2786d86ec580c44 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 10 Nov 2025 15:24:46 +0100
Subject: [PATCH 129/254] =?UTF-8?q?maint(core):=20fix=20option=20defaults?=
 =?UTF-8?q?=20for=20Meson=20>=3D=201.1=20=F0=9F=8D=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Meson 1.1 changed the name of the options file from `meson_options.txt`
to `meson.options`. Currently we're stuck with Meson 1.0 as minimum
Meson version because we still support Ubuntu 22.04 Jammy, but on some
machines a newer version of meson gets installed which causes the
options to be ignored.

The first attempt to simply symlink or copy `meson_options.txt` to
`meson.options` failed because git on Windows doesn't support symlinks
by default, and Meson complains if it finds two options files (#15127).

Fortunately not having an options file is only a problem for Core where
we have one option in the options file that defaults to true. The solution
implemented in this change is to always pass the option to Meson.

Cherry-pick-of: #15131
Test-bot: skip
---
 core/build.bat                          | 2 +-
 core/build.sh                           | 2 +-
 resources/build/minimum-versions.inc.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/build.bat b/core/build.bat
index 5dd219e9f27..fc4f400bfbb 100644
--- a/core/build.bat
+++ b/core/build.bat
@@ -83,7 +83,7 @@ if "!COMMAND!" == "configure" (
   if "%1" == "--no-tests" (
     meson setup build\!ARCH!\!BUILDTYPE! !STATIC_LIBRARY! --buildtype !BUILDTYPE! -Dkeyman_core_tests=false --werror %2 %3 %4 %5 %6 %7 %8 %9 || exit !errorlevel!
   ) else (
-    meson setup build\!ARCH!\!BUILDTYPE! !STATIC_LIBRARY! --buildtype !BUILDTYPE! --werror %1 %2 %3 %4 %5 %6 %7 %8 %9 || exit !errorlevel!
+    meson setup build\!ARCH!\!BUILDTYPE! !STATIC_LIBRARY! --buildtype !BUILDTYPE! -Dkeyman_core_tests=true --werror %1 %2 %3 %4 %5 %6 %7 %8 %9 || exit !errorlevel!
   )
   shift
 )
diff --git a/core/build.sh b/core/build.sh
index 1c1d337b1cc..1defefe13ba 100755
--- a/core/build.sh
+++ b/core/build.sh
@@ -79,7 +79,7 @@ builder_parse "$@"
 # if we don't plan to run them, for example when doing a dependency build
 # in CI
 #
-MESON_OPTION_keyman_core_tests=
+MESON_OPTION_keyman_core_tests="-Dkeyman_core_tests=true"
 BUILD_BAT_keyman_core_tests=
 
 if builder_is_dep_build || builder_has_option --no-tests; then
diff --git a/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh
index 65778fece80..8f2c19ae3eb 100644
--- a/resources/build/minimum-versions.inc.sh
+++ b/resources/build/minimum-versions.inc.sh
@@ -30,7 +30,7 @@ KEYMAN_MIN_VERSION_NODE_MAJOR=20              # node version source of truth is
 KEYMAN_MIN_VERSION_NPM=10.5.1                 # 10.5.0 has bug, discussed in #10350
 KEYMAN_MIN_VERSION_EMSCRIPTEN=3.1.64          # Use KEYMAN_USE_EMSDK to automatically update to this version
 KEYMAN_MIN_VERSION_VISUAL_STUDIO=2022         # Visual Studio 2022, see /docs/build/windows.md for workloads and components
-KEYMAN_MIN_VERSION_MESON=1.0.0
+KEYMAN_MIN_VERSION_MESON=1.0.0                # TODO: rename meson_options.txt to meson.options when updating to >= 1.1, see #15127.
 
 KEYMAN_VERSION_GRADLE=8.12                    # See /android/KMEA/gradle/wrapper/gradle-wrapper.properties
 

From dbb5f43d29713146aabee57a6cf5b9f813510dd7 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 6 Nov 2025 09:47:21 +0100
Subject: [PATCH 130/254] refactor(web): text-store: rename `getDeadkeyCaret`
 to `getCaret`

Also renames internal `_dks` to `_deadkeys`.

Test-bot: skip
---
 .../contentEditableTextStore.ts               |  2 +-
 .../designIFrameTextStore.ts                  |  2 +-
 .../src/element-text-stores/inputTextStore.ts |  4 ----
 .../element-text-stores/textareaTextStore.ts  |  4 ----
 .../src/js-processor/jsKeyboardInterface.ts   |  2 +-
 .../engine/src/keyboard/syntheticTextStore.ts |  2 +-
 web/src/engine/src/keyboard/textStore.ts      | 23 ++++++++++---------
 .../element_interfaces.tests.ts               |  4 ++--
 .../element-text-stores/target_mocks.tests.ts |  2 +-
 9 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/web/src/engine/src/element-text-stores/contentEditableTextStore.ts b/web/src/engine/src/element-text-stores/contentEditableTextStore.ts
index 0a421174025..13d6086838e 100644
--- a/web/src/engine/src/element-text-stores/contentEditableTextStore.ts
+++ b/web/src/engine/src/element-text-stores/contentEditableTextStore.ts
@@ -103,7 +103,7 @@ export class ContentEditableElementTextStore extends AbstractElementTextStore<{}
     }
   }
 
-  getDeadkeyCaret(): number {
+  getCaret(): number {
     return KMWString.length(this.getTextBeforeCaret());
   }
 
diff --git a/web/src/engine/src/element-text-stores/designIFrameTextStore.ts b/web/src/engine/src/element-text-stores/designIFrameTextStore.ts
index 651b64d9ec9..c5014f8dad6 100644
--- a/web/src/engine/src/element-text-stores/designIFrameTextStore.ts
+++ b/web/src/engine/src/element-text-stores/designIFrameTextStore.ts
@@ -125,7 +125,7 @@ export class DesignIFrameElementTextStore extends AbstractElementTextStore<{}> {
     }
   }
 
-  getDeadkeyCaret(): number {
+  getCaret(): number {
     return KMWString.length(this.getTextBeforeCaret());
   }
 
diff --git a/web/src/engine/src/element-text-stores/inputTextStore.ts b/web/src/engine/src/element-text-stores/inputTextStore.ts
index 7f10982b2ff..262dc51a83b 100644
--- a/web/src/engine/src/element-text-stores/inputTextStore.ts
+++ b/web/src/engine/src/element-text-stores/inputTextStore.ts
@@ -98,10 +98,6 @@ export class InputElementTextStore extends AbstractElementTextStore<EventMap> {
     return this.root.selectionDirection == 'forward' ? this.processedSelectionEnd : this.processedSelectionStart;
   }
 
-  getDeadkeyCaret(): number {
-    return this.getCaret();
-  }
-
   setCaret(caret: number) {
     this.setSelection(caret, caret, "none");
   }
diff --git a/web/src/engine/src/element-text-stores/textareaTextStore.ts b/web/src/engine/src/element-text-stores/textareaTextStore.ts
index 5418ef1c77d..8f96594d115 100644
--- a/web/src/engine/src/element-text-stores/textareaTextStore.ts
+++ b/web/src/engine/src/element-text-stores/textareaTextStore.ts
@@ -73,10 +73,6 @@ export class TextAreaElementTextStore extends AbstractElementTextStore<{}> {
     return this.root.selectionDirection == 'forward' ? this.processedSelectionEnd : this.processedSelectionStart;
   }
 
-  getDeadkeyCaret(): number {
-    return this.getCaret();
-  }
-
   setCaret(caret: number) {
     this.setSelection(caret, caret, "none");
   }
diff --git a/web/src/engine/src/js-processor/jsKeyboardInterface.ts b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
index d0a8e99a113..bd545322b0d 100644
--- a/web/src/engine/src/js-processor/jsKeyboardInterface.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
@@ -364,7 +364,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
         cache = { valContext: [], deadContext: []};
         while(cache.valContext.length < n) {
           // As adapted from `deadkeyMatch`.
-          const sp = textStore.getDeadkeyCaret();
+          const sp = textStore.getCaret();
           const deadPos = sp - index;
           if(unmatchedDeadkeys.length > 0 && unmatchedDeadkeys[0].p > deadPos) {
             // We have deadkeys at the right-hand side of the caret!  They don't belong in the context, so pop 'em off.
diff --git a/web/src/engine/src/keyboard/syntheticTextStore.ts b/web/src/engine/src/keyboard/syntheticTextStore.ts
index fac8274ff93..4611b6ea2cb 100644
--- a/web/src/engine/src/keyboard/syntheticTextStore.ts
+++ b/web/src/engine/src/keyboard/syntheticTextStore.ts
@@ -82,7 +82,7 @@ export class SyntheticTextStore extends TextStore {
     return true;
   }
 
-  getDeadkeyCaret(): number {
+  getCaret(): number {
     return this.selStart;
   }
 
diff --git a/web/src/engine/src/keyboard/textStore.ts b/web/src/engine/src/keyboard/textStore.ts
index fdecd52389c..f3729c5e266 100644
--- a/web/src/engine/src/keyboard/textStore.ts
+++ b/web/src/engine/src/keyboard/textStore.ts
@@ -11,10 +11,10 @@ import { Deadkey, DeadkeyTracker } from "./deadkeys.js";
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
 export abstract class TextStore {
-  private _dks: DeadkeyTracker;
+  private _deadkeys: DeadkeyTracker;
 
   constructor() {
-    this._dks = new DeadkeyTracker();
+    this._deadkeys = new DeadkeyTracker();
   }
 
   /**
@@ -30,15 +30,15 @@ export abstract class TextStore {
   }
 
   deadkeys(): DeadkeyTracker {
-    return this._dks;
+    return this._deadkeys;
   }
 
   hasDeadkeyMatch(n: number, d: number): boolean {
-    return this.deadkeys().isMatch(this.getDeadkeyCaret(), n, d);
+    return this.deadkeys().isMatch(this.getCaret(), n, d);
   }
 
   insertDeadkeyBeforeCaret(d: number) {
-    const dk: Deadkey = new Deadkey(this.getDeadkeyCaret(), d);
+    const dk: Deadkey = new Deadkey(this.getCaret(), d);
     this.deadkeys().add(dk);
   }
 
@@ -49,7 +49,7 @@ export abstract class TextStore {
    * @param {number} delta  Use negative values if characters were deleted, positive if characters were added.
    */
   protected adjustDeadkeys(delta: number) {
-    this.deadkeys().adjustPositions(this.getDeadkeyCaret(), delta);
+    this.deadkeys().adjustPositions(this.getCaret(), delta);
   }
 
   /**
@@ -57,7 +57,7 @@ export abstract class TextStore {
    * @param {object}  dks   An existing set of deadkeys to deep-copy for use by this element interface.
    */
   protected setDeadkeys(dks: DeadkeyTracker) {
-    this._dks = dks.clone();
+    this._deadkeys = dks.clone();
   }
 
   static assertIsTextStore(textStore: TextStoreLanguageProcessorInterface): asserts textStore is TextStore {
@@ -123,7 +123,8 @@ export abstract class TextStore {
     this.setTextAfterCaret(original.getTextAfterCaret());
 
     // Also, restore the deadkeys!
-    this._dks = original._dks.clone();
+    // TODO-web-core: km_core_context_set or similar?
+    this.setDeadkeys(original._deadkeys);
   }
 
   apply(transform: LexicalModelTypes.Transform) {
@@ -145,7 +146,7 @@ export abstract class TextStore {
 
     // We assume that all deadkeys are invalidated after applying a Transform, since
     // prediction implies we'll be completing a word, post-deadkeys.
-    this._dks.clear();
+    this.deadkeys().clear();
   }
 
   /**
@@ -191,9 +192,9 @@ export abstract class TextStore {
   abstract isSelectionEmpty(): boolean;
 
   /**
-   * Returns an index corresponding to the caret's position for use with deadkeys.
+   * Returns an index corresponding to the caret's position in the text store.
    */
-  abstract getDeadkeyCaret(): number;
+  abstract getCaret(): number;
 
   /**
    * Relative to the caret, gets the current context within the wrapper's element.
diff --git a/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts b/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts
index fd21f7a9d45..37811258b4a 100644
--- a/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts
+++ b/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts
@@ -339,7 +339,7 @@ class MockTestHelper implements TestHelper {
 
   // Implemented for completeness and generality with other tests.
   getCaret(pair: ElementPair<any>) {
-    return pair.wrapper.getDeadkeyCaret();
+    return pair.wrapper.getCaret();
   }
 
   setSelectionRange(pair: ElementPair<any>, start: number, end: number) {
@@ -962,7 +962,7 @@ class InterfaceTests {
       pair.wrapper.deadkeys().deleteMatched();
       assert.equal(pair.wrapper.deadkeys().count(), 2, "Failed to delete 'matched' deadkey");
 
-      // Failure here likely reflects incorrect logic in .getDeadkeyCaret()!
+      // Failure here likely reflects incorrect logic in .getCaret()!
       assert.isTrue(pair.wrapper.deadkeys().isMatch(4, 0, 3), "Failed to correctly note position of deadkey after an SMP character!");
       pair.wrapper.deadkeys().resetMatched();
 
diff --git a/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts b/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts
index b3aa77b1026..42e90b54da9 100644
--- a/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts
+++ b/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts
@@ -84,7 +84,7 @@ describe('SyntheticTextStore', function() {
         const mock = new SyntheticTextStore(MockTests.Apple.mixed);
 
         assert.equal(mock.getText(), MockTests.Apple.mixed);
-        assert.equal(mock.getDeadkeyCaret(), 5);
+        assert.equal(mock.getCaret(), 5);
       });
 
       it('copies an existing TextStore without a text selection', function() {

From 9710f5b06ab8a4d300bb6591e6773b64be89f15e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 7 Nov 2025 09:23:56 +0100
Subject: [PATCH 131/254] chore(web): remove duplicate `deadkeys.ts`

The file sneaked in through a merge/rebase.

Build-bot: skip
Test-bot: skip
---
 web/src/engine/src/js-processor/deadkeys.ts | 179 --------------------
 1 file changed, 179 deletions(-)
 delete mode 100644 web/src/engine/src/js-processor/deadkeys.ts

diff --git a/web/src/engine/src/js-processor/deadkeys.ts b/web/src/engine/src/js-processor/deadkeys.ts
deleted file mode 100644
index 53cf0d59959..00000000000
--- a/web/src/engine/src/js-processor/deadkeys.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-// Defines the base Deadkey-tracking object.
-export class Deadkey {
-  p: number;  // Position of deadkey
-  d: number;  // Numerical id of the deadkey
-  o: number;  // Ordinal value of the deadkey (resolves same-place conflicts)
-  matched: number;
-
-  static ordinalSeed: number = 0;
-
-  constructor(pos: number, id: number) {
-    this.p = pos;
-    this.d = id;
-    this.o = Deadkey.ordinalSeed++;
-  }
-
-  match(p: number, d: number): boolean {
-    const result:boolean = (this.p == p && this.d == d);
-
-    return result;
-  }
-
-  set(): void {
-    this.matched = 1;
-  }
-
-  reset(): void {
-    this.matched = 0;
-  }
-
-  before(other: Deadkey): boolean {
-    return this.o < other.o;
-  }
-
-  clone(): Deadkey {
-    const dk = new Deadkey(this.p, this.d);
-    dk.o = this.o;
-
-    return dk;
-  }
-
-  equal(other: Deadkey) {
-    return this.d == other.d && this.p == other.d && this.o == other.o;
-  }
-
-  /**
-   * Sorts the deadkeys in reverse order.
-   */
-  static sortFunc = function(a: Deadkey, b: Deadkey) {
-    // We want descending order, so we want 'later' deadkeys first.
-    if(a.p != b.p) {
-      return b.p - a.p;
-    } else {
-      return b.o - a.o;
-    }
-  };
-}
-
-// Object-orients deadkey management.
-export class DeadkeyTracker {
-  dks: Deadkey[] = [];
-
-  toSortedArray(): Deadkey[] {
-    this.dks = this.dks.sort(Deadkey.sortFunc);
-    return [].concat(this.dks);
-  }
-
-  clone(): DeadkeyTracker {
-    const dkt = new DeadkeyTracker();
-    const dks = this.toSortedArray();
-
-    // Make sure to clone the deadkeys themselves - the Deadkey object is mutable.
-    dkt.dks = [];
-    dks.forEach(function(value: Deadkey) {
-      dkt.dks.push(value.clone());
-    });
-
-    return dkt;
-  }
-
-  /**
-   * Function     isMatch
-   * Scope        Public
-   * @param       {number}      caretPos  current cursor position
-   * @param       {number}      n         expected offset of deadkey from cursor
-   * @param       {number}      d         deadkey
-   * @return      {boolean}               True if deadkey found selected context matches val
-   * Description  Match deadkey at current cursor position
-   */
-  isMatch(caretPos: number, n: number, d: number): boolean {
-    if(this.dks.length == 0) {
-      return false; // I3318
-    }
-
-    const sp=caretPos;
-    n = sp - n;
-    for(let i = 0; i < this.dks.length; i++) {
-      // Don't re-match an already-matched deadkey.  It's possible to have two identical
-      // entries, and they should be kept separately.
-      if(this.dks[i].match(n, d) && !this.dks[i].matched) {
-        this.dks[i].set();
-        // Assumption:  since we match the first possible entry in the array, we
-        // match the entry with the lower ordinal - the 'first' deadkey in the position.
-        return true; // I3318
-      }
-    }
-
-    this.resetMatched(); // I3318
-
-    return false;
-  }
-
-  add(dk: Deadkey) {
-    this.dks = this.dks.concat(dk);
-  }
-
-  remove(dk: Deadkey) {
-    const index = this.dks.indexOf(dk);
-    this.dks.splice(index, 1);
-  }
-
-  clear() {
-    this.dks = [];
-  }
-
-  resetMatched() {
-    for(const dk of this.dks) {
-      dk.reset();
-    }
-  }
-
-  deleteMatched(): void {
-    for(let Li = 0; Li < this.dks.length; Li++) {
-      if(this.dks[Li].matched) {
-        this.dks.splice(Li--, 1); // Don't forget to decrement!
-      }
-    }
-  }
-
-  /**
-   * Function     adjustPositions (formerly _DeadkeyAdjustPos)
-   * Scope        Private
-   * @param       {number}      Lstart      start position in context
-   * @param       {number}      Ldelta      characters to adjust by
-   * Description  Adjust saved positions of deadkeys in context
-   */
-  adjustPositions(Lstart: number, Ldelta: number): void {
-    if(Ldelta == 0) {
-      return;
-    }
-
-    for(const dk of this.dks) {
-      if(dk.p > Lstart) {
-        dk.p += Ldelta;
-      }
-    }
-  }
-
-  equal(other: DeadkeyTracker) {
-    if(this.dks.length != other.dks.length) {
-      return false;
-    }
-
-    const otherDks = other.dks;
-    const matchedDks: Deadkey[] = [];
-
-    for(const dk of this.dks) {
-      const match = otherDks.find((otherDk) => dk.equal(otherDk));
-      if(!match) {
-        return false;
-      }
-    }
-
-    return matchedDks.length == otherDks.length;
-  }
-
-  count(): number {
-    return this.dks.length;
-  }
-}
\ No newline at end of file

From 98fa9e3003a4789492503f5e85fbfef1d7fe5bf3 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 7 Nov 2025 09:24:28 +0100
Subject: [PATCH 132/254] fix(web): add unit tests for DeadkeyTracker and fix a
 few bugs

- initialize `Deadkey.matched` in c'tor
- fix `Deadkey.equal` method
- verify deadkey exists before removing it in `DeadkeyTracker.remove`
- add unit tests for DeadkeyTracker

Test-bot: skip
---
 .../src/js-processor/jsKeyboardInterface.ts   |   2 +
 web/src/engine/src/keyboard/deadkeys.ts       |  20 +-
 web/src/engine/src/keyboard/index.ts          |   9 +
 .../engine/keyboard/deadkeyTracker.tests.ts   | 283 ++++++++++++++++++
 4 files changed, 305 insertions(+), 9 deletions(-)
 create mode 100644 web/src/test/auto/headless/engine/keyboard/deadkeyTracker.tests.ts

diff --git a/web/src/engine/src/js-processor/jsKeyboardInterface.ts b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
index bd545322b0d..71b988373ec 100644
--- a/web/src/engine/src/js-processor/jsKeyboardInterface.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
@@ -627,6 +627,8 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param       {number}      d             deadkey
    * @return      {boolean}                   True if deadkey found selected context matches val
    * Description  Match deadkey at current cursor position
+   *
+   * Deprecated:  use `fullContextMatch` instead.
    */
   deadkeyMatch(n: number, textStore: TextStore, d: number): boolean {
     return textStore.hasDeadkeyMatch(n, d);
diff --git a/web/src/engine/src/keyboard/deadkeys.ts b/web/src/engine/src/keyboard/deadkeys.ts
index 53cf0d59959..8c3effc7cb5 100644
--- a/web/src/engine/src/keyboard/deadkeys.ts
+++ b/web/src/engine/src/keyboard/deadkeys.ts
@@ -11,10 +11,11 @@ export class Deadkey {
     this.p = pos;
     this.d = id;
     this.o = Deadkey.ordinalSeed++;
+    this.matched = 0;
   }
 
-  match(p: number, d: number): boolean {
-    const result:boolean = (this.p == p && this.d == d);
+  match(pos: number, deadkey: number): boolean {
+    const result:boolean = (this.p == pos && this.d == deadkey);
 
     return result;
   }
@@ -39,7 +40,7 @@ export class Deadkey {
   }
 
   equal(other: Deadkey) {
-    return this.d == other.d && this.p == other.d && this.o == other.o;
+    return this.d == other.d && this.p == other.p && this.o == other.o;
   }
 
   /**
@@ -82,11 +83,11 @@ export class DeadkeyTracker {
    * Scope        Public
    * @param       {number}      caretPos  current cursor position
    * @param       {number}      n         expected offset of deadkey from cursor
-   * @param       {number}      d         deadkey
+   * @param       {number}      deadkey   deadkey
    * @return      {boolean}               True if deadkey found selected context matches val
    * Description  Match deadkey at current cursor position
    */
-  isMatch(caretPos: number, n: number, d: number): boolean {
+  isMatch(caretPos: number, n: number, deadkey: number): boolean {
     if(this.dks.length == 0) {
       return false; // I3318
     }
@@ -96,7 +97,7 @@ export class DeadkeyTracker {
     for(let i = 0; i < this.dks.length; i++) {
       // Don't re-match an already-matched deadkey.  It's possible to have two identical
       // entries, and they should be kept separately.
-      if(this.dks[i].match(n, d) && !this.dks[i].matched) {
+      if(this.dks[i].match(n, deadkey) && !this.dks[i].matched) {
         this.dks[i].set();
         // Assumption:  since we match the first possible entry in the array, we
         // match the entry with the lower ordinal - the 'first' deadkey in the position.
@@ -115,7 +116,9 @@ export class DeadkeyTracker {
 
   remove(dk: Deadkey) {
     const index = this.dks.indexOf(dk);
-    this.dks.splice(index, 1);
+    if (index > -1) {
+      this.dks.splice(index, 1);
+    }
   }
 
   clear() {
@@ -161,7 +164,6 @@ export class DeadkeyTracker {
     }
 
     const otherDks = other.dks;
-    const matchedDks: Deadkey[] = [];
 
     for(const dk of this.dks) {
       const match = otherDks.find((otherDk) => dk.equal(otherDk));
@@ -170,7 +172,7 @@ export class DeadkeyTracker {
       }
     }
 
-    return matchedDks.length == otherDks.length;
+    return true;
   }
 
   count(): number {
diff --git a/web/src/engine/src/keyboard/index.ts b/web/src/engine/src/keyboard/index.ts
index 90e1489e1f8..ba3250d4118 100644
--- a/web/src/engine/src/keyboard/index.ts
+++ b/web/src/engine/src/keyboard/index.ts
@@ -38,6 +38,15 @@ export { TextStoreLanguageProcessorInterface } from "./textStoreLanguageProcesso
 export { findCommonSubstringEndIndex } from "./stringDivergence.js";
 export { Deadkey } from "./deadkeys.js";
 
+import { DeadkeyTracker } from './deadkeys.js';
+
+/**
+ * these are exported only for unit tests, do not use
+ */
+export const unitTestEndpoints = {
+  DeadkeyTracker,
+};
+
 // TODO-web-core: why do we export these here?
 export * from "keyman/common/web-utils";
 
diff --git a/web/src/test/auto/headless/engine/keyboard/deadkeyTracker.tests.ts b/web/src/test/auto/headless/engine/keyboard/deadkeyTracker.tests.ts
new file mode 100644
index 00000000000..fe749074f8c
--- /dev/null
+++ b/web/src/test/auto/headless/engine/keyboard/deadkeyTracker.tests.ts
@@ -0,0 +1,283 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+
+import { assert } from 'chai';
+import { Deadkey, unitTestEndpoints } from 'keyman/engine/keyboard';
+
+const DeadkeyTracker = unitTestEndpoints.DeadkeyTracker;
+
+describe('DeadkeyTracker', function() {
+  it('can add deadkeys and return count', function() {
+    const tracker = new DeadkeyTracker();
+    tracker.add(new Deadkey(3,  1));
+    tracker.add(new Deadkey(5,  2));
+    tracker.add(new Deadkey(10, 3));
+
+    assert.equal(tracker.dks.length, 3);
+    assert.equal(tracker.count(), 3);
+  });
+
+  it('sorts deadkeys by position, latest first', function() {
+    const tracker = new DeadkeyTracker();
+    tracker.add(new Deadkey(5,  2));
+    tracker.add(new Deadkey(3,  1));
+    tracker.add(new Deadkey(10, 3));
+
+    const sortedDeadkeys = tracker.toSortedArray();
+
+    assert.equal(sortedDeadkeys[0].p, 10);
+    assert.equal(sortedDeadkeys[1].p, 5);
+    assert.equal(sortedDeadkeys[2].p, 3);
+  });
+
+  it('can adjust positions', function () {
+    const tracker = new DeadkeyTracker();
+    tracker.add(new Deadkey(3, 1));
+    tracker.add(new Deadkey(5, 2));
+    tracker.add(new Deadkey(10, 3));
+
+    tracker.adjustPositions(4, 2); // adjust deadkeys after position 4 by +2
+
+    const sortedDeadkeys = tracker.toSortedArray();
+    assert.equal(sortedDeadkeys[0].p, 12); // 10 + 2
+    assert.equal(sortedDeadkeys[1].p, 7);  // 5 + 2
+    assert.equal(sortedDeadkeys[2].p, 3);  // unchanged
+  });
+
+  describe('equal', function () {
+    it('treats cloned tracker as equal', function () {
+      const tracker1 = new DeadkeyTracker();
+      tracker1.add(new Deadkey(3, 1));
+      tracker1.add(new Deadkey(5, 2));
+      tracker1.add(new Deadkey(10, 3));
+
+      const tracker2 = tracker1.clone();
+
+      assert.isTrue(tracker1.equal(tracker2));
+    });
+
+    it('treats two trackers with same deadkeys create separately not as equal', function () {
+      const tracker1 = new DeadkeyTracker();
+      tracker1.add(new Deadkey(3, 1));
+      tracker1.add(new Deadkey(5, 2));
+      tracker1.add(new Deadkey(10, 3));
+
+      const tracker2 = new DeadkeyTracker();
+      tracker2.add(new Deadkey(3, 1));
+      tracker2.add(new Deadkey(5, 2));
+      tracker2.add(new Deadkey(10, 3));
+
+      assert.isFalse(tracker1.equal(tracker2));
+    });
+
+    it('treats two trackers with same deadkeys in different order not as equal', function () {
+      const tracker1 = new DeadkeyTracker();
+      tracker1.add(new Deadkey(5, 2));
+      tracker1.add(new Deadkey(3, 1));
+      tracker1.add(new Deadkey(10, 3));
+
+      const tracker2 = new DeadkeyTracker();
+      tracker2.add(new Deadkey(10, 3));
+      tracker2.add(new Deadkey(5, 2));
+      tracker2.add(new Deadkey(3, 1));
+
+      assert.isFalse(tracker1.equal(tracker2));
+    });
+
+    it('treats two trackers with same deadkeys in different places not as equal', function () {
+      const tracker1 = new DeadkeyTracker();
+      tracker1.add(new Deadkey(7, 2));
+      tracker1.add(new Deadkey(3, 1));
+      tracker1.add(new Deadkey(12, 3));
+
+      const tracker2 = new DeadkeyTracker();
+      tracker2.add(new Deadkey(10, 3));
+      tracker2.add(new Deadkey(5, 2));
+      tracker2.add(new Deadkey(3, 1));
+
+      assert.isFalse(tracker1.equal(tracker2));
+    });
+
+    it('treats a tracker with additional deadkeys not as equal', function () {
+      const tracker1 = new DeadkeyTracker();
+      tracker1.add(new Deadkey(3, 1));
+      tracker1.add(new Deadkey(5, 2));
+      tracker1.add(new Deadkey(10, 3));
+
+      const tracker2 = tracker1.clone();
+      tracker2.add(new Deadkey(15, 4));
+
+      assert.isFalse(tracker1.equal(tracker2));
+    });
+  });
+
+  it('can clear deadkeys', function() {
+    const tracker = new DeadkeyTracker();
+    tracker.add(new Deadkey(3,  1));
+    tracker.add(new Deadkey(5,  2));
+    tracker.add(new Deadkey(10, 3));
+
+    tracker.clear();
+
+    assert.equal(tracker.count(), 0);
+  });
+
+  describe('remove', function () {
+    it('can remove existing deadkey', function () {
+      const tracker = new DeadkeyTracker();
+      tracker.add(new Deadkey(3, 1));
+      const dk = new Deadkey(5, 2);
+      tracker.add(dk);
+      tracker.add(new Deadkey(10, 3));
+
+      tracker.remove(dk);
+
+      assert.equal(tracker.count(), 2);
+      assert.equal(tracker.dks[0].p, 3);
+      assert.equal(tracker.dks[1].p, 10);
+    });
+
+    it('does not remove similar deadkey', function () {
+      const tracker = new DeadkeyTracker();
+      tracker.add(new Deadkey(3, 1));
+      tracker.add(new Deadkey(5, 2));
+      tracker.add(new Deadkey(10, 3));
+
+      tracker.remove(new Deadkey(5, 2));
+
+      assert.equal(tracker.count(), 3);
+      assert.equal(tracker.dks[0].p, 3);
+      assert.equal(tracker.dks[1].p, 5);
+      assert.equal(tracker.dks[2].p, 10);
+    });
+  });
+
+  it('sorts deadkeys in cloned tracker', function () {
+    const tracker1 = new DeadkeyTracker();
+    tracker1.add(new Deadkey(5, 1));
+    tracker1.add(new Deadkey(3, 2));
+    tracker1.add(new Deadkey(10, 3));
+
+    const tracker2 = tracker1.clone();
+
+    assert.equal(tracker2.count(), 3);
+    assert.equal(tracker2.dks[0].p, 10);
+    assert.equal(tracker2.dks[1].p, 5);
+    assert.equal(tracker2.dks[2].p, 3);
+  });
+
+  it('can delete matched deadkeys', function () {
+    const dk1 = new Deadkey(5, 1);
+    const dk2 = new Deadkey(3, 2);
+    const dk3 = new Deadkey(10, 3);
+    const tracker = new DeadkeyTracker();
+    tracker.add(dk1);
+    tracker.add(dk2);
+    tracker.add(dk3);
+    dk2.set();
+    dk3.set();
+
+    tracker.deleteMatched();
+
+    assert.equal(tracker.count(), 1);
+    assert.equal(tracker.dks[0].p, 5);
+  });
+
+  it('can reset matched deadkeys', function () {
+    const dk1 = new Deadkey(5, 1);
+    const dk2 = new Deadkey(3, 2);
+    const dk3 = new Deadkey(10, 3);
+    const tracker = new DeadkeyTracker();
+    tracker.add(dk1);
+    tracker.add(dk2);
+    tracker.add(dk3);
+    dk2.set();
+    dk3.set();
+
+    tracker.resetMatched();
+
+    assert.equal(tracker.count(), 3);
+    assert.equal(tracker.dks[0].matched, 0);
+    assert.equal(tracker.dks[1].matched, 0);
+    assert.equal(tracker.dks[2].matched, 0);
+  });
+
+  describe('isMatch', function () {
+    it('returns false without having any deadkeys', function () {
+      const tracker = new DeadkeyTracker();
+
+      assert.isFalse(tracker.isMatch(0, 1, 2));
+    });
+
+    it('returns false for non-matching deadkey', function () {
+      const tracker = new DeadkeyTracker();
+      tracker.add(new Deadkey(3, 1));
+      tracker.add(new Deadkey(5, 2));
+      tracker.add(new Deadkey(10, 3));
+
+      assert.isFalse(tracker.isMatch(0, 88, 99));
+
+      assert.equal(tracker.dks[0].matched, 0);
+      assert.equal(tracker.dks[1].matched, 0);
+      assert.equal(tracker.dks[2].matched, 0);
+    });
+
+    it('returns false if offset is wrong', function () {
+      const tracker = new DeadkeyTracker();
+      tracker.add(new Deadkey(3, 1));
+      tracker.add(new Deadkey(5, 2));
+      tracker.add(new Deadkey(10, 3));
+
+      // REVIEW: this behavior seems odd
+      assert.isFalse(tracker.isMatch(0, 3, 1));
+
+      assert.equal(tracker.dks[0].matched, 0);
+      assert.equal(tracker.dks[1].matched, 0);
+      assert.equal(tracker.dks[2].matched, 0);
+    });
+
+    it('returns true for matching deadkey and sets matched flag on deadkey', function () {
+      const tracker = new DeadkeyTracker();
+      tracker.add(new Deadkey(3, 1));
+      tracker.add(new Deadkey(5, 2));
+      tracker.add(new Deadkey(10, 3));
+
+      // REVIEW: this behavior seems odd
+      assert.isTrue(tracker.isMatch(0, -3, 1));
+
+      assert.equal(tracker.dks[0].matched, 1);
+      assert.equal(tracker.dks[1].matched, 0);
+      assert.equal(tracker.dks[2].matched, 0);
+    });
+
+    it('returns true for matching deadkey if caret on dk', function () {
+      const tracker = new DeadkeyTracker();
+      tracker.add(new Deadkey(3, 1));
+      tracker.add(new Deadkey(5, 2));
+      tracker.add(new Deadkey(10, 3));
+
+      assert.isTrue(tracker.isMatch(3, 0, 1));
+
+      assert.equal(tracker.dks[0].matched, 1);
+      assert.equal(tracker.dks[1].matched, 0);
+      assert.equal(tracker.dks[2].matched, 0);
+    });
+
+    it('returns false for matching deadkey if already matched and resets matched flag', function () {
+      const tracker = new DeadkeyTracker();
+      tracker.add(new Deadkey(3, 1));
+      tracker.add(new Deadkey(5, 2));
+      tracker.add(new Deadkey(10, 3));
+      tracker.dks[0].matched = 1;
+      tracker.dks[1].matched = 1;
+      tracker.dks[2].matched = 1;
+
+      assert.isFalse(tracker.isMatch(0, -3, 1));
+
+      assert.equal(tracker.dks[0].matched, 0);
+      assert.equal(tracker.dks[1].matched, 0);
+      assert.equal(tracker.dks[2].matched, 0);
+    });
+  });
+});

From 8191c6910fc97daf81de420f2391ca27634ef07b Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 12 Nov 2025 18:01:46 +0100
Subject: [PATCH 133/254] feat(web): add `Deadkey.toString` function

This allows to use `console.log(deadkey.toString())` to get the values
of a deadkey.

Test-bot: skip
---
 web/src/engine/src/keyboard/deadkeys.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/src/engine/src/keyboard/deadkeys.ts b/web/src/engine/src/keyboard/deadkeys.ts
index 8c3effc7cb5..7b3f6ce39ce 100644
--- a/web/src/engine/src/keyboard/deadkeys.ts
+++ b/web/src/engine/src/keyboard/deadkeys.ts
@@ -43,6 +43,10 @@ export class Deadkey {
     return this.d == other.d && this.p == other.p && this.o == other.o;
   }
 
+  toString() {
+    return `Deadkey { p: ${this.p}, d: ${this.d}, o: ${this.o}, matched: ${this.matched}}`
+  }
+
   /**
    * Sorts the deadkeys in reverse order.
    */

From 937460b1041fd20f4f10f160b82603233a39047c Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 6 Nov 2025 15:30:14 +0100
Subject: [PATCH 134/254] feat(web): expose `km_core_context_get/set` to WASM

Test-bot: skip
---
 core/src/wasm.cpp                  | 237 ++++++++++++++++++++++++-----
 core/tests/unit/wasm/wasm.tests.js |  40 +++++
 2 files changed, 237 insertions(+), 40 deletions(-)

diff --git a/core/src/wasm.cpp b/core/src/wasm.cpp
index 34487f937d7..2aa0946d04e 100644
--- a/core/src/wasm.cpp
+++ b/core/src/wasm.cpp
@@ -1,3 +1,6 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
 #ifdef __EMSCRIPTEN__
 #include <emscripten/emscripten.h>
 #include <emscripten/bind.h>
@@ -21,12 +24,23 @@ namespace em = emscripten;
 namespace emscripten {
 namespace internal {
 
-template <typename T, typename Allocator>
-struct BindingType<std::vector<T, Allocator>> {
-    using ValBinding = BindingType<val>;
-    using WireType = ValBinding::WireType;
+// Enable for std::vector<T>
+template <typename T>
+struct TypeID<
+    T,
+    typename std::enable_if_t<std::is_same<
+        typename Canonicalized<T>::type,
+        std::vector<typename Canonicalized<T>::type::value_type, typename Canonicalized<T>::type::allocator_type>>::value>> {
+  static constexpr TYPEID get() {
+    return TypeID<val>::get();
+  }
+};
+
+template <typename T, typename Allocator> struct BindingType<std::vector<T, Allocator>> {
+  using ValBinding = BindingType<val>;
+  using WireType   = ValBinding::WireType;
 
-#if __EMSCRIPTEN_major__ == 3 && __EMSCRIPTEN_minor__ == 1 && __EMSCRIPTEN_tiny__ >= 60
+#if (__EMSCRIPTEN_major__ == 3 && __EMSCRIPTEN_minor__ == 1 && __EMSCRIPTEN_tiny__ >= 60) || (__EMSCRIPTEN_major__ > 3)
     // emscripten-core/emscripten#21692
     static WireType toWireType(const std::vector<T, Allocator> &vec, rvp::default_tag) {
         return ValBinding::toWireType(val::array(vec), rvp::default_tag{});
@@ -42,15 +56,6 @@ struct BindingType<std::vector<T, Allocator>> {
     }
 };
 
-template <typename T>
-struct TypeID<T,
-              typename std::enable_if_t<std::is_same<
-                  typename Canonicalized<T>::type,
-                  std::vector<typename Canonicalized<T>::type::value_type,
-                              typename Canonicalized<T>::type::allocator_type>>::value>> {
-    static constexpr TYPEID get() { return TypeID<val>::get(); }
-};
-
 }  // namespace internal
 }  // namespace emscripten
 
@@ -63,7 +68,7 @@ constexpr km_core_attr const engine_attrs = {
   "SIL International"
 };
 
-EMSCRIPTEN_KEEPALIVE km_core_attr const& tmp_wasm_attributes() {
+km_core_attr const& tmp_wasm_attributes() {
   return engine_attrs;
 }
 
@@ -92,7 +97,94 @@ class km_core_actions_wasm {
   std::u32string deleted_context;
 };
 
-template <typename T> class CoreReturn {
+class km_core_context_item_wasm: public km_core_context_item {
+  // Binding a union is not directly supported by emscripten, so we
+  // provide getters and setters.
+  // See https://github.com/emscripten-core/emscripten/issues/5381
+
+public:
+  km_core_context_item_wasm() {}
+  km_core_context_item_wasm(km_core_context_item const& item) : km_core_context_item(item) {}
+
+  unsigned int getType() const {
+    return this->type;
+  }
+
+  unsigned int getCharacter() const {
+    return this->character;
+  }
+  void setCharacter(unsigned int character) {
+    this->character = character;
+    this->type = KM_CORE_CT_CHAR;
+  }
+
+  unsigned int getMarker() const {
+    return this->marker;
+  }
+  void setMarker(unsigned int marker) {
+    this->marker = marker;
+    this->type = KM_CORE_CT_MARKER;
+  }
+
+  std::string toString() const {
+    switch (this->type) {
+      case KM_CORE_CT_CHAR:
+        return "CHAR(" + std::to_string(this->character) + ")";
+      case KM_CORE_CT_MARKER:
+        return "MARKER(" + std::to_string(this->marker) + ")";
+      case KM_CORE_CT_END:
+        return "END";
+      default:
+        return "UNKNOWN";
+    }
+  }
+};
+
+struct km_core_context_items {
+private:
+  std::vector<km_core_context_item_wasm> items = std::vector<km_core_context_item_wasm>();
+public:
+  void push_back(const km_core_context_item_wasm& item) {
+    items.push_back(km_core_context_item_wasm(item));
+  }
+  void resize(const size_t size) {
+    items.resize(size);
+  }
+  size_t size() const {
+    return items.size();
+  }
+  const km_core_context_item_wasm& get(size_t index) const {
+    if (index >= items.size()) {
+      throw std::out_of_range("index out of range");
+    }
+    return items[index];
+  }
+  void set(size_t index, const km_core_context_item_wasm& item) {
+    if (index >= items.size()) {
+      throw std::out_of_range("index out of range");
+    }
+    items[index] = item;
+  }
+
+  const km_core_context_item_wasm* data() const {
+    return items.data();
+  }
+
+  std::string toString() const {
+    std::string result = "(" + std::to_string(items.size()) + ") [";
+    for (size_t i = 0; i < items.size(); ++i) {
+      result += items[i].toString();
+      if (i + 1 < items.size()) {
+        result += ", ";
+      }
+    }
+    result += "]";
+    return result;
+  }
+};
+
+template <typename T>
+class CoreReturn {
 public:
   CoreReturn(int status = 0, const T* obj = nullptr) : status(status), object(obj) {
   }
@@ -114,10 +206,14 @@ template <typename T> class CoreReturn {
   const T* object;
 };
 
+km_core_context_item_wasm* km_core_context_item_create_end() {
+  return new km_core_context_item_wasm({KM_CORE_CT_END, {0,}, {0,}});
+}
+
 km_core_status
 keyboard_load_from_blob_internal(const km_core_path_name kb_name, const std::vector<uint8_t>& buf, km_core_keyboard** keyboard);
 
-EMSCRIPTEN_KEEPALIVE const CoreReturn<km_core_keyboard>*
+const CoreReturn<km_core_keyboard>*
 km_core_keyboard_load_from_blob_wasm(
   std::string kb_name,
   const emscripten::val& blob_val
@@ -129,7 +225,7 @@ km_core_keyboard_load_from_blob_wasm(
   return new CoreReturn<km_core_keyboard>(retVal, keyboard_ptr);
 }
 
-EMSCRIPTEN_KEEPALIVE const CoreReturn<km_core_keyboard_attrs_wasm>*
+const CoreReturn<km_core_keyboard_attrs_wasm>*
 km_core_keyboard_get_attrs_wasm(const km_core_keyboard* keyboard) {
   const km_core_keyboard_attrs* attrs = nullptr;
   km_core_status retVal = km_core_keyboard_get_attrs(keyboard, &attrs);
@@ -149,7 +245,7 @@ km_core_keyboard_get_attrs_wasm(const km_core_keyboard* keyboard) {
   return new CoreReturn<km_core_keyboard_attrs_wasm>(retVal, attrs_wasm);
 }
 
-EMSCRIPTEN_KEEPALIVE const CoreReturn<km_core_state>*
+const CoreReturn<km_core_state>*
 km_core_state_create_wasm(const km_core_keyboard* keyboard,
                           const std::vector<km_core_option_item_wasm>& env) {
   km_core_option_item* env_c = new km_core_option_item[env.size() + 1];
@@ -166,21 +262,22 @@ km_core_state_create_wasm(const km_core_keyboard* keyboard,
   return new CoreReturn<km_core_state>(retVal, state);
 }
 
-EMSCRIPTEN_KEEPALIVE const CoreReturn<km_core_state>*
+const CoreReturn<km_core_state>*
 km_core_state_clone_wasm(const km_core_state* state) {
   km_core_state* new_state = nullptr;
   km_core_status retVal = km_core_state_clone(state, &new_state);
   return new CoreReturn<km_core_state>(retVal, new_state);
 }
 
-EMSCRIPTEN_KEEPALIVE int
+int
 km_core_state_context_set_if_needed_wasm(
   km_core_state const* state,
-std::u16string application_context) {
+  std::u16string application_context
+) {
   return km_core_state_context_set_if_needed(const_cast<km_core_state*>(state), application_context.c_str());
 }
 
-EMSCRIPTEN_KEEPALIVE std::u16string
+std::u16string
 km_core_state_context_debug_wasm(const km_core_state* state, int context_type) {
   std::u16string context;
   km_core_cu* context_c = km_core_state_context_debug(state, static_cast<km_core_debug_context_type>(context_type));
@@ -191,7 +288,7 @@ km_core_state_context_debug_wasm(const km_core_state* state, int context_type) {
   return context;
 }
 
-EMSCRIPTEN_KEEPALIVE km_core_actions_wasm*
+km_core_actions_wasm*
 km_core_state_get_actions_wasm(km_core_state const *state) {
   km_core_actions const* actions = km_core_state_get_actions(state);
   km_core_actions_wasm* actions_wasm = new km_core_actions_wasm();
@@ -211,6 +308,38 @@ km_core_state_get_actions_wasm(km_core_state const *state) {
   return actions_wasm;
 }
 
+const CoreReturn<km_core_context_items>*
+km_core_context_get_wasm(
+  km_core_context const* context
+) {
+  km_core_context_item* items = nullptr;
+  km_core_status status = km_core_context_get(context, &items);
+  km_core_context_items* items_wasm = new km_core_context_items();
+  if (status == KM_CORE_STATUS_OK) {
+    for (const km_core_context_item* item = items; item && item->type != KM_CORE_CT_END; item++) {
+      items_wasm->push_back(km_core_context_item_wasm(*item));
+    }
+    items_wasm->push_back(km_core_context_item_wasm({KM_CORE_CT_END, {0,}, {0,}}));
+    km_core_context_items_dispose(items);
+  }
+  return new CoreReturn<km_core_context_items>(status, items_wasm);
+}
+
+km_core_status
+km_core_context_set_wasm(
+  km_core_context const* context,
+  km_core_context_items const *context_items
+) {
+  if (!context_items) {
+    return KM_CORE_STATUS_INVALID_ARGUMENT;
+  }
+  auto items = std::vector<km_core_context_item>(context_items->size());
+  for (size_t i = 0; i < context_items->size(); ++i) {
+    items[i] = context_items->get(i);
+  }
+  return km_core_context_set((km_core_context*)context, items.data());
+}
+
 EMSCRIPTEN_BINDINGS(core_interface) {
 
   em::value_object<km_core_attr>("km_core_attr")
@@ -253,6 +382,9 @@ EMSCRIPTEN_BINDINGS(core_interface) {
   em::class_<CoreReturn<km_core_keyboard_attrs_wasm>>("CoreKeyboardAttrsReturn")
       .property("status", &CoreReturn<km_core_keyboard_attrs_wasm>::getStatus)
       .property("object", &CoreReturn<km_core_keyboard_attrs_wasm>::getObject, em::allow_raw_pointers());
+  em::class_<CoreReturn<km_core_context_items>>("CoreContextReturn")
+      .property("status", &CoreReturn<km_core_context_items>::getStatus)
+      .property("object", &CoreReturn<km_core_context_items>::getObject, em::allow_raw_pointers());
   em::class_<km_core_keyboard_attrs_wasm>("km_core_keyboard_attrs")
     .property("version_string", &km_core_keyboard_attrs_wasm::version_string)
     .property("id", &km_core_keyboard_attrs_wasm::id)
@@ -268,21 +400,46 @@ EMSCRIPTEN_BINDINGS(core_interface) {
 
   em::class_<km_core_state>("km_core_state");
   em::class_<CoreReturn<km_core_state>>("CoreStateReturn")
-      .property("status", &CoreReturn<km_core_state>::getStatus)
-      .property("object", &CoreReturn<km_core_state>::getObject, em::allow_raw_pointers());
-
-  em::function("keyboard_load_from_blob", &km_core_keyboard_load_from_blob_wasm, em::allow_raw_pointers());
-  em::function("keyboard_dispose", &km_core_keyboard_dispose, em::allow_raw_pointers());
-  em::function("keyboard_get_attrs", &km_core_keyboard_get_attrs_wasm, em::allow_raw_pointers());
-  em::function("state_create", &km_core_state_create_wasm, em::allow_raw_pointers());
-  em::function("state_clone", &km_core_state_clone_wasm, em::allow_raw_pointers());
-  em::function("state_dispose", &km_core_state_dispose, em::allow_raw_pointers());
-  em::function("process_event", &km_core_process_event, em::allow_raw_pointers());
-
-  em::function("state_context_set_if_needed", &km_core_state_context_set_if_needed_wasm, em::allow_raw_pointers());
-  em::function("state_context_clear", &km_core_state_context_clear, em::allow_raw_pointers());
-  em::function("state_context_debug", &km_core_state_context_debug_wasm, em::allow_raw_pointers());
-
-  em::function("state_get_actions", &km_core_state_get_actions_wasm, em::allow_raw_pointers());
+    .property("status", &CoreReturn<km_core_state>::getStatus)
+    .property("object", &CoreReturn<km_core_state>::getObject, em::allow_raw_pointers());
+
+  em::class_<km_core_context>("km_core_context");
+  // Since we use it in CoreReturn it has to be bound as class.
+  em::class_<km_core_context_items>("km_core_context_items")
+    .constructor()
+    .function("push_back(item)", &km_core_context_items::push_back)
+    .function("resize(size)", &km_core_context_items::resize)
+    .function("size", &km_core_context_items::size)
+    .function("get(index)", &km_core_context_items::get)
+    .function("set(index, item)", &km_core_context_items::set)
+    .function("data", &km_core_context_items::data, em::allow_raw_pointers())
+    .function("toString", &km_core_context_items::toString);
+
+  em::class_<km_core_context_item_wasm>("km_core_context_item")
+    .constructor<>()
+    .property("type", &km_core_context_item_wasm::getType)
+    .property("character", &km_core_context_item_wasm::getCharacter, &km_core_context_item_wasm::setCharacter)
+    .property("marker", &km_core_context_item_wasm::getMarker, &km_core_context_item_wasm::setMarker)
+    .function("toString", &km_core_context_item_wasm::toString);
+
+  em::function("create_end_context", &km_core_context_item_create_end, em::allow_raw_pointers());
+  em::function("keyboard_load_from_blob(kb_name, blob)", &km_core_keyboard_load_from_blob_wasm, em::allow_raw_pointers());
+  em::function("keyboard_dispose(keyboard)", &km_core_keyboard_dispose, em::allow_raw_pointers());
+  em::function("keyboard_get_attrs(keyboard)", &km_core_keyboard_get_attrs_wasm, em::allow_raw_pointers());
+  em::function("state_create(keyboard, env)", &km_core_state_create_wasm, em::allow_raw_pointers());
+  em::function("state_clone(state)", &km_core_state_clone_wasm, em::allow_raw_pointers());
+  em::function("state_dispose(state)", &km_core_state_dispose, em::allow_raw_pointers());
+  em::function("process_event(state, vk, modifier_state, is_key_down, event_flags)", &km_core_process_event, em::allow_raw_pointers());
+
+  em::function("state_context(state)", &km_core_state_context, em::allow_raw_pointers());
+  em::function("state_context_set_if_needed(state, application_context)", &km_core_state_context_set_if_needed_wasm, em::allow_raw_pointers());
+  em::function("state_context_clear(state)", &km_core_state_context_clear, em::allow_raw_pointers());
+  em::function("state_context_debug(state, context_type)", &km_core_state_context_debug_wasm, em::allow_raw_pointers());
+
+  em::function("state_get_actions(state)", &km_core_state_get_actions_wasm, em::allow_raw_pointers());
+
+  em::function("context_get(context)", &km_core_context_get_wasm, em::allow_raw_pointers());
+  em::function("context_set(context, context_items)", &km_core_context_set_wasm, em::allow_raw_pointers());
 }
+
 #endif
diff --git a/core/tests/unit/wasm/wasm.tests.js b/core/tests/unit/wasm/wasm.tests.js
index 110ff6f8882..0342c9db96c 100644
--- a/core/tests/unit/wasm/wasm.tests.js
+++ b/core/tests/unit/wasm/wasm.tests.js
@@ -146,4 +146,44 @@ describe('Unit tests for wasm Core API', function () {
     const context = km_core.state_context_debug(state, 0);
     assert.equal(context, '|abc| (len: 3) [ U+0061 U+0062 U+0063 ]');
   });
+
+  const contextItemsFromString = function (str) {
+    const context_items = new km_core.km_core_context_items();
+    for (let i = 0; i < str.length; i++) {
+      const item = new km_core.km_core_context_item();
+      item.character = str.charCodeAt(i);
+      context_items.push_back(item);
+    }
+    context_items.push_back(km_core.create_end_context());
+    return context_items;
+  };
+
+  it('can get and set context items', function () {
+    // Setup
+    const state = createState('k_020___deadkeys_and_backspace');
+    const context = km_core.state_context(state);
+    const data = "Hello, အရှောက်, मानव अधिकारों की सार्वभौम घोषणा";
+    const contextItems = contextItemsFromString(data);
+
+    // Execute
+    const status = km_core.context_set(context, contextItems);
+
+    // Verify
+    assert.equal(status, 0);
+
+    // Execute
+    const result = km_core.context_get(context);
+
+    // Verify
+    assert.equal(result.status, 0);
+    assert.isOk(result.object);
+    const resultContextItems = result.object;
+    assert.equal(resultContextItems.size(), contextItems.size());
+    for (let i = 0; i < resultContextItems.size(); i++) {
+      assert.equal(resultContextItems.get(i).type, contextItems.get(i).type, `at index ${i}`);
+      assert.equal(resultContextItems.get(i).character, contextItems.get(i).character, `at index ${i}`);
+    }
+    assert.deepEqual(resultContextItems.data(), contextItems.data());
+    assert.deepEqual(resultContextItems, contextItems);
+  });
 });

From 3897517760cda0d35bfe35c8a0e9823de62b3082 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 13 Nov 2025 18:38:26 +0100
Subject: [PATCH 135/254] =?UTF-8?q?fix(web):=20improve=20determination=20o?=
 =?UTF-8?q?f=20default=20path=20=F0=9F=8D=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Browser extensions can dynamically insert scripts into a web page, so
it's possible that the last script is not what we expected, which
can cause the path to the script to be wrong. This change fixes the
determination of the default path by using the `document.currentScript`
property. It also replaces the use of the deprecated `substr` function
in those places.

Cherry-pick-of: #15159
Fixes: #15158
Test-bot: skip
---
 web/src/app/browser/src/debug-main.ts   | 16 ++++++----------
 web/src/app/browser/src/release-main.ts | 16 ++++++----------
 web/src/app/webview/src/debug-main.ts   | 16 ++++++----------
 web/src/app/webview/src/release-main.ts | 16 ++++++----------
 4 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/web/src/app/browser/src/debug-main.ts b/web/src/app/browser/src/debug-main.ts
index 973e0d7efcd..aa6b23a2a4b 100644
--- a/web/src/app/browser/src/debug-main.ts
+++ b/web/src/app/browser/src/debug-main.ts
@@ -1,16 +1,12 @@
 import { KeymanEngine } from './keymanEngine.js'
 import { SourcemappedWorker } from '@keymanapp/lexical-model-layer/web'
 
- /**
-  * Determine path and protocol of executing script, setting them as
-  * construction defaults.
-  *
-  * This can only be done during load when the active script will be the
-  * last script loaded.  Otherwise the script must be identified by name.
- */
- const scripts = document.getElementsByTagName('script');
- const ss = scripts[scripts.length-1].src;
- const sPath = ss.substr(0,ss.lastIndexOf('/')+1);
+/**
+* Determine path and protocol of executing script, setting them as
+* construction defaults.
+*/
+const ss = (document.currentScript as HTMLScriptElement)?.src;
+const sPath = ss ? ss.substring(0, ss.lastIndexOf('/') + 1) : './';
 
 // @ts-ignore
 window['keyman'] = new KeymanEngine(SourcemappedWorker, sPath);
\ No newline at end of file
diff --git a/web/src/app/browser/src/release-main.ts b/web/src/app/browser/src/release-main.ts
index faf96e9097c..da6b5be1092 100644
--- a/web/src/app/browser/src/release-main.ts
+++ b/web/src/app/browser/src/release-main.ts
@@ -1,16 +1,12 @@
 import { KeymanEngine } from './keymanEngine.js'
 import { Worker } from '@keymanapp/lexical-model-layer/web'
 
- /**
-  * Determine path and protocol of executing script, setting them as
-  * construction defaults.
-  *
-  * This can only be done during load when the active script will be the
-  * last script loaded.  Otherwise the script must be identified by name.
- */
- const scripts = document.getElementsByTagName('script');
- const ss = scripts[scripts.length-1].src;
- const sPath = ss.substr(0,ss.lastIndexOf('/')+1);
+/**
+* Determine path and protocol of executing script, setting them as
+* construction defaults.
+*/
+const ss = (document.currentScript as HTMLScriptElement)?.src;
+const sPath = ss ? ss.substring(0, ss.lastIndexOf('/') + 1) : './';
 
 // @ts-ignore
 window['keyman'] = new KeymanEngine(Worker, sPath);
\ No newline at end of file
diff --git a/web/src/app/webview/src/debug-main.ts b/web/src/app/webview/src/debug-main.ts
index 646c8f16878..aa6b23a2a4b 100644
--- a/web/src/app/webview/src/debug-main.ts
+++ b/web/src/app/webview/src/debug-main.ts
@@ -1,16 +1,12 @@
 import { KeymanEngine } from './keymanEngine.js'
 import { SourcemappedWorker } from '@keymanapp/lexical-model-layer/web'
 
- /**
-  * Determine path and protocol of executing script, setting them as
-  * construction defaults.
-  *
-  * This can only be done during load when the active script will be the
-  * last script loaded.  Otherwise the script must be identified by name.
- */
-const scripts = document.getElementsByTagName('script');
-const ss = scripts[scripts.length-1].src;
-const sPath = ss.substring(0,ss.lastIndexOf('/')+1);
+/**
+* Determine path and protocol of executing script, setting them as
+* construction defaults.
+*/
+const ss = (document.currentScript as HTMLScriptElement)?.src;
+const sPath = ss ? ss.substring(0, ss.lastIndexOf('/') + 1) : './';
 
 // @ts-ignore
 window['keyman'] = new KeymanEngine(SourcemappedWorker, sPath);
\ No newline at end of file
diff --git a/web/src/app/webview/src/release-main.ts b/web/src/app/webview/src/release-main.ts
index ba70bfef9b2..da6b5be1092 100644
--- a/web/src/app/webview/src/release-main.ts
+++ b/web/src/app/webview/src/release-main.ts
@@ -1,16 +1,12 @@
 import { KeymanEngine } from './keymanEngine.js'
 import { Worker } from '@keymanapp/lexical-model-layer/web'
 
- /**
-  * Determine path and protocol of executing script, setting them as
-  * construction defaults.
-  *
-  * This can only be done during load when the active script will be the
-  * last script loaded.  Otherwise the script must be identified by name.
- */
-const scripts = document.getElementsByTagName('script');
-const ss = scripts[scripts.length-1].src;
-const sPath = ss.substring(0,ss.lastIndexOf('/')+1);
+/**
+* Determine path and protocol of executing script, setting them as
+* construction defaults.
+*/
+const ss = (document.currentScript as HTMLScriptElement)?.src;
+const sPath = ss ? ss.substring(0, ss.lastIndexOf('/') + 1) : './';
 
 // @ts-ignore
 window['keyman'] = new KeymanEngine(Worker, sPath);
\ No newline at end of file

From a7083e7960309045887910cf5b28d8a21040487a Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 12 Nov 2025 19:50:42 +0100
Subject: [PATCH 136/254] feat(web): move/add core-adapter module

This change moves the core adapter to core-adapter module which contains
the code to bind to the the WASM core binaries and adds additional type
definitions for Core.

Part-of: #13926
Test-bot: skip
---
 core/include/keyman/keyman_core_api.h         |  2 +-
 web/build.sh                                  |  6 ++---
 web/package.json                              |  5 +++++
 web/src/app/browser/build.sh                  |  4 ++--
 web/src/app/ui/build.sh                       |  4 ++--
 web/src/app/webview/build.sh                  |  4 ++--
 web/src/engine/build.sh                       | 12 +++++-----
 .../.gitignore                                |  0
 .../KM_Core.ts                                | 22 +++++++++++++++++++
 web/src/engine/src/core-adapter/index.ts      |  3 +++
 web/src/engine/src/core-processor/index.ts    |  3 ---
 .../keyboard/keyboards/keyboardLoaderBase.ts  |  2 +-
 .../src/keyboard/keyboards/kmxKeyboard.ts     |  2 +-
 .../src/main/headless/inputProcessor.ts       |  2 +-
 .../basic.tests.ts                            |  8 +++----
 .../test/auto/dom/web-test-runner.config.mjs  |  4 ++--
 web/src/test/manual/web/core/paths.js         |  2 +-
 web/src/test/manual/web/core/stress.html      |  2 +-
 18 files changed, 57 insertions(+), 30 deletions(-)
 rename web/src/engine/src/{core-processor => core-adapter}/.gitignore (100%)
 rename web/src/engine/src/{core-processor => core-adapter}/KM_Core.ts (75%)
 create mode 100644 web/src/engine/src/core-adapter/index.ts
 rename web/src/test/auto/dom/cases/{core-processor => core-adapter}/basic.tests.ts (88%)

diff --git a/core/include/keyman/keyman_core_api.h b/core/include/keyman/keyman_core_api.h
index 6ed5847894f..eb9e5ec7b60 100644
--- a/core/include/keyman/keyman_core_api.h
+++ b/core/include/keyman/keyman_core_api.h
@@ -308,7 +308,7 @@ non-zero value is an error).
 ## Specification
 
 -->
-// keep in sync with web/src/engine/core-processor/src/core-factory.ts
+// keep in sync with web/src/engine/src/core-adapter/KM_Core.ts
 // (see https://github.com/emscripten-core/emscripten/issues/18585)
 <!--
 ```c */
diff --git a/web/build.sh b/web/build.sh
index ed61f87537f..dd68090334b 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -103,8 +103,8 @@ build_tests_action() {
 
   builder_echo "Copying some files"
 
-  mkdir -p "${KEYMAN_ROOT}/web/build/test/dom/cases/core-processor/import/core/"
-  cp "${KEYMAN_ROOT}/web/src/engine/src/core-processor/import/core/keymancore.d.ts" "${KEYMAN_ROOT}/web/build/test/dom/cases/core-processor/import/core/"
+  mkdir -p "${KEYMAN_ROOT}/web/build/test/dom/cases/core-adapter/import/core/"
+  cp "${KEYMAN_ROOT}/web/src/engine/src/core-adapter/import/core/keymancore.d.ts" "${KEYMAN_ROOT}/web/build/test/dom/cases/core-adapter/import/core/"
 
   for dir in \
     "${KEYMAN_ROOT}/web/build/test/dom/cases"/*/ \
@@ -149,7 +149,7 @@ builder_run_child_actions build:common/web-utils
 builder_run_child_actions build:engine
 # builder_run_child_actions build:engine/predictive-text
 
-# Uses all but engine/element-wrappers and engine/attachment
+# Uses all but engine/element-text-stores and engine/attachment
 builder_run_child_actions build:app/webview
 
 # Uses literally everything `engine/` above
diff --git a/web/package.json b/web/package.json
index 61c626a6112..5567e44f485 100644
--- a/web/package.json
+++ b/web/package.json
@@ -17,6 +17,11 @@
       "types": "./build/engine/obj/attachment/index.d.ts",
       "import": "./build/engine/obj/attachment/index.js"
     },
+    "./engine/core-adapter": {
+      "es6-bundling": "./src/engine/src/core-adapter/index.ts",
+      "types": "./build/engine/obj/core-adapter/index.d.ts",
+      "import": "./build/engine/obj/core-adapter/index.js"
+    },
     "./engine/core-processor": {
       "es6-bundling": "./src/engine/src/core-processor/index.ts",
       "types": "./build/engine/obj/core-processor/index.d.ts",
diff --git a/web/src/app/browser/build.sh b/web/src/app/browser/build.sh
index e9b702ebe88..d23b67987af 100755
--- a/web/src/app/browser/build.sh
+++ b/web/src/app/browser/build.sh
@@ -73,8 +73,8 @@ compile_and_copy() {
   cp -R "$KEYMAN_ROOT/web/src/resources/osk/." "$KEYMAN_ROOT/web/build/app/resources/osk/"
 
   # Copy Keyman Core build artifacts for local reference
-  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/browser/debug/"
-  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/browser/release/"
+  cp "${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/browser/debug/"
+  cp "${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/browser/release/"
 
   # Update the build/publish copy of our build artifacts
   prepare
diff --git a/web/src/app/ui/build.sh b/web/src/app/ui/build.sh
index 298f571479f..1ac39c3fc09 100755
--- a/web/src/app/ui/build.sh
+++ b/web/src/app/ui/build.sh
@@ -65,8 +65,8 @@ compile_and_copy() {
   cp -R "$KEYMAN_ROOT/web/src/resources/ui/." "$KEYMAN_ROOT/web/build/app/resources/ui/"
 
   # Copy Keyman Core build artifacts for local reference
-  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/ui/debug/"
-  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/ui/release/"
+  cp "${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/ui/debug/"
+  cp "${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/ui/release/"
 
   # Update the build/publish copy of our build artifacts
   prepare
diff --git a/web/src/app/webview/build.sh b/web/src/app/webview/build.sh
index 08d1fe47db0..3e7861afb5e 100755
--- a/web/src/app/webview/build.sh
+++ b/web/src/app/webview/build.sh
@@ -62,8 +62,8 @@ compile_and_copy() {
   cp -R "$KEYMAN_ROOT/web/src/resources/osk/." "$KEYMAN_ROOT/web/build/app/resources/osk/"
 
   # Copy Keyman Core build artifacts for local reference
-  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/webview/debug/"
-  cp "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/webview/release/"
+  cp "${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/webview/debug/"
+  cp "${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core/"km-core.{js,wasm} "${KEYMAN_ROOT}/web/build/app/webview/release/"
 
   # Clean the sourcemaps of .. and . components
   for script in "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME/debug/"*.js; do
diff --git a/web/src/engine/build.sh b/web/src/engine/build.sh
index 996734e8cee..2ca80f0066b 100755
--- a/web/src/engine/build.sh
+++ b/web/src/engine/build.sh
@@ -36,16 +36,16 @@ builder_parse "$@"
 #### Build action definitions ####
 
 copy_deps() {
-  mkdir -p "src/core-processor/import/core/"
+  mkdir -p "${KEYMAN_ROOT}/web/src/engine/src/core-adapter/import/core/"
   # we don't need this file for release builds, but it's nice to have
   # for reference and auto-completion
-  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/keymancore.d.ts" "src/core-processor/import/core/"
+  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/keymancore.d.ts" "${KEYMAN_ROOT}/web/src/engine/src/core-adapter/import/core/"
 
-  mkdir -p "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"
-  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/keymancore.d.ts" "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"
-  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/"km-core{.js,.wasm} "${KEYMAN_ROOT}/web/build/engine/core-processor/obj/import/core/"
+  mkdir -p "${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core/"
+  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/keymancore.d.ts" "${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core/"
+  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/"km-core{.js,.wasm} "${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core/"
 
-  cp "$KEYMAN_ROOT/common/resources/fonts/keymanweb-osk.ttf" "$KEYMAN_ROOT/web/src/resources/osk/"
+  cp "${KEYMAN_ROOT}/common/resources/fonts/keymanweb-osk.ttf" "${KEYMAN_ROOT}/web/src/resources/osk/"
 }
 
 do_build () {
diff --git a/web/src/engine/src/core-processor/.gitignore b/web/src/engine/src/core-adapter/.gitignore
similarity index 100%
rename from web/src/engine/src/core-processor/.gitignore
rename to web/src/engine/src/core-adapter/.gitignore
diff --git a/web/src/engine/src/core-processor/KM_Core.ts b/web/src/engine/src/core-adapter/KM_Core.ts
similarity index 75%
rename from web/src/engine/src/core-processor/KM_Core.ts
rename to web/src/engine/src/core-adapter/KM_Core.ts
index c8ca4a56c7f..4202ef74adb 100644
--- a/web/src/engine/src/core-processor/KM_Core.ts
+++ b/web/src/engine/src/core-adapter/KM_Core.ts
@@ -20,6 +20,28 @@ export enum KM_CORE_STATUS {
   OS_ERROR = 0x80000000
 }
 
+export enum KM_CORE_OPTION_SCOPE {
+  OPT_UNKNOWN = 0,
+  OPT_KEYBOARD = 1,
+  OPT_ENVIRONMENT = 2,
+  OPT_MAX_SCOPES
+}
+
+export enum KM_CORE_KMX_ENV {
+  PLATFORM = "platform",
+  BASELAYOUT = "baseLayout",
+  BASELAYOUTALT = "baseLayoutAlt",
+  SIMULATEALTGR = "simulateAltgr",
+  CAPSLOCK = "capsLock",
+  BASELAYOUTGIVESCTRLRALTFORRALT = "baseLayoutGivesCtrlRAltForRAlt",
+}
+
+export enum KM_CORE_CT {
+  END = 0,
+  CHAR = 1,
+  MARKER = 2,
+}
+
 export class KM_Core {
   private static km_core: KMXCoreModule = null;
 
diff --git a/web/src/engine/src/core-adapter/index.ts b/web/src/engine/src/core-adapter/index.ts
new file mode 100644
index 00000000000..c0357143d12
--- /dev/null
+++ b/web/src/engine/src/core-adapter/index.ts
@@ -0,0 +1,3 @@
+export { KM_Core, KM_CORE_STATUS, KM_CORE_OPTION_SCOPE, KM_CORE_KMX_ENV, KM_CORE_CT } from './KM_Core.js';
+import { type km_core_keyboard, type km_core_state, type km_core_context, type km_core_context_item } from './import/core/keymancore.js';
+export { km_core_keyboard, km_core_state, km_core_context, km_core_context_item };
diff --git a/web/src/engine/src/core-processor/index.ts b/web/src/engine/src/core-processor/index.ts
index d34471a2cc9..e69de29bb2d 100644
--- a/web/src/engine/src/core-processor/index.ts
+++ b/web/src/engine/src/core-processor/index.ts
@@ -1,3 +0,0 @@
-export { KM_Core, KM_CORE_STATUS } from './KM_Core.js';
-import { type km_core_keyboard } from './import/core/keymancore.js';
-export { km_core_keyboard };
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts b/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
index c8a89d420ff..b7fe16dd1d1 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
@@ -1,4 +1,4 @@
-import { KM_Core, KM_CORE_STATUS } from 'keyman/engine/core-processor';
+import { KM_Core, KM_CORE_STATUS } from 'keyman/engine/core-adapter';
 import { JSKeyboard } from "./jsKeyboard.js";
 import { KMXKeyboard } from './kmxKeyboard.js';
 import { KeyboardHarness } from "./keyboardHarness.js";
diff --git a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
index 80ca7be6389..a11ed052e0e 100644
--- a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
@@ -1,4 +1,4 @@
-import { KM_Core, km_core_keyboard } from 'keyman/engine/core-processor';
+import { KM_Core, km_core_keyboard } from 'keyman/engine/core-adapter';
 
 /**
  * Acts as a wrapper class for KMX(+) Keyman keyboards
diff --git a/web/src/engine/src/main/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
index 6429c7263d4..a5018f6bd91 100644
--- a/web/src/engine/src/main/headless/inputProcessor.ts
+++ b/web/src/engine/src/main/headless/inputProcessor.ts
@@ -5,7 +5,7 @@ import { LanguageProcessor }  from "./languageProcessor.js";
 import type { ModelSpec, PathConfiguration }  from "keyman/engine/interfaces";
 import { globalObject, DeviceSpec, isEmptyTransform } from "keyman/common/web-utils";
 
-import { KM_Core } from 'keyman/engine/core-processor';
+import { KM_Core } from 'keyman/engine/core-adapter';
 
 import {
   Codes,
diff --git a/web/src/test/auto/dom/cases/core-processor/basic.tests.ts b/web/src/test/auto/dom/cases/core-adapter/basic.tests.ts
similarity index 88%
rename from web/src/test/auto/dom/cases/core-processor/basic.tests.ts
rename to web/src/test/auto/dom/cases/core-adapter/basic.tests.ts
index a8ce6e57972..6bf7f900a46 100644
--- a/web/src/test/auto/dom/cases/core-processor/basic.tests.ts
+++ b/web/src/test/auto/dom/cases/core-adapter/basic.tests.ts
@@ -1,10 +1,10 @@
 import { assert } from 'chai';
-import { KM_Core, KM_CORE_STATUS } from 'keyman/engine/core-processor';
+import { KM_Core, KM_CORE_STATUS } from 'keyman/engine/core-adapter';
 
-const coreurl = '/build/engine/core-processor/obj/import/core';
+const coreurl = '/build/engine/obj/core-adapter/import/core';
 
-// Test the CoreProcessor interface.
-describe('CoreProcessor', function () {
+// Test the KM_Core interface.
+describe('KM_Core', function () {
   this.timeout(5000); // increased timeout for async loading
 
   async function loadKeyboardBlob(uri: string) {
diff --git a/web/src/test/auto/dom/web-test-runner.config.mjs b/web/src/test/auto/dom/web-test-runner.config.mjs
index f1acf47d852..3ca15cc3792 100644
--- a/web/src/test/auto/dom/web-test-runner.config.mjs
+++ b/web/src/test/auto/dom/web-test-runner.config.mjs
@@ -59,9 +59,9 @@ export default {
       files: ['web/build/test/dom/cases/browser/**/*.tests.mjs']
     },
     {
-      name: 'engine/core-processor',
+      name: 'engine/core-adapter',
       // Relative, from the containing package.json
-      files: ['web/src/test/auto/dom/cases/core-processor/*.tests.ts']
+      files: ['web/src/test/auto/dom/cases/core-adapter/*.tests.ts']
     },
     {
       name: 'engine/dom-utils',
diff --git a/web/src/test/manual/web/core/paths.js b/web/src/test/manual/web/core/paths.js
index 5b595711fa3..9803ea624ba 100644
--- a/web/src/test/manual/web/core/paths.js
+++ b/web/src/test/manual/web/core/paths.js
@@ -1 +1 @@
-export const CORE_WASM = '../../../../../build/engine/core-processor/obj/import/core';
+export const CORE_WASM = '../../../../../build/engine/core-adapter/obj/import/core';
diff --git a/web/src/test/manual/web/core/stress.html b/web/src/test/manual/web/core/stress.html
index fed4dfeaa0d..e78facdb9f4 100644
--- a/web/src/test/manual/web/core/stress.html
+++ b/web/src/test/manual/web/core/stress.html
@@ -22,7 +22,7 @@
   </script>
 
   <script module="es6" type="module">
-    import { KM_Core } from 'keyman/engine/core-processor/lib/index.mjs';
+    import { KM_Core } from 'keyman/engine/core-adapter/lib/index.mjs';
     import { CORE_WASM } from './paths.js';
     import { loadKeyboardBlob } from './load-keyboard-blob.js';
 

From 14826a4ab6364ea83310aee66feec14677a18e35 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 17 Jan 2025 14:35:15 +0100
Subject: [PATCH 137/254] feat(web): add KMX keyboard test page

Part-of: #13926
Test-bot: skip
---
 web/src/test/manual/build.sh             |  18 ++--
 web/src/test/manual/web/index.html       |   3 +
 web/src/test/manual/web/kmxkeyboard.html | 114 +++++++++++++++++++++++
 3 files changed, 127 insertions(+), 8 deletions(-)
 create mode 100644 web/src/test/manual/web/kmxkeyboard.html

diff --git a/web/src/test/manual/build.sh b/web/src/test/manual/build.sh
index 34a839bdd65..6e524895f9e 100755
--- a/web/src/test/manual/build.sh
+++ b/web/src/test/manual/build.sh
@@ -19,22 +19,24 @@ builder_parse "$@"
 DEST="web/build/test-resources"
 
 builder_describe_outputs \
-  build       "/$DEST/sentry-manager.js"
+  build       "${KEYMAN_ROOT}/${DEST}/sentry-manager.js"
 
 #### Build action definitions ####
 
 function do_copy() {
-  mkdir -p "$KEYMAN_ROOT/$DEST/keyboards"
+  mkdir -p "${KEYMAN_ROOT}/${DEST}/keyboards"
 
   # The next two lines are needed for the sentry-integration manual test page.
-  cp "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js"      "$KEYMAN_ROOT/$DEST/sentry-manager.js"
-  cp "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js.map"  "$KEYMAN_ROOT/$DEST/sentry-manager.js.map"
+  cp "${KEYMAN_ROOT}/common/web/sentry-manager/build/lib/index.js"      "${KEYMAN_ROOT}/${DEST}/sentry-manager.js"
+  cp "${KEYMAN_ROOT}/common/web/sentry-manager/build/lib/index.js.map"  "${KEYMAN_ROOT}/${DEST}/sentry-manager.js.map"
+
+  cp "${KEYMAN_ROOT}/common/web/types/tests/fixtures/kmx/khmer_angkor.kmx" "${KEYMAN_ROOT}/${DEST}/"
 
   # copy common test (resources) keyboards
-  cp -f "$KEYMAN_ROOT/common/test/keyboards/platform-rules/platformtest.js" "$KEYMAN_ROOT/$DEST/keyboards/"
-  cp -f "$KEYMAN_ROOT/common/test/keyboards/test9469/build/test9469.js" "$KEYMAN_ROOT/$DEST/keyboards/"
-  cp -f "$KEYMAN_ROOT/common/test/resources/keyboards/"*.js "$KEYMAN_ROOT/$DEST/keyboards/"
+  cp -f "${KEYMAN_ROOT}/common/test/keyboards/platform-rules/platformtest.js" "${KEYMAN_ROOT}/${DEST}/keyboards/"
+  cp -f "${KEYMAN_ROOT}/common/test/keyboards/test9469/build/test9469.js" "${KEYMAN_ROOT}/${DEST}/keyboards/"
+  cp -f "${KEYMAN_ROOT}/common/test/resources/keyboards/"*.js "${KEYMAN_ROOT}/${DEST}/keyboards/"
 }
 
-builder_run_action clean   rm -rf "$KEYMAN_ROOT/$DEST"
+builder_run_action clean   rm -rf "${KEYMAN_ROOT}/${DEST}"
 builder_run_action build   do_copy
diff --git a/web/src/test/manual/web/index.html b/web/src/test/manual/web/index.html
index 04ad2a84fc9..20023590c7d 100644
--- a/web/src/test/manual/web/index.html
+++ b/web/src/test/manual/web/index.html
@@ -20,6 +20,9 @@
   </head>
   <body>
 
+  <h1>KeymanWeb 19 Testing</h1>
+  <h2><a href="./kmxkeyboard.html">Test KMX keyboard loaded in Keymanweb</a></h2>
+
   <h1>KeymanWeb 17 Testing</h1>
   <h2><a href="./unminified.html">Test unminified Keymanweb</a></h2>
   <h2><a href="./unminified - manual.html">Test unminified Keymanweb in manual-attachment mode.</a></h2>
diff --git a/web/src/test/manual/web/kmxkeyboard.html b/web/src/test/manual/web/kmxkeyboard.html
new file mode 100644
index 00000000000..f0d23eaea63
--- /dev/null
+++ b/web/src/test/manual/web/kmxkeyboard.html
@@ -0,0 +1,114 @@
+<!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>KeymanWeb Sample Page - Unminified Source</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: 24px; width:80%; min-height:30px; border: 1px solid gray;}
+      #KeymanWebControl {width:50%;min-width:600px;}
+    </style>
+
+    <!-- Insert uncompiled KeymanWeb source scripts -->
+    <script src="../../../../build/publish/debug/keymanweb.js" type="application/javascript"></script>
+
+    <!--
+      For desktop browsers, a script for the user interface must be inserted here.
+
+      Standard UIs are toggle, button, float and toolbar.
+      The toolbar UI is best for any page designed to support keyboards for
+      a large number of languages.
+    -->
+    <script src="../../../../build/publish/debug/kmwuitoggle.js"></script>
+
+    <!-- Initialization: set paths to keyboards, resources and fonts as required -->
+    <script>
+      window.addEventListener('load', function () {
+        keyman.init().then(function () {
+          keyman.addKeyboards({
+            id: 'khmer_angkor',
+            name: 'Khmer Angkor',
+            languages: {
+              id: 'km',
+              name: 'Khmer'
+            },
+            filename: '/build/test-resources/khmer_angkor.kmx'
+          });
+        });
+      });
+    </script>
+
+    <!-- Add keyboard management script for local selection of keyboards to use -->
+    <script src="commonHeader.js"></script>
+
+  </head>
+
+<!-- Sample page HTML -->
+  <body>
+    <h2>KeymanWeb Sample Page - KMX Keyboards</h2>
+
+    <div>
+    <!--
+      The following DIV is used to position the Button or Toolbar User Interfaces on the page.
+      If omitted, those User Interfaces will appear at the top of the document body.
+      (It is ignored by other User Interfaces.)
+    -->
+    <div id='KeymanWebControl'></div>
+
+    <h3>Type in your language in this text area:</h3>
+    <textarea id='ta1' class='test' placeholder='Type here'></textarea>
+
+    <h3>or in this input field:</h3>
+    <input class='test' value='' placeholder='or here'/>
+
+    <!--  The following elements show how the language menu can be dynamically extended at any time -->
+    <h3>Add a keyboard by keyboard name:</h3>
+    <input type='input' id='kbd_id1' class='kmw-disabled' onkeypress="clickOnEnter(event,1);"/>
+    <input type='button' id='btn1' onclick='addKeyboard(1);' value='Add' />
+
+    <h3>Add a keyboard by BCP-47 language code:</h3>
+    <input type='input' id='kbd_id2' class='kmw-disabled' onkeypress="clickOnEnter(event,2);"/>
+    <input type='button' id='btn2' onclick='addKeyboard(2);' value='Add' />
+
+    <h3>Add a keyboard by language name(s):</h3>
+    <input type='input' id='kbd_id3' class='kmw-disabled' onkeypress="clickOnEnter(event,3);"/>
+    <input type='button' id='btn3' onclick='addKeyboard(3);' value='Add' />
+
+    <h3><a href="./">Return to testing home page</a></h3>
+  </div>
+
+  <!-- include a blank div to enable scrolling -->
+  <div style="height:1000px"></div>
+  <p>--End of Document--</p>
+
+  </body>
+
+  <!--
+    *** DEVELOPER NOTE -- FIREFOX CONFIGURATION FOR TESTING ***
+    *
+    * If the URL bar starts with <b>file://</b>, Firefox may not load the font used
+    * to display the special characters used in the On-Screen Keyboard.
+    *
+    * To work around this Firefox bug, navigate to <b>about:config</b>
+    * and set <b>security.fileuri.strict_origin_policy</b> to <b>false</b>
+    * while testing.
+    *
+    * Firefox resolves website-based CSS URI references correctly without needing
+    * any configuration change, so this change should only be made for file-based testing.
+    *
+    ***
+  -->
+</html>

From a76c1487420299e8078371b32bb750c145532f33 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 12 Nov 2025 19:04:01 +0100
Subject: [PATCH 138/254] feat(web): add KeyboardProcessor interface and
 CoreKeyboardProcessor class

Basic key events are working with this change, and it is possible to type
on a hardware keyboard.

Part-of: #13926
Test-bot: skip
---
 web/src/app/browser/src/contextManager.ts     |   6 +-
 .../app/browser/src/hardwareEventKeyboard.ts  |   9 +-
 web/src/app/browser/src/keymanEngine.ts       |   4 +-
 .../core-processor/coreKeyboardProcessor.ts   | 144 ++++++++++++++++++
 web/src/engine/src/core-processor/index.ts    |   1 +
 web/src/engine/src/js-processor/index.ts      |   2 +-
 .../src/js-processor/jsKeyboardProcessor.ts   |  16 +-
 web/src/engine/src/keyboard/index.ts          |   1 +
 .../keyboard/keyboards/keyboardProcessor.ts   |  83 ++++++++++
 .../src/keyboard/keyboards/kmxKeyboard.ts     |  86 ++++++++++-
 web/src/engine/src/main/hardKeyboardBase.ts   |   1 -
 .../src/main/headless/inputProcessor.ts       |  33 ++--
 web/src/engine/src/osk/visualKeyboard.ts      |   6 +-
 13 files changed, 351 insertions(+), 41 deletions(-)
 create mode 100644 web/src/engine/src/core-processor/coreKeyboardProcessor.ts
 create mode 100644 web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts

diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index a7c3708a267..497ae111a68 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -43,14 +43,14 @@ function _SetTargDir(Ptarg: HTMLElement, activeKeyboard: Keyboard) {
 }
 
 export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
-  private _activeKeyboard: {keyboard: JSKeyboard, metadata: KeyboardStub};
+  private _activeKeyboard: {keyboard: Keyboard, metadata: KeyboardStub};
   private cookieManager = new CookieSerializer<KeyboardCookie>('KeymanWeb_Keyboard');
   readonly focusAssistant = new FocusAssistant(() => this.activeTarget?.isForcingScroll());
   readonly page: PageContextAttachment;
   private mostRecentTarget: AbstractElementTextStore<any>;
   private currentTarget: AbstractElementTextStore<any>;
 
-  private globalKeyboard: {keyboard: JSKeyboard, metadata: KeyboardStub};
+  private globalKeyboard: {keyboard: Keyboard, metadata: KeyboardStub};
 
   private _eventsObj: () => LegacyEventEmitter<LegacyAPIEvents>;
   private domEventTracker = new DomEventTracker();
@@ -387,7 +387,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
   }
 
   // Note:  is part of the keyboard activation process.  Not to be called directly by published API.
-  activateKeyboardForTarget(kbd: { keyboard: JSKeyboard, metadata: KeyboardStub }, target: AbstractElementTextStore<any>) {
+  activateKeyboardForTarget(kbd: { keyboard: Keyboard, metadata: KeyboardStub }, target: AbstractElementTextStore<any>) {
     const attachment = target?.getElement()._kmwAttachment;
 
     if(!attachment) {
diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts
index 4db23cc0d5a..0e0957d5890 100644
--- a/web/src/app/browser/src/hardwareEventKeyboard.ts
+++ b/web/src/app/browser/src/hardwareEventKeyboard.ts
@@ -1,5 +1,4 @@
-import { Codes, DeviceSpec, KeyEvent, KeyMapping, JSKeyboard } from 'keyman/engine/keyboard';
-import { JSKeyboardProcessor } from 'keyman/engine/js-processor';
+import { Codes, DeviceSpec, KeyEvent, KeyMapping, KeyboardProcessor, Keyboard } from 'keyman/engine/keyboard';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
 import { HardKeyboardBase, processForMnemonicsAndLegacy } from 'keyman/engine/main';
@@ -10,7 +9,7 @@ import { textStoreForEvent, textStoreForElement } from 'keyman/engine/attachment
 import { ContextManager } from './contextManager.js';
 
 type KeyboardState = {
-  activeKeyboard: JSKeyboard,
+  activeKeyboard: Keyboard,
   modStateFlags: number,
   baseLayout: string
 }
@@ -218,13 +217,13 @@ export default class HardwareEventKeyboard extends HardKeyboardBase {
   // - `modStateFlags`
   // - `baseLayout`
   // - `doModifierPress()` - for modifier updates on key-up.
-  private readonly processor: JSKeyboardProcessor;
+  private readonly processor: KeyboardProcessor;
   private readonly contextManager: ContextManager;
   private domEventTracker = new DomEventTracker();
 
   private swallowKeypress: boolean = false;
 
-  constructor(hardDevice: DeviceSpec, processor: JSKeyboardProcessor, contextManager: ContextManager) {
+  constructor(hardDevice: DeviceSpec, processor: KeyboardProcessor, contextManager: ContextManager) {
     super();
     this.hardDevice = hardDevice;
     this.contextManager = contextManager;
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index a2a3eab486b..db88684dc6c 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -7,7 +7,7 @@ import {
   VisualKeyboard
 } from 'keyman/engine/osk';
 import { ErrorStub, KeyboardStub, CloudQueryResult, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage';
-import { DeviceSpec, JSKeyboard, Keyboard } from "keyman/engine/keyboard";
+import { DeviceSpec, JSKeyboard, Keyboard, KMXKeyboard } from "keyman/engine/keyboard";
 import KeyboardObject = KeymanWebKeyboard.KeyboardObject;
 
 import * as views from './viewsAnchorpoint.js';
@@ -692,7 +692,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
     }
 
     PKbd = PKbd || this.core.activeKeyboard;
-    if (!(PKbd instanceof JSKeyboard)) {
+    if (PKbd instanceof KMXKeyboard) {
       // TODO-web-core: implement for KMX keyboards if needed
       return null;
     }
diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
new file mode 100644
index 00000000000..f33f23b54d1
--- /dev/null
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -0,0 +1,144 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+
+import { EventEmitter } from 'eventemitter3';
+import { KM_Core, KM_CORE_STATUS } from 'keyman/engine/core-adapter';
+import {
+  BeepHandler,
+  DeviceSpec, EventMap, Keyboard, KeyboardMinimalInterface, KeyboardProcessor,
+  KeyEvent, KMXKeyboard, SyntheticTextStore, MutableSystemStore, TextStore, ProcessorAction,
+  StateKeyMap
+} from "keyman/engine/keyboard";
+
+export class CoreKeyboardInterface implements KeyboardMinimalInterface {
+  public activeKeyboard: Keyboard;
+
+  constructor() {
+
+  }
+}
+
+export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements KeyboardProcessor {
+  private _newLayerStore: MutableSystemStore = new MutableSystemStore(0, 'default');
+  private _oldLayerStore: MutableSystemStore = new MutableSystemStore(0, 'default');
+  private _layerStore: MutableSystemStore = new MutableSystemStore(0, 'default');
+  private _keyboardInterface: CoreKeyboardInterface = new CoreKeyboardInterface();
+
+  public async init(basePath: string): Promise<void> {
+    await KM_Core.createCoreProcessor(basePath);
+  }
+
+  // Tracks the simulated value for supported state keys, allowing the OSK to mirror a physical keyboard for them.
+  // Using the exact keyCode name from the Codes definitions will allow for certain optimizations elsewhere in the code.
+  public stateKeys: StateKeyMap = {
+    "K_CAPS": false,
+    "K_NUMLOCK": false,
+    "K_SCROLL": false
+  }
+
+  /**
+  * Indicates the device (platform) to be used for non-keystroke events,
+  * such as those sent to `begin postkeystroke` and `begin newcontext`
+  * entry points.
+  */
+  public contextDevice: DeviceSpec;
+
+  public beepHandler?: BeepHandler;
+
+  // Tracks the most recent modifier state information in order to quickly detect changes
+  // in keyboard state not otherwise captured by the hosting page in the browser.
+  // Needed for AltGr simulation.
+  public modStateFlags: number = 0;
+  public baseLayout: string;
+
+  public get activeKeyboard(): Keyboard {
+    return this.keyboardInterface.activeKeyboard;
+  }
+
+  public set activeKeyboard(keyboard: Keyboard) {
+    this.keyboardInterface.activeKeyboard = keyboard;
+  }
+
+  get keyboardInterface(): KeyboardMinimalInterface {
+    return this._keyboardInterface;
+  }
+
+  public get layerStore(): MutableSystemStore {
+    // TODO-web-core: link to .kmx layer store
+    return this._layerStore;
+  }
+
+  public get newLayerStore(): MutableSystemStore {
+    // TODO-web-core: link to .kmx new-layer store
+    return this._newLayerStore;
+  }
+
+  public get oldLayerStore(): MutableSystemStore {
+    // TODO-web-core: link to .kmx old-layer store
+    return this._oldLayerStore;
+  }
+
+  public get layerId(): string {
+    return this._layerStore.value;
+  }
+  public set layerId(value: string) {
+    this._layerStore.set(value);
+  }
+
+  public processPostKeystroke(device: DeviceSpec, textStore: TextStore): ProcessorAction {
+    // TODO-web-core: Implement this method
+    return null;
+  }
+
+  public processKeystroke(keyEvent: KeyEvent, textStore: TextStore): ProcessorAction {
+    const preInput = SyntheticTextStore.from(textStore, true);
+    const activeKeyboard = this.activeKeyboard as KMXKeyboard;
+    const status = KM_Core.instance.process_event(activeKeyboard.state, keyEvent.Lcode, keyEvent.Lmodifiers, 1, 0); // TODO-web-core: properly set keyDown and flags
+    if (status != KM_CORE_STATUS.OK) {
+      console.error('KeymanWeb: km_core_process_event failed with status: ' + status);
+      return null;
+    }
+    const processorAction = new ProcessorAction();
+    const core_actions = KM_Core.instance.state_get_actions(activeKeyboard.state);
+
+    textStore.deleteCharsBeforeCaret(core_actions.code_points_to_delete);
+    textStore.insertTextBeforeCaret(core_actions.output);
+    processorAction.beep = core_actions.do_alert;
+    processorAction.triggerKeyDefault = core_actions.emit_keystroke;
+
+    // TODO-web-core: Implement options
+    // process_persist_action(engine, actions->persist_options);
+    // TODO-web-core: do we have to do anything with the new_caps_lock_state?
+    // process_capslock_action(actions->new_caps_lock_state);
+
+    processorAction.transcription = textStore.buildTranscriptionFrom(preInput, keyEvent, false);
+
+    return processorAction;
+  }
+
+  /**
+   * Select the OSK's next keyboard layer based upon layer switching keys as a default
+   * The next layer will be determined from the key name unless otherwise specifed
+   *
+   *  @param  {string}                    keyName     key identifier
+   *  @return {boolean}                               return true if keyboard layer changed
+   */
+  public selectLayer(keyEvent: KeyEvent): boolean {
+    // TODO-web-core: Implement this method
+    return false;
+  }
+
+  // Returns true if the key event is a modifier press, allowing keyPress to return selectively
+  // in those cases.
+  public doModifierPress(Levent: KeyEvent, textStore: TextStore, isKeyDown: boolean): boolean {
+    // TODO-web-core: Implement this method
+    return false;
+  }
+
+  public resetContext(textStore?: TextStore): void {}
+
+  public setNumericLayer(device: DeviceSpec): void {}
+
+  public finalizeProcessorAction(data: ProcessorAction, textStore: TextStore): void {}
+}
diff --git a/web/src/engine/src/core-processor/index.ts b/web/src/engine/src/core-processor/index.ts
index e69de29bb2d..3376653ad86 100644
--- a/web/src/engine/src/core-processor/index.ts
+++ b/web/src/engine/src/core-processor/index.ts
@@ -0,0 +1 @@
+export { CoreKeyboardProcessor } from './coreKeyboardProcessor.js';
diff --git a/web/src/engine/src/js-processor/index.ts b/web/src/engine/src/js-processor/index.ts
index 67443d44bf3..4b544c1b710 100644
--- a/web/src/engine/src/js-processor/index.ts
+++ b/web/src/engine/src/js-processor/index.ts
@@ -1,3 +1,3 @@
-export { BeepHandler, JSKeyboardProcessor, LogMessageHandler, ProcessorInitOptions } from "./jsKeyboardProcessor.js";
+export { JSKeyboardProcessor, LogMessageHandler, ProcessorInitOptions } from "./jsKeyboardProcessor.js";
 export { JSKeyboardInterface, KeyInformation, StoreNonCharEntry } from "./jsKeyboardInterface.js";
 export { type ComplexKeyboardStore } from "./stores.js";
diff --git a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
index dddf1bf1af2..6201bc0cf81 100644
--- a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
@@ -11,30 +11,28 @@ import { ModifierKeyConstants } from '@keymanapp/common-types';
 import {
   Codes, type JSKeyboard, MinimalKeymanGlobal, KeyEvent, Layouts,
   DefaultRules, EmulationKeystrokes, type MutableSystemStore,
-  TextStore, ProcessorAction, SystemStoreIDs, SyntheticTextStore
+  TextStore, ProcessorAction, SystemStoreIDs, SyntheticTextStore,
+  KeyboardProcessor,
+  EventMap,
+  BeepHandler,
 } from "keyman/engine/keyboard";
 import { JSKeyboardInterface }  from './jsKeyboardInterface.js';
 import { DeviceSpec, globalObject, KMWString } from "keyman/common/web-utils";
 
 // #endregion
 
-export type BeepHandler = (textStore: TextStore) => void;
 export type LogMessageHandler = (str: string) => void;
 
 export interface ProcessorInitOptions {
   baseLayout?: string;
-  keyboardInterface?: JSKeyboardInterface;
+  keyboardInterface?: JSKeyboardInterface; // for tests, replace keyboardInterface with a mock, TODO-web-core: refactor into a unit test pattern
   defaultOutputRules?: DefaultRules; // Takes the class def object, not an instance thereof.
 }
 
-interface EventMap {
-  statekeychange: (stateKeys: typeof JSKeyboardProcessor.prototype.stateKeys) => void;
-}
-
-export class JSKeyboardProcessor extends EventEmitter<EventMap> {
+export class JSKeyboardProcessor extends EventEmitter<EventMap> implements KeyboardProcessor {
   private static readonly DEFAULT_OPTIONS: ProcessorInitOptions = {
     baseLayout: 'us',
-    defaultOutputRules: new DefaultRules()
+    defaultOutputRules: new DefaultRules()  // TODO-web-core: move this out of here and only in keymanEngine.ts, rename to DefaultOutputRules
   };
 
   // Tracks the simulated value for supported state keys, allowing the OSK to mirror a physical keyboard for them.
diff --git a/web/src/engine/src/keyboard/index.ts b/web/src/engine/src/keyboard/index.ts
index ba3250d4118..7d327785878 100644
--- a/web/src/engine/src/keyboard/index.ts
+++ b/web/src/engine/src/keyboard/index.ts
@@ -6,6 +6,7 @@ export { KMXKeyboard } from './keyboards/kmxKeyboard.js';
 export { KeyboardHarness, KeyboardKeymanGlobal, MinimalCodesInterface, MinimalKeymanGlobal } from "./keyboards/keyboardHarness.js";
 export { Keyboard, KeyboardLoaderBase } from "./keyboards/keyboardLoaderBase.js";
 export { KeyboardLoadErrorBuilder, KeyboardMissingError, KeyboardScriptError, KeyboardDownloadError, InvalidKeyboardError } from './keyboards/keyboardLoadError.js'
+export { BeepHandler, EventMap, KeyboardProcessor } from "./keyboards/keyboardProcessor.js";
 export {
   CloudKeyboardFont,
   internalizeFont,
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts b/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts
new file mode 100644
index 00000000000..334e5857050
--- /dev/null
+++ b/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts
@@ -0,0 +1,83 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import { EventEmitter } from 'eventemitter3';
+import { DeviceSpec } from 'keyman/common/web-utils';
+import { KeyEvent } from '../keyEvent.js';
+import { type MutableSystemStore } from "../systemStore.js";
+import { Keyboard } from './keyboardLoaderBase.js';
+import { KeyboardMinimalInterface } from './keyboardMinimalInterface.js';
+import { ProcessorAction } from './processorAction.js';
+import { StateKeyMap } from './stateKeyMap.js';
+import { TextStore } from '../textStore.js';
+
+export interface EventMap {
+  statekeychange: (stateKeys: StateKeyMap) => void;
+}
+
+export type BeepHandler = (textStore: TextStore) => void;
+
+export interface KeyboardProcessor extends EventEmitter<EventMap> {
+  // public static readonly DEFAULT_OPTIONS: ProcessorInitOptions = {
+  //   baseLayout: 'us',
+  //   defaultOutputRules: new DefaultRules()
+  // };
+
+  // Tracks the simulated value for supported state keys, allowing the OSK to mirror a physical keyboard for them.
+  // Using the exact keyCode name from the Codes definitions will allow for certain optimizations elsewhere in the code.
+  stateKeys: StateKeyMap;
+
+  /**
+  * Indicates the device (platform) to be used for non-keystroke events,
+  * such as those sent to `begin postkeystroke` and `begin newcontext`
+  * entry points.
+  */
+  contextDevice: DeviceSpec;
+
+  beepHandler?: BeepHandler;
+  baseLayout: string;
+
+  // Tracks the most recent modifier state information in order to quickly detect changes
+  // in keyboard state not otherwise captured by the hosting page in the browser.
+  // Needed for AltGr simulation.
+  modStateFlags: number;
+
+  get activeKeyboard(): Keyboard;
+
+  set activeKeyboard(keyboard: Keyboard);
+
+
+  get keyboardInterface(): KeyboardMinimalInterface
+
+  get layerStore(): MutableSystemStore;
+
+  get newLayerStore(): MutableSystemStore;
+
+  get oldLayerStore(): MutableSystemStore;
+
+  get layerId(): string;
+  set layerId(value: string);
+
+  processPostKeystroke(device: DeviceSpec, textStore: TextStore): ProcessorAction;
+
+  processKeystroke(keyEvent: KeyEvent, textStore: TextStore): ProcessorAction;
+
+  /**
+   * Select the OSK's next keyboard layer based upon layer switching keys as a default
+   * The next layer will be determined from the key name unless otherwise specifed
+   *
+   *  @param  {string}                    keyName     key identifier
+   *  @return {boolean}                               return true if keyboard layer changed
+   */
+  selectLayer(keyEvent: KeyEvent): boolean;
+
+  // Returns true if the key event is a modifier press, allowing keyPress to return selectively
+  // in those cases.
+  doModifierPress(Levent: KeyEvent, textStore: TextStore, isKeyDown: boolean): boolean;
+
+  resetContext(textStore?: TextStore): void;
+
+  setNumericLayer(device: DeviceSpec): void;
+
+  finalizeProcessorAction(data: ProcessorAction, textStore: TextStore): void;
+}
diff --git a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
index a11ed052e0e..5a2187057e1 100644
--- a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
@@ -1,39 +1,111 @@
-import { KM_Core, km_core_keyboard } from 'keyman/engine/core-adapter';
+import { DeviceSpec } from 'keyman/common/web-utils';
+import {
+  KM_Core, km_core_keyboard, KM_CORE_KMX_ENV,
+  KM_CORE_OPTION_SCOPE, km_core_state, KM_CORE_STATUS
+} from 'keyman/engine/core-adapter';
+import { ActiveKey, ActiveSubKey } from './activeLayout.js';
+import { StateKeyMap } from './stateKeyMap.js';
+import { KeyEvent } from '../keyEvent.js';
+import { TextStore } from '../textStore.js';
 
 /**
  * Acts as a wrapper class for KMX(+) Keyman keyboards
  */
 export class KMXKeyboard {
+  private _state: km_core_state;
 
-  constructor(private _keyboard: km_core_keyboard) {
+  public constructor(private _keyboard: km_core_keyboard) {
+    const environment_opts =
+      [
+        {
+          scope: KM_CORE_OPTION_SCOPE.OPT_ENVIRONMENT,
+          key: KM_CORE_KMX_ENV.PLATFORM,
+          // TODO-web-core: Turn touch off for non-touch targets; read proper platform string from web
+          value: "web iphone ipad androidphone androidtablet mobile touch hardware android phone"
+        }, {
+          scope: KM_CORE_OPTION_SCOPE.OPT_ENVIRONMENT,
+          key: KM_CORE_KMX_ENV.BASELAYOUT,
+          value: "kbdus.dll"
+        }, {
+          scope: KM_CORE_OPTION_SCOPE.OPT_ENVIRONMENT,
+          key: KM_CORE_KMX_ENV.BASELAYOUTALT,
+          value: "us", // TODO-web-core: use proper base layout
+        },{
+          scope: KM_CORE_OPTION_SCOPE.OPT_ENVIRONMENT,
+          key: KM_CORE_KMX_ENV.SIMULATEALTGR,
+          value: "0" // TODO-web-core: keyman_get_option_fromdconf(KEYMAN_DCONF_OPTIONS_SIMULATEALTGR) ? "1": "0"
+        }
+      ]
+    const result = KM_Core.instance.state_create(_keyboard, environment_opts);
+    if (result.status == KM_CORE_STATUS.OK) {
+      this._state = result.object;
+    }
   }
 
-  shutdown() {
+  public shutdown() {
+    if (this._state) {
+      this._state.delete();
+      this._state = null;
+    }
     if (this._keyboard) {
       KM_Core.instance.keyboard_dispose(this._keyboard);
       this._keyboard = null;
     }
   }
 
-  get isMnemonic(): boolean {
+  public constructKeyEvent(key: ActiveKey | ActiveSubKey, device: DeviceSpec, stateKeys: StateKeyMap): KeyEvent {
+    // TODO-web-core: Implement this method
+    return null;
+  }
+
+  public get isMnemonic(): boolean {
     return false;
   }
 
-  get version(): string {
+  public get version(): string {
     const attrs = KM_Core.instance.keyboard_get_attrs(this._keyboard);
     const version = attrs.object.version_string;
     attrs.delete();
     return version;
   }
 
-  get id(): string {
+  public get id(): string {
     const attrs = KM_Core.instance.keyboard_get_attrs(this._keyboard);
     const id = attrs.object.id;
     attrs.delete();
     return id;
   }
 
-  get keyboard(): km_core_keyboard {
+  public get keyboard(): km_core_keyboard {
     return this._keyboard;
   }
+
+  public get state(): km_core_state {
+    return this._state;
+  }
+
+  public get isChiral(): boolean {
+    // TODO-web-core: Implement this method
+    return false;
+  }
+
+  /**
+   * Signifies whether or not a layout or OSK should include AltGr / Right-alt emulation for this  keyboard.
+   * @return  {boolean}
+   */
+  public get emulatesAltGr(): boolean {
+    // TODO-web-core: Implement this method
+    return false;
+  }
+
+  /**
+   * @param       {number}    eventCode     event code (16,17,18) or 0 // TODO-web-core: document meaning of these!
+   * @param       {TextStore} textStore     target element
+   * @param       {number}    data          1 or 0
+   * Notifies keyboard of keystroke or other event
+   */
+  public notify(eventCode: 16|17|18|0, textStore: TextStore, data: number) { // I2187
+    // TODO-web-core: do we need to support this?
+  }
+
 }
diff --git a/web/src/engine/src/main/hardKeyboardBase.ts b/web/src/engine/src/main/hardKeyboardBase.ts
index 7c6a2c3dfc7..0b323573abb 100644
--- a/web/src/engine/src/main/hardKeyboardBase.ts
+++ b/web/src/engine/src/main/hardKeyboardBase.ts
@@ -60,7 +60,6 @@ export function processForMnemonicsAndLegacy(s: KeyEvent, activeKeyboard: Keyboa
     }
   } else {
     // KMX keyboard
-    // TODO-web-core: forward to Core
   }
 
   return s;
diff --git a/web/src/engine/src/main/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
index a5018f6bd91..01aa0810cc9 100644
--- a/web/src/engine/src/main/headless/inputProcessor.ts
+++ b/web/src/engine/src/main/headless/inputProcessor.ts
@@ -5,11 +5,11 @@ import { LanguageProcessor }  from "./languageProcessor.js";
 import type { ModelSpec, PathConfiguration }  from "keyman/engine/interfaces";
 import { globalObject, DeviceSpec, isEmptyTransform } from "keyman/common/web-utils";
 
-import { KM_Core } from 'keyman/engine/core-adapter';
+import { CoreKeyboardProcessor } from 'keyman/engine/core-processor';
 
 import {
   Codes,
-  JSKeyboard,
+  JSKeyboard, // TODO-web-core: huh? why is this here
   KeyboardMinimalInterface,
   SyntheticTextStore,
   TextStore,
@@ -18,6 +18,7 @@ import {
   type Alternate,
   type Keyboard,
   type KeyEvent,
+  KeyboardProcessor
 } from "keyman/engine/keyboard";
 import {
   JSKeyboardProcessor,
@@ -39,8 +40,10 @@ export class InputProcessor {
    * entry points.
    */
   private contextDevice: DeviceSpec;
-  private kbdProcessor: JSKeyboardProcessor;
-  private lngProcessor: LanguageProcessor;
+  private jsKbdProcessor: JSKeyboardProcessor;
+  private coreKbdProcessor: CoreKeyboardProcessor;
+  private _keyboardProcessor: KeyboardProcessor;
+  private _languageProcessor: LanguageProcessor;
 
 
   private readonly contextCache = new TranscriptionCache();
@@ -55,20 +58,22 @@ export class InputProcessor {
     }
 
     this.contextDevice = device;
-    this.kbdProcessor = new JSKeyboardProcessor(device, options);
-    this.lngProcessor = new LanguageProcessor(predictiveWorkerFactory, this.contextCache);
+    this.jsKbdProcessor = new JSKeyboardProcessor(device, options);
+    this._keyboardProcessor = this.jsKbdProcessor;
+    this.coreKbdProcessor = new CoreKeyboardProcessor();
+    this._languageProcessor = new LanguageProcessor(predictiveWorkerFactory, this.contextCache);
   }
 
   public async init(paths: PathConfiguration): Promise<void> {
-    await KM_Core.createCoreProcessor(paths.basePath);
+    await this.coreKbdProcessor.init(paths.basePath);
   }
 
   public get languageProcessor(): LanguageProcessor {
-    return this.lngProcessor;
+    return this._languageProcessor;
   }
 
-  public get keyboardProcessor(): JSKeyboardProcessor {
-    return this.kbdProcessor;
+  public get keyboardProcessor(): KeyboardProcessor {
+    return this._keyboardProcessor;
   }
 
   public get keyboardInterface(): KeyboardMinimalInterface {
@@ -80,6 +85,14 @@ export class InputProcessor {
   }
 
   public set activeKeyboard(keyboard: Keyboard) {
+
+    if (keyboard instanceof JSKeyboard || keyboard == null) {
+      // TODO-web-core: consider keyboard==null scenario; which keyboardProcessor should be active?
+      this._keyboardProcessor = this.jsKbdProcessor;
+    } else {
+      this._keyboardProcessor = this.coreKbdProcessor;
+    }
+
     this.keyboardInterface.activeKeyboard = keyboard;
 
     // All old deadkeys and keyboard-specific cache should immediately be invalidated
diff --git a/web/src/engine/src/osk/visualKeyboard.ts b/web/src/engine/src/osk/visualKeyboard.ts
index 9b68edc6d95..ebcc7127f5d 100644
--- a/web/src/engine/src/osk/visualKeyboard.ts
+++ b/web/src/engine/src/osk/visualKeyboard.ts
@@ -2,18 +2,18 @@ import { EventEmitter } from 'eventemitter3';
 
 import {
   ActiveKey,
+  ActiveKeyBase,
   ActiveLayout,
+  ActiveSubKey,
   DeviceSpec,
-  type InternalKeyboardFont,
   JSKeyboard,
   KeyboardProperties,
   KeyDistribution,
   KeyEvent,
   Layouts,
   StateKeyMap,
-  ActiveSubKey,
   timedPromise,
-  ActiveKeyBase
+  type InternalKeyboardFont,
 } from 'keyman/engine/keyboard';
 import { isEmptyTransform } from 'keyman/common/web-utils';
 

From 51b05c96610e6d5c7d6af5da906a26a904602f0d Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 12 Nov 2025 19:40:44 +0100
Subject: [PATCH 139/254] feat(web): implement `CoreKeyboardProcessor` context
 functions

This implements and uses`CoreKeyboardProcessor.applyContextFromTextStore`
and `CoreKeyboardProcessor.saveMarkersToTextStore`, and also adds unit
tests.

Fixes: #13926
Test-bot: skip
---
 web/src/engine/src/core-adapter/index.ts      |   4 +-
 .../core-processor/coreKeyboardProcessor.ts   |  86 +++++++++++-
 .../dom/cases/core-adapter/basic.tests.ts     |  22 +--
 .../coreKeyboardProcessor.tests.ts            | 131 ++++++++++++++++++
 .../test/auto/dom/web-test-runner.config.mjs  |   5 +
 5 files changed, 230 insertions(+), 18 deletions(-)
 create mode 100644 web/src/test/auto/dom/cases/core-processor/coreKeyboardProcessor.tests.ts

diff --git a/web/src/engine/src/core-adapter/index.ts b/web/src/engine/src/core-adapter/index.ts
index c0357143d12..9052d97a9d0 100644
--- a/web/src/engine/src/core-adapter/index.ts
+++ b/web/src/engine/src/core-adapter/index.ts
@@ -1,3 +1,3 @@
 export { KM_Core, KM_CORE_STATUS, KM_CORE_OPTION_SCOPE, KM_CORE_KMX_ENV, KM_CORE_CT } from './KM_Core.js';
-import { type km_core_keyboard, type km_core_state, type km_core_context, type km_core_context_item } from './import/core/keymancore.js';
-export { km_core_keyboard, km_core_state, km_core_context, km_core_context_item };
+import { type km_core_keyboard, type km_core_state, type km_core_context, type km_core_context_item, type km_core_context_items } from './import/core/keymancore.js';
+export { km_core_keyboard, km_core_state, km_core_context, km_core_context_item, km_core_context_items };
diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index f33f23b54d1..638c1c7495e 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -3,19 +3,19 @@
  */
 
 import { EventEmitter } from 'eventemitter3';
-import { KM_Core, KM_CORE_STATUS } from 'keyman/engine/core-adapter';
+import { KM_Core, KM_CORE_STATUS, KM_CORE_CT, km_core_context, km_core_context_items } from 'keyman/engine/core-adapter';
 import {
   BeepHandler,
   DeviceSpec, EventMap, Keyboard, KeyboardMinimalInterface, KeyboardProcessor,
   KeyEvent, KMXKeyboard, SyntheticTextStore, MutableSystemStore, TextStore, ProcessorAction,
-  StateKeyMap
+  StateKeyMap,
+  Deadkey
 } from "keyman/engine/keyboard";
 
 export class CoreKeyboardInterface implements KeyboardMinimalInterface {
   public activeKeyboard: Keyboard;
 
   constructor() {
-
   }
 }
 
@@ -91,10 +91,78 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     return null;
   }
 
+  private applyContextFromTextStore(context: km_core_context, textStore: TextStore) {
+    // Retrieve context including deadkeys from textStore and
+    // apply to Core's context
+    //
+    // Unlike the desktop Engines, we still track markers (deadkeys) in Engine
+    // for Web at this time. This is for two reasons:
+    // 1. We still have the legacy JSKeyboard code paths which manage deadkey
+    //    state
+    // 2. SyntheticTextStores which are used for rewinding and replaying key
+    //    events in predictive text and multitap need to also replay deadkeys
+    //
+    // TODO: Once we make CoreKeyboardProcessor the primary keyboard processor
+    // and fully deprecate JSKeyboardProcessor, we should consider moving the
+    // ownership of context back into opaque Core objects within
+    // SyntheticTextStore, so ownership of context and marker state can be
+    // managed entirely within Core, KeymanWeb does not need to have knowledge
+    // of markers, and then we better align with the desktop Engines.
+
+    const text = textStore.getText();
+    const deadKeys = textStore.deadkeys().dks.sort((a, b) => a.p != b.p ? a.p - b.p : a.o - b.o);
+    const contextItems = new KM_Core.instance.km_core_context_items();
+    const caretPosition = textStore.getCaret();
+    let textIndex = 0
+    for (let deadkeyIndex = 0; deadkeyIndex < deadKeys.length; deadkeyIndex++) {
+      const deadKey = deadKeys[deadkeyIndex];
+      for (; textIndex < text.length && textIndex <= caretPosition; textIndex++) {
+        const contextItem = new KM_Core.instance.km_core_context_item();
+        if (deadKey.p == textIndex) {
+          contextItem.marker = deadKey.d;
+          contextItems.push_back(contextItem);
+          break;
+        }
+        contextItem.character = text.charCodeAt(textIndex);
+        contextItems.push_back(contextItem);
+      }
+    }
+
+    // Add end element
+    contextItems.push_back(KM_Core.instance.create_end_context());
+
+    KM_Core.instance.context_set(context, contextItems);
+  }
+
+  private saveMarkersToTextStore(context: km_core_context, textStore: TextStore): void {
+    const { status, object } = KM_Core.instance.context_get(context);
+    if (status != KM_CORE_STATUS.OK) {
+      console.error('KeymanWeb: km_core_context_get failed with status: ' + status);
+      return;
+    }
+    textStore.deadkeys().clear();
+    let textIndex = 0;
+    const contextItems: km_core_context_items = object;
+    for (let i = 0; i < contextItems.size(); i++) {
+      const contextItem = contextItems.get(i);
+      if (contextItem.type !== KM_CORE_CT.MARKER) {
+        textIndex++;
+        continue;
+      }
+      textStore.deadkeys().add(new Deadkey(textIndex, contextItem.marker));
+    }
+  }
+
   public processKeystroke(keyEvent: KeyEvent, textStore: TextStore): ProcessorAction {
+
     const preInput = SyntheticTextStore.from(textStore, true);
     const activeKeyboard = this.activeKeyboard as KMXKeyboard;
-    const status = KM_Core.instance.process_event(activeKeyboard.state, keyEvent.Lcode, keyEvent.Lmodifiers, 1, 0); // TODO-web-core: properly set keyDown and flags
+    const coreContext = KM_Core.instance.state_context(activeKeyboard.state);
+
+    this.applyContextFromTextStore(coreContext, textStore);
+
+    const status = KM_Core.instance.process_event(activeKeyboard.state, keyEvent.Lcode, keyEvent.Lmodifiers, 1, 0);
+    // TODO-web-core: properly set keyDown and flags
     if (status != KM_CORE_STATUS.OK) {
       console.error('KeymanWeb: km_core_process_event failed with status: ' + status);
       return null;
@@ -104,10 +172,12 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
 
     textStore.deleteCharsBeforeCaret(core_actions.code_points_to_delete);
     textStore.insertTextBeforeCaret(core_actions.output);
+    this.saveMarkersToTextStore(coreContext, textStore);
+
     processorAction.beep = core_actions.do_alert;
     processorAction.triggerKeyDefault = core_actions.emit_keystroke;
 
-    // TODO-web-core: Implement options
+    // TODO-web-core: Implement options (#13426)
     // process_persist_action(engine, actions->persist_options);
     // TODO-web-core: do we have to do anything with the new_caps_lock_state?
     // process_capslock_action(actions->new_caps_lock_state);
@@ -141,4 +211,10 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
   public setNumericLayer(device: DeviceSpec): void {}
 
   public finalizeProcessorAction(data: ProcessorAction, textStore: TextStore): void {}
+
+  /** @internal */
+  public unitTestEndPoints = {
+    saveMarkersToTextStore: this.saveMarkersToTextStore.bind(this),
+    applyContextFromTextStore: this.applyContextFromTextStore.bind(this),
+  };
 }
diff --git a/web/src/test/auto/dom/cases/core-adapter/basic.tests.ts b/web/src/test/auto/dom/cases/core-adapter/basic.tests.ts
index 6bf7f900a46..9d9a13e5e66 100644
--- a/web/src/test/auto/dom/cases/core-adapter/basic.tests.ts
+++ b/web/src/test/auto/dom/cases/core-adapter/basic.tests.ts
@@ -1,22 +1,22 @@
 import { assert } from 'chai';
 import { KM_Core, KM_CORE_STATUS } from 'keyman/engine/core-adapter';
 
-const coreurl = '/build/engine/obj/core-adapter/import/core';
+export const coreurl = '/build/engine/obj/core-adapter/import/core';
+
+export async function loadKeyboardBlob(uri: string) {
+  const response = await fetch(uri);
+  if (!response.ok) {
+    throw new Error(`HTTP ${response.status} ${response.statusText}`);
+  }
+
+  const buffer = await response.arrayBuffer();
+  return new Uint8Array(buffer);
+}
 
 // Test the KM_Core interface.
 describe('KM_Core', function () {
   this.timeout(5000); // increased timeout for async loading
 
-  async function loadKeyboardBlob(uri: string) {
-    const response = await fetch(uri);
-    if (!response.ok) {
-      throw new Error(`HTTP ${response.status} ${response.statusText}`);
-    }
-
-    const buffer = await response.arrayBuffer();
-    return new Uint8Array(buffer);
-  }
-
   it('can initialize without errors', async function () {
     const km_core = await KM_Core.createCoreProcessor(coreurl);
     assert.isNotNull(km_core);
diff --git a/web/src/test/auto/dom/cases/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/dom/cases/core-processor/coreKeyboardProcessor.tests.ts
new file mode 100644
index 00000000000..c37b7f63bf5
--- /dev/null
+++ b/web/src/test/auto/dom/cases/core-processor/coreKeyboardProcessor.tests.ts
@@ -0,0 +1,131 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+
+import { assert } from 'chai';
+import sinon from 'sinon';
+import { KM_Core, km_core_context, km_core_keyboard, km_core_state, KM_CORE_CT, KM_CORE_STATUS, km_core_context_items } from 'keyman/engine/core-adapter';
+import { coreurl, loadKeyboardBlob } from '../core-adapter/basic.tests.js';
+import { Deadkey, SyntheticTextStore } from 'keyman/engine/keyboard';
+import { CoreKeyboardProcessor } from 'keyman/engine/core-processor';
+
+// These tests would run headless if we'd additionally build WASM for node
+
+describe('CoreKeyboardProcessor', function () {
+  const loadKeyboard = async function (name: string): Promise<km_core_keyboard> {
+    const blob = await loadKeyboardBlob(name)
+    const result = KM_Core.instance.keyboard_load_from_blob(name, blob);
+    assert.equal(result.status, 0);
+    assert.isOk(result.object);
+    return result.object;
+  };
+
+  const createState = async function (keyboardName: string): Promise<km_core_state> {
+    const keyboard = await loadKeyboard(keyboardName);
+    const state = KM_Core.instance.state_create(keyboard, []);
+    assert.equal(state.status, 0);
+    assert.isOk(state.object);
+    return state.object;
+  };
+
+  const addContextItem = function (contextItems: km_core_context_items, c: string | number, isMarker: boolean) {
+    const item = new KM_Core.instance.km_core_context_item();
+    if (isMarker) {
+      item.marker = c as number;
+    } else {
+      item.character = (c as string).charCodeAt(0);
+    }
+    contextItems.push_back(item);
+  };
+
+  let coreProcessor: CoreKeyboardProcessor;
+  let state: km_core_state;
+  let context: km_core_context;
+  let textStore: SyntheticTextStore;
+
+  describe('saveMarkersToTextStore', function () {
+    before(async function () {
+      coreProcessor = new CoreKeyboardProcessor();
+      await coreProcessor.init(coreurl);
+      state = await createState('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
+      context = KM_Core.instance.state_context(state);
+      textStore = new SyntheticTextStore('abcd', 3);
+    });
+
+    it('saves markers to TextStore', function() {
+      // Setup
+      // Text index   : 0 1   1   1 2 3   3
+      // context index: 0 1   2   3 4 5   6
+      // ContextItems : a dk1 dk2 b c dk3 d
+      const contextItems = new KM_Core.instance.km_core_context_items();
+      addContextItem(contextItems, 'a', false);
+      addContextItem(contextItems, 1, true); // deadkey 1
+      addContextItem(contextItems, 2, true); // deadkey 2
+      addContextItem(contextItems, 'b', false);
+      addContextItem(contextItems, 'c', false);
+      addContextItem(contextItems, 3, true); // deadkey 3
+      addContextItem(contextItems, 'd', false);
+      contextItems.push_back(KM_Core.instance.create_end_context());
+
+      sinon.stub(KM_Core.instance, 'context_get').returns({
+        status: KM_CORE_STATUS.OK,
+        object: contextItems,
+        delete: function (): void {}
+      });
+
+      // Execute
+      coreProcessor.unitTestEndPoints.saveMarkersToTextStore(context, textStore);
+
+      // Verify
+      assert.equal(textStore.deadkeys().count(), 3, 'Should have 3 deadkeys');
+      assert.isTrue(textStore.deadkeys().dks[0].match(1, 1), 'dks[0]');
+      assert.isTrue(textStore.deadkeys().dks[1].match(1, 2), 'dks[1]');
+      assert.isTrue(textStore.deadkeys().dks[2].match(3, 3), 'dks[2]');
+    });
+  });
+
+  describe('applyContextFromTextStore', function () {
+    before(async function () {
+      coreProcessor = new CoreKeyboardProcessor();
+      await coreProcessor.init(coreurl);
+      state = await createState('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
+      context = KM_Core.instance.state_context(state);
+      textStore = new SyntheticTextStore('abcd', 3);
+    });
+
+    it('applies deadkeys from TextStore to Core context', function () {
+      // Setup
+      textStore.deadkeys().add(new Deadkey(1, 1)); // before 'b'
+      textStore.deadkeys().add(new Deadkey(1, 2));
+      textStore.deadkeys().add(new Deadkey(3, 3)); // before 'd'
+
+      // Execute
+      coreProcessor.unitTestEndPoints.applyContextFromTextStore(context, textStore);
+
+      // Verify
+      const result = KM_Core.instance.context_get(context);
+      assert.equal(result.status, KM_CORE_STATUS.OK);
+      const items = result.object;
+
+      // Text index   : 0 1   1   1 2 3         3
+      // Text:        : a         b c         | d
+      // context index: 0 1   2   3 4 5   6
+      // ContextItems : a dk1 dk2 b c dk3 END
+      assert.equal(items.size(), 7, 'Should have 7 context items');
+      assert.equal(items.get(0).type, KM_CORE_CT.CHAR, 'Item 0 should be CHAR');
+      assert.equal(items.get(0).character, 'a'.charCodeAt(0), 'Item 0 should be "a"');
+      assert.equal(items.get(1).type, KM_CORE_CT.MARKER, 'Item 1 should be MARKER');
+      assert.equal(items.get(1).marker, 1, 'Item 1 should be marker 1');
+      assert.equal(items.get(2).type, KM_CORE_CT.MARKER, 'Item 2 should be MARKER');
+      assert.equal(items.get(2).marker, 2, 'Item 2 should be marker 2');
+      assert.equal(items.get(3).type, KM_CORE_CT.CHAR, 'Item 3 should be CHAR');
+      assert.equal(items.get(3).character, 'b'.charCodeAt(0), 'Item 3 should be "b"');
+      assert.equal(items.get(4).type, KM_CORE_CT.CHAR, 'Item 4 should be CHAR');
+      assert.equal(items.get(4).character, 'c'.charCodeAt(0), 'Item 4 should be "c"');
+      assert.equal(items.get(5).type, KM_CORE_CT.MARKER, 'Item 5 should be MARKER');
+      assert.equal(items.get(5).marker, 3, 'Item 5 should be marker 3');
+      assert.equal(items.get(6).type, KM_CORE_CT.END, 'Item 6 should be END');
+      result.delete();
+    });
+  });
+});
diff --git a/web/src/test/auto/dom/web-test-runner.config.mjs b/web/src/test/auto/dom/web-test-runner.config.mjs
index 3ca15cc3792..01e973d011c 100644
--- a/web/src/test/auto/dom/web-test-runner.config.mjs
+++ b/web/src/test/auto/dom/web-test-runner.config.mjs
@@ -63,6 +63,11 @@ export default {
       // Relative, from the containing package.json
       files: ['web/src/test/auto/dom/cases/core-adapter/*.tests.ts']
     },
+    {
+      name: 'engine/core-processor',
+      // Relative, from the containing package.json
+      files: ['web/src/test/auto/dom/cases/core-processor/*.tests.ts']
+    },
     {
       name: 'engine/dom-utils',
       // Relative, from the containing package.json

From 274d0f836a604bee3b9ff714839c857abfa50285 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 6 Nov 2025 09:29:42 +0100
Subject: [PATCH 140/254] docs(web): update TODO-web-core after code review

Reviewed work remaining on web-core and updated TODOs accordingly; some
have been moved to epic/embed-osk-in-kmx.

Test-bot: skip
---
 common/web/types/src/kmx/kmx.ts                      |  3 ++-
 web/src/app/browser/src/contextManager.ts            |  2 +-
 web/src/app/browser/src/keymanEngine.ts              | 10 +++++++---
 web/src/app/webview/src/contextManager.ts            |  2 +-
 web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts |  6 +++---
 web/src/engine/src/keyboard/syntheticTextStore.ts    |  1 +
 web/src/engine/src/main/keymanEngineBase.ts          |  4 ++--
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/common/web/types/src/kmx/kmx.ts b/common/web/types/src/kmx/kmx.ts
index 4f53e29fde1..df6617e9143 100644
--- a/common/web/types/src/kmx/kmx.ts
+++ b/common/web/types/src/kmx/kmx.ts
@@ -3,7 +3,8 @@ import { ModifierKeyConstants } from '../consts/modifier-key-constants.js';
 
 /* Definitions from kmx_file.h. Must be kept in sync */
 
-// TODO: split kmx-file from kmx in-memory, similar to what I've done for kvk (keep restructure decl + BUILDER_ interfaces together)
+// TODO-web-core: split kmx-file from kmx in-memory, similar to what I've done for kvk (keep restructure decl + BUILDER_ interfaces together)
+// this will make it possible to use these declarations in KeymanWeb
 
 // In memory representations of KMX structures
 // kmx-builder will transform these to the corresponding COMP_xxxx
diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index 497ae111a68..6b3f3ed12c7 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -27,7 +27,7 @@ export interface KeyboardCookie {
  * @param       {Keyboard}    activeKeyboard  The active keyboard
  */
 function _SetTargDir(Ptarg: HTMLElement, activeKeyboard: Keyboard) {
-  // TODO-web-core: do we need to support RTL in Core?
+  // TODO-web-core: we need to support RTL in Core. Means supporting km_core_keyboard_get_named_attr(KMX.KMXFile.TSS_KMW_RTL)
   const elDir = activeKeyboard instanceof JSKeyboard && activeKeyboard?.isRTL ? 'rtl' : 'ltr';
 
   if(Ptarg) {
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index db88684dc6c..11fc5bb36fd 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -396,6 +396,10 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
    * @return      {Object}               Copy of keyboard identification strings
    *
    */
+  // TODO-web-core: Lkbd should be type 'Keyboard'
+  // TODO-web-core: add isRTL into KMXKeyboard keyboard definition
+  // TODO-web-core: check each property of Lstub for KMXKeyboard availability
+  // TODO-web-core: define an interface for the return type and use it instead of ReturnType<> (and document!)
   private _GetKeyboardDetail = function(Lstub: KeyboardStub, Lkbd: JSKeyboard) { // I2078 - Full keyboard detail
     const Lr = {
       Name: Lstub.KN,
@@ -463,7 +467,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
     if (keyboard instanceof JSKeyboard) {
       return stub && this._GetKeyboardDetail(stub, keyboard);
     } else {
-      // TODO-web-core: implement for KMX keyboards if needed
+      // TODO-web-core: do this work in _GetKeyboardDetail (implement for KMX keyboards)
       return null;
     }
   }
@@ -494,7 +498,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
         const Lrn = this._GetKeyboardDetail(Lstub, Lkbd);  // I2078 - Full keyboard detail
         Lr.push(Lrn);
       } else {
-        // TODO-web-core: implement for KMX keyboards if needed
+        // TODO-web-core:  do this work in _GetKeyboardDetail (implement for KMX keyboards if needed)
       }
     }
     return Lr;
@@ -693,7 +697,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
 
     PKbd = PKbd || this.core.activeKeyboard;
     if (PKbd instanceof KMXKeyboard) {
-      // TODO-web-core: implement for KMX keyboards if needed
+      // TODO-web-core: implement for KMX keyboards (epic/embed-osk-in-kmx)
       return null;
     }
     const Pstub = this.keyboardRequisitioner.cache.getStub(PKbd);
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index 886b55ce277..ba1a6728cc6 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -209,7 +209,7 @@ export class ContextManager extends ContextManagerBase<WebviewConfiguration> {
     // That said, it's best to keep it around for now and verify later.
     if(originalKeyboard?.metadata?.id == activatingKeyboard?.metadata?.id) {
       activatingKeyboard.keyboard = activatingKeyboard.keyboard.then((kbd) => {
-        // TODO-web-core: Do we need to refresh layouts for KMX keyboards also?
+        // TODO-embed-osk-in-kmx: Do we need to refresh layouts for KMX keyboards also?
         if (kbd instanceof JSKeyboard) {
           kbd.refreshLayouts();
         }
diff --git a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
index 5a2187057e1..54ba27ffa56 100644
--- a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
@@ -25,15 +25,15 @@ export class KMXKeyboard {
         }, {
           scope: KM_CORE_OPTION_SCOPE.OPT_ENVIRONMENT,
           key: KM_CORE_KMX_ENV.BASELAYOUT,
-          value: "kbdus.dll"
+          value: "kbdus.dll" // TODO: Base layout assumed to be US in v19
         }, {
           scope: KM_CORE_OPTION_SCOPE.OPT_ENVIRONMENT,
           key: KM_CORE_KMX_ENV.BASELAYOUTALT,
-          value: "us", // TODO-web-core: use proper base layout
+          value: "us", // TODO: Base layout assumed to be US in v19
         },{
           scope: KM_CORE_OPTION_SCOPE.OPT_ENVIRONMENT,
           key: KM_CORE_KMX_ENV.SIMULATEALTGR,
-          value: "0" // TODO-web-core: keyman_get_option_fromdconf(KEYMAN_DCONF_OPTIONS_SIMULATEALTGR) ? "1": "0"
+          value: "0" // TODO: We won't support simulating AltGr option in v19
         }
       ]
     const result = KM_Core.instance.state_create(_keyboard, environment_opts);
diff --git a/web/src/engine/src/keyboard/syntheticTextStore.ts b/web/src/engine/src/keyboard/syntheticTextStore.ts
index 4611b6ea2cb..007889e1473 100644
--- a/web/src/engine/src/keyboard/syntheticTextStore.ts
+++ b/web/src/engine/src/keyboard/syntheticTextStore.ts
@@ -58,6 +58,7 @@ export class SyntheticTextStore extends TextStore {
       clone = new SyntheticTextStore(text, selectionStart, selectionEnd);
     }
 
+    // TODO-web-core: we need to support saving Core markers here (km_core_context_get / km_core_context_set)
     // Also duplicate deadkey state!  (Needed for fat-finger ops.)
     clone.setDeadkeys(textStore.deadkeys());
 
diff --git a/web/src/engine/src/main/keymanEngineBase.ts b/web/src/engine/src/main/keymanEngineBase.ts
index 4446250ecac..561216bfd28 100644
--- a/web/src/engine/src/main/keymanEngineBase.ts
+++ b/web/src/engine/src/main/keymanEngineBase.ts
@@ -176,7 +176,7 @@ export class KeymanEngineBase<
         If possible, we want to only perform layout operations once the correct layer is
         set to active.
       */
-      if(this.osk && (!kbdData || kbdData.keyboard instanceof JSKeyboard)) { // TODO-web-core: add support for OSK for KMX keyboards
+      if(this.osk && (!kbdData || kbdData.keyboard instanceof JSKeyboard)) { // TODO-embed-osk-in-kmx: add support for OSK for KMX keyboards
         this.osk.batchLayoutAfter(() => {
           prepareKeyboardSwap();
           this.osk.activeKeyboard = kbdData ? { keyboard: kbdData.keyboard as JSKeyboard, metadata: kbdData.metadata } : undefined;
@@ -386,7 +386,7 @@ export class KeymanEngineBase<
     this.core.keyboardProcessor.contextDevice = value?.targetDevice ?? this.config.softDevice;
     if(value) {
       // Don't build an OSK if no keyboard is available yet; avoid the extra flash.
-      if (this.contextManager.activeKeyboard && this.contextManager.activeKeyboard instanceof JSKeyboardData) { // TODO-web-core: add support for OSK for KMX keyboards
+      if (this.contextManager.activeKeyboard && this.contextManager.activeKeyboard instanceof JSKeyboardData) { // TODO-embed-osk-in-kmx: add support for OSK for KMX keyboards
         value.activeKeyboard = this.contextManager.activeKeyboard;
       }
       value.on('keyevent', this.keyEventListener);

From 8fd825e252342f75c2cb58cd106d9bdab818653b Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 14 Nov 2025 15:44:34 +0100
Subject: [PATCH 141/254] refactor(web): change `preInput` to
 `SyntheticTextStore`

`preInput` always contains a `SyntheticTextStore`, so this change modifies
the type of the property so that we don't have to always cast it.

Follow-up-of: #15092
Test-bot: skip
---
 web/src/app/webview/src/contextManager.ts              | 3 +--
 web/src/engine/src/keyboard/keyboards/transcription.ts | 6 +++---
 web/src/engine/src/main/headless/inputProcessor.ts     | 6 ++----
 web/src/engine/src/main/headless/languageProcessor.ts  | 6 +++---
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index ba1a6728cc6..39d2c9b01cb 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -34,8 +34,7 @@ export class HostTextStore extends SyntheticTextStore {
       let transform: TextTransform = null;
 
       if(transcription) {
-        //TODO-web-core: shouldn't need cast in the future?
-        const preInput = transcription.preInput as SyntheticTextStore;
+        const { preInput } = transcription;
         // If our saved state matches the `preInput` from the incoming transcription, just reuse its transform.
         // Will generally not match during multitap operations, though.
         //
diff --git a/web/src/engine/src/keyboard/keyboards/transcription.ts b/web/src/engine/src/keyboard/keyboards/transcription.ts
index 7623a2f0d1c..0af9f78a366 100644
--- a/web/src/engine/src/keyboard/keyboards/transcription.ts
+++ b/web/src/engine/src/keyboard/keyboards/transcription.ts
@@ -1,20 +1,20 @@
 /*
  * Keyman is copyright (C) SIL Global. MIT License.
  */
-import { TextStore } from '../textStore.js';
 import { KeyEvent } from '../keyEvent.js';
 import { Alternate, TextTransform } from './textTransform.js';
+import { SyntheticTextStore } from '../syntheticTextStore.js';
 
 export class Transcription {
   readonly token: number;
   readonly keystroke: KeyEvent;
   readonly transform: TextTransform;
   alternates: Alternate[]; // constructed after the rest of the transcription.
-  readonly preInput: TextStore;
+  readonly preInput: SyntheticTextStore;
 
   private static tokenSeed: number = 0;
 
-  constructor(keystroke: KeyEvent, transform: TextTransform, preInput: TextStore, alternates?: Alternate[]) {
+  constructor(keystroke: KeyEvent, transform: TextTransform, preInput: SyntheticTextStore, alternates?: Alternate[]) {
     const token = this.token = Transcription.tokenSeed++;
 
     this.keystroke = keystroke;
diff --git a/web/src/engine/src/main/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
index 01aa0810cc9..760144f5ca3 100644
--- a/web/src/engine/src/main/headless/inputProcessor.ts
+++ b/web/src/engine/src/main/headless/inputProcessor.ts
@@ -132,11 +132,9 @@ export class InputProcessor {
           // Has there been a context change at any point during the multitap?  If so, we need
           // to revert it.  If not, we assume it's a layer-change multitap, in which case
           // no such reset is needed.
-          // TODO-web-core
-          if(!isEmptyTransform(transcription.transform) || !(transcription.preInput as SyntheticTextStore).isEqual(SyntheticTextStore.from(textStore))) {
+          if(!isEmptyTransform(transcription.transform) || !transcription.preInput.isEqual(SyntheticTextStore.from(textStore))) {
             // Restores full context, including deadkeys in their exact pre-keystroke state.
-            // TODO-web-core
-            textStore.restoreTo(transcription.preInput as SyntheticTextStore);
+            textStore.restoreTo(transcription.preInput);
           }
           /*
             else:
diff --git a/web/src/engine/src/main/headless/languageProcessor.ts b/web/src/engine/src/main/headless/languageProcessor.ts
index 42ed8544e08..3b220b628b1 100644
--- a/web/src/engine/src/main/headless/languageProcessor.ts
+++ b/web/src/engine/src/main/headless/languageProcessor.ts
@@ -234,7 +234,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
 
       // Builds the reversion option according to the loaded lexical model's known
       // syntactic properties.
-      const suggestionContext = new ContextWindow(original.preInput as SyntheticTextStore, this.configuration, getLayerId());
+      const suggestionContext = new ContextWindow(original.preInput, this.configuration, getLayerId());
 
       // We must accept the Suggestion from its original context, which was before
       // `original.transform` was applied.
@@ -297,7 +297,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     textStore.apply(transform);
 
     // The reason we need to preserve the additive-inverse 'transformId' property on Reversions.
-    const promise = this.currentPromise = this.lmEngine.revertSuggestion(reversion, new ContextWindow(original.preInput as SyntheticTextStore, this.configuration, null))
+    const promise = this.currentPromise = this.lmEngine.revertSuggestion(reversion, new ContextWindow(original.preInput, this.configuration, null))
     // If the "current Promise" is as set above, clear it.
     // If another one has been triggered since... don't.
     promise.then(() => this.currentPromise = (this.currentPromise == promise) ? null : this.currentPromise);
@@ -324,7 +324,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
       return null;
     }
 
-    const context = new ContextWindow(transcription.preInput as SyntheticTextStore, this.configuration, layerId);
+    const context = new ContextWindow(transcription.preInput, this.configuration, layerId);
     this.recordTranscription(transcription);
 
     if(resetContext) {

From 5ce9a3edd114626c113255e80c032e0240300322 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 17 Nov 2025 16:55:55 +0100
Subject: [PATCH 142/254] feat(web): address code review comments

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 web/src/test/manual/build.sh             | 4 ++--
 web/src/test/manual/web/kmxkeyboard.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/src/test/manual/build.sh b/web/src/test/manual/build.sh
index 6e524895f9e..eef52ac19aa 100755
--- a/web/src/test/manual/build.sh
+++ b/web/src/test/manual/build.sh
@@ -19,7 +19,7 @@ builder_parse "$@"
 DEST="web/build/test-resources"
 
 builder_describe_outputs \
-  build       "${KEYMAN_ROOT}/${DEST}/sentry-manager.js"
+  build       "/${DEST}/sentry-manager.js"
 
 #### Build action definitions ####
 
@@ -30,7 +30,7 @@ function do_copy() {
   cp "${KEYMAN_ROOT}/common/web/sentry-manager/build/lib/index.js"      "${KEYMAN_ROOT}/${DEST}/sentry-manager.js"
   cp "${KEYMAN_ROOT}/common/web/sentry-manager/build/lib/index.js.map"  "${KEYMAN_ROOT}/${DEST}/sentry-manager.js.map"
 
-  cp "${KEYMAN_ROOT}/common/web/types/tests/fixtures/kmx/khmer_angkor.kmx" "${KEYMAN_ROOT}/${DEST}/"
+  cp "${KEYMAN_ROOT}/common/web/types/tests/fixtures/kmx/khmer_angkor.kmx" "${KEYMAN_ROOT}/${DEST}/keyboards/"
 
   # copy common test (resources) keyboards
   cp -f "${KEYMAN_ROOT}/common/test/keyboards/platform-rules/platformtest.js" "${KEYMAN_ROOT}/${DEST}/keyboards/"
diff --git a/web/src/test/manual/web/kmxkeyboard.html b/web/src/test/manual/web/kmxkeyboard.html
index f0d23eaea63..8510324f9f7 100644
--- a/web/src/test/manual/web/kmxkeyboard.html
+++ b/web/src/test/manual/web/kmxkeyboard.html
@@ -45,7 +45,7 @@
               id: 'km',
               name: 'Khmer'
             },
-            filename: '/build/test-resources/khmer_angkor.kmx'
+            filename: '/build/test-resources/keyboards/khmer_angkor.kmx'
           });
         });
       });

From 97a624dc50e2953d009f5a789b4315ecf096b7c0 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 17 Nov 2025 18:54:19 +0100
Subject: [PATCH 143/254] docs(web): add jsdoc documentation

This addresses code review comments. Also change the order of some
functions to put them in a more logical order.
---
 .../core-processor/coreKeyboardProcessor.ts   | 167 ++++++++++++++---
 .../keyboard/keyboards/keyboardProcessor.ts   | 169 +++++++++++++++---
 2 files changed, 287 insertions(+), 49 deletions(-)

diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index f33f23b54d1..8ecbc1585f5 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -13,24 +13,37 @@ import {
 
 export class CoreKeyboardInterface implements KeyboardMinimalInterface {
   public activeKeyboard: Keyboard;
-
-  constructor() {
-
-  }
 }
 
+/**
+ * Implements the core keyboard processing engine that interacts with the
+ * shared Keyman Core component which handles .kmx keyboards.
+ */
 export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements KeyboardProcessor {
   private _newLayerStore: MutableSystemStore = new MutableSystemStore(0, 'default');
   private _oldLayerStore: MutableSystemStore = new MutableSystemStore(0, 'default');
   private _layerStore: MutableSystemStore = new MutableSystemStore(0, 'default');
   private _keyboardInterface: CoreKeyboardInterface = new CoreKeyboardInterface();
 
+  /**
+   * Initialize the core processor with the provided base path.
+   * Sets up the necessary environment for processing keyboard events.
+   *
+   * @param {string}  basePath    The path for the core processor resources, i.e. where the
+   *                              km-core.js file is located.
+   * @returns {Promise<void>} A promise that resolves when initialization is complete.
+   */
   public async init(basePath: string): Promise<void> {
     await KM_Core.createCoreProcessor(basePath);
   }
 
-  // Tracks the simulated value for supported state keys, allowing the OSK to mirror a physical keyboard for them.
-  // Using the exact keyCode name from the Codes definitions will allow for certain optimizations elsewhere in the code.
+  /**
+   * Tracks the simulated value for supported state keys, allowing the OSK to
+   * mirror a physical keyboard for them. Uses the exact keyCode name from the
+   * Codes definitions to enable certain optimizations elsewhere in the code.
+   *
+   * @type {StateKeyMap}
+   */
   public stateKeys: StateKeyMap = {
     "K_CAPS": false,
     "K_NUMLOCK": false,
@@ -38,47 +51,96 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
   }
 
   /**
-  * Indicates the device (platform) to be used for non-keystroke events,
-  * such as those sent to `begin postkeystroke` and `begin newcontext`
-  * entry points.
-  */
+   * Indicates the device (platform) to be used for non-keystroke events.
+   * Used for events such as those sent to `begin postkeystroke` and
+   * `begin newcontext` entry points.
+   *
+   * @type {DeviceSpec}
+   */
   public contextDevice: DeviceSpec;
 
+  /**
+   * Optional handler for beep events triggered by the processor.
+   * Allows custom handling of beep feedback, such as for alerts or errors.
+   *
+   * @type {BeepHandler}
+   */
   public beepHandler?: BeepHandler;
 
-  // Tracks the most recent modifier state information in order to quickly detect changes
-  // in keyboard state not otherwise captured by the hosting page in the browser.
-  // Needed for AltGr simulation.
+  /**
+   * Bitfield representing the most recent modifier state (Alt, Ctrl, Shift, etc.)
+   * as observed or simulated by the processor. Used to quickly detect changes in
+   * modifier state not otherwise captured by the hosting page (important for AltGr).
+   *
+   * @type {number}
+   */
   public modStateFlags: number = 0;
+
+  /**
+   * Stores the identifier for the base keyboard layout in use.
+   * Used to determine the default layout for key mapping and processing.
+   *
+   * @type {string}
+   */
   public baseLayout: string;
 
+  /**
+   * The currently active keyboard.
+   *
+   * @type {Keyboard}
+   */
   public get activeKeyboard(): Keyboard {
     return this.keyboardInterface.activeKeyboard;
   }
-
   public set activeKeyboard(keyboard: Keyboard) {
     this.keyboardInterface.activeKeyboard = keyboard;
   }
 
+  /**
+   * The keyboard interface used by the processor.
+   * Provides access to the keyboard interface implementation.
+   *
+   * @type {KeyboardMinimalInterface}
+   */
   get keyboardInterface(): KeyboardMinimalInterface {
     return this._keyboardInterface;
   }
 
+  /**
+   * The store representing the currently active keyboard layer.
+   *
+   * @type {MutableSystemStore}
+   */
   public get layerStore(): MutableSystemStore {
     // TODO-web-core: link to .kmx layer store
     return this._layerStore;
   }
 
+  /**
+   * A writable store used when transitioning to a new layer
+   *
+   * @type {MutableSystemStore}
+   */
   public get newLayerStore(): MutableSystemStore {
     // TODO-web-core: link to .kmx new-layer store
     return this._newLayerStore;
   }
 
+  /**
+   * A store representing the previously active layer
+   *
+   * @type {MutableSystemStore}
+   */
   public get oldLayerStore(): MutableSystemStore {
     // TODO-web-core: link to .kmx old-layer store
     return this._oldLayerStore;
   }
 
+  /**
+   * Identifier of the currently active layer.
+   *
+   * @type {string}
+   */
   public get layerId(): string {
     return this._layerStore.value;
   }
@@ -86,11 +148,15 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     this._layerStore.set(value);
   }
 
-  public processPostKeystroke(device: DeviceSpec, textStore: TextStore): ProcessorAction {
-    // TODO-web-core: Implement this method
-    return null;
-  }
-
+  /**
+   * Processes a keystroke event and updates the text store accordingly.
+   * Handles the main logic for interpreting and applying keyboard input.
+   *
+   * @param {KeyEvent}   keyEvent    The key event to process.
+   * @param {TextStore}  textStore   The current text store context.
+   *
+   * @returns {ProcessorAction} The resulting processor action.
+   */
   public processKeystroke(keyEvent: KeyEvent, textStore: TextStore): ProcessorAction {
     const preInput = SyntheticTextStore.from(textStore, true);
     const activeKeyboard = this.activeKeyboard as KMXKeyboard;
@@ -118,27 +184,70 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
   }
 
   /**
-   * Select the OSK's next keyboard layer based upon layer switching keys as a default
-   * The next layer will be determined from the key name unless otherwise specifed
+   * Processes post-keystroke actions for the given device and text store.
+   * Handles any actions that should occur after a keystroke is processed.
+   *
+   * @param {DeviceSpec}  device     The device specification.
+   * @param {TextStore}   textStore  The current text store context.
    *
-   *  @param  {string}                    keyName     key identifier
-   *  @return {boolean}                               return true if keyboard layer changed
+   * @returns {ProcessorAction} The resulting processor action, or null if not applicable.
    */
-  public selectLayer(keyEvent: KeyEvent): boolean {
+  public processPostKeystroke(device: DeviceSpec, textStore: TextStore): ProcessorAction {
     // TODO-web-core: Implement this method
-    return false;
+    return null;
   }
 
-  // Returns true if the key event is a modifier press, allowing keyPress to return selectively
-  // in those cases.
-  public doModifierPress(Levent: KeyEvent, textStore: TextStore, isKeyDown: boolean): boolean {
+  /**
+   * Determines if the given key event is a modifier key press.
+   * Returns true if the event corresponds to a modifier key, otherwise false.
+   *
+   * @param {KeyEvent}   keyEvent    The key event to evaluate.
+   * @param {TextStore}  textStore   The current text store context.
+   * @param {boolean}    isKeyDown   Indicates if the key event is a key down event.
+   *
+   * @returns {boolean} True if the event is a modifier key press, false otherwise.
+   */
+  public doModifierPress(keyEvent: KeyEvent, textStore: TextStore, isKeyDown: boolean): boolean {
     // TODO-web-core: Implement this method
     return false;
   }
 
+  /**
+   * Resets the keyboard context, optionally using the provided text store.
+   * Clears or reinitializes the context for subsequent keyboard processing.
+   *
+   * @param {TextStore} [textStore] - The optional text store to use for resetting context.
+   */
   public resetContext(textStore?: TextStore): void {}
 
+  /**
+   * Finalizes the processor action and applies any final changes to the text store.
+   * Ensures that all necessary updates are completed after processing a key event.
+   *
+   * @param {ProcessorAction}   data        The processor action to finalize.
+   * @param {TextStore}         textStore   The text store to update.
+   */
+  public finalizeProcessorAction(data: ProcessorAction, textStore: TextStore): void { }
+
+  /**
+   * Selects the next keyboard layer based on the provided key event.
+   * Determines and applies the appropriate layer switch for the OSK.
+   *
+   * @param {KeyEvent}  keyEvent   The key event used to determine the next layer.
+   *
+   * @returns {boolean} True if the keyboard layer changed, false otherwise.
+   */
+  public selectLayer(keyEvent: KeyEvent): boolean {
+    // TODO-web-core: Implement this method
+    return false;
+  }
+
+  /**
+   * Sets the numeric layer for the given device.
+   * Switches the keyboard to a numeric input layer if supported.
+   *
+   * @param {DeviceSpec} device - The device for which to set the numeric layer.
+   */
   public setNumericLayer(device: DeviceSpec): void {}
 
-  public finalizeProcessorAction(data: ProcessorAction, textStore: TextStore): void {}
 }
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts b/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts
index 334e5857050..331ea0a1bb7 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts
@@ -17,67 +17,196 @@ export interface EventMap {
 
 export type BeepHandler = (textStore: TextStore) => void;
 
+/**
+ * Interface for the keyboard processing engine used by the web runtime to
+ * translate low-level key events and device/context signals into high-level
+ * keyboard actions and text-store updates.
+ *
+ * This interface extends an EventEmitter of EventMap and centralizes responsibilities
+ * such as:
+ * - tracking simulated state keys so the on‑screen keyboard (OSK) can mirror hardware state,
+ * - selecting and switching keyboard layers for the OSK,
+ * - handling modifier simulation (including AltGr),
+ * - routing non-keystroke device/context events,
+ * - coordinating mutable layer state stores,
+ * - performing keystroke and post‑keystroke processing and finalizing ProcessorAction
+ *   results against a TextStore.
+ */
 export interface KeyboardProcessor extends EventEmitter<EventMap> {
   // public static readonly DEFAULT_OPTIONS: ProcessorInitOptions = {
   //   baseLayout: 'us',
   //   defaultOutputRules: new DefaultRules()
   // };
 
-  // Tracks the simulated value for supported state keys, allowing the OSK to mirror a physical keyboard for them.
-  // Using the exact keyCode name from the Codes definitions will allow for certain optimizations elsewhere in the code.
+  /**
+   * Tracks the simulated values for supported state keys (e.g. CapsLock, NumLock)
+   * so that the OSK can reflect a physical keyboard's state. Keys are referenced
+   * using the exact keyCode names from the Codes definitions to allow for optimized
+   * handling elsewhere.
+   *
+   * @type {StateKeyMap}
+   */
   stateKeys: StateKeyMap;
 
   /**
-  * Indicates the device (platform) to be used for non-keystroke events,
-  * such as those sent to `begin postkeystroke` and `begin newcontext`
-  * entry points.
-  */
+   * Indicates the device/platform to be used for non-keystroke events (for example,
+   * events dispatched to "begin postkeystroke" and "begin newcontext" entry points).
+   * This lets the processor adapt behavior or rule evaluation to the active device.
+   *
+   * @type {DeviceSpec}
+   */
   contextDevice: DeviceSpec;
 
+  /**
+   * Optional handler used to produce an audible beep or other feedback when a rule
+   * or keyboard action requests it.
+   *
+   * @type {BeepHandler | undefined}
+   */
   beepHandler?: BeepHandler;
+
+  /**
+   * Stores the identifier for the base physical layout in use (for
+   * example "us"). Used to determine the default layout for key mapping
+   * and processing.
+   *
+   * @type {string}
+   */
   baseLayout: string;
 
-  // Tracks the most recent modifier state information in order to quickly detect changes
-  // in keyboard state not otherwise captured by the hosting page in the browser.
-  // Needed for AltGr simulation.
+  /**
+   * Bitfield representing the most recent modifier state (Alt, Ctrl, Shift, etc.)
+   * as observed or simulated by the processor. Used to quickly detect changes in
+   * modifier state not otherwise captured by the hosting page (important for AltGr).
+   *
+   * @type {number}
+   */
   modStateFlags: number;
 
+  /**
+   * The currently active Keyboard instance. Implementations provide a getter and
+   * setter to change the active keyboard at runtime. Setting a new keyboard should
+   * update any associated stores and clear or reinitialize processor state as needed.
+   *
+   * @type {Keyboard}
+   */
   get activeKeyboard(): Keyboard;
 
   set activeKeyboard(keyboard: Keyboard);
 
 
+  /**
+   * Read-only minimal interface for interacting with the current keyboard.
+   *
+   * @type {KeyboardMinimalInterface}
+   */
   get keyboardInterface(): KeyboardMinimalInterface
 
+  /**
+   * The store representing the currently active keyboard layer.
+   *
+   * @type {MutableSystemStore}
+   */
   get layerStore(): MutableSystemStore;
 
+  /**
+   * A writable store used when transitioning to a new layer; allows
+   * accumulation of changes before committing them to layerStore.
+   *
+   * @type {MutableSystemStore}
+   */
   get newLayerStore(): MutableSystemStore;
 
+  /**
+   * A store representing the previously active layer; useful for reverting or
+   * comparing layer states when switching layers.
+   *
+   * @type {MutableSystemStore}
+   */
   get oldLayerStore(): MutableSystemStore;
 
+  /**
+   * Identifier of the currently active layer. Implementations provide getter and
+   * setter access. Setting this value should trigger the appropriate layer store
+   * updates and notify any listeners of the change.
+   *
+   * @type {string}
+   */
   get layerId(): string;
   set layerId(value: string);
 
-  processPostKeystroke(device: DeviceSpec, textStore: TextStore): ProcessorAction;
-
+  /**
+   * Process a keystroke, i.e. the `begin Unicode` group.
+   * Evaluates keyboard rules, updates internal state, and returns a ProcessorAction
+   * describing the changes to apply to the TextStore.
+   *
+   * @param {KeyEvent}   keyEvent   The key event to process.
+   * @param {TextStore}  textStore  The text store representing current context.
+   *
+   * @returns {ProcessorAction} The resulting processor action.
+   */
   processKeystroke(keyEvent: KeyEvent, textStore: TextStore): ProcessorAction;
 
   /**
-   * Select the OSK's next keyboard layer based upon layer switching keys as a default
-   * The next layer will be determined from the key name unless otherwise specifed
+   * Processes the `begin PostKeystroke` group.
+   * This is used to evaluate rules that run after a keystroke has been
+   * processed and can produce actions that affect the TextStore, layer state,
+   * or other side effects.
    *
-   *  @param  {string}                    keyName     key identifier
-   *  @return {boolean}                               return true if keyboard layer changed
+   * @param {DeviceSpec} device     The device context.
+   * @param {TextStore}  textStore  The text store representing current context.
+   *
+   * @returns {ProcessorAction} The resulting processor action.
    */
-  selectLayer(keyEvent: KeyEvent): boolean;
+  processPostKeystroke(device: DeviceSpec, textStore: TextStore): ProcessorAction;
 
-  // Returns true if the key event is a modifier press, allowing keyPress to return selectively
-  // in those cases.
-  doModifierPress(Levent: KeyEvent, textStore: TextStore, isKeyDown: boolean): boolean;
+  /**
+   * Determines if the given key event is a modifier key press.
+   * Returns true if the event corresponds to a modifier key, otherwise false.
+   *
+   * @param {KeyEvent}   keyEvent    The key event to evaluate.
+   * @param {TextStore}  textStore   The current text store context.
+   * @param {boolean}    isKeyDown   Indicates if the key event is a key down event.
+   *
+   * @returns {boolean} True if the event is a modifier key press, false otherwise.
+   */
+  doModifierPress(keyEvent: KeyEvent, textStore: TextStore, isKeyDown: boolean): boolean;
 
+  /**
+   * Resets the processor's context to a clean state.
+   * May clear stores, simulated state keys, and modifier flags. If a TextStore is provided,
+   * it will also be reset.
+   *
+   * @param {TextStore} [textStore] - The optional text store to use for resetting context.
+   */
   resetContext(textStore?: TextStore): void;
 
+  /**
+   * Finalizes the processor action and applies any final changes to the text store.
+   * Ensures that all necessary updates are completed after processing a key event.
+   *
+   * @param {ProcessorAction}   data        The processor action to finalize.
+   * @param {TextStore}         textStore   The text store to update.
+   */
+  finalizeProcessorAction(data: ProcessorAction, textStore: TextStore): void;
+
+  /**
+   * Selects the OSK's next keyboard layer based upon layer switching keys.
+   * By default, the next layer is determined from the key name unless otherwise
+   * specified. Returns true if the active keyboard layer changed.
+   *
+   * @param {KeyEvent} keyEvent - Key identifier or event used to determine layer change.
+   *
+   * @returns {boolean} True if the keyboard layer changed.
+   */
+  selectLayer(keyEvent: KeyEvent): boolean;
+
+  /**
+   *
+   * Select the numeric layer if the provided device contains one.
+   *
+   * @param {DeviceSpec} device - The device for which the numeric layer should be set.
+   */
   setNumericLayer(device: DeviceSpec): void;
 
-  finalizeProcessorAction(data: ProcessorAction, textStore: TextStore): void;
 }

From b0ea7e58c8d223362c3f98ae9bf8b3ec66d5ecb5 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
Date: Mon, 17 Nov 2025 19:28:06 +0100
Subject: [PATCH 144/254] Update
 web/src/engine/src/core-processor/coreKeyboardProcessor.ts

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 web/src/engine/src/core-processor/coreKeyboardProcessor.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index 638c1c7495e..6eb060e7930 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -114,12 +114,11 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     const contextItems = new KM_Core.instance.km_core_context_items();
     const caretPosition = textStore.getCaret();
     let textIndex = 0
-    for (let deadkeyIndex = 0; deadkeyIndex < deadKeys.length; deadkeyIndex++) {
-      const deadKey = deadKeys[deadkeyIndex];
+    for (const deadkey of deadkeys) {
       for (; textIndex < text.length && textIndex <= caretPosition; textIndex++) {
         const contextItem = new KM_Core.instance.km_core_context_item();
-        if (deadKey.p == textIndex) {
-          contextItem.marker = deadKey.d;
+        if (deadkey.p == textIndex) {
+          contextItem.marker = deadkey.d;
           contextItems.push_back(contextItem);
           break;
         }

From e970cb7fdfd29a6b4d226f247e7b3ad256eba470 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
Date: Mon, 17 Nov 2025 19:28:22 +0100
Subject: [PATCH 145/254] Update
 web/src/engine/src/core-processor/coreKeyboardProcessor.ts

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 web/src/engine/src/core-processor/coreKeyboardProcessor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index 6eb060e7930..f6a96825dbf 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -113,7 +113,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     const deadKeys = textStore.deadkeys().dks.sort((a, b) => a.p != b.p ? a.p - b.p : a.o - b.o);
     const contextItems = new KM_Core.instance.km_core_context_items();
     const caretPosition = textStore.getCaret();
-    let textIndex = 0
+    let textIndex = 0;
     for (const deadkey of deadkeys) {
       for (; textIndex < text.length && textIndex <= caretPosition; textIndex++) {
         const contextItem = new KM_Core.instance.km_core_context_item();

From e75327dc44a95bbb0e86f2d68a49647149e62227 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 18 Nov 2025 15:21:37 +0100
Subject: [PATCH 146/254] feat(web): properly treat SMP characters in context

Addresses code review comments.
---
 .../core-processor/coreKeyboardProcessor.ts   |  29 ++++-
 .../dom/cases/core-adapter/basic.tests.ts     |  13 +--
 .../coreKeyboardProcessor.tests.ts            | 108 ++++++++++++++++--
 web/src/test/auto/dom/test_utils.ts           |  14 ++-
 4 files changed, 133 insertions(+), 31 deletions(-)

diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index f6a96825dbf..ca11aecd96b 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -91,10 +91,13 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     return null;
   }
 
-  private applyContextFromTextStore(context: km_core_context, textStore: TextStore) {
-    // Retrieve context including deadkeys from textStore and
-    // apply to Core's context
-    //
+  /**
+   * Retrieve context including deadkeys from TextStore and apply to Core's context
+   *
+   * @param context     Context from Keyman Core
+   * @param textStore   Web TextStore
+   */
+  private applyContextFromTextStore(context: km_core_context, textStore: TextStore): void {
     // Unlike the desktop Engines, we still track markers (deadkeys) in Engine
     // for Web at this time. This is for two reasons:
     // 1. We still have the legacy JSKeyboard code paths which manage deadkey
@@ -110,7 +113,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     // of markers, and then we better align with the desktop Engines.
 
     const text = textStore.getText();
-    const deadKeys = textStore.deadkeys().dks.sort((a, b) => a.p != b.p ? a.p - b.p : a.o - b.o);
+    const deadkeys = textStore.deadkeys().dks.sort((a, b) => a.p != b.p ? a.p - b.p : a.o - b.o);
     const contextItems = new KM_Core.instance.km_core_context_items();
     const caretPosition = textStore.getCaret();
     let textIndex = 0;
@@ -122,7 +125,11 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
           contextItems.push_back(contextItem);
           break;
         }
-        contextItem.character = text.charCodeAt(textIndex);
+        contextItem.character = text.codePointAt(textIndex);
+        if (contextItem.character > 0xFFFF) {
+          // we have a surrogate pair, skip other half of surrogate
+          textIndex++;
+        }
         contextItems.push_back(contextItem);
       }
     }
@@ -133,6 +140,12 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     KM_Core.instance.context_set(context, contextItems);
   }
 
+  /**
+   * Saves marker entries from Core's context into a TextStore's deadkey list.
+   *
+   * @param context     Context from Keyman Core
+   * @param textStore   Web TextStore
+   */
   private saveMarkersToTextStore(context: km_core_context, textStore: TextStore): void {
     const { status, object } = KM_Core.instance.context_get(context);
     if (status != KM_CORE_STATUS.OK) {
@@ -146,6 +159,10 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
       const contextItem = contextItems.get(i);
       if (contextItem.type !== KM_CORE_CT.MARKER) {
         textIndex++;
+        if (contextItem.character > 0xFFFF) {
+          // character will be a surrogate pair in the text store
+          textIndex++;
+        }
         continue;
       }
       textStore.deadkeys().add(new Deadkey(textIndex, contextItem.marker));
diff --git a/web/src/test/auto/dom/cases/core-adapter/basic.tests.ts b/web/src/test/auto/dom/cases/core-adapter/basic.tests.ts
index 9d9a13e5e66..b28d3859118 100644
--- a/web/src/test/auto/dom/cases/core-adapter/basic.tests.ts
+++ b/web/src/test/auto/dom/cases/core-adapter/basic.tests.ts
@@ -1,17 +1,6 @@
 import { assert } from 'chai';
 import { KM_Core, KM_CORE_STATUS } from 'keyman/engine/core-adapter';
-
-export const coreurl = '/build/engine/obj/core-adapter/import/core';
-
-export async function loadKeyboardBlob(uri: string) {
-  const response = await fetch(uri);
-  if (!response.ok) {
-    throw new Error(`HTTP ${response.status} ${response.statusText}`);
-  }
-
-  const buffer = await response.arrayBuffer();
-  return new Uint8Array(buffer);
-}
+import { coreurl, loadKeyboardBlob } from '../../test_utils.js';
 
 // Test the KM_Core interface.
 describe('KM_Core', function () {
diff --git a/web/src/test/auto/dom/cases/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/dom/cases/core-processor/coreKeyboardProcessor.tests.ts
index c37b7f63bf5..d5b034867be 100644
--- a/web/src/test/auto/dom/cases/core-processor/coreKeyboardProcessor.tests.ts
+++ b/web/src/test/auto/dom/cases/core-processor/coreKeyboardProcessor.tests.ts
@@ -5,7 +5,7 @@
 import { assert } from 'chai';
 import sinon from 'sinon';
 import { KM_Core, km_core_context, km_core_keyboard, km_core_state, KM_CORE_CT, KM_CORE_STATUS, km_core_context_items } from 'keyman/engine/core-adapter';
-import { coreurl, loadKeyboardBlob } from '../core-adapter/basic.tests.js';
+import { coreurl, loadKeyboardBlob } from '../../test_utils.js';
 import { Deadkey, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { CoreKeyboardProcessor } from 'keyman/engine/core-processor';
 
@@ -33,7 +33,11 @@ describe('CoreKeyboardProcessor', function () {
     if (isMarker) {
       item.marker = c as number;
     } else {
-      item.character = (c as string).charCodeAt(0);
+      if (typeof (c) == 'number') {
+        item.character = c;
+      } else {
+        item.character = c.codePointAt(0);
+      }
     }
     contextItems.push_back(item);
   };
@@ -42,18 +46,26 @@ describe('CoreKeyboardProcessor', function () {
   let state: km_core_state;
   let context: km_core_context;
   let textStore: SyntheticTextStore;
+  let sandbox: sinon.SinonSandbox;
 
   describe('saveMarkersToTextStore', function () {
-    before(async function () {
+    beforeEach(async function () {
       coreProcessor = new CoreKeyboardProcessor();
       await coreProcessor.init(coreurl);
       state = await createState('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
       context = KM_Core.instance.state_context(state);
-      textStore = new SyntheticTextStore('abcd', 3);
+      sandbox = sinon.createSandbox();
+      Deadkey.ordinalSeed = 0;
     });
 
-    it('saves markers to TextStore', function() {
+    afterEach(() => {
+      sandbox.restore();
+      sandbox = null;
+    })
+
+    it('saves markers to TextStore (BMP)', function() {
       // Setup
+      textStore = new SyntheticTextStore('abcd', 3);
       // Text index   : 0 1   1   1 2 3   3
       // context index: 0 1   2   3 4 5   6
       // ContextItems : a dk1 dk2 b c dk3 d
@@ -67,7 +79,7 @@ describe('CoreKeyboardProcessor', function () {
       addContextItem(contextItems, 'd', false);
       contextItems.push_back(KM_Core.instance.create_end_context());
 
-      sinon.stub(KM_Core.instance, 'context_get').returns({
+      sandbox.stub(KM_Core.instance, 'context_get').returns({
         status: KM_CORE_STATUS.OK,
         object: contextItems,
         delete: function (): void {}
@@ -78,23 +90,56 @@ describe('CoreKeyboardProcessor', function () {
 
       // Verify
       assert.equal(textStore.deadkeys().count(), 3, 'Should have 3 deadkeys');
-      assert.isTrue(textStore.deadkeys().dks[0].match(1, 1), 'dks[0]');
-      assert.isTrue(textStore.deadkeys().dks[1].match(1, 2), 'dks[1]');
-      assert.isTrue(textStore.deadkeys().dks[2].match(3, 3), 'dks[2]');
+      assert.equal(textStore.deadkeys().dks[0].toString(), 'Deadkey { p: 1, d: 1, o: 0, matched: 0}', 'dks[0]');
+      assert.equal(textStore.deadkeys().dks[1].toString(), 'Deadkey { p: 1, d: 2, o: 1, matched: 0}', 'dks[1]');
+      assert.equal(textStore.deadkeys().dks[2].toString(), 'Deadkey { p: 3, d: 3, o: 2, matched: 0}', 'dks[2]');
+    });
+
+    it('saves markers to TextStore (SMP)', function () {
+      // Setup
+      textStore = new SyntheticTextStore('𐌀𐌁𐌂𐌃', 6); // U+10300 U+10301 U+10302 U+10303
+      // Text index   : 0 1 2   2   2 3 4 5 6         6 7
+      // context index: 0   1   2   3   4   5   6
+      // ContextItems : 𐌀   dk1 dk2 𐌁   𐌂   dk3 END
+      // ContextItem.character is a UTF-32 value!
+      const contextItems = new KM_Core.instance.km_core_context_items();
+      addContextItem(contextItems, '𐌀', false);
+      addContextItem(contextItems, 1, true); // deadkey 1
+      addContextItem(contextItems, 2, true); // deadkey 2
+      addContextItem(contextItems, '𐌁', false);
+      addContextItem(contextItems, '𐌂', false);
+      addContextItem(contextItems, 3, true); // deadkey 3
+      addContextItem(contextItems, '𐌃', false);
+      contextItems.push_back(KM_Core.instance.create_end_context());
+
+      sandbox.stub(KM_Core.instance, 'context_get').returns({
+        status: KM_CORE_STATUS.OK,
+        object: contextItems,
+        delete: function (): void { }
+      });
+
+      // Execute
+      coreProcessor.unitTestEndPoints.saveMarkersToTextStore(context, textStore);
+
+      // Verify
+      assert.equal(textStore.deadkeys().count(), 3, 'Should have 3 deadkeys');
+      assert.equal(textStore.deadkeys().dks[0].toString(), 'Deadkey { p: 2, d: 1, o: 0, matched: 0}', 'dks[0]');
+      assert.equal(textStore.deadkeys().dks[1].toString(), 'Deadkey { p: 2, d: 2, o: 1, matched: 0}', 'dks[1]');
+      assert.equal(textStore.deadkeys().dks[2].toString(), 'Deadkey { p: 6, d: 3, o: 2, matched: 0}', 'dks[2]');
     });
   });
 
   describe('applyContextFromTextStore', function () {
-    before(async function () {
+    beforeEach(async function () {
       coreProcessor = new CoreKeyboardProcessor();
       await coreProcessor.init(coreurl);
       state = await createState('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
       context = KM_Core.instance.state_context(state);
-      textStore = new SyntheticTextStore('abcd', 3);
     });
 
-    it('applies deadkeys from TextStore to Core context', function () {
+    it('applies deadkeys from TextStore to Core context (BMP)', function () {
       // Setup
+      textStore = new SyntheticTextStore('abcd', 3);
       textStore.deadkeys().add(new Deadkey(1, 1)); // before 'b'
       textStore.deadkeys().add(new Deadkey(1, 2));
       textStore.deadkeys().add(new Deadkey(3, 3)); // before 'd'
@@ -127,5 +172,44 @@ describe('CoreKeyboardProcessor', function () {
       assert.equal(items.get(6).type, KM_CORE_CT.END, 'Item 6 should be END');
       result.delete();
     });
+
+    it('applies deadkeys from TextStore to Core context (SMP)', function () {
+      // Setup
+      // Use a string with Old Italic letters which will consist of surrogate pairs
+      // in a UTF-16 string.
+      textStore = new SyntheticTextStore('𐌀𐌁𐌂𐌃', 6); // U+10300 U+10301 U+10302 U+10303
+      textStore.deadkeys().add(new Deadkey(2, 1)); // before '𐌁'
+      textStore.deadkeys().add(new Deadkey(2, 2));
+      textStore.deadkeys().add(new Deadkey(6, 3)); // before '𐌃'
+
+      // Execute
+      coreProcessor.unitTestEndPoints.applyContextFromTextStore(context, textStore);
+
+      // Verify
+      const result = KM_Core.instance.context_get(context);
+      assert.equal(result.status, KM_CORE_STATUS.OK);
+      const items = result.object;
+
+      // Text index   : 0 1 2   2   2 3 4 5 6         6 7
+      // Text:        : 𐌀           𐌁   𐌂           | 𐌃
+      // context index: 0   1   2   3   4   5   6
+      // ContextItems : 𐌀   dk1 dk2 𐌁   𐌂   dk3 END
+      // ContextItem.character is a UTF-32 value!
+      assert.equal(items.size(), 7, 'Should have 7 context items');
+      assert.equal(items.get(0).type, KM_CORE_CT.CHAR, 'Item 0 should be CHAR');
+      assert.equal(items.get(0).character, 0x10300, 'Item 0 should be "𐌀"');
+      assert.equal(items.get(1).type, KM_CORE_CT.MARKER, 'Item 1 should be MARKER');
+      assert.equal(items.get(1).marker, 1, 'Item 1 should be marker 1');
+      assert.equal(items.get(2).type, KM_CORE_CT.MARKER, 'Item 2 should be MARKER');
+      assert.equal(items.get(2).marker, 2, 'Item 2 should be marker 2');
+      assert.equal(items.get(3).type, KM_CORE_CT.CHAR, 'Item 3 should be CHAR');
+      assert.equal(items.get(3).character, 0x10301, 'Item 3 should be "𐌁"');
+      assert.equal(items.get(4).type, KM_CORE_CT.CHAR, 'Item 4 should be CHAR');
+      assert.equal(items.get(4).character, 0x10302, 'Item 4 should be "𐌂"');
+      assert.equal(items.get(5).type, KM_CORE_CT.MARKER, 'Item 5 should be MARKER');
+      assert.equal(items.get(5).marker, 3, 'Item 5 should be marker 3');
+      assert.equal(items.get(6).type, KM_CORE_CT.END, 'Item 6 should be END');
+      result.delete();
+    });
   });
 });
diff --git a/web/src/test/auto/dom/test_utils.ts b/web/src/test/auto/dom/test_utils.ts
index f85c7114826..4799520fd24 100644
--- a/web/src/test/auto/dom/test_utils.ts
+++ b/web/src/test/auto/dom/test_utils.ts
@@ -81,4 +81,16 @@ export class DynamicElements {
     masterDiv.appendChild(editable);
     return editable.id;
   }
-}
\ No newline at end of file
+}
+
+export const coreurl = '/build/engine/obj/core-adapter/import/core';
+
+export async function loadKeyboardBlob(uri: string) {
+  const response = await fetch(uri);
+  if (!response.ok) {
+    throw new Error(`HTTP ${response.status} ${response.statusText}`);
+  }
+
+  const buffer = await response.arrayBuffer();
+  return new Uint8Array(buffer);
+}

From 825573d8f189ab39c84ef2d9b8dd4c68f54f1ffd Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 18 Nov 2025 15:26:10 +0100
Subject: [PATCH 147/254] docs(web): address code review comment

---
 common/web/types/src/kmx/kmx.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/web/types/src/kmx/kmx.ts b/common/web/types/src/kmx/kmx.ts
index df6617e9143..651a6db0d13 100644
--- a/common/web/types/src/kmx/kmx.ts
+++ b/common/web/types/src/kmx/kmx.ts
@@ -3,7 +3,7 @@ import { ModifierKeyConstants } from '../consts/modifier-key-constants.js';
 
 /* Definitions from kmx_file.h. Must be kept in sync */
 
-// TODO-web-core: split kmx-file from kmx in-memory, similar to what I've done for kvk (keep restructure decl + BUILDER_ interfaces together)
+// TODO-embed-osk-in-kmx: split kmx-file from kmx in-memory, similar to what I've done for kvk (keep restructure decl + BUILDER_ interfaces together)
 // this will make it possible to use these declarations in KeymanWeb
 
 // In memory representations of KMX structures

From 6975bf383ec9cc852cfb6e87f5415d296541a371 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 19 Nov 2025 15:17:34 +0100
Subject: [PATCH 148/254] refactor(web): rename target and mock variables and
 functions

This change renames `target` and `mock` variables that identify a
text store. Similarly it renames functions with `Target` in the name.

Follow-up-of: #15092
Test-bot: skip
---
 .../app/browser/src/context/focusAssistant.ts |   4 +-
 .../src/context/pageIntegrationHandlers.ts    |   6 +-
 web/src/app/browser/src/contextManager.ts     | 285 +++++++++---------
 .../app/browser/src/defaultBrowserRules.ts    |   4 +-
 .../app/browser/src/hardwareEventKeyboard.ts  |  32 +-
 web/src/app/browser/src/keyboardInterface.ts  |   4 +-
 web/src/app/browser/src/keymanEngine.ts       |  30 +-
 web/src/app/browser/src/languageMenu.ts       |   2 +-
 web/src/app/browser/src/oskConfiguration.ts   |   8 +-
 .../browser/src/utils/rotationProcessor.ts    |   6 +-
 web/src/app/webview/src/contextManager.ts     |  18 +-
 web/src/app/webview/src/keymanEngine.ts       |   2 +-
 .../src/element-text-stores/inputTextStore.ts |   2 +-
 .../prediction/predictionContext.ts           |  30 +-
 .../src/js-processor/jsKeyboardInterface.ts   |  26 +-
 .../src/js-processor/jsKeyboardProcessor.ts   |  26 +-
 .../src/keyboard/keyboards/activeLayout.ts    |   4 +-
 .../src/keyboard/keyboards/jsKeyboard.ts      |  11 +-
 .../src/keyboard/keyboards/kmxKeyboard.ts     |   2 +-
 .../engine/src/keyboard/syntheticTextStore.ts |   4 +-
 web/src/engine/src/keyboard/textStore.ts      |  18 +-
 web/src/engine/src/main/contextManagerBase.ts |  88 +++---
 .../engine/src/main/headless/contextWindow.ts |   8 +-
 .../src/main/headless/inputProcessor.ts       |  20 +-
 .../src/main/headless/languageProcessor.ts    |   4 +-
 web/src/engine/src/main/keymanEngineBase.ts   |  20 +-
 .../attachment/textStoreForElement.def.ts     |  60 ++--
 .../dom/cases/browser/contextManager.tests.ts | 270 ++++++++---------
 .../element_interfaces.tests.ts               |   8 +-
 ...s.tests.ts => syntheticTextStore.tests.ts} |  62 ++--
 .../cases/gesture-processor/canary.tests.ts   |   2 +-
 .../cases/keyboard/domKeyboardLoader.tests.ts |   4 +-
 .../prediction/predictionContext.tests.js     |  10 +-
 .../js-processor/bundled-module.tests.js      |  12 +-
 .../js-processor/engine/context.tests.js      |  23 +-
 .../engine/notany_context.tests.js            |   4 +-
 .../non-positional-rules.tests.js             |  36 +--
 .../js-processor/transcriptions.tests.js      | 239 +++++++--------
 .../headless/engine/keyboard/mocks.tests.js   |  92 ------
 .../keyboard/syntheticTextStore.tests.js      |  92 ++++++
 .../tools/testing/recorder-core/src/index.ts  |   8 +-
 .../testing/recorder-core/src/nodeProctor.ts  |   2 +-
 .../testing/recorder-core/src/proctor.ts      |   2 +-
 web/src/tools/testing/recorder/scribe.ts      |   8 +-
 44 files changed, 798 insertions(+), 800 deletions(-)
 rename web/src/test/auto/dom/cases/element-text-stores/{target_mocks.tests.ts => syntheticTextStore.tests.ts} (66%)
 delete mode 100644 web/src/test/auto/headless/engine/keyboard/mocks.tests.js
 create mode 100644 web/src/test/auto/headless/engine/keyboard/syntheticTextStore.tests.js

diff --git a/web/src/app/browser/src/context/focusAssistant.ts b/web/src/app/browser/src/context/focusAssistant.ts
index ee67fde2833..accb9b811ec 100644
--- a/web/src/app/browser/src/context/focusAssistant.ts
+++ b/web/src/app/browser/src/context/focusAssistant.ts
@@ -69,7 +69,7 @@ export class FocusAssistant extends EventEmitter<EventMap> {
    * its element's loss of focus within the page unless setting a different TextStore as active.
    *
    * TODO: (potential) Future enhancement - this should not be possible to set if there is no currently-active
-   * context target to maintain.
+   * textStore to maintain.
    */
   // Formerly `isActivating`.
   public get maintainingFocus(): boolean {
@@ -80,7 +80,7 @@ export class FocusAssistant extends EventEmitter<EventMap> {
     const priorValue = this._maintainingFocus;
     this._maintainingFocus = value;
 
-    // Needed to properly update .activeTarget upon loss of maintaining-focus state.
+    // Needed to properly update .activeTextStore upon loss of maintaining-focus state.
     if(priorValue && !value) {
       this.emit('maintainingfocusend');
     }
diff --git a/web/src/app/browser/src/context/pageIntegrationHandlers.ts b/web/src/app/browser/src/context/pageIntegrationHandlers.ts
index 3a997d9392f..eebf0ebde57 100644
--- a/web/src/app/browser/src/context/pageIntegrationHandlers.ts
+++ b/web/src/app/browser/src/context/pageIntegrationHandlers.ts
@@ -85,7 +85,7 @@ export class PageIntegrationHandlers {
    **/
   private pageFocusHandler: (e: FocusEvent) => boolean = () => {
     if(!this.focusAssistant.maintainingFocus && this.engine.osk?.vkbd) {
-      this.engine.contextManager.deactivateCurrentTarget();
+      this.engine.contextManager.deactivateCurrentTextStore();
       this.engine.contextManager.resetContext();
     }
     return false;
@@ -138,7 +138,7 @@ export class PageIntegrationHandlers {
   private touchMoveActivationHandler: (e: TouchEvent) => boolean = (e) => {
     if(this.deactivateOnScroll) {  // Android / Chrone case.
       this.focusAssistant.focusing = false;
-      this.engine.contextManager.deactivateCurrentTarget();
+      this.engine.contextManager.deactivateCurrentTextStore();
     }
 
     const y = e.touches[0].screenY;
@@ -153,7 +153,7 @@ export class PageIntegrationHandlers {
     // Should not hide OSK if simply closing the language menu (30/4/15)
     // or if the focusing timer (focusAssistant.setFocusTimer) is still active.
     if(this.deactivateOnRelease && !this.engine.touchLanguageMenu && !this.focusAssistant.focusing) {
-      this.engine.contextManager.deactivateCurrentTarget();
+      this.engine.contextManager.deactivateCurrentTextStore();
     }
     this.deactivateOnRelease=false;
     return false;
diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index 6b3f3ed12c7..82231aa9af0 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -45,17 +45,17 @@ function _SetTargDir(Ptarg: HTMLElement, activeKeyboard: Keyboard) {
 export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
   private _activeKeyboard: {keyboard: Keyboard, metadata: KeyboardStub};
   private cookieManager = new CookieSerializer<KeyboardCookie>('KeymanWeb_Keyboard');
-  readonly focusAssistant = new FocusAssistant(() => this.activeTarget?.isForcingScroll());
+  readonly focusAssistant = new FocusAssistant(() => this.activeTextStore?.isForcingScroll());
   readonly page: PageContextAttachment;
-  private mostRecentTarget: AbstractElementTextStore<any>;
-  private currentTarget: AbstractElementTextStore<any>;
+  private mostRecentTextStore: AbstractElementTextStore<any>;
+  private currentTextStore: AbstractElementTextStore<any>;
 
   private globalKeyboard: {keyboard: Keyboard, metadata: KeyboardStub};
 
   private _eventsObj: () => LegacyEventEmitter<LegacyAPIEvents>;
   private domEventTracker = new DomEventTracker();
 
-  constructor(engineConfig: BrowserConfiguration, eventsClosure: () => LegacyEventEmitter<LegacyAPIEvents>) {
+  public constructor(engineConfig: BrowserConfiguration, eventsClosure: () => LegacyEventEmitter<LegacyAPIEvents>) {
     super(engineConfig);
 
     this._eventsObj = eventsClosure;
@@ -65,18 +65,18 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
     });
 
     this.focusAssistant.on('maintainingfocusend', () => {
-      // Basically, if the maintaining state were the reason we still had an `activeTarget`...
-      if(!this.activeTarget && this.mostRecentTarget) {
-        this.emit('targetchange', this.activeTarget);
+      // Basically, if the maintaining state were the reason we still had an `activeTextStore`...
+      if(!this.activeTextStore && this.mostRecentTextStore) {
+        this.emit('textstorechange', this.activeTextStore);
       }
     });
   }
 
-  get apiEvents(): LegacyEventEmitter<LegacyAPIEvents> {
+  public get apiEvents(): LegacyEventEmitter<LegacyAPIEvents> {
     return this._eventsObj();
   }
 
-  initialize(): void {
+  public initialize(): void {
     this.on('keyboardasyncload', (stub, completion) => {
       this.engineConfig.alertHost?.wait('Installing keyboard<br/>' + stub.name);
 
@@ -126,7 +126,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
         }
 
         if(elem.ownerDocument.activeElement == elem) {
-          this.setActiveTarget(textStoreForElement(elem), true);
+          this.setActiveTextStore(textStoreForElement(elem), true);
         }
       });
 
@@ -164,9 +164,9 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
         }
 
         // This block:  has to do with maintaining focus (and consequences)
-        const lastElem = this.mostRecentTarget?.getElement();
+        const lastElem = this.mostRecentTextStore?.getElement();
         if(lastElem && lastElem == elem) {
-          this.forgetActiveTarget(); // should already auto-hide the OSK while at it via event.
+          this.forgetActiveTextStore(); // should already auto-hide the OSK while at it via event.
         }
       });
 
@@ -175,69 +175,69 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
     });
   }
 
-  get activeTarget(): AbstractElementTextStore<any> {
+  public get activeTextStore(): AbstractElementTextStore<any> {
     /*
-     * Assumption:  the maintainingFocus flag may only be set when there is a current target.
+     * Assumption:  the maintainingFocus flag may only be set when there is a current textStore.
      * This is not enforced proactively at present, but the assumption should hold.  (2023-05-03)
      */
-    const maintainingFocus = this.focusAssistant.maintainingFocus;
-    return this.currentTarget || (maintainingFocus ? this.mostRecentTarget : null);
+    const {maintainingFocus} = this.focusAssistant;
+    return this.currentTextStore || (maintainingFocus ? this.mostRecentTextStore : null);
   }
 
-  get lastActiveTarget(): AbstractElementTextStore<any> {
-    return this.mostRecentTarget;
+  public get lastActiveTextStore(): AbstractElementTextStore<any> {
+    return this.mostRecentTextStore;
   }
 
-  public deactivateCurrentTarget() {
-    const priorTarget = this.activeTarget || this.lastActiveTarget;
+  public deactivateCurrentTextStore() {
+    const priorTextStore = this.activeTextStore || this.lastActiveTextStore;
 
     /* During integrated tests, it was possible in the past for a `beforeAll`
-     * -initialized KMW to reach this state between tests.  The target fixture
-     * got cleared, but the `mostRecentTarget` / `lastActiveTarget` was not
-     * - just the `currentTarget` / `activeTarget`.  See #9718.
+     * -initialized KMW to reach this state between tests.  The textstore fixture
+     * got cleared, but the `mostRecentTextStore` / `lastActiveTextStore` was not
+     * - just the `currentTextStore` / `activeTextStore`.  See #9718.
      *
-     * Newly-added code in `forgetActiveTarget` seeks to prevent this scenario,
+     * Newly-added code in `forgetActiveTextStore` seeks to prevent this scenario,
      * but as there's no consistent repro to prove it sufficient, an appropriate
      * guard-condition has been added here too.
      */
-    if(priorTarget && this.page.isAttached(priorTarget.getElement())) {
-      this._BlurKeyboardSettings(priorTarget.getElement());
+    if(priorTextStore && this.page.isAttached(priorTextStore.getElement())) {
+      this._BlurKeyboardSettings(priorTextStore.getElement());
     }
 
     // Because of focus-maintenance effects
-    if(!this.activeTarget) {
-      this.setActiveTarget(null, true);
+    if(!this.activeTextStore) {
+      this.setActiveTextStore(null, true);
     }
   }
 
-  public forgetActiveTarget() {
+  public forgetActiveTextStore() {
     this.focusAssistant.maintainingFocus = false;
     this.focusAssistant.restoringFocus = false;
 
-    const priorTarget = this.activeTarget || this.mostRecentTarget;
-    if(priorTarget) {
-      this._BlurKeyboardSettings(priorTarget.getElement());
+    const priorTextStore = this.activeTextStore || this.mostRecentTextStore;
+    if(priorTextStore) {
+      this._BlurKeyboardSettings(priorTextStore.getElement());
     }
 
     // Will ensure that the element is no longer active.  Does not erase
-    // it from being the `lastActiveTarget`, though.
-    this.setActiveTarget(null, true);
+    // it from being the `lastActiveTextStore`, though.
+    this.setActiveTextStore(null, true);
 
     // So we erase it here.
-    if(priorTarget == this.lastActiveTarget) {
-      this.mostRecentTarget = null;
+    if(priorTextStore == this.lastActiveTextStore) {
+      this.mostRecentTextStore = null;
     }
   }
 
-  public setActiveTarget(target: AbstractElementTextStore<any>, sendEvents?: boolean) {
-    const previousTarget = this.mostRecentTarget;
-    const originalTarget = this.activeTarget; // may differ, depending on focus state.
+  public setActiveTextStore(textStore: AbstractElementTextStore<any>, sendEvents?: boolean) {
+    const previousTextStore = this.mostRecentTextStore;
+    const originalTextStore = this.activeTextStore; // may differ, depending on focus state.
 
-    if(target == originalTarget) {
-      // A focus state may have .currentTarget as null at this stage; if the func
+    if(textStore == originalTextStore) {
+      // A focus state may have .currentTextStore as null at this stage; if the func
       // is being called with a non-null parameter, we want this SET. #9404
-      if(originalTarget) {
-        this.currentTarget = originalTarget;
+      if(originalTextStore) {
+        this.currentTextStore = originalTextStore;
       }
 
       /**
@@ -270,42 +270,42 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
     }
 
     // We condition on 'priorElement' below as a check to allow KMW to set a default active keyboard.
-    const hadRecentElement = !!previousTarget;
+    const hadRecentElement = !!previousTextStore;
 
     // Must set before _Blur / _Focus to avoid infinite recursion due to complications
     // in setActiveKeyboard behavior with managed keyboard settings.
-    this.currentTarget = this.mostRecentTarget = target; // I3363 (Build 301)
-    this.predictionContext.setCurrentTarget(target);
+    this.currentTextStore = this.mostRecentTextStore = textStore; // I3363 (Build 301)
+    this.predictionContext.setCurrentTextStore(textStore);
 
     if(this.focusAssistant.restoringFocus) {
-      this._BlurKeyboardSettings(target.getElement());
-    } else if(target) {
-      this._FocusKeyboardSettings(target.getElement(), !hadRecentElement);
+      this._BlurKeyboardSettings(textStore.getElement());
+    } else if(textStore) {
+      this._FocusKeyboardSettings(textStore.getElement(), !hadRecentElement);
     }
 
     // Always do the common focus stuff, instantly returning if we're in an editable iframe.
-    if(this._CommonFocusHelper(target)) {
+    if(this._CommonFocusHelper(textStore)) {
       return;
     };
 
     // Set element directionality (but only if element is empty)
-    let focusedElement = target?.getElement();
-    if(target instanceof DesignIFrameElementTextStore) {
-      focusedElement = target.docRoot;
+    let focusedElement = textStore?.getElement();
+    if(textStore instanceof DesignIFrameElementTextStore) {
+      focusedElement = textStore.docRoot;
     }
     if(focusedElement && focusedElement.ownerDocument && focusedElement instanceof focusedElement.ownerDocument.defaultView.HTMLElement) {
       _SetTargDir(focusedElement, this.activeKeyboard?.keyboard);
     }
 
-    if(target != originalTarget) {
-      this.emit('targetchange', target);
+    if(textStore != originalTextStore) {
+      this.emit('textstorechange', textStore);
     }
 
     //Execute external (UI) code needed on focus if required
     if(sendEvents) {
-      let blurredElement = previousTarget?.getElement();
-      if(previousTarget instanceof DesignIFrameElementTextStore) {
-        blurredElement = previousTarget.docRoot;
+      let blurredElement = previousTextStore?.getElement();
+      if(previousTextStore instanceof DesignIFrameElementTextStore) {
+        blurredElement = previousTextStore.docRoot;
       }
 
       if(!focusedElement) {
@@ -329,57 +329,57 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
     }
   }
 
-  get activeKeyboard() {
+  public get activeKeyboard(): { keyboard: Keyboard, metadata: KeyboardStub } {
     return this._activeKeyboard;
   }
 
-  restoreLastActiveTarget() {
-    if(!this.mostRecentTarget) {
+  public restoreLastActiveTextStore(): void {
+    if(!this.mostRecentTextStore) {
       return;
     }
 
     this.focusAssistant.restoringFocus = true;
-    this.mostRecentTarget.focus(); // should auto-restore .mostRecentTarget as .currentTarget
+    this.mostRecentTextStore.focus(); // should auto-restore .mostRecentTextStore as .currentTextStore
                                    // via related focus events.
     this.focusAssistant.restoringFocus = false;
   }
 
-  insertText(kbdInterface: KeyboardInterfaceBase<ContextManager>, Ptext: string, PdeadKey: number) {
-    // Find the correct output target to manipulate.  The user has likely be interacting with a
+  public insertText(kbdInterface: KeyboardInterfaceBase<ContextManager>, text: string, deadkey: number): boolean {
+    // Find the correct text store to manipulate.  The user has likely be interacting with a
     // 'help page' keyboard, like desktop `sil_euro_latin`, and active browser focus on the
     // original context element may have been lost.
-    this.restoreLastActiveTarget();
+    this.restoreLastActiveTextStore();
 
-    let textStore = this.activeTarget;
+    let textStore = this.activeTextStore;
 
-    if(textStore == null && this.mostRecentTarget) {
-      textStore = this.activeTarget;
+    if(textStore == null && this.mostRecentTextStore) {
+      textStore = this.activeTextStore;
     }
 
     if(textStore != null) {
-      return super.insertText(kbdInterface, Ptext, PdeadKey);
+      return super.insertText(kbdInterface, text, deadkey);
     }
     return false;
   }
 
   /**
-   * Determines the 'target' currently used to determine which keyboard should be active.
+   * Determines the 'textStore' currently used to determine which keyboard should be active.
    * When `null`, keyboard-activation operations will affect the global default; otherwise,
-   * such operations affect only the specified `target`.
+   * such operations affect only the specified `textStore`.
    *
-   * This is based on the current `.activeTarget` and its related attachment metadata.
+   * This is based on the current `.activeTextStore` and its related attachment metadata.
    */
-  protected currentKeyboardSrcTarget(): AbstractElementTextStore<any> {
-    const target = this.currentTarget || this.mostRecentTarget;
+  protected currentKeyboardSrcTextStore(): AbstractElementTextStore<any> {
+    const textStore = this.currentTextStore || this.mostRecentTextStore;
 
-    if(this.isTargetKeyboardIndependent(target)) {
-      return target;
+    if(this.isTextStoreKeyboardIndependent(textStore)) {
+      return textStore;
     } else {
       return null;
     }
   }
 
-  private isTargetKeyboardIndependent(textStore: AbstractElementTextStore<any>): boolean {
+  private isTextStoreKeyboardIndependent(textStore: AbstractElementTextStore<any>): boolean {
     const attachment = textStore?.getElement()._kmwAttachment;
 
     // If null or undefined, we're in 'global' mode.
@@ -387,14 +387,14 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
   }
 
   // Note:  is part of the keyboard activation process.  Not to be called directly by published API.
-  activateKeyboardForTarget(kbd: { keyboard: Keyboard, metadata: KeyboardStub }, target: AbstractElementTextStore<any>) {
-    const attachment = target?.getElement()._kmwAttachment;
+  public activateKeyboardForTextStore(kbd: { keyboard: Keyboard, metadata: KeyboardStub }, textStore: AbstractElementTextStore<any>): void {
+    const attachment = textStore?.getElement()._kmwAttachment;
 
     if(!attachment) {
       // if not set with an "independent keyboard", changes the global.
       this.globalKeyboard = kbd;
     } else {
-      // if set with an "independent keyboard", changes only the active target's keyboard.
+      // if set with an "independent keyboard", changes only the active textStore's keyboard.
       //
       // This method is not called on the pathway to shift a control back to 'global keyboard' mode;
       // only after.
@@ -402,7 +402,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
       attachment.languageCode = kbd?.metadata.langId ?? '';
     }
 
-    if(this.currentKeyboardSrcTarget() == target) {
+    if(this.currentKeyboardSrcTextStore() == textStore) {
       this._activeKeyboard = kbd;
 
       // Also, update with appropriate styling.
@@ -418,32 +418,33 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
    *
    * This is the core method that backs
    * https://help.keyman.com/developer/engine/web/15.0/reference/core/setKeyboardForControl.
-   * @param target
-   * @param metadata
+   * @param textStore
+   * @param kbdId
+   * @param langId
    */
-  public setKeyboardForTarget(target: AbstractElementTextStore<any>, kbdId: string, langId: string) {
-    if(target instanceof DesignIFrameElementTextStore) {
+  public setKeyboardForTextStore(textStore: AbstractElementTextStore<any>, kbdId: string, langId: string): void {
+    if(textStore instanceof DesignIFrameElementTextStore) {
       console.warn("'keymanweb.setKeyboardForControl' cannot set keyboard on iframes.");
       return;
     }
 
-    const attachment = target.getElement()._kmwAttachment;
+    const attachment = textStore.getElement()._kmwAttachment;
 
-    // Catches if the target is already in independent-mode, even if it's being cancelled
+    // Catches if the textStore is already in independent-mode, even if it's being cancelled
     // during this call.
-    const wasPriorTarget = this.currentKeyboardSrcTarget() == target;
+    const wasPriorTextStore = this.currentKeyboardSrcTextStore() == textStore;
 
     if(!attachment) {
       return;
     } else {
       // Either establishes or cancels independent-keyboard mode by setting the
       // associated metadata.  This will have direct effects on the results
-      // of .currentKeyboardSrcTarget().
+      // of .currentKeyboardSrcTextStore().
       attachment.keyboard = kbdId || null;
       attachment.languageCode = langId || null;
 
       // If it has just entered independent-keyboard mode, we need the second check.
-      if(wasPriorTarget || this.currentKeyboardSrcTarget() == target) {
+      if(wasPriorTextStore || this.currentKeyboardSrcTextStore() == textStore) {
         const globalKbd = this.globalKeyboard.metadata;
 
         // The `||` bits below - in case we're cancelling independent-keyboard mode.
@@ -456,16 +457,16 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
     }
   }
 
-  public getKeyboardStubForTarget(target: AbstractElementTextStore<any>) {
-    if(!this.isTargetKeyboardIndependent(target)) {
+  public getKeyboardStubForTextStore(textStore: AbstractElementTextStore<any>) {
+    if(!this.isTextStoreKeyboardIndependent(textStore)) {
       return this.globalKeyboard.metadata;
     } else {
-      const attachment = target.getElement()._kmwAttachment;
+      const attachment = textStore.getElement()._kmwAttachment;
       return this.keyboardCache.getStub(attachment.keyboard, attachment.languageCode);
     }
   }
 
-  protected getFallbackStubKey() {
+  protected getFallbackStubKey(): KeyboardStub | { id: string, langId: string } {
     const emptyCodes = {
       id: '',
       langId: ''
@@ -489,7 +490,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
 
   public async activateKeyboard(keyboardId: string, languageCode?: string, saveCookie?: boolean): Promise<boolean> {
     saveCookie ||= false;
-    const originalKeyboardTarget = this.currentKeyboardSrcTarget();
+    const originalKeyboardTextStore = this.currentKeyboardSrcTextStore();
 
     // If someone tries to activate a keyboard before we've had a chance to load it,
     // we should defer the activation, just as we'd have deferred the load attempt.
@@ -510,17 +511,17 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
 
       this.engineConfig.alertHost?.wait(); // clear any pending waits.
 
-      if(saveCookie && !originalKeyboardTarget) { // if the active target uses global keyboard settings
+      if(saveCookie && !originalKeyboardTextStore) { // if the active textStore uses global keyboard settings
         this.cookieManager.save({current: `${keyboardId}:${languageCode}`});
       }
 
-      // Only do these if the active keyboard-target still matches the original keyboard-target;
+      // Only do these if the active keyboard-textstore still matches the original keyboard-textStore;
       // otherwise, maintain what's correct for the currently active one.
-      if(originalKeyboardTarget == this.currentKeyboardSrcTarget()) {
-        _SetTargDir(this.currentTarget?.getElement(), this.keyboardCache.getKeyboard(keyboardId));
+      if(originalKeyboardTextStore == this.currentKeyboardSrcTextStore()) {
+        _SetTargDir(this.currentTextStore?.getElement(), this.keyboardCache.getKeyboard(keyboardId));
         this.page.setAttachmentFont(this.activeKeyboard?.metadata?.KFont, this.engineConfig.paths.fonts, this.engineConfig.hostDevice.OS);
 
-        this.restoreLastActiveTarget();
+        this.restoreLastActiveTextStore();
       }
 
       return result;
@@ -569,7 +570,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
    * Description          Stores the last active element's keyboard settings.  Should be called
    *                      whenever a KMW-enabled page element loses control.
    */
-  _BlurKeyboardSettings(lastElem: HTMLElement, PInternalName?: string, PLgCode?: string) {
+  public _BlurKeyboardSettings(lastElem: HTMLElement, PInternalName?: string, PLgCode?: string): void {
     let keyboardID = this.activeKeyboard ? this.activeKeyboard.keyboard.id : '';
     let langCode = this.activeKeyboard?.metadata.langId;
 
@@ -593,7 +594,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
    *                      whenever a KMW-enabled page element gains control, but only once the prior
    *                      element's loss of control is guaranteed.
    */
-  _FocusKeyboardSettings(lastElem: HTMLElement, blockGlobalChange: boolean) {
+  public _FocusKeyboardSettings(lastElem: HTMLElement, blockGlobalChange: boolean): void {
     // Important pre-condition:  the newly-focused element must be set as active.
     const attachment = lastElem._kmwAttachment;
     const global = this.globalKeyboard;
@@ -608,14 +609,14 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
 
   /**
    * Function             _CommonFocusHelper
-   * @param   {Element}   target
+   * @param   {Element}   textStore
    * @returns {boolean}
    * Description          Performs common state management for the various focus events of KeymanWeb.
    *                      The return value indicates whether (true) or not (false) the calling event handler
    *                      should be terminated immediately after the call.
    */
-  _CommonFocusHelper(textStore: AbstractElementTextStore<any>): boolean {
-    const focusAssistant = this.focusAssistant;
+  public _CommonFocusHelper(textStore: AbstractElementTextStore<any>): boolean {
+    const {focusAssistant} = this;
 
     const activeKeyboard = this.activeKeyboard?.keyboard;
     if(!focusAssistant.restoringFocus) {
@@ -623,7 +624,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
       activeKeyboard?.notify(0, textStore, 1);  // I2187
     }
 
-    if(!focusAssistant.restoringFocus && this.mostRecentTarget != textStore) {
+    if(!focusAssistant.restoringFocus && this.mostRecentTextStore != textStore) {
       focusAssistant.maintainingFocus = false;
     }
     focusAssistant.restoringFocus = false;
@@ -636,29 +637,27 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
     return false;
   }
 
-
-
   /**
    * Respond to KeymanWeb-aware input element receiving focus
    */
-  _ControlFocus = (e: FocusEvent): boolean => {
+  public _ControlFocus = (e: FocusEvent): boolean => {
     // Step 1: determine the corresponding TextStore instance.
-    const target = textStoreForEvent(e);
-    if(!target) {
+    const textStore = textStoreForEvent(e);
+    if(!textStore) {
       // Probably should also make a warning or error?
       return true;
     }
 
     // ???? ?: ensure it's properly active?
-    // if(target instanceof DesignIFrameElementTextStore) { //**TODO: check case reference
+    // if(textStore instanceof DesignIFrameElementTextStore) { //**TODO: check case reference
     //   // But... the following should already have been done during attachment...
     //   // attachmentEngine._AttachToIframe(Ltarg as HTMLIFrameElement);
-    //   target.docRoot
+    //   textStore.docRoot
     //   Ltarg=Ltarg.contentWindow.document.body; // And we only care about Ltarg b/c of finding the TextStore.
     // }
 
     // Step 2:  Make the newly-focused control the active control, and thus the active context.
-    this.setActiveTarget(target, true);
+    this.setActiveTextStore(textStore, true);
 
     return true;
   }
@@ -666,7 +665,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
   /**
    * Respond to KMW losing focus on event
    */
-  _ControlBlur = (e: FocusEvent): boolean => {
+  public _ControlBlur = (e: FocusEvent): boolean => {
     // Step 0:  if we're in a state where loss-of-focus should be outright-ignored, bypass the handler entirely.
     if(this.focusAssistant._IgnoreNextSelChange) {
 
@@ -686,28 +685,28 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
     }
 
     // Step 1: determine the corresponding TextStore instance.
-    const target = textStoreForEvent(e);
-    if (target == null) {
+    const textStore = textStoreForEvent(e);
+    if (textStore == null) {
       return true;
     }
 
     // Step 2:  persist the keyboard setting for the deactivating context.
 
     ////keymanweb._SelectionControl = null;
-    if(this.lastActiveTarget) {
+    if(this.lastActiveTextStore) {
       // There's no harm in saving them at this stage, even if we're still in the `maintainingFocus` state.
-      this._BlurKeyboardSettings(this.lastActiveTarget.getElement());
+      this._BlurKeyboardSettings(this.lastActiveTextStore.getElement());
     }
 
     // Step 3: Now that we've handled all prior-element maintenance, update the active and 'last-active element'.
-    // (The "context target" state fields)
-    const previousTarget = this.activeTarget;
-    this.currentTarget = null; // I3363 (Build 301)
+    // (The "context textStore" state fields)
+    const previousTextStore = this.activeTextStore;
+    this.currentTextStore = null; // I3363 (Build 301)
 
-    // After a .forgetActiveTarget call occurs before _ControlBlur is called on the corresponding element,
+    // After a .forgetActiveTextStore call occurs before _ControlBlur is called on the corresponding element,
     // we should avoid accidentally 'remembering' it here.
-    if(previousTarget || this.lastActiveTarget) {
-      this.mostRecentTarget = target;
+    if(previousTextStore || this.lastActiveTextStore) {
+      this.mostRecentTextStore = textStore;
     }
 
     // Step 4: any and all related events
@@ -717,37 +716,37 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
      */
     this.focusAssistant.restoringFocus = false;
 
-    const activeKeyboard = this.activeKeyboard;
-    const maintainingFocus = this.focusAssistant.maintainingFocus;
+    const {activeKeyboard} = this;
+    const {maintainingFocus} = this.focusAssistant;
     if(!maintainingFocus && activeKeyboard) {
-      activeKeyboard.keyboard.notify(0, target, 0);  // I2187
+      activeKeyboard.keyboard.notify(0, textStore, 0);  // I2187
     }
-    if(previousTarget && !this.activeTarget) {
-      this.emit('targetchange', null);
+    if(previousTextStore && !this.activeTextStore) {
+      this.emit('textstorechange', null);
     }
 
     this.apiEvents.callEvent('controlblurred', {
-      target: target.getElement(),
+      target: textStore.getElement(),
       event: e,
       isActivating: maintainingFocus
     });
 
     // Is not an "API event"; it models a native browser event instead.
-    this.doChangeEvent(target);
+    this.doChangeEvent(textStore);
     this.resetContext();
     return true;
   }
 
-  doChangeEvent(target: AbstractElementTextStore<any>) {
-    if(target.changed) {
+  doChangeEvent(textStore: AbstractElementTextStore<any>) {
+    if(textStore.changed) {
       const event = new Event('change', {"bubbles": true, "cancelable": false});
-      target.getElement().dispatchEvent(event);
+      textStore.getElement().dispatchEvent(event);
     }
 
-    target.changed = false;
+    textStore.changed = false;
   }
 
-  _Click: (e: MouseEvent) => boolean = (e: MouseEvent) => {
+  public _Click: (e: MouseEvent) => boolean = (e: MouseEvent) => {
     this.resetContext();
     return true;
   };
@@ -756,7 +755,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
    * Gets the 'saved keyboard' cookie value for the last keyboard used in the
    * iser's previous session.
    **/
-  getSavedKeyboardRaw(): string {
+  public getSavedKeyboardRaw(): string {
     const cookie = new CookieSerializer<KeyboardCookie>('KeymanWeb_Keyboard');
     const v = cookie.load(decodeURIComponent);
 
@@ -777,7 +776,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
    *
    * @return      {string}          InternalName:LanguageCode
    **/
-  getSavedKeyboard(): string {
+  public getSavedKeyboard(): string {
     const cookieValue = this.getSavedKeyboardRaw();
 
     // Check that the requested keyboard is included in the available keyboard stubs
@@ -811,7 +810,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
   /**
    * Restore the most recently used keyboard, if still available
    */
-  restoreSavedKeyboard(kbd: string) {
+  public restoreSavedKeyboard(kbd: string) {
     // If no saved keyboard, defaults to US English
     const d=kbd;
 
@@ -838,14 +837,14 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
    * Scope        Private
    * Description  A handler for KMW-touch-disabled elements when operating on touch devices.
    */
-  nonKMWTouchHandler = (x: Event) => {
+  public nonKMWTouchHandler = (x: Event) => {
     this.focusAssistant.focusing=false;
     clearTimeout(this.focusAssistant.focusTimer);
-    this.forgetActiveTarget();
+    this.forgetActiveTextStore();
     // this.keyman.osk.hideNow(); // TODO:  is more aggressive than the default - how to migrate this tidbit?
   };
 
-  shutdown() {
+  public shutdown(): void {
     this.page.shutdown();
     this.domEventTracker.shutdown();
   }
diff --git a/web/src/app/browser/src/defaultBrowserRules.ts b/web/src/app/browser/src/defaultBrowserRules.ts
index d6740978d61..f0002401519 100644
--- a/web/src/app/browser/src/defaultBrowserRules.ts
+++ b/web/src/app/browser/src/defaultBrowserRules.ts
@@ -37,14 +37,14 @@ export default class DefaultBrowserRules extends DefaultRules {
 
     const moveToNext = (back: boolean) => {
       const contextManager = this.contextManager;
-      const activeElement = contextManager.activeTarget?.getElement();
+      const activeElement = contextManager.activeTextStore?.getElement();
       const nextElement = contextManager.page.findNeighboringInput(activeElement, back);
       nextElement?.focus();
     }
 
     switch(code) {
       // This method will be handled between `ContextManager` and PageContextAttachment:
-      // pageContextAttachment.findNeighboringInput(contextManager.activeTarget.getElement(), <same flag>)
+      // pageContextAttachment.findNeighboringInput(contextManager.activeTextStore.getElement(), <same flag>)
       case Codes.keyCodes['K_TAB']:
         moveToNext((Lkc.Lmodifiers & ModifierKeyConstants.K_SHIFTFLAG) != 0);
         break;
diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts
index 0e0957d5890..7057bd9df98 100644
--- a/web/src/app/browser/src/hardwareEventKeyboard.ts
+++ b/web/src/app/browser/src/hardwareEventKeyboard.ts
@@ -229,20 +229,20 @@ export default class HardwareEventKeyboard extends HardKeyboardBase {
     this.contextManager = contextManager;
     this.processor = processor;
 
-    const page = contextManager.page;
+    const {page} = contextManager;
 
     const eventTracker = this.domEventTracker;
 
     page.on('enabled', (Pelem) => {
-      const target = textStoreForElement(Pelem);
+      const textStore = textStoreForElement(Pelem);
 
-      if(!(target instanceof DesignIFrameElementTextStore)) {
+      if(!(textStore instanceof DesignIFrameElementTextStore)) {
         // These need to be on the actual input element, as otherwise the keyboard will disappear on touch.
         eventTracker.attachDOMEvent(Pelem, 'keypress', this._KeyPress);
         eventTracker.attachDOMEvent(Pelem, 'keydown', this._KeyDown);
         eventTracker.attachDOMEvent(Pelem, 'keyup', this._KeyUp);
       } else {
-        const Lelem = target.getElement().contentDocument;
+        const Lelem = textStore.getElement().contentDocument;
         eventTracker.attachDOMEvent(Lelem.body,'keydown', this._KeyDown);
         eventTracker.attachDOMEvent(Lelem.body,'keypress', this._KeyPress);
         eventTracker.attachDOMEvent(Lelem.body,'keyup', this._KeyUp);
@@ -250,14 +250,14 @@ export default class HardwareEventKeyboard extends HardKeyboardBase {
     });
 
     page.on('disabled', (Pelem) => {
-      const target = textStoreForElement(Pelem);
+      const textStore = textStoreForElement(Pelem);
 
-      if(!(target instanceof DesignIFrameElementTextStore)) {
+      if(!(textStore instanceof DesignIFrameElementTextStore)) {
         eventTracker.detachDOMEvent(Pelem, 'keypress', this._KeyPress);
         eventTracker.detachDOMEvent(Pelem, 'keydown', this._KeyDown);
         eventTracker.detachDOMEvent(Pelem, 'keyup', this._KeyUp);
       } else {
-        const Lelem = target.getElement().contentDocument;
+        const Lelem = textStore.getElement().contentDocument;
         eventTracker.detachDOMEvent(Lelem.body,'keydown', this._KeyDown);
         eventTracker.detachDOMEvent(Lelem.body,'keypress', this._KeyPress);
         eventTracker.detachDOMEvent(Lelem.body,'keyup', this._KeyUp);
@@ -275,15 +275,15 @@ export default class HardwareEventKeyboard extends HardKeyboardBase {
    * not affected.
    */
   _KeyDown: (e: KeyboardEvent) => boolean = (e) => {
-    const activeKeyboard = this.contextManager.activeKeyboard;
-    const target = textStoreForEvent(e);
+    const {activeKeyboard} = this.contextManager;
+    const textStore = textStoreForEvent(e);
 
-    if(!target || activeKeyboard == null) {
+    if(!textStore || activeKeyboard == null) {
       return true;
     }
 
     // Prevent mapping element is readonly or tagged as kmw-disabled
-    const el = target.getElement();
+    const el = textStore.getElement();
     if(el?.getAttribute('class')?.indexOf('kmw-disabled') >= 0) {
       return true;
     }
@@ -297,8 +297,8 @@ export default class HardwareEventKeyboard extends HardKeyboardBase {
    * Description Processes keypress event (does not pass data to keyboard)
    */
   _KeyPress: (e: KeyboardEvent) => boolean = (e) => {
-    const target = textStoreForEvent(e);
-    if(!target || this.contextManager.activeKeyboard?.keyboard == null) {
+    const textStore = textStoreForEvent(e);
+    if(!textStore || this.contextManager.activeKeyboard?.keyboard == null) {
       return true;
     }
 
@@ -311,13 +311,13 @@ export default class HardwareEventKeyboard extends HardKeyboardBase {
    * Description Processes keyup event and passes event data to keyboard
    */
   _KeyUp: (e: KeyboardEvent) => boolean = (e) => {
-    const target = textStoreForEvent(e);
+    const textStore = textStoreForEvent(e);
     const Levent = preprocessKeyboardEvent(e, this.processor, this.hardDevice);
-    if(Levent == null || target == null) {
+    if(Levent == null || textStore == null) {
       return true;
     }
 
-    const inputEle = target.getElement();
+    const inputEle = textStore.getElement();
 
     // Since this part concerns DOM element + browser interaction management, we preprocess it for
     // browser form commands before passing control to the Processor module.
diff --git a/web/src/app/browser/src/keyboardInterface.ts b/web/src/app/browser/src/keyboardInterface.ts
index dc9a8cbe80d..4da0579a007 100644
--- a/web/src/app/browser/src/keyboardInterface.ts
+++ b/web/src/app/browser/src/keyboardInterface.ts
@@ -30,11 +30,11 @@ export class KeyboardInterface extends KeyboardInterfaceBase<ContextManager> {
    * Legacy entry points (non-standard names)- included only to allow existing IME keyboards to continue to be used
    */
   getLastActiveElement(): AbstractElementTextStore<any> {
-    return this.engine.contextManager.lastActiveTarget;
+    return this.engine.contextManager.lastActiveTextStore;
   }
 
   focusLastActiveElement(): void {
-    this.engine.contextManager.restoreLastActiveTarget();
+    this.engine.contextManager.restoreLastActiveTextStore();
   }
 
   //The following entry points are defined but should not normally be used in a keyboard, as OSK display is no longer determined by the keyboard
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 11fc5bb36fd..c5e44512c5c 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -53,7 +53,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
   public readonly helpURL = 'https://help.keyman.com/go';
 
   keyEventRefocus = () => {
-    this.contextManager.restoreLastActiveTarget();
+    this.contextManager.restoreLastActiveTextStore();
   }
 
   constructor(workerFactory: WorkerFactory, sourceUri: string) {
@@ -70,18 +70,18 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
 
     this._util = new UtilApiEndpoint(config);
     this.beepHandler = new BeepHandler(this.core.keyboardInterface);
-    this.core.keyboardProcessor.beepHandler = () => this.beepHandler.beep(this.contextManager.activeTarget);
+    this.core.keyboardProcessor.beepHandler = () => this.beepHandler.beep(this.contextManager.activeTextStore);
 
     this.hardKeyboard = new HardwareEventKeyboard(config.hardDevice, this.core.keyboardProcessor, this.contextManager);
 
     // Scrolls the document-body to ensure that a focused element remains visible after the OSK appears.
-    this.contextManager.on('targetchange', (target) => {
-      const e = (target as AbstractElementTextStore<any>)?.getElement();
+    this.contextManager.on('textstorechange', (textStore) => {
+      const e = (textStore as AbstractElementTextStore<any>)?.getElement();
       if(this.osk) {
         (this.osk.activationModel as TwoStateActivator<HTMLElement>).activationTrigger = e;
       }
 
-      if(this.config.hostDevice.touchable && target) {
+      if(this.config.hostDevice.touchable && textStore) {
         this.ensureElementVisibility(e);
       }
     });
@@ -302,7 +302,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
       }
     }
 
-    this.contextManager.setKeyboardForTarget(Pelem._kmwAttachment.textStore, Pkbd, Plc);
+    this.contextManager.setKeyboardForTextStore(Pelem._kmwAttachment.textStore, Pkbd, Plc);
   }
   /**
    * Function     getKeyboardForControl
@@ -315,8 +315,8 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
    * See https://help.keyman.com/developer/engine/web/current-version/reference/core/getKeyboardForControl
    */
   public getKeyboardForControl(Pelem: HTMLElement) {
-    const target = textStoreForElement(Pelem);
-    return this.contextManager.getKeyboardStubForTarget(target).id;
+    const textStore = textStoreForElement(Pelem);
+    return this.contextManager.getKeyboardStubForTextStore(textStore).id;
   }
 
   // Is not currently published API... but it exists.
@@ -329,8 +329,8 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
    *              If it is currently following the global keyboard setting, returns null instead.
    */
   getLanguageForControl(Pelem: HTMLElement) {
-    const target = textStoreForElement(Pelem);
-    return this.contextManager.getKeyboardStubForTarget(target).langId;
+    const textStore = textStoreForElement(Pelem);
+    return this.contextManager.getKeyboardStubForTextStore(textStore).langId;
   }
 
   isAttached(x: HTMLElement): boolean {
@@ -544,7 +544,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
    * See https://help.keyman.com/developer/engine/web/current-version/reference/core/focusLastActiveElement
    */
   public focusLastActiveElement() {
-    this.contextManager.lastActiveTarget?.focus();
+    this.contextManager.lastActiveTextStore?.focus();
   }
 
   /**
@@ -555,7 +555,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
    * See https://help.keyman.com/developer/engine/web/current-version/reference/core/getLastActiveElement
    */
   public getLastActiveElement() {
-    return this.contextManager.lastActiveTarget?.getElement();
+    return this.contextManager.lastActiveTextStore?.getElement();
   }
 
   /**
@@ -574,11 +574,11 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
       }
     }
 
-    const target = textStoreForElement(e);
-    if(!target) {
+    const textStore = textStoreForElement(e);
+    if(!textStore) {
       throw new Error(`KMW is not attached to the specified element (id: ${e.id}).`);
     }
-    this.contextManager.setActiveTarget(target, setFocus);
+    this.contextManager.setActiveTextStore(textStore, setFocus);
   }
 
   /**
diff --git a/web/src/app/browser/src/languageMenu.ts b/web/src/app/browser/src/languageMenu.ts
index 0549d9850a0..b0453b6dd2a 100644
--- a/web/src/app/browser/src/languageMenu.ts
+++ b/web/src/app/browser/src/languageMenu.ts
@@ -558,7 +558,7 @@ export class LanguageMenu {
 
         languageMenu.lgList.style.display='none'; //still allows blank menu momentarily on selection
         languageMenu.keyman.contextManager.activateKeyboard(entry.kn, entry.kc,true);
-        languageMenu.keyman.contextManager.restoreLastActiveTarget();
+        languageMenu.keyman.contextManager.restoreLastActiveTextStore();
         languageMenu.hide();
       }
 
diff --git a/web/src/app/browser/src/oskConfiguration.ts b/web/src/app/browser/src/oskConfiguration.ts
index f8ee6360d90..7186e9936a4 100644
--- a/web/src/app/browser/src/oskConfiguration.ts
+++ b/web/src/app/browser/src/oskConfiguration.ts
@@ -23,14 +23,14 @@ export function setupOskListeners(engine: KeymanEngine, osk: OSKView, contextMan
   osk.on('hiderequested', (key) => { // K_ROPT
     if(osk) {
       osk.startHide(true);
-      contextManager.forgetActiveTarget();
+      contextManager.forgetActiveTextStore();
     }
   });
 
   osk.addEventListener('hide', (params) => {
     // If hidden by the UI, be sure to restore the focus
     if(params?.HiddenByUser) {
-      contextManager.activeTarget?.focus();
+      contextManager.activeTextStore?.focus();
     }
   });
 
@@ -44,7 +44,7 @@ export function setupOskListeners(engine: KeymanEngine, osk: OSKView, contextMan
 
     await promise;
 
-    contextManager.restoreLastActiveTarget();
+    contextManager.restoreLastActiveTextStore();
 
     focusAssistant.restoringFocus = false;
     focusAssistant.setMaintainingFocus(false);
@@ -54,7 +54,7 @@ export function setupOskListeners(engine: KeymanEngine, osk: OSKView, contextMan
     focusAssistant.restoringFocus = true;
 
     await promise;
-    contextManager.restoreLastActiveTarget();
+    contextManager.restoreLastActiveTextStore();
 
     focusAssistant.restoringFocus = false;
     focusAssistant.setMaintainingFocus(false);
diff --git a/web/src/app/browser/src/utils/rotationProcessor.ts b/web/src/app/browser/src/utils/rotationProcessor.ts
index 07e1c1b202c..c6854aa8c03 100644
--- a/web/src/app/browser/src/utils/rotationProcessor.ts
+++ b/web/src/app/browser/src/utils/rotationProcessor.ts
@@ -59,12 +59,12 @@ export class RotationProcessor {
       this.rotState = null;
     }
 
-    const target = this.keyman.contextManager.activeTarget;
-    if(target) {
+    const textStore = this.keyman.contextManager.activeTextStore;
+    if(textStore) {
       // This seems to help with scrolling accuracy in iOS Safari;
       // the scroll tends to consistently go too far without it.
       window.setTimeout(() => {
-        this.keyman.ensureElementVisibility(target.getElement());
+        this.keyman.ensureElementVisibility(textStore.getElement());
       }, 0);
     }
   }
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index 39d2c9b01cb..5b9fffd5ebd 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -69,8 +69,8 @@ export class HostTextStore extends SyntheticTextStore {
 
   updateContext(text: string, selStart: number, selEnd: number): boolean {
     let shouldResetContext = false;
-    const tempMock = new SyntheticTextStore(text, selStart ?? KMWString.length(text), selEnd ?? KMWString.length(text));
-    const newLeft = tempMock.getTextBeforeCaret();
+    const tempTextStore = new SyntheticTextStore(text, selStart ?? KMWString.length(text), selEnd ?? KMWString.length(text));
+    const newLeft = tempTextStore.getTextBeforeCaret();
     const oldLeft = this.getTextBeforeCaret();
 
     if(text != this.text) {
@@ -129,11 +129,11 @@ export class ContextManager extends ContextManagerBase<WebviewConfiguration> {
 
   initialize(): void {
     this._hostTextStore = new HostTextStore(this.engineConfig.oninserttext);
-    this.predictionContext.setCurrentTarget(this.activeTarget);
+    this.predictionContext.setCurrentTextStore(this.activeTextStore);
     this.resetContext();
   }
 
-  get activeTarget(): SyntheticTextStore {
+  get activeTextStore(): SyntheticTextStore {
     return this._hostTextStore;
   }
 
@@ -141,18 +141,18 @@ export class ContextManager extends ContextManagerBase<WebviewConfiguration> {
     return this._activeKeyboard;
   }
 
-  activateKeyboardForTarget(kbd: { keyboard: JSKeyboard, metadata: KeyboardStub }, target: TextStore) {
-    // `target` is irrelevant for `app/webview`, as it'll only ever use 'global' keyboard settings.
+  activateKeyboardForTextStore(kbd: { keyboard: JSKeyboard, metadata: KeyboardStub }, textStore: TextStore) {
+    // `textStore` is irrelevant for `app/webview`, as it'll only ever use 'global' keyboard settings.
 
     // Clone the object to prevent accidental by-reference changes.
     this._activeKeyboard = {...kbd};
   }
 
   /**
-   * Reflects the active 'target' upon which any `set activeKeyboard` operation will take place.
-   * For app/webview... there's only one target, thus only a "global default" matters.
+   * Reflects the active 'textStore' upon which any `set activeKeyboard` operation will take place.
+   * For app/webview... there's only one textStore, thus only a "global default" matters.
    */
-  protected currentKeyboardSrcTarget(): SyntheticTextStore {
+  protected currentKeyboardSrcTextStore(): SyntheticTextStore {
     return null;
   }
 
diff --git a/web/src/app/webview/src/keymanEngine.ts b/web/src/app/webview/src/keymanEngine.ts
index 14b63dcc51b..0ea022d99c9 100644
--- a/web/src/app/webview/src/keymanEngine.ts
+++ b/web/src/app/webview/src/keymanEngine.ts
@@ -157,6 +157,6 @@ export class KeymanEngine extends KeymanEngineBase<WebviewConfiguration, Context
   getOskWidth?: () => number = null;
 
   get context() {
-    return this.contextManager.activeTarget;
+    return this.contextManager.activeTextStore;
   }
 }
diff --git a/web/src/engine/src/element-text-stores/inputTextStore.ts b/web/src/engine/src/element-text-stores/inputTextStore.ts
index 262dc51a83b..2f43a16cb9a 100644
--- a/web/src/engine/src/element-text-stores/inputTextStore.ts
+++ b/web/src/engine/src/element-text-stores/inputTextStore.ts
@@ -214,7 +214,7 @@ export class InputElementTextStore extends AbstractElementTextStore<EventMap> {
 
   handleNewlineAtCaret(): void {
     const inputEle = this.root;
-    // Can't occur for Mocks - just Input types.
+    // Can't occur for SyntheticTextSTores - just Input types.
     if (inputEle && (inputEle.type == 'search' || inputEle.type == 'submit')) {
       inputEle.disabled=false;
       inputEle.form.submit();
diff --git a/web/src/engine/src/interfaces/prediction/predictionContext.ts b/web/src/engine/src/interfaces/prediction/predictionContext.ts
index 7ee27de9bff..e4ce9821230 100644
--- a/web/src/engine/src/interfaces/prediction/predictionContext.ts
+++ b/web/src/engine/src/interfaces/prediction/predictionContext.ts
@@ -41,17 +41,17 @@ export default class PredictionContext extends EventEmitter<PredictionContextEve
   /**
    * Represents the active context used when requesting and applying predictive-text operations.
    */
-  private _currentTarget: TextStore;
+  private _currentTextStore: TextStore;
 
-  public get currentTarget(): TextStore {
-    return this._currentTarget;
+  public get currentTextStore(): TextStore {
+    return this._currentTextStore;
   }
 
-  public setCurrentTarget(target: TextStore): Promise<Suggestion[]> {
-    const originalTarget = this._currentTarget;
-    this._currentTarget = target;
+  public setCurrentTextStore(textStore: TextStore): Promise<Suggestion[]> {
+    const originalTextStore = this._currentTextStore;
+    this._currentTextStore = textStore;
 
-    if(originalTarget != target) {
+    if(originalTextStore != textStore) {
       // Note:  should be triggered after the corresponding new-context event rule has been processed,
       // as that may affect the value of layerId here.
       return this.resetContext();
@@ -70,11 +70,11 @@ export default class PredictionContext extends EventEmitter<PredictionContextEve
     this.getLayerId = getLayerId;
 
     const validSuggestionState: () => boolean = () =>
-      this.currentTarget && langProcessor.state == 'configured';
+      this.currentTextStore && langProcessor.state == 'configured';
 
     this.suggestionApplier = (suggestion) => {
       if(validSuggestionState()) {
-        return langProcessor.applySuggestion(suggestion, this.currentTarget, getLayerId);
+        return langProcessor.applySuggestion(suggestion, this.currentTextStore, getLayerId);
       } else {
         return null;
       }
@@ -82,7 +82,7 @@ export default class PredictionContext extends EventEmitter<PredictionContextEve
 
     this.suggestionReverter = async (reversion) => {
       if(validSuggestionState()) {
-        const suggestions = await langProcessor.applyReversion(reversion, this.currentTarget);
+        const suggestions = await langProcessor.applyReversion(reversion, this.currentTextStore);
         // We want to avoid altering flags that indicate our post-reversion state.
         this.swallowPrediction = true;
         this.updateSuggestions(new ReadySuggestions(suggestions, reversion.id ? -reversion.id : undefined));
@@ -215,7 +215,7 @@ export default class PredictionContext extends EventEmitter<PredictionContextEve
       this.accept(this.selected);
       // If there is right-context, DO emit the space instead of swallowing it.
       // It's not auto-added by the predictive-text worker for such cases.
-      returnObj.shouldSwallow = !this.currentTarget.getTextAfterCaret();
+      returnObj.shouldSwallow = !this.currentTextStore.getTextAfterCaret();
 
       // doTryAccept is the path for keystroke-based auto-acceptance.
       // Overwrite the cause to reflect this.
@@ -235,7 +235,7 @@ export default class PredictionContext extends EventEmitter<PredictionContextEve
       // If the model doesn't insert wordbreaks, there's no space to alias, so
       // don't swallow the space.  If it does, we consider that insertion to be
       // the results of the first post-accept space.
-      returnObj.shouldSwallow = !!this.langProcessor.wordbreaksAfterSuggestions && !this.currentTarget.getTextAfterCaret();; // can be handed outside
+      returnObj.shouldSwallow = !!this.langProcessor.wordbreaksAfterSuggestions && !this.currentTextStore.getTextAfterCaret();; // can be handed outside
     } else {
       returnObj.shouldSwallow = false;
     }
@@ -351,12 +351,12 @@ export default class PredictionContext extends EventEmitter<PredictionContextEve
   }
 
   public resetContext(): Promise<Suggestion[]> {
-    const target = this.currentTarget;
+    const textStore = this.currentTextStore;
 
-    if(target) {
+    if(textStore) {
       // Note:  should be triggered after the corresponding new-context event rule has been processed,
       // as that may affect the value of layerId here.
-      return this.langProcessor.invalidateContext(target, this.getLayerId());
+      return this.langProcessor.invalidateContext(textStore, this.getLayerId());
     } else {
       return Promise.resolve([]);
     }
diff --git a/web/src/engine/src/js-processor/jsKeyboardInterface.ts b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
index 71b988373ec..f1b117eb812 100644
--- a/web/src/engine/src/js-processor/jsKeyboardInterface.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
@@ -186,7 +186,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
   cachedContextEx: CachedContextEx = new CachedContextEx();
   ruleContextEx: CachedContextEx;
 
-  activeTargetOutput: TextStore;
+  activeTextStore: TextStore;
   ruleBehavior: ProcessorAction;
 
   systemStores: {[storeID: number]: SystemStore};
@@ -588,7 +588,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
       retVal = (keyCode == Lrulekey); // I3318, I3555
     }
     if(!retVal) {
-      this.activeTargetOutput.deadkeys().resetMatched();  // I3318
+      this.activeTextStore.deadkeys().resetMatched();  // I3318
     }
     return retVal; // I3318
   };
@@ -623,7 +623,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * Function     deadkeyMatch  KDM
    * Scope        Public
    * @param       {number}      n             offset from current cursor position
-   * @param       {Object}      textStore  target element
+   * @param       {Object}      textStore     TextStore
    * @param       {number}      d             deadkey
    * @return      {boolean}                   True if deadkey found selected context matches val
    * Description  Match deadkey at current cursor position
@@ -839,7 +839,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @alias       KCXO
    * @public
    * @param       {number}        Pdn            number of characters to delete left of cursor
-   * @param       {TextStore}  textStore   target to output to
+   * @param       {TextStore}     textStore      textStore to output to
    * @param       {number}        contextLength  length of current rule context to retrieve
    * @param       {number}        contextOffset  offset from start of current rule context, 1-based
    */
@@ -992,8 +992,8 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * Function     processNewContextEvent
    * Scope        Private
-   * @param       {Object}        textStore   The target receiving input
-   * @param       {Object}        keystroke      The input keystroke (with its properties) to be mapped by the keyboard.
+   * @param       {TextStore}       textStore   The textStore receiving input
+   * @param       {KeyEvent}        keystroke   The input keystroke (with its properties) to be mapped by the keyboard.
    * Description  Calls the keyboard's `begin newContext` group
    * @returns     {ProcessorAction}  Record of commands and state changes that result from executing `begin NewContext`
    */
@@ -1007,8 +1007,8 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * Function     processPostKeystroke
    * Scope        Private
-   * @param       {Object}        textStore   The target receiving input
-   * @param       {Object}        keystroke      The input keystroke with relevant properties to be mapped by the keyboard.
+   * @param       {TextStore}       textStore   The textStore receiving input
+   * @param       {KeyEvent}        keystroke   The input keystroke with relevant properties to be mapped by the keyboard.
    * Description  Calls the keyboard's `begin postKeystroke` group
    * @returns     {ProcessorAction}  Record of commands and state changes that result from executing `begin PostKeystroke`
    */
@@ -1022,8 +1022,8 @@ export class JSKeyboardInterface extends KeyboardHarness {
   /**
    * Function     processKeystroke
    * Scope        Private
-   * @param       {Object}        textStore   The target receiving input
-   * @param       {Object}        keystroke   The input keystroke (with its properties) to be mapped by the keyboard.
+   * @param       {TextStore}       textStore   The textStore receiving input
+   * @param       {KeyEvent}        keystroke   The input keystroke (with its properties) to be mapped by the keyboard.
    * Description  Encapsulates calls to keyboard input processing.
    * @returns     {ProcessorAction}  Record of commands and state changes that result from executing `begin Unicode`
    */
@@ -1037,7 +1037,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
   private process(callee: (textStore: TextStore, keystroke: KeyEvent) => boolean, textStore: TextStore, keystroke: KeyEvent, readonly: boolean): ProcessorAction {
     // Clear internal state tracking data from prior keystrokes.
     if(!textStore) {
-      throw "No target specified for keyboard output!";
+      throw "No textStore specified for keyboard output!";
     } else if(!this.activeKeyboard) {
       throw "No active keyboard for keystroke processing!";
     } else if(!callee) {
@@ -1063,9 +1063,9 @@ export class JSKeyboardInterface extends KeyboardHarness {
     this.activeDevice = keystroke.device;
 
     // Calls the start-group of the active keyboard.
-    this.activeTargetOutput = textStore;
+    this.activeTextStore = textStore;
     const matched = callee(textStore, keystroke);
-    this.activeTargetOutput = null;
+    this.activeTextStore = null;
 
     // Finalize the rule's results.
     this.ruleBehavior.transcription = textStore.buildTranscriptionFrom(preInput, keystroke, readonly);
diff --git a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
index 6201bc0cf81..a42ecc70673 100644
--- a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
@@ -117,9 +117,9 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
    * Get the default ProcessorAction for the specified key, attempting to mimic standard browser defaults
    * where and when appropriate.
    *
-   * @param   {object}  Lkc           The pre-analyzed KeyEvent object
-   * @param   {TextStore} textStore  The output target receiving the KeyEvent
-   * @param   {boolean}  readonly      True if the target is read-only
+   * @param   {KeyEvent}  Lkc           The pre-analyzed KeyEvent object
+   * @param   {TextStore} textStore     The textStore receiving the KeyEvent
+   * @param   {boolean}   readonly      True if the textStore is read-only
    * @return  {string}
    */
   private defaultRuleBehavior(Lkc: KeyEvent, textStore: TextStore, readonly: boolean): ProcessorAction {
@@ -234,7 +234,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
 
       // Handle unmapped keys, including special keys
       // The following is physical layout dependent, so should be avoided if possible.  All keys should be mapped.
-      this.keyboardInterface.activeTargetOutput = textStore;
+      this.keyboardInterface.activeTextStore = textStore;
 
       // Match against the 'default keyboard' - rules to mimic the default string output when typing in a browser.
       // Many keyboards rely upon these 'implied rules'.
@@ -248,7 +248,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
         matchBehavior.triggerKeyDefault = false; // We've triggered it successfully.
       } // If null, we must rely on something else (like the browser, in DOM-aware code) to fulfill the default.
 
-      this.keyboardInterface.activeTargetOutput = null;
+      this.keyboardInterface.activeTextStore = null;
     }
 
     return matchBehavior;
@@ -576,18 +576,18 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
     return ruleBehavior;
   }
 
-  public resetContext(target?: TextStore) {
+  public resetContext(textStore?: TextStore) {
     this.layerId = 'default';
 
     // Make sure all deadkeys for the context get cleared properly.
-    target?.resetContext();
+    textStore?.resetContext();
     this.keyboardInterface.resetContextCache();
 
     // May be null if it's a keyboard swap.
     // Performed before _UpdateVKShift since the op may modify the displayed layer
     // Also updates the layer for predictions.
-    if(target) {
-      this.performNewContextEvent(target);
+    if(textStore) {
+      this.performNewContextEvent(textStore);
     }
 
     if(!this.contextDevice.touchable) {
@@ -668,11 +668,11 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
 
     first.triggersDefaultCommand = first.triggersDefaultCommand || other.triggersDefaultCommand;
 
-    const mergingMock = SyntheticTextStore.from(first.transcription.preInput, false);
-    mergingMock.apply(first.transcription.transform);
-    mergingMock.apply(other.transcription.transform);
+    const mergingTextStore = SyntheticTextStore.from(first.transcription.preInput, false);
+    mergingTextStore.apply(first.transcription.transform);
+    mergingTextStore.apply(other.transcription.transform);
 
-    first.transcription = mergingMock.buildTranscriptionFrom(first.transcription.preInput, keystroke, false, first.transcription.alternates);
+    first.transcription = mergingTextStore.buildTranscriptionFrom(first.transcription.preInput, keystroke, false, first.transcription.alternates);
   }
 
 }
diff --git a/web/src/engine/src/keyboard/keyboards/activeLayout.ts b/web/src/engine/src/keyboard/keyboards/activeLayout.ts
index fe6cc7e640d..0aad7376fd4 100644
--- a/web/src/engine/src/keyboard/keyboards/activeLayout.ts
+++ b/web/src/engine/src/keyboard/keyboards/activeLayout.ts
@@ -72,9 +72,9 @@ const KeyTypesOfFlickList = ['n', 'ne', 'e', 'se', 's', 'sw', 'w', 'nw'] as cons
 function assignDefaultsWithPropDefs<RawType, Type extends RawType>(rawObj: RawType, defaults: Type) {
   const proto = Object.getPrototypeOf(defaults);
 
-  for(let prop in defaults) {
+  for(const prop in defaults) {
     if(!rawObj.hasOwnProperty(prop)) {
-      let descriptor = Object.getOwnPropertyDescriptor(proto, prop);
+      const descriptor = Object.getOwnPropertyDescriptor(proto, prop);
       if(descriptor) {
         // It's a computed property!  Copy the descriptor onto the key's object.
         Object.defineProperty(rawObj, prop, descriptor);
diff --git a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
index d76030de973..90b45f3ba59 100644
--- a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
@@ -354,15 +354,16 @@ export class JSKeyboard {
   }
 
   /**
-   * @param       {number}    _PCommand     event code (16,17,18) or 0
-   * @param       {Object}    _PTarget      target element
-   * @param       {number}    _PData        1 or 0
    * Notifies keyboard of keystroke or other event
+   *
+   * @param       {number}    command     event code (16,17,18) or 0
+   * @param       {TextStore} textStore   textStore
+   * @param       {number}    data        1 or 0
    */
-  notify(_PCommand: number, _PTarget: TextStore, _PData: number) { // I2187
+  public notify(command: number, textStore: TextStore, data: number): void { // I2187
     // Good example use case - the Japanese CJK-picker keyboard
     if(typeof(this.scriptObject['KNS']) == 'function') {
-      this.scriptObject['KNS'](_PCommand, _PTarget, _PData);
+      this.scriptObject['KNS'](command, textStore, data);
     }
   }
 
diff --git a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
index 54ba27ffa56..27be600c458 100644
--- a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
@@ -100,7 +100,7 @@ export class KMXKeyboard {
 
   /**
    * @param       {number}    eventCode     event code (16,17,18) or 0 // TODO-web-core: document meaning of these!
-   * @param       {TextStore} textStore     target element
+   * @param       {TextStore} textStore     textStore
    * @param       {number}    data          1 or 0
    * Notifies keyboard of keystroke or other event
    */
diff --git a/web/src/engine/src/keyboard/syntheticTextStore.ts b/web/src/engine/src/keyboard/syntheticTextStore.ts
index 007889e1473..e5c47f39cb0 100644
--- a/web/src/engine/src/keyboard/syntheticTextStore.ts
+++ b/web/src/engine/src/keyboard/syntheticTextStore.ts
@@ -35,8 +35,8 @@ export class SyntheticTextStore extends TextStore {
     if (textStore instanceof SyntheticTextStore) {
       // Avoids the need to run expensive kmwstring.ts `length()`
       // calculations when deep-copying SyntheticTextStore instances.
-      const priorMock = textStore as SyntheticTextStore;
-      clone = new SyntheticTextStore(priorMock.text, priorMock.selStart, priorMock.selEnd);
+      const priorTextStore = textStore as SyntheticTextStore;
+      clone = new SyntheticTextStore(priorTextStore.text, priorTextStore.selStart, priorTextStore.selEnd);
     } else {
       const text = textStore.getText();
       const textLen = KMWString.length(text);
diff --git a/web/src/engine/src/keyboard/textStore.ts b/web/src/engine/src/keyboard/textStore.ts
index f3729c5e266..5aa5212e3bc 100644
--- a/web/src/engine/src/keyboard/textStore.ts
+++ b/web/src/engine/src/keyboard/textStore.ts
@@ -19,7 +19,7 @@ export abstract class TextStore {
 
   /**
    * Signifies that this TextStore has no default key processing behaviors.  This should be false
-   * for OutputTargets backed by web elements like HTMLInputElement or HTMLTextAreaElement.
+   * for TextStores backed by web elements like HTMLInputElement or HTMLTextAreaElement.
    */
   get isSynthetic(): boolean {
     return true;
@@ -43,7 +43,7 @@ export abstract class TextStore {
   }
 
   /**
-   * Should be called by each output target immediately before text mutation operations occur.
+   * Should be called by each textStore immediately before text mutation operations occur.
    *
    * Maintains solutions to old issues:  I3318,I3319
    * @param {number} delta  Use negative values if characters were deleted, positive if characters were added.
@@ -73,13 +73,13 @@ export abstract class TextStore {
    *
    * This is designed for use as a "before and after" comparison to determine the effect of a single keyboard rule at a time.
    * As such, it assumes that the caret is immediately after any inserted text.
-   * @param from An output target (preferably a SyntheticTextStore) representing the prior state of the input/output system.
+   * @param textStore   A text store (preferably a SyntheticTextStore) representing the prior state of the input/output system.
    */
-  buildTransformFrom(original: TextStoreLanguageProcessorInterface): TextTransform {
-    TextStore.assertIsTextStore(original);
+  buildTransformFrom(textStore: TextStoreLanguageProcessorInterface): TextTransform {
+    TextStore.assertIsTextStore(textStore);
 
     const toLeft = this.getTextBeforeCaret();
-    const fromLeft = original.getTextBeforeCaret();
+    const fromLeft = textStore.getTextBeforeCaret();
 
     const leftDivergenceIndex = findCommonSubstringEndIndex(fromLeft, toLeft, false);
     const deletedLeft = KMWString.length(fromLeft.substring(leftDivergenceIndex));
@@ -87,7 +87,7 @@ export abstract class TextStore {
     const insertedText = toLeft.substring(leftDivergenceIndex);
 
     const toRight = this.getTextAfterCaret();
-    const fromRight = original.getTextAfterCaret();
+    const fromRight = textStore.getTextAfterCaret();
     const rightDivergenceIndex = findCommonSubstringEndIndex(fromRight, toRight, true);
 
     // Right insertions aren't supported, but right deletions will matter in some scenarios.
@@ -95,7 +95,7 @@ export abstract class TextStore {
     // caret mid-word..
     const deletedRight = KMWString.length(fromRight.substring(0, rightDivergenceIndex + 1));
 
-    return new TextTransform(insertedText, deletedLeft, deletedRight, original.getSelectedText() && !this.getSelectedText());
+    return new TextTransform(insertedText, deletedLeft, deletedRight, textStore.getSelectedText() && !this.getSelectedText());
   }
 
   buildTranscriptionFrom(original: TextStore, keyEvent: KeyEvent, readonly: boolean, alternates?: Alternate[]): Transcription {
@@ -113,7 +113,7 @@ export abstract class TextStore {
   restoreTo(original: TextStore) {
     this.clearSelection();
     // We currently do not restore selected text; the mechanism isn't supported at present for
-    // all output target types - especially in regard to re-selecting the text if restored.
+    // all TextStore types - especially in regard to re-selecting the text if restored.
     //
     // I believe this would mostly matter if/when reverting predictions based upon selected text.
     // That pattern isn't well-supported yet, though.
diff --git a/web/src/engine/src/main/contextManagerBase.ts b/web/src/engine/src/main/contextManagerBase.ts
index 58da68f34bf..6ba861360e0 100644
--- a/web/src/engine/src/main/contextManagerBase.ts
+++ b/web/src/engine/src/main/contextManagerBase.ts
@@ -6,8 +6,8 @@ import { PredictionContext } from 'keyman/engine/interfaces';
 import { EngineConfiguration } from './engineConfiguration.js';
 
 interface EventMap {
-  // target, then keyboard.
-  'targetchange': (target: TextStore) => boolean;
+  // textStore, then keyboard.
+  'textstorechange': (textStore: TextStore) => boolean;
 
   /**
    * This event is raised whenever a keyboard change is requested.
@@ -64,7 +64,7 @@ export interface ContextManagerConfiguration {
 }
 
 interface PendingActivation {
-  target: TextStore,
+  textStore: TextStore,
   keyboard: Promise<Keyboard>,
   stub: KeyboardStub;
 }
@@ -72,9 +72,9 @@ interface PendingActivation {
 export abstract class ContextManagerBase<MainConfig extends EngineConfiguration> extends EventEmitter<EventMap> {
   public static readonly TIMEOUT_THRESHOLD = 10000;
 
-  abstract initialize(): void;
+  public abstract initialize(): void;
 
-  abstract get activeTarget(): TextStore;
+  public abstract get activeTextStore(): TextStore;
 
   private _predictionContext: PredictionContext;
   protected keyboardCache: StubAndKeyboardCache;
@@ -83,33 +83,33 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
   private pendingActivations: PendingActivation[] = [];
   protected engineConfig: MainConfig;
 
-  get predictionContext(): PredictionContext {
+  public get predictionContext(): PredictionContext {
     return this._predictionContext;
   }
 
-  constructor(engineConfig: MainConfig) {
+  public constructor(engineConfig: MainConfig) {
     super();
 
     this.engineConfig = engineConfig;
   }
 
-  configure(config: ContextManagerConfiguration) {
+  public configure(config: ContextManagerConfiguration): void {
     this._resetContext = config.resetContext;
     this._predictionContext = config.predictionContext;
     this.keyboardCache = config.keyboardCache;
   }
 
-  insertText(kbdInterface: JSKeyboardInterface, Ptext: string, PdeadKey: number) {
-    // Find the correct output target to manipulate.
-    const textStore = this.activeTarget;
+  public insertText(kbdInterface: JSKeyboardInterface, text: string, deadkey: number): boolean {
+    // Find the correct textStore to manipulate.
+    const textStore = this.activeTextStore;
 
     if(textStore != null) {
-      if(Ptext != null) {
-        kbdInterface.output(0, textStore, Ptext);
+      if(text != null) {
+        kbdInterface.output(0, textStore, text);
       }
 
-      if((typeof(PdeadKey)!=='undefined') && (PdeadKey !== null)) {
-        kbdInterface.deadkeyOutput(0, textStore, PdeadKey);
+      if((typeof(deadkey)!=='undefined') && (deadkey !== null)) {
+        kbdInterface.deadkeyOutput(0, textStore, deadkey);
       }
 
       textStore.invalidateSelection();
@@ -119,44 +119,44 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
     return false;
   }
 
-  resetContext() {
-    this._resetContext(this.activeTarget);
+  public resetContext(): void {
+    this._resetContext(this.activeTextStore);
     this.predictionContext.resetContext();
   }
 
-  abstract get activeKeyboard(): {keyboard: Keyboard, metadata: KeyboardStub};
+  public abstract get activeKeyboard(): {keyboard: Keyboard, metadata: KeyboardStub};
 
   /**
-   * Determines the 'target' currently used to determine which keyboard should be active.
+   * Determines the textStore currently used to determine which keyboard should be active.
    * When `null`, keyboard-activation operations will affect the global default; otherwise,
-   * such operations affect only the specified `target`.
+   * such operations affect only the specified `textStore`.
    *
    * This method exists to facilitate independent-keyboard mode operations for specific
-   * attached elements within the app/browser target.  For `app/webview`, this should
+   * attached elements within the app/browser textStore.  For `app/webview`, this should
    * always return a consistent value - likely, `null`.
    */
-  protected abstract currentKeyboardSrcTarget(): TextStore;
+  protected abstract currentKeyboardSrcTextStore(): TextStore;
 
   /**
    * Ensures that newly activated keyboards are set correctly within managed context, possibly
-   * against inactive output targets.
+   * against inactive textStores.
    * @param kbd
-   * @param target
+   * @param textStore
    */
-  protected abstract activateKeyboardForTarget(kbd: { keyboard: Keyboard, metadata: KeyboardStub }, target: TextStore): void;
+  protected abstract activateKeyboardForTextStore(kbd: { keyboard: Keyboard, metadata: KeyboardStub }, textStore: TextStore): void;
 
   /**
    * Checks the pending keyboard-activation array for an entry corresponding to the specified
    * TextStore.  If found, also removes the entry for bookkeeping purposes.
-   * @param target  The specific TextStore affected by the pending Keyboard activation.
+   * @param textStore  The specific TextStore affected by the pending Keyboard activation.
    *                May be `null`, which corresponds to the global default Keyboard.
    * @returns `true` if pending activation is still valid, `false` otherwise.
    */
-  private findAndPopActivation(target: TextStore): PendingActivation {
+  private findAndPopActivation(textStore: TextStore): PendingActivation {
     // Array.findIndex requires Chrome 45+. :(
     let activationIndex;
     for(activationIndex = 0; activationIndex < this.pendingActivations.length; activationIndex++) {
-      if(this.pendingActivations[activationIndex].target == target) {
+      if(this.pendingActivations[activationIndex].textStore == textStore) {
         break;
       }
     }
@@ -174,27 +174,27 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
    * corresponding context.
    * @param kbdPromise
    * @param metadata
-   * @param target
+   * @param textStore
    * @returns
    */
   protected async deferredKeyboardActivation(
     kbdPromise: Promise<Keyboard>,
     metadata: KeyboardStub,
-    target: TextStore
+    textStore: TextStore
   ): Promise<PendingActivation> {
     const activation: PendingActivation = {
-      target: target,
+      textStore: textStore,
       keyboard: kbdPromise,
       stub: metadata
     };
 
-    // Invalidate existing requests for the specified target.
-    this.findAndPopActivation(target);
+    // Invalidate existing requests for the specified textStore.
+    this.findAndPopActivation(textStore);
     this.pendingActivations.push(activation);
     await kbdPromise;
 
     // The keyboard-load is complete; is the activation still desired?
-    const activationAfterAwait = this.findAndPopActivation(target);
+    const activationAfterAwait = this.findAndPopActivation(textStore);
     if(activationAfterAwait == activation) {
       return activation;
     } else if(activationAfterAwait) {
@@ -232,14 +232,14 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
     // unfound stubs here.
     const wasNull = !this.activeKeyboard;
 
-    // If there was a previous activation attempt set and still active for the specified keyboard target,
+    // If there was a previous activation attempt set and still active for the specified keyboard textStore,
     // cancel it.  For exmaple, if the user selects a preloaded keyboard after having tried to select one
     // still async-loading, we should go with the later setting - the preloaded one.
-    this.findAndPopActivation(this.currentKeyboardSrcTarget());
+    this.findAndPopActivation(this.currentKeyboardSrcTextStore());
 
     const activatingKeyboard = this.prepareKeyboardForActivation(keyboardId, languageCode);
 
-    const originalKeyboardTarget = this.currentKeyboardSrcTarget();
+    const originalKeyboardTextStore = this.currentKeyboardSrcTextStore();
 
     const keyboard = await activatingKeyboard.keyboard;
     if(keyboard == null && activatingKeyboard.metadata) {
@@ -259,7 +259,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
      * If the now-current context would be unaffected by the keyboard change, we do not raise the corresponding
      * event.
      */
-    if(this.currentKeyboardSrcTarget() == originalKeyboardTarget) {
+    if(this.currentKeyboardSrcTextStore() == originalKeyboardTextStore) {
       this.emit('beforekeyboardchange', activatingKeyboard.metadata);
     }
 
@@ -271,12 +271,12 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
       };
     }
 
-    this.activateKeyboardForTarget(kbdStubPair, originalKeyboardTarget);
+    this.activateKeyboardForTextStore(kbdStubPair, originalKeyboardTextStore);
 
     // Only trigger `keyboardchange` events when they will affect the active context.
     // (!wasNull || !!keyboard) - blocks events for `null` -> `null` transitions.
     // (keyman/keymanweb.com#96)
-    if(this.currentKeyboardSrcTarget() == originalKeyboardTarget && (!wasNull || !!keyboard)) {
+    if(this.currentKeyboardSrcTextStore() == originalKeyboardTextStore && (!wasNull || !!keyboard)) {
       // Will trigger KeymanEngine handler that passes keyboard to the OSK, displays it.
       this.emit('keyboardchange', this.activeKeyboard);
     }
@@ -322,8 +322,8 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
     }
 
     // Check if current keyboard matches requested keyboard, but not (necessarily) stub
-    if(this.activeKeyboard?.metadata && keyboardId == this.activeKeyboard.metadata.id) {
-      const keyboard = this.activeKeyboard.keyboard;
+    if (this.activeKeyboard?.metadata && keyboardId == this.activeKeyboard.metadata.id) {
+      const {keyboard} = this.activeKeyboard;
       // In this case, the keyboard is loaded; just update the stub.
 
       return {
@@ -373,14 +373,14 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
       });
 
       // Now the fun part:  note the original call's parameters as a pending activation.
-      const promise = this.deferredKeyboardActivation(defermentPromise, requestedStub, this.currentKeyboardSrcTarget());
+      const promise = this.deferredKeyboardActivation(defermentPromise, requestedStub, this.currentKeyboardSrcTextStore());
       return {
         keyboard: promise.then(async (activation) => {
           // Is the activation we requested still pending, or was it cancelled in favor of a
           // different activation in some manner?
           if(!activation) {
             // If the user chose to load a different keyboard afterward that would affect the same
-            // output target, the activation is no longer valid.
+            // textStore, the activation is no longer valid.
             return Promise.resolve(null);
           } else {
             return defermentPromise;
diff --git a/web/src/engine/src/main/headless/contextWindow.ts b/web/src/engine/src/main/headless/contextWindow.ts
index 37a023466cf..dd243d3bc06 100644
--- a/web/src/engine/src/main/headless/contextWindow.ts
+++ b/web/src/engine/src/main/headless/contextWindow.ts
@@ -18,15 +18,15 @@ export default class ContextWindow implements LexicalModelTypes.Context {
 
   casingForm?: LexicalModelTypes.CasingForm;
 
-  constructor(mock: SyntheticTextStore, config: LexicalModelTypes.Configuration, layerId: string) {
-    this.left = mock.getTextBeforeCaret();
+  constructor(textStore: SyntheticTextStore, config: LexicalModelTypes.Configuration, layerId: string) {
+    this.left = textStore.getTextBeforeCaret();
     this.startOfBuffer = KMWString.length(this.left) <= config.leftContextCodePoints;
     if(!this.startOfBuffer) {
       // Our custom substring version will return the last n characters if param #1 is given -n.
       this.left = KMWString.substr(this.left, -config.leftContextCodePoints);
     }
 
-    this.right = mock.getTextAfterCaret();
+    this.right = textStore.getTextAfterCaret();
     this.endOfBuffer = KMWString.length(this.right) <= config.rightContextCodePoints;
     if(!this.endOfBuffer) {
       this.right = KMWString.substr(this.right, 0, config.rightContextCodePoints);
@@ -38,7 +38,7 @@ export default class ContextWindow implements LexicalModelTypes.Context {
       null;
   }
 
-  public toMock(): SyntheticTextStore {
+  public toSyntheticTextStore(): SyntheticTextStore {
     const caretPos = KMWString.length(this.left);
 
     return new SyntheticTextStore(this.left + (this.right || ""), caretPos);
diff --git a/web/src/engine/src/main/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
index 760144f5ca3..ffcb282a69b 100644
--- a/web/src/engine/src/main/headless/inputProcessor.ts
+++ b/web/src/engine/src/main/headless/inputProcessor.ts
@@ -207,14 +207,14 @@ export class InputProcessor {
 
     // // ...end I3363 (Build 301)
 
-    // Create a "mock" backup of the current textStore in its pre-input state.
+    // Create a backup of the current textStore in its pre-input state.
     // Current, long-existing assumption - it's DOM-backed.
-    const preInputMock = SyntheticTextStore.from(textStore, true);
+    const preInputTextStore = SyntheticTextStore.from(textStore, true);
 
     const startingLayerId = this.keyboardProcessor.layerId;
 
     // We presently need the true keystroke to run on the FULL context.  That index is still
-    // needed for some indexing operations when comparing two different output targets.
+    // needed for some indexing operations when comparing two different textStores.
     let ruleBehavior = this.keyboardProcessor.processKeystroke(keyEvent, textStore);
 
     // Swap layer as appropriate.
@@ -247,7 +247,7 @@ export class InputProcessor {
     if(keepRuleBehavior) {
       // alternates are our fat-finger alternate outputs. We don't build these for keys we detect as
       // layer switch keys
-      const alternates = isOnlyLayerSwitchKey ? null : this.buildAlternates(ruleBehavior, keyEvent, preInputMock);
+      const alternates = isOnlyLayerSwitchKey ? null : this.buildAlternates(ruleBehavior, keyEvent, preInputTextStore);
 
       // Now that we've done all the keystroke processing needed, ensure any extra effects triggered
       // by the actual keystroke occur.
@@ -291,14 +291,14 @@ export class InputProcessor {
 
     // Text did not change (thus, no text "input") if we tabbed or merely moved the caret.
     if(!ruleBehavior.triggersDefaultCommand) {
-      // For DOM-aware targets, this will trigger a DOM event page designers may listen for.
+      // For DOM-aware textStores, this will trigger a DOM event page designers may listen for.
       textStore.doInputEvent();
     }
 
     return keepRuleBehavior ? ruleBehavior : null;
   }
 
-  private buildAlternates(ruleBehavior: ProcessorAction, keyEvent: KeyEvent, preInputMock: SyntheticTextStore): Alternate[] {
+  private buildAlternates(ruleBehavior: ProcessorAction, keyEvent: KeyEvent, preInputTextStore: SyntheticTextStore): Alternate[] {
     let alternates: Alternate[];
 
     // If we're performing a 'default command', it's not a standard 'typing' event - don't do fat-finger stuff.
@@ -310,8 +310,8 @@ export class InputProcessor {
       // only position-relative, so it's better to use a sliding window for context
       // when making alternates.  (Slightly worse for short text, matters greatly
       // for long text.)
-      const contextWindow = new ContextWindow(preInputMock, ContextWindow.ENGINE_RULE_WINDOW, this.keyboardProcessor.layerId);
-      const windowedMock = contextWindow.toMock();
+      const contextWindow = new ContextWindow(preInputTextStore, ContextWindow.ENGINE_RULE_WINDOW, this.keyboardProcessor.layerId);
+      const contextWindowTextStore = contextWindow.toSyntheticTextStore();
 
       // Note - we don't yet do fat-fingering with longpress keys.
       if(this.languageProcessor.isActive && keyDistribution && keyEvent.kbdLayer) {
@@ -366,7 +366,7 @@ export class InputProcessor {
             break;
           }
 
-          const mock = SyntheticTextStore.from(windowedMock, false);
+          const textStore = SyntheticTextStore.from(contextWindowTextStore, false);
 
           const altKey = pair.keySpec;
           if(!altKey) {
@@ -375,7 +375,7 @@ export class InputProcessor {
           }
 
           const altEvent = this.keyboardProcessor.activeKeyboard.constructKeyEvent(altKey, keyEvent.device, this.keyboardProcessor.stateKeys);
-          const alternateBehavior = this.keyboardProcessor.processKeystroke(altEvent, mock);
+          const alternateBehavior = this.keyboardProcessor.processKeystroke(altEvent, textStore);
 
           // If alternateBehavior.beep == true, ignore it.  It's a disallowed key sequence,
           // so we expect users to never intend their use.
diff --git a/web/src/engine/src/main/headless/languageProcessor.ts b/web/src/engine/src/main/headless/languageProcessor.ts
index 3b220b628b1..bad68b5d2b5 100644
--- a/web/src/engine/src/main/headless/languageProcessor.ts
+++ b/web/src/engine/src/main/headless/languageProcessor.ts
@@ -255,7 +255,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
         // // If using the version from lm-layer:
         // let mappedReversion = reversion;
         // mappedReversion.transformId = reversionTranscription.token;
-        this.predictFromTarget(textStore, getLayerId());
+        this.predictFromTextStore(textStore, getLayerId());
         return mappedReversion;
       });
 
@@ -305,7 +305,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     return promise;
   }
 
-  public predictFromTarget(textStore: TextStoreLanguageProcessorInterface, layerId: string): Promise<Suggestion[]> {
+  public predictFromTextStore(textStore: TextStoreLanguageProcessorInterface, layerId: string): Promise<Suggestion[]> {
     if(!this.isActive || !textStore) {
       return null;
     }
diff --git a/web/src/engine/src/main/keymanEngineBase.ts b/web/src/engine/src/main/keymanEngineBase.ts
index 561216bfd28..484d77820c4 100644
--- a/web/src/engine/src/main/keymanEngineBase.ts
+++ b/web/src/engine/src/main/keymanEngineBase.ts
@@ -54,9 +54,9 @@ export class KeymanEngineBase<
   protected keyEventRefocus?: () => void;
 
   private keyEventListener: KeyEventFullHandler = (event, callback) => {
-    const textStore = this.contextManager.activeTarget;
+    const textStore = this.contextManager.activeTextStore;
 
-    if(!this.contextManager.activeKeyboard || !textStore) {
+    if (!this.contextManager.activeKeyboard || !textStore) {
       if(callback) {
         callback(null, null);
       }
@@ -91,7 +91,7 @@ export class KeymanEngineBase<
     const result = this.core.processKeyEvent(event, textStore);
 
     if(result && result.transcription?.transform) {
-      this.config.onRuleFinalization(result, this.contextManager.activeTarget);
+      this.config.onRuleFinalization(result, this.contextManager.activeTextStore);
     }
 
     if(callback) {
@@ -250,15 +250,15 @@ export class KeymanEngineBase<
     const keyboardProcessor = this.core.keyboardProcessor;
     const predictionContext = new PredictionContext(this.core.languageProcessor, () => keyboardProcessor.layerId);
     this.contextManager.configure({
-      resetContext: (target) => {
-        // Could reset the target's deadkeys here, but it's really more of a 'core' task.
+      resetContext: (textStore) => {
+        // Could reset the textStore's deadkeys here, but it's really more of a 'core' task.
         // So we delegate that to keyboard.
         if(this.osk) {
           this.osk.batchLayoutAfter(() => {
-            this.core.resetContext(target);
+            this.core.resetContext(textStore);
           })
         } else {
-          this.core.resetContext(target);
+          this.core.resetContext(textStore);
         }
       },
       predictionContext: predictionContext,
@@ -276,11 +276,11 @@ export class KeymanEngineBase<
       keyboardProcessor.newLayerStore.set('');
       keyboardProcessor.oldLayerStore.set('');
       // Call the keyboard's entry point.
-      const data = keyboardProcessor.processPostKeystroke(keyboardProcessor.contextDevice, predictionContext.currentTarget)
-      // If we have a ProcessorAction as a result, run it on the target. This should
+      const data = keyboardProcessor.processPostKeystroke(keyboardProcessor.contextDevice, predictionContext.currentTextStore)
+      // If we have a ProcessorAction as a result, run it on the textStore. This should
       // only change system store and variable store values.
       if (data) {
-        keyboardProcessor.finalizeProcessorAction(data, predictionContext.currentTarget);
+        keyboardProcessor.finalizeProcessorAction(data, predictionContext.currentTextStore);
       }
     });
 
diff --git a/web/src/test/auto/dom/cases/attachment/textStoreForElement.def.ts b/web/src/test/auto/dom/cases/attachment/textStoreForElement.def.ts
index cfa0cdb4443..dda426748c4 100644
--- a/web/src/test/auto/dom/cases/attachment/textStoreForElement.def.ts
+++ b/web/src/test/auto/dom/cases/attachment/textStoreForElement.def.ts
@@ -67,38 +67,38 @@ describe('textStoreForElement()', function () {
 
     it('<input> => InputElementTextStore', () => {
       const inputElement = document.getElementById('input');
-      const inputTarget = textStoreForElement(inputElement);
+      const textStore = textStoreForElement(inputElement);
 
-      assert.isTrue(inputTarget instanceof InputElementTextStore);
+      assert.isTrue(textStore instanceof InputElementTextStore);
     });
 
     it('<iframe>.<input> => InputElementTextStore', async () => {
       const iframe = document.getElementById('iframe') as HTMLIFrameElement;
       const iframeInput = iframe.contentDocument.getElementById('iframe-input');
-      const inputTarget = textStoreForElement(iframeInput);
+      const textStore = textStoreForElement(iframeInput);
 
-      assert.isTrue(inputTarget instanceof InputElementTextStore);
+      assert.isTrue(textStore instanceof InputElementTextStore);
     });
 
     it('<textarea> => TextAreaElementTextStore', () => {
       const textElement = document.getElementById('textarea');
-      const textTarget = textStoreForElement(textElement);
+      const textStore = textStoreForElement(textElement);
 
-      assert.isTrue(textTarget instanceof TextAreaElementTextStore);
+      assert.isTrue(textStore instanceof TextAreaElementTextStore);
     });
 
     it('<iframe>.#doc.designMode = "on" => DesignIFrameElementTextStore', () => {
       const designElement = document.getElementById('design-iframe');
-      const designTarget = textStoreForElement(designElement);
+      const textStore = textStoreForElement(designElement);
 
-      assert.isTrue(designTarget instanceof DesignIFrameElementTextStore);
+      assert.isTrue(textStore instanceof DesignIFrameElementTextStore);
     });
 
     it('<div contenteditable="true"/> => ContentEditableElementTextStore', () => {
       const divElement = document.getElementById('editable');
-      const divTarget = textStoreForElement(divElement);
+      const textStore = textStoreForElement(divElement);
 
-      assert.isTrue(divTarget instanceof ContentEditableElementTextStore);
+      assert.isTrue(textStore instanceof ContentEditableElementTextStore);
     });
   });
 
@@ -108,20 +108,20 @@ describe('textStoreForElement()', function () {
 
     it('DesignIFrameElementTextStore: from .contentDocument.body', () => {
       const designElement = document.getElementById('design-iframe') as HTMLIFrameElement;
-      const designTarget = textStoreForElement(designElement.contentDocument.body);
+      const textStore = textStoreForElement(designElement.contentDocument.body);
 
-      assert.isTrue(designTarget instanceof DesignIFrameElementTextStore);
-      assert.strictEqual(designTarget.getElement(), designElement);
-      assert.strictEqual(designTarget, textStoreForElement(designElement));
+      assert.isTrue(textStore instanceof DesignIFrameElementTextStore);
+      assert.strictEqual(textStore.getElement(), designElement);
+      assert.strictEqual(textStore, textStoreForElement(designElement));
     });
 
     it('DesignIFrameElementTextStore: from .contentDocument', () => {
       const designElement = document.getElementById('design-iframe') as HTMLIFrameElement;
-      const designTarget = textStoreForElement(designElement.contentDocument as any as HTMLElement);
+      const textStore = textStoreForElement(designElement.contentDocument as any as HTMLElement);
 
-      assert.isTrue(designTarget instanceof DesignIFrameElementTextStore);
-      assert.strictEqual(designTarget.getElement(), designElement);
-      assert.strictEqual(designTarget, textStoreForElement(designElement));
+      assert.isTrue(textStore instanceof DesignIFrameElementTextStore);
+      assert.strictEqual(textStore.getElement(), designElement);
+      assert.strictEqual(textStore, textStoreForElement(designElement));
     });
 
     it('ContentEditableElementTextStore: from direct #text child', () => {
@@ -131,11 +131,11 @@ describe('textStoreForElement()', function () {
       // Text node!  Corresponds to a `// defeat Safari bug` comment in the codebase.
       assert.equal(textNode.nodeType, 3);
 
-      const divTarget = textStoreForElement(textNode);
+      const textStore = textStoreForElement(textNode);
 
-      assert.isTrue(divTarget instanceof ContentEditableElementTextStore);
-      assert.strictEqual(divTarget.getElement(), divElement);
-      assert.strictEqual(divTarget, textStoreForElement(divElement));
+      assert.isTrue(textStore instanceof ContentEditableElementTextStore);
+      assert.strictEqual(textStore.getElement(), divElement);
+      assert.strictEqual(textStore, textStoreForElement(divElement));
     });
   });
 });
@@ -178,9 +178,9 @@ describe('textStoreForEvent()', function () {
       inputElement.removeEventListener('keydown', fake);
     }
 
-    const inputTarget = textStoreForElement(inputElement);
+    const textStore = textStoreForElement(inputElement);
 
-    assert.isTrue(inputTarget instanceof InputElementTextStore);
+    assert.isTrue(textStore instanceof InputElementTextStore);
   });
 
   it('FocusEvent on <textarea> => TextAreaElementTextStore', () => {
@@ -200,9 +200,9 @@ describe('textStoreForEvent()', function () {
       textElement.blur();
     }
 
-    const textTarget = textStoreForEvent(fake.firstCall.args[0]);
+    const textStore = textStoreForEvent(fake.firstCall.args[0]);
 
-    assert.isTrue(textTarget instanceof TextAreaElementTextStore);
+    assert.isTrue(textStore instanceof TextAreaElementTextStore);
   });
 
   it('FocusEvent on design iframe .contentDocument => DesignIFrameElementTextStore', () => {
@@ -220,9 +220,9 @@ describe('textStoreForEvent()', function () {
       designElement.contentDocument.removeEventListener('focus', fake, true);
     }
 
-    const designTarget = textStoreForEvent(fake.firstCall.args[0]);
+    const textStore = textStoreForEvent(fake.firstCall.args[0]);
 
-    assert.isTrue(designTarget instanceof DesignIFrameElementTextStore);
+    assert.isTrue(textStore instanceof DesignIFrameElementTextStore);
   });
 
   it('KeyEvent on ContentEditableElementTextStore', () => {
@@ -245,8 +245,8 @@ describe('textStoreForEvent()', function () {
       divElement.removeEventListener('keydown', fake);
     }
 
-    const divTarget = textStoreForElement(divElement);
+    const textStore = textStoreForElement(divElement);
 
-    assert.isTrue(divTarget instanceof ContentEditableElementTextStore);
+    assert.isTrue(textStore instanceof ContentEditableElementTextStore);
   });
 });
\ No newline at end of file
diff --git a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
index 4735e05ae41..6bc005d19dd 100644
--- a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
+++ b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
@@ -189,7 +189,7 @@ describe('app/browser:  ContextManager', function () {
       predictionContext: {
         // we're dummying these out.
         resetContext: (() => {}) as any,
-        setCurrentTarget: (() => {}) as any,
+        setCurrentTextStore: (() => {}) as any,
       } as any,
       resetContext: () => {}
     });
@@ -225,42 +225,42 @@ describe('app/browser:  ContextManager', function () {
   // ---------------------------- Start of suite 1 -------------------------------
   describe('focus management', () => {
     it('initial state: null', () => {
-      assert.isNotOk(contextManager.activeTarget);
+      assert.isNotOk(contextManager.activeTextStore);
     });
 
     it('change: null -> input', () => {
-      const targetchange = sinon.fake();
-      contextManager.on('targetchange', targetchange);
+      const textstorechange = sinon.fake();
+      contextManager.on('textstorechange', textstorechange);
 
       const input = document.getElementById('input');
       dispatchFocus('focus', input);
 
-      assert.equal(contextManager.activeTarget?.getElement(), input, ".activeTarget not updated when element gained focus");
+      assert.equal(contextManager.activeTextStore?.getElement(), input, ".activeTextStore not updated when element gained focus");
 
-      // Check our expectations re: the `targetchange` event.
-      assert.isTrue(targetchange.calledOnce, 'targetchange event not raised');
-      const textStore = targetchange.firstCall.args[0]; // Should be an `InputElementTextStore` instance.
-      assert.equal(textStore.getElement(), input, '.activeTarget does not match the newly-focused element');
+      // Check our expectations re: the `textstorechange` event.
+      assert.isTrue(textstorechange.calledOnce, 'textstorechange event not raised');
+      const textStore = textstorechange.firstCall.args[0]; // Should be an `InputElementTextStore` instance.
+      assert.equal(textStore.getElement(), input, '.activeTextStore does not match the newly-focused element');
     });
 
     it('change: null -> textarea', () => {
-      const targetchange = sinon.fake();
-      contextManager.on('targetchange', targetchange);
+      const textstorechange = sinon.fake();
+      contextManager.on('textstorechange', textstorechange);
 
       const textarea = document.getElementById('textarea');
       dispatchFocus('focus', textarea);
 
-      assert.equal(contextManager.activeTarget?.getElement(), textarea, ".activeTarget not updated when element gained focus");
+      assert.equal(contextManager.activeTextStore?.getElement(), textarea, ".activeTextStore not updated when element gained focus");
 
-      // Check our expectations re: the `targetchange` event.
-      assert.isTrue(targetchange.calledOnce, 'targetchange event not raised');
-      const textStore = targetchange.firstCall.args[0]; // Should be an `InputElementTextStore` instance.
-      assert.equal(textStore.getElement(), textarea, '.activeTarget does not match the newly-focused element');
+      // Check our expectations re: the `textstorechange` event.
+      assert.isTrue(textstorechange.calledOnce, 'textstorechange event not raised');
+      const textStore = textstorechange.firstCall.args[0]; // Should be an `InputElementTextStore` instance.
+      assert.equal(textStore.getElement(), textarea, '.activeTextStore does not match the newly-focused element');
     });
 
     it('change: null -> designIframe', () => {
-      const targetchange = sinon.fake();
-      contextManager.on('targetchange', targetchange);
+      const textstorechange = sinon.fake();
+      contextManager.on('textstorechange', textstorechange);
 
       const iframe = document.getElementById('design-iframe') as HTMLIFrameElement;
 
@@ -274,56 +274,56 @@ describe('app/browser:  ContextManager', function () {
       // Though that may be affected by the Chrome vs Firefox bit noted above.
       dispatchFocus('focus', iframe.contentDocument.body);
 
-      assert.equal(contextManager.activeTarget?.getElement(), iframe, ".activeTarget not updated when element gained focus");
+      assert.equal(contextManager.activeTextStore?.getElement(), iframe, ".activeTextStore not updated when element gained focus");
 
-      // Check our expectations re: the `targetchange` event.
-      assert.isTrue(targetchange.calledOnce, 'targetchange event not raised');
-      const textStore = targetchange.firstCall.args[0]; // Should be an `InputElementTextStore` instance.
-      assert.equal(textStore.getElement(), iframe, '.activeTarget does not match the newly-focused element');
+      // Check our expectations re: the `textstorechange` event.
+      assert.isTrue(textstorechange.calledOnce, 'textstorechange event not raised');
+      const textStore = textstorechange.firstCall.args[0]; // Should be an `InputElementTextStore` instance.
+      assert.equal(textStore.getElement(), iframe, '.activeTextStore does not match the newly-focused element');
     });
 
     it('change: null -> contentEditable', () => {
-      const targetchange = sinon.fake();
-      contextManager.on('targetchange', targetchange);
+      const textstorechange = sinon.fake();
+      contextManager.on('textstorechange', textstorechange);
 
       const editable = document.getElementById('editable');
       dispatchFocus('focus', editable);
 
-      assert.equal(contextManager.activeTarget?.getElement(), editable, ".activeTarget not updated when element gained focus");
+      assert.equal(contextManager.activeTextStore?.getElement(), editable, ".activeTextStore not updated when element gained focus");
 
-      // Check our expectations re: the `targetchange` event.
-      assert.isTrue(targetchange.calledOnce, 'targetchange event not raised');
-      const textStore = targetchange.firstCall.args[0]; // Should be an `InputElementTextStore` instance.
-      assert.equal(textStore.getElement(), editable, '.activeTarget does not match the newly-focused element');
+      // Check our expectations re: the `textstorechange` event.
+      assert.isTrue(textstorechange.calledOnce, 'textstorechange event not raised');
+      const textStore = textstorechange.firstCall.args[0]; // Should be an `InputElementTextStore` instance.
+      assert.equal(textStore.getElement(), editable, '.activeTextStore does not match the newly-focused element');
     });
 
     it('change: input -> null', () => {
       // Setup:  from prior test
-      const targetchange = sinon.fake();
-      contextManager.on('targetchange', targetchange);
+      const textstorechange = sinon.fake();
+      contextManager.on('textstorechange', textstorechange);
 
       const input = document.getElementById('input');
       dispatchFocus('focus', input);
-      assert.equal(contextManager.activeTarget?.getElement(), input);
+      assert.equal(contextManager.activeTextStore?.getElement(), input);
 
       // actual test
       dispatchFocus('blur', input);
-      assert.equal(contextManager.activeTarget, null, '.activeTarget not updated when element lost focus');
+      assert.equal(contextManager.activeTextStore, null, '.activeTextStore not updated when element lost focus');
 
-      // Check our expectations re: the `targetchange` event.
-      assert.isTrue(targetchange.calledTwice, 'targetchange event not raised');
-      const textStore = targetchange.secondCall.args[0]; // Should be null, since we lost focus.
-      assert.equal(textStore, null, 'targetchange event did not indicate clearing of .activeTarget');
+      // Check our expectations re: the `textstorechange` event.
+      assert.isTrue(textstorechange.calledTwice, 'textstorechange event not raised');
+      const textStore = textstorechange.secondCall.args[0]; // Should be null, since we lost focus.
+      assert.equal(textStore, null, 'textstorechange event did not indicate clearing of .activeTextStore');
     });
 
     it('change: input disabled, -> null', async () => {
       // Setup:  from prior test
-      const targetchange = sinon.fake();
-      contextManager.on('targetchange', targetchange);
+      const textstorechange = sinon.fake();
+      contextManager.on('textstorechange', textstorechange);
 
       const input = document.getElementById('input');
       dispatchFocus('focus', input);
-      assert.equal(contextManager.activeTarget?.getElement(), input);
+      assert.equal(contextManager.activeTextStore?.getElement(), input);
 
       // actual test
       contextManager.page.disableControl(input);
@@ -331,155 +331,155 @@ describe('app/browser:  ContextManager', function () {
       // Relies on a MutationObserver (for 'kmw-disabled' CSS class name checks) to resolve
       await timedPromise(10);
 
-      assert.equal(contextManager.activeTarget, null, '.activeTarget not updated when element KMW-disabled');
+      assert.equal(contextManager.activeTextStore, null, '.activeTextStore not updated when element KMW-disabled');
 
-      // Check our expectations re: the `targetchange` event.
-      assert.isTrue(targetchange.calledTwice, 'targetchange event not raised');
-      const textStore = targetchange.secondCall.args[0]; // Should be null, since we lost focus.
-      assert.equal(textStore, null, 'targetchange event did not indicate clearing of .activeTarget');
+      // Check our expectations re: the `textstorechange` event.
+      assert.isTrue(textstorechange.calledTwice, 'textstorechange event not raised');
+      const textStore = textstorechange.secondCall.args[0]; // Should be null, since we lost focus.
+      assert.equal(textStore, null, 'textstorechange event did not indicate clearing of .activeTextStore');
     });
 
     it('change: input -> textarea', () => {
       // Setup:  from prior test
-      const targetchange = sinon.fake();
-      contextManager.on('targetchange', targetchange);
+      const textstorechange = sinon.fake();
+      contextManager.on('textstorechange', textstorechange);
 
       const input = document.getElementById('input');
       dispatchFocus('focus', input);
 
       dispatchFocus('blur', input);
-      assert.equal(contextManager.activeTarget?.getElement(), null);
+      assert.equal(contextManager.activeTextStore?.getElement(), null);
 
       // And now the new stuff.
       const textarea = document.getElementById('textarea');
       dispatchFocus('focus', textarea);
 
-      assert.equal(contextManager.activeTarget?.getElement(), textarea, ".activeTarget not updated when element gained focus");
+      assert.equal(contextManager.activeTextStore?.getElement(), textarea, ".activeTextStore not updated when element gained focus");
 
-      // Check our expectations re: the `targetchange` event.
-      assert.isTrue(targetchange.calledThrice, 'targetchange event not raised');
-      const textStore = targetchange.thirdCall.args[0]; // Should be an `InputElementTextStore` instance.
-      assert.equal(textStore.getElement(), textarea, '.activeTarget does not match the newly-focused element');
+      // Check our expectations re: the `textstorechange` event.
+      assert.isTrue(textstorechange.calledThrice, 'textstorechange event not raised');
+      const textStore = textstorechange.thirdCall.args[0]; // Should be an `InputElementTextStore` instance.
+      assert.equal(textStore.getElement(), textarea, '.activeTextStore does not match the newly-focused element');
     });
 
     it('restoration: input (no flags set)', () => {
-      const targetchange = sinon.fake();
-      contextManager.on('targetchange', targetchange);
+      const textstorechange = sinon.fake();
+      contextManager.on('textstorechange', textstorechange);
 
       const input = document.getElementById('input');
       dispatchFocus('focus', input);
-      assert.isTrue(targetchange.calledOnce);
+      assert.isTrue(textstorechange.calledOnce);
       dispatchFocus('blur', input);
-      assert.isTrue(targetchange.calledTwice);
+      assert.isTrue(textstorechange.calledTwice);
 
-      assert.equal(contextManager.activeTarget?.getElement(), null);
+      assert.equal(contextManager.activeTextStore?.getElement(), null);
 
-      contextManager.restoreLastActiveTarget();
-      assert.isTrue(targetchange.calledThrice);
+      contextManager.restoreLastActiveTextStore();
+      assert.isTrue(textstorechange.calledThrice);
 
-      assert.equal(contextManager.activeTarget?.getElement(), input);
+      assert.equal(contextManager.activeTextStore?.getElement(), input);
     });
 
     it('forget: input', () => {
-      const targetchange = sinon.fake();
-      contextManager.on('targetchange', targetchange);
+      const textstorechange = sinon.fake();
+      contextManager.on('textstorechange', textstorechange);
 
       const input = document.getElementById('input');
       dispatchFocus('focus', input);
-      assert.isTrue(targetchange.calledOnce);
+      assert.isTrue(textstorechange.calledOnce);
 
       contextManager.focusAssistant.maintainingFocus = true;
       contextManager.focusAssistant.restoringFocus = true;
-      contextManager.forgetActiveTarget();
+      contextManager.forgetActiveTextStore();
       // The 'forget' operation is **aggressive**.  Perma-forget.
-      assert.isNotOk(contextManager.lastActiveTarget);
+      assert.isNotOk(contextManager.lastActiveTextStore);
 
-      assert.isTrue(targetchange.calledTwice);
-      assert.equal(contextManager.activeTarget?.getElement(), null);
+      assert.isTrue(textstorechange.calledTwice);
+      assert.equal(contextManager.activeTextStore?.getElement(), null);
       // Again, the 'forget' operation is **aggressive**.  Clears all focus-maintenance states.
-      // After all, there's no longer any prior target to maintain or restore - it's forgotten.
+      // After all, there's no longer any prior textStore to maintain or restore - it's forgotten.
       assert.equal(contextManager.focusAssistant.maintainingFocus, false);
       assert.equal(contextManager.focusAssistant.restoringFocus, false);
 
       dispatchFocus('blur', input); // Should be 100% ignored
-      assert.isTrue(targetchange.calledTwice); // there should be no effect.
-      assert.equal(contextManager.activeTarget?.getElement(), null);
+      assert.isTrue(textstorechange.calledTwice); // there should be no effect.
+      assert.equal(contextManager.activeTextStore?.getElement(), null);
       // If we aren't careful, we can accidentally 'unforget' the element here!
-      assert.isNotOk(contextManager.lastActiveTarget, "post-forget target blur restored .lastActiveTarget");
+      assert.isNotOk(contextManager.lastActiveTextStore, "post-forget textStore blur restored .lastActiveTextStore");
 
-      contextManager.restoreLastActiveTarget();
-      assert.isTrue(targetchange.calledTwice); // there should be no effect.
-      assert.equal(contextManager.activeTarget?.getElement(), null);
+      contextManager.restoreLastActiveTextStore();
+      assert.isTrue(textstorechange.calledTwice); // there should be no effect.
+      assert.equal(contextManager.activeTextStore?.getElement(), null);
     });
 
     it('restoration: input (`maintaining`)', () => {
-      const targetchange = sinon.fake();
-      contextManager.on('targetchange', targetchange);
+      const textstorechange = sinon.fake();
+      contextManager.on('textstorechange', textstorechange);
 
       const input = document.getElementById('input');
       dispatchFocus('focus', input);
-      assert.isTrue(targetchange.calledOnce);
+      assert.isTrue(textstorechange.calledOnce);
 
       contextManager.focusAssistant.maintainingFocus = true;
       dispatchFocus('blur', input); // ignored
-      assert.isTrue(targetchange.calledOnce);
+      assert.isTrue(textstorechange.calledOnce);
 
       // b/c is 'maintained'
-      assert.isTrue(targetchange.calledOnce, 'targetchange called on blur during maintaining state');
-      assert.equal(contextManager.activeTarget?.getElement(), input);
+      assert.isTrue(textstorechange.calledOnce, 'textstorechange called on blur during maintaining state');
+      assert.equal(contextManager.activeTextStore?.getElement(), input);
 
-      contextManager.restoreLastActiveTarget();
+      contextManager.restoreLastActiveTextStore();
 
-      assert.equal(contextManager.activeTarget?.getElement(), input);
+      assert.equal(contextManager.activeTextStore?.getElement(), input);
 
       // Since we never 'lost' focus due to the 'maintaining' state, we should only
-      // have the initial 'targetchange' raise.
-      assert.isTrue(targetchange.calledOnce, 'targetchange called during restoration of maintained state');
+      // have the initial 'textstorechange' raise.
+      assert.isTrue(textstorechange.calledOnce, 'textstorechange called during restoration of maintained state');
     });
 
     it('loss: input (on clear of `maintaining`)', () => {
-      const targetchange = sinon.fake();
-      contextManager.on('targetchange', targetchange);
+      const textstorechange = sinon.fake();
+      contextManager.on('textstorechange', textstorechange);
 
       const input = document.getElementById('input');
       dispatchFocus('focus', input);
-      assert.isTrue(targetchange.calledOnce);
+      assert.isTrue(textstorechange.calledOnce);
 
       contextManager.focusAssistant.maintainingFocus = true;
       dispatchFocus('blur', input); // ignored
 
       // b/c is 'maintained'
-      assert.isTrue(targetchange.calledOnce);
-      assert.equal(contextManager.activeTarget?.getElement(), input);
+      assert.isTrue(textstorechange.calledOnce);
+      assert.equal(contextManager.activeTextStore?.getElement(), input);
 
       contextManager.focusAssistant.maintainingFocus = false;
-      assert.isTrue(targetchange.calledTwice);
+      assert.isTrue(textstorechange.calledTwice);
 
-      assert.equal(contextManager.activeTarget?.getElement(), null);
+      assert.equal(contextManager.activeTextStore?.getElement(), null);
     });
 
     it('restoration: input (`restoring`)', () => {
-      const targetchange = sinon.fake();
-      contextManager.on('targetchange', targetchange);
+      const textstorechange = sinon.fake();
+      contextManager.on('textstorechange', textstorechange);
 
       const input = document.getElementById('input');
       dispatchFocus('focus', input); // 1
-      assert.isTrue(targetchange.calledOnce);
+      assert.isTrue(textstorechange.calledOnce);
 
       contextManager.focusAssistant.maintainingFocus = true;
       dispatchFocus('blur', input);
-      assert.isTrue(targetchange.calledOnce); // 'maintaining' state
-      assert.equal(contextManager.activeTarget?.getElement(), input);
+      assert.isTrue(textstorechange.calledOnce); // 'maintaining' state
+      assert.equal(contextManager.activeTextStore?.getElement(), input);
 
       contextManager.focusAssistant.maintainingFocus = false;
-      assert.isTrue(targetchange.calledTwice);
-      assert.equal(contextManager.activeTarget?.getElement(), null);
+      assert.isTrue(textstorechange.calledTwice);
+      assert.equal(contextManager.activeTextStore?.getElement(), null);
 
       contextManager.focusAssistant.restoringFocus = true;
-      contextManager.restoreLastActiveTarget();
-      assert.isTrue(targetchange.calledThrice);
+      contextManager.restoreLastActiveTextStore();
+      assert.isTrue(textstorechange.calledThrice);
 
-      assert.equal(contextManager.activeTarget?.getElement(), input);
+      assert.equal(contextManager.activeTextStore?.getElement(), input);
     });
   });
 
@@ -536,7 +536,7 @@ describe('app/browser:  ContextManager', function () {
     });
 
     describe('global-keyboard mode only' , () => {
-      it('activate: without .activeTarget, null -> null (desktop)', async () => {
+      it('activate: without .activeTextStore, null -> null (desktop)', async () => {
         const beforekeyboardchange = sinon.fake();
         const keyboardchange = sinon.fake();
         const keyboardasyncload = sinon.fake();
@@ -555,7 +555,7 @@ describe('app/browser:  ContextManager', function () {
         assert.isTrue(keyboardasyncload.notCalled);
       });
 
-      it('activate: without .activeTarget, null -> null (touch)', async () => {
+      it('activate: without .activeTextStore, null -> null (touch)', async () => {
         const beforekeyboardchange = sinon.fake();
         const keyboardchange = sinon.fake();
         const keyboardasyncload = sinon.fake();
@@ -576,7 +576,7 @@ describe('app/browser:  ContextManager', function () {
         assert.equal(keyboardchange.firstCall.args[0].metadata.id, 'khmer_angkor');
       });
 
-      it('activate: without .activeTarget, preloaded keyboard', async () => {
+      it('activate: without .activeTextStore, preloaded keyboard', async () => {
         const beforekeyboardchange = sinon.fake();
         const keyboardchange = sinon.fake();
         const keyboardasyncload = sinon.fake();
@@ -598,7 +598,7 @@ describe('app/browser:  ContextManager', function () {
         assert.strictEqual(keyboardchange.firstCall.args[0], contextManager.activeKeyboard);
       });
 
-      it('activate: without .activeTarget, loads keyboard', async () => {
+      it('activate: without .activeTextStore, loads keyboard', async () => {
         const beforekeyboardchange = sinon.fake();
         const keyboardchange = sinon.fake();
         const keyboardasyncload = sinon.fake();
@@ -622,7 +622,7 @@ describe('app/browser:  ContextManager', function () {
         await assertPromiseResolved(keyboardasyncload.firstCall.args[1]);
       });
 
-      it('activate: without .activeTarget, missing definition (desktop)', async () => {
+      it('activate: without .activeTextStore, missing definition (desktop)', async () => {
         const beforekeyboardchange = sinon.fake();
         const keyboardchange = sinon.fake();
         const keyboardasyncload = sinon.fake();
@@ -654,7 +654,7 @@ describe('app/browser:  ContextManager', function () {
         assert.isTrue(keyboardasyncload.notCalled);
       });
 
-      it('activate: without .activeTarget, missing definition (touch)', async () => {
+      it('activate: without .activeTextStore, missing definition (touch)', async () => {
         const beforekeyboardchange = sinon.fake();
         const keyboardchange = sinon.fake();
         const keyboardasyncload = sinon.fake();
@@ -863,10 +863,10 @@ describe('app/browser:  ContextManager', function () {
 
         const textarea = document.getElementById('textarea');
         const textStore = textStoreForElement(textarea);
-        contextManager.setKeyboardForTarget(textStore, 'lao_2008_basic', 'lo');
+        contextManager.setKeyboardForTextStore(textStore, 'lao_2008_basic', 'lo');
 
         // As we haven't yet focused the affected target, no keyboard-change events should have triggered yet.
-        assert.equal((contextManager as any).currentKeyboardSrcTarget(), null);
+        assert.equal((contextManager as any).currentKeyboardSrcTextStore(), null);
         assert.isTrue(beforekeyboardchange.notCalled);
         assert.isTrue(keyboardchange.notCalled);
         assert.isTrue(keyboardasyncload.notCalled);
@@ -878,7 +878,7 @@ describe('app/browser:  ContextManager', function () {
         await timedPromise(10);
 
         // No need to 'keyboardchange' when the same keyboard is kept active.
-        assert.equal((contextManager as any).currentKeyboardSrcTarget(), textStore);
+        assert.equal((contextManager as any).currentKeyboardSrcTextStore(), textStore);
         assert.isTrue(beforekeyboardchange.calledOnce);
         assert.isTrue(keyboardchange.calledOnce);
         assert.isTrue(keyboardasyncload.notCalled);
@@ -908,8 +908,8 @@ describe('app/browser:  ContextManager', function () {
         await contextManager.activateKeyboard('khmer_angkor', 'km');
 
         const textarea = document.getElementById('textarea');
-        const target = textStoreForElement(textarea);
-        contextManager.setKeyboardForTarget(target, 'lao_2008_basic', 'lo');
+        const textStore = textStoreForElement(textarea);
+        contextManager.setKeyboardForTextStore(textStore, 'lao_2008_basic', 'lo');
         dispatchFocus('focus', textarea);
 
         // Allows any _FocusKeyboardSettings stuff trigger to resolve.
@@ -949,8 +949,8 @@ describe('app/browser:  ContextManager', function () {
         await contextManager.activateKeyboard('khmer_angkor', 'km');
 
         const textarea = document.getElementById('textarea');
-        const target = textStoreForElement(textarea);
-        contextManager.setKeyboardForTarget(target, 'lao_2008_basic', 'lo');
+        const textStore = textStoreForElement(textarea);
+        contextManager.setKeyboardForTextStore(textStore, 'lao_2008_basic', 'lo');
         dispatchFocus('focus', textarea);
 
         // Allows any _FocusKeyboardSettings stuff trigger to resolve.
@@ -966,7 +966,7 @@ describe('app/browser:  ContextManager', function () {
 
         // Actual test:  transitioning focus from an independent-mode target
         // to a global-mode target.
-        contextManager.setKeyboardForTarget(target, '', '');
+        contextManager.setKeyboardForTextStore(textStore, '', '');
 
         const beforekeyboardchange = sinon.fake();
         const keyboardchange = sinon.fake();
@@ -998,8 +998,8 @@ describe('app/browser:  ContextManager', function () {
         await contextManager.activateKeyboard('khmer_angkor', 'km');
 
         const textarea = document.getElementById('textarea');
-        const target = textStoreForElement(textarea);
-        contextManager.setKeyboardForTarget(target, 'lao_2008_basic', 'lo');
+        const textStore = textStoreForElement(textarea);
+        contextManager.setKeyboardForTextStore(textStore, 'lao_2008_basic', 'lo');
         dispatchFocus('focus', textarea);
 
         // Allows any _FocusKeyboardSettings stuff trigger to resolve.
@@ -1014,7 +1014,7 @@ describe('app/browser:  ContextManager', function () {
 
         // Actual test:  transitioning focus from an independent-mode target
         // to a global-mode target.
-        contextManager.setKeyboardForTarget(target, '', '');
+        contextManager.setKeyboardForTextStore(textStore, '', '');
 
         // Allow the indirect keyboard-change operation to resolve.
         await timedPromise(10);
@@ -1035,8 +1035,8 @@ describe('app/browser:  ContextManager', function () {
         await contextManager.activateKeyboard('khmer_angkor', 'km');
 
         const textarea = document.getElementById('textarea');
-        const target = textStoreForElement(textarea);
-        contextManager.setKeyboardForTarget(target, 'lao_2008_basic', 'lo');
+        const textStore = textStoreForElement(textarea);
+        contextManager.setKeyboardForTextStore(textStore, 'lao_2008_basic', 'lo');
         dispatchFocus('focus', textarea);
 
         // Allows any _FocusKeyboardSettings stuff trigger to resolve.
@@ -1055,7 +1055,7 @@ describe('app/browser:  ContextManager', function () {
         await contextManager.activateKeyboard('test_chirality', 'en');
 
         // Aspect 1:  the current keyboard has changed
-        assert.equal((contextManager as any).currentKeyboardSrcTarget(), target);
+        assert.equal((contextManager as any).currentKeyboardSrcTextStore(), textStore);
         assert.isTrue(beforekeyboardchange.calledOnce);
         assert.isTrue(keyboardchange.calledOnce);
         assert.isTrue(keyboardasyncload.notCalled);
@@ -1069,7 +1069,7 @@ describe('app/browser:  ContextManager', function () {
         await timedPromise(10);
 
         // Aspect 2: ... without affecting the global keyboard's setting.
-        assert.equal((contextManager as any).currentKeyboardSrcTarget(), null);
+        assert.equal((contextManager as any).currentKeyboardSrcTextStore(), null);
         assert.isTrue(beforekeyboardchange.calledTwice);
         assert.isTrue(keyboardchange.calledTwice);
         assert.isTrue(keyboardasyncload.notCalled);
@@ -1085,8 +1085,8 @@ describe('app/browser:  ContextManager', function () {
         await contextManager.activateKeyboard('khmer_angkor', 'km');
 
         const textarea = document.getElementById('textarea');
-        const target = textStoreForElement(textarea);
-        contextManager.setKeyboardForTarget(target, 'lao_2008_basic', 'lo');
+        const textStore = textStoreForElement(textarea);
+        contextManager.setKeyboardForTextStore(textStore, 'lao_2008_basic', 'lo');
         dispatchFocus('focus', textarea);
 
         // Allows any _FocusKeyboardSettings stuff trigger to resolve.
@@ -1110,7 +1110,7 @@ describe('app/browser:  ContextManager', function () {
         await Promise.resolve();
 
         // Aspect 1:  the current keyboard has not yet changed
-        assert.equal((contextManager as any).currentKeyboardSrcTarget(), target);
+        assert.equal((contextManager as any).currentKeyboardSrcTextStore(), textStore);
         assert.isTrue(beforekeyboardchange.calledOnce);  // +1
         assert.isTrue(keyboardchange.notCalled);         // is delayed 50 ms, so not yet.
         assert.isTrue(keyboardasyncload.calledOnce);     // The async load has already started.
@@ -1125,7 +1125,7 @@ describe('app/browser:  ContextManager', function () {
         // Allows any _FocusKeyboardSettings stuff trigger to resolve.
         await timedPromise(10);
 
-        assert.equal((contextManager as any).currentKeyboardSrcTarget(), null);
+        assert.equal((contextManager as any).currentKeyboardSrcTextStore(), null);
         assert.isTrue(beforekeyboardchange.calledTwice);  // +1: re-activating the global keyboard
         assert.isTrue(keyboardchange.calledOnce);         // +1: same
         assert.isTrue(keyboardasyncload.calledOnce);
@@ -1136,7 +1136,7 @@ describe('app/browser:  ContextManager', function () {
 
         // ...and verify that the active keyboard has not changed, since the target for
         // activation is not itself active.
-        assert.equal((contextManager as any).currentKeyboardSrcTarget(), null);
+        assert.equal((contextManager as any).currentKeyboardSrcTextStore(), null);
         assert.isTrue(beforekeyboardchange.calledTwice);  // +1: re-activating the global keyboard
         assert.isTrue(keyboardchange.calledOnce);         // +1: same
         assert.isTrue(keyboardasyncload.calledOnce);
@@ -1154,7 +1154,7 @@ describe('app/browser:  ContextManager', function () {
         await timedPromise(10);
 
         // And, final expectations:
-        assert.equal((contextManager as any).currentKeyboardSrcTarget(), target);
+        assert.equal((contextManager as any).currentKeyboardSrcTextStore(), textStore);
         assert.isTrue(beforekeyboardchange.calledThrice);  // +1: activating the independent-mode kbd
         assert.isTrue(keyboardchange.calledTwice);         // +1: same
         assert.isTrue(keyboardasyncload.calledOnce);
@@ -1179,9 +1179,9 @@ describe('app/browser:  ContextManager', function () {
         await contextManager.activateKeyboard('khmer_angkor', 'km');
 
         const textarea = document.getElementById('textarea');
-        const target = textStoreForElement(textarea);
+        const textStore = textStoreForElement(textarea);
         // Matches the current global keyboard, but still sets it to independent-mode.
-        contextManager.setKeyboardForTarget(target, 'khmer_angkor', 'km');
+        contextManager.setKeyboardForTextStore(textStore, 'khmer_angkor', 'km');
         dispatchFocus('focus', textarea);
 
         // Allows any _FocusKeyboardSettings stuff trigger to resolve.
@@ -1206,7 +1206,7 @@ describe('app/browser:  ContextManager', function () {
         await Promise.resolve();
 
         // Aspect 1:  the current keyboard has not yet changed
-        assert.equal((contextManager as any).currentKeyboardSrcTarget(), target);
+        assert.equal((contextManager as any).currentKeyboardSrcTextStore(), textStore);
         assert.isTrue(beforekeyboardchange.calledOnce);  // +1
         assert.isTrue(keyboardchange.notCalled);         // is delayed 50 ms, so not yet.
         assert.isTrue(keyboardasyncload.calledOnce);     // The async load has already started.
@@ -1229,7 +1229,7 @@ describe('app/browser:  ContextManager', function () {
         await Promise.resolve();
 
         // Aspect 2:  the current keyboard STILL has not yet changed - still delayed.
-        assert.equal((contextManager as any).currentKeyboardSrcTarget(), target);
+        assert.equal((contextManager as any).currentKeyboardSrcTextStore(), textStore);
         assert.isTrue(beforekeyboardchange.calledTwice);  // +1
         assert.isTrue(keyboardchange.notCalled);          // both should still be delayed.
         assert.isTrue(keyboardasyncload.calledTwice);      // The async load has already started.
@@ -1241,7 +1241,7 @@ describe('app/browser:  ContextManager', function () {
 
         // Critical bit: the `lao` activation should appear to have auto-canceled; this is because
         // when its keyboard loaded, we'd already requested the `test_chirality` keyboard.
-        assert.equal((contextManager as any).currentKeyboardSrcTarget(), target);
+        assert.equal((contextManager as any).currentKeyboardSrcTextStore(), textStore);
         assert.isTrue(beforekeyboardchange.calledThrice);  // +1
         assert.isTrue(keyboardchange.calledOnce);          // There should be no attempt to swap to the lao kbd.
         assert.isTrue(keyboardasyncload.calledTwice);
diff --git a/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts b/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts
index 37811258b4a..bf834577fc1 100644
--- a/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts
+++ b/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts
@@ -321,7 +321,7 @@ class DesignIFrameTestHelper implements TestHelper {
 //#endregion
 
 //#region Defines helpers related to SyntheticTextStore test setup.
-class MockTestHelper implements TestHelper {
+class SyntheticTextStoreTestHelper implements TestHelper {
   setupElement(): ElementPair<any> {
     return { elem: null, wrapper: new SyntheticTextStore() };
   }
@@ -371,7 +371,7 @@ class InterfaceTests {
 
   public static DesignIFrameElementTextStore = new DesignIFrameTestHelper();
 
-  public static SyntheticTextStore = new MockTestHelper();
+  public static SyntheticTextStore = new SyntheticTextStoreTestHelper();
 
   //#region Defines common test patterns across element tests
   public static Tests = class {
@@ -1379,9 +1379,9 @@ describe('Element InputElementTextStore/Output Interfacing', function () {
     });
   });
 
-  describe('The "SyntheticTextStore" output target', function () {
+  describe('The "SyntheticTextStore" textStore', function () {
     // Unique to the SyntheticTextStore type - element interface cloning tests.  Is element state properly copied?
-    // As those require a very different setup, they're in the target_mocks.js test case file instead.
+    // As those require a very different setup, they're in the syntheticTextStore.tests.ts test case file instead.
 
     // Basic text-retrieval unit tests are now done headlessly in keyman/engine/keyboard.
 
diff --git a/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts b/web/src/test/auto/dom/cases/element-text-stores/syntheticTextStore.tests.ts
similarity index 66%
rename from web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts
rename to web/src/test/auto/dom/cases/element-text-stores/syntheticTextStore.tests.ts
index 42e90b54da9..644a97a2b46 100644
--- a/web/src/test/auto/dom/cases/element-text-stores/target_mocks.tests.ts
+++ b/web/src/test/auto/dom/cases/element-text-stores/syntheticTextStore.tests.ts
@@ -11,7 +11,7 @@ document.body.appendChild(host);
 const u = (code: number) => String.fromCodePoint(code);
 
 // Define common interface testing functions that can be run upon the TextStore interface.
-class MockTests {
+class SyntheticTextStoreTests {
   public static Apple = {
     normal: 'apple',
     // Built in-line via function.  Looks functionally equivalent to "apple", but with SMP characters.
@@ -28,9 +28,7 @@ class MockTests {
   public static initBase() {
     const elem = document.createElement('input');
     host.appendChild(elem);
-    const wrapper = new InputElementTextStore(elem);
-
-    return wrapper;
+    return new InputElementTextStore(elem);
   }
 
   public static applyDeadkeys(base: any, dks: any) {
@@ -51,7 +49,7 @@ class MockTests {
     }
 
     const base = this.initBase();
-    base.root.value = MockTests.Apple.mixed;
+    base.root.value = SyntheticTextStoreTests.Apple.mixed;
     this.applyDeadkeys(base, this.Deadkeys);
 
     // Set the requested selection range.
@@ -78,33 +76,33 @@ describe('SyntheticTextStore', function() {
     KMWString.enableSupplementaryPlane(false);
   })
 
-  describe('The "SyntheticTextStore" output target', function() {
+  describe('The "SyntheticTextStore" textStore', function() {
     describe('Initialization', function() {
       it('properly initializes from a raw string', function() {
-        const mock = new SyntheticTextStore(MockTests.Apple.mixed);
+        const textStore = new SyntheticTextStore(SyntheticTextStoreTests.Apple.mixed);
 
-        assert.equal(mock.getText(), MockTests.Apple.mixed);
-        assert.equal(mock.getCaret(), 5);
+        assert.equal(textStore.getText(), SyntheticTextStoreTests.Apple.mixed);
+        assert.equal(textStore.getCaret(), 5);
       });
 
       it('copies an existing TextStore without a text selection', function() {
-        const base = MockTests.setupBase(4);
+        const base = SyntheticTextStoreTests.setupBase(4);
 
-        const mock = SyntheticTextStore.from(base);
-        assert.equal(mock.getText(), MockTests.Apple.mixed);
-        assert.deepEqual(mock.deadkeys(), base.deadkeys());
+        const textStore = SyntheticTextStore.from(base);
+        assert.equal(textStore.getText(), SyntheticTextStoreTests.Apple.mixed);
+        assert.deepEqual(textStore.deadkeys(), base.deadkeys());
       });
 
       it('copies an existing TextStore with a text selection', function() {
-        const base = MockTests.setupBase(4, 5);
+        const base = SyntheticTextStoreTests.setupBase(4, 5);
 
-        const mock = SyntheticTextStore.from(base);
+        const textStore = SyntheticTextStore.from(base);
         // The selection should appear to be automatically deleted, as any text mutation
         // by KMW would automatically erase the text anyway.
-        assert.equal(mock.getTextBeforeCaret(), MockTests.Apple.mixed.substr(0, 5));
-        assert.equal(mock.getText(), MockTests.Apple.mixed);
-        assert.equal(mock.getSelectedText(), MockTests.Apple.mixed.substring(5));
-        assert.deepEqual(mock.deadkeys(), base.deadkeys());
+        assert.equal(textStore.getTextBeforeCaret(), SyntheticTextStoreTests.Apple.mixed.substr(0, 5));
+        assert.equal(textStore.getText(), SyntheticTextStoreTests.Apple.mixed);
+        assert.equal(textStore.getSelectedText(), SyntheticTextStoreTests.Apple.mixed.substring(5));
+        assert.deepEqual(textStore.deadkeys(), base.deadkeys());
       });
     });
 
@@ -113,12 +111,12 @@ describe('SyntheticTextStore', function() {
       // with/without deadkeys
       it('is not affected by mutation of the source element', function() {
         // Already-verified code
-        const base = MockTests.setupBase(4);
-        const mock = SyntheticTextStore.from(base);
+        const base = SyntheticTextStoreTests.setupBase(4);
+        const textStore = SyntheticTextStore.from(base);
         const baseInitDks = base.deadkeys().clone();
 
         // Now for the actual test.
-        const dk = MockTests.Deadkeys;
+        const dk = SyntheticTextStoreTests.Deadkeys;
         // Note - we selectively match and remove only ONE of the deadkeys.  (Naturally, the one closer to the caret.)
         base.hasDeadkeyMatch(4-dk[1].p, dk[1].d);
         base.deadkeys().deleteMatched();
@@ -126,25 +124,25 @@ describe('SyntheticTextStore', function() {
 
         assert.notDeepEqual(base.deadkeys(), baseInitDks, 'TextStore deadkey return is not a proper deep-copy');
 
-        assert.equal(mock.getText(), MockTests.Apple.mixed);
-        assert.deepEqual(mock.deadkeys(), baseInitDks);
+        assert.equal(textStore.getText(), SyntheticTextStoreTests.Apple.mixed);
+        assert.deepEqual(textStore.deadkeys(), baseInitDks);
       });
 
       it('does not affect the source element when mutated', function() {
         // Already-verified code
-        const base = MockTests.setupBase(4);
-        const mock = SyntheticTextStore.from(base);
+        const base = SyntheticTextStoreTests.setupBase(4);
+        const textStore = SyntheticTextStore.from(base);
         const baseInitDks = base.deadkeys().clone();
 
         // Now for the actual test.
-        const dk = MockTests.Deadkeys;
+        const dk = SyntheticTextStoreTests.Deadkeys;
         // Note - we selectively match and remove only ONE of the deadkeys.  (Naturally, the one closer to the caret.)
-        mock.hasDeadkeyMatch(4-dk[1].p, dk[1].d);
-        mock.deadkeys().deleteMatched();
-        mock.deleteCharsBeforeCaret(2);
+        textStore.hasDeadkeyMatch(4-dk[1].p, dk[1].d);
+        textStore.deadkeys().deleteMatched();
+        textStore.deleteCharsBeforeCaret(2);
 
-        assert.notDeepEqual(mock.deadkeys(), baseInitDks);
-        assert.equal(base.getText(), MockTests.Apple.mixed);
+        assert.notDeepEqual(textStore.deadkeys(), baseInitDks);
+        assert.equal(base.getText(), SyntheticTextStoreTests.Apple.mixed);
         assert.deepEqual(base.deadkeys(), baseInitDks);
       });
     });
diff --git a/web/src/test/auto/dom/cases/gesture-processor/canary.tests.ts b/web/src/test/auto/dom/cases/gesture-processor/canary.tests.ts
index 78fbcf6f793..7c3fde9b85a 100644
--- a/web/src/test/auto/dom/cases/gesture-processor/canary.tests.ts
+++ b/web/src/test/auto/dom/cases/gesture-processor/canary.tests.ts
@@ -54,7 +54,7 @@ describe("'Canary' checks", function() {
     const jsonObject = await jsonResponse.json();
 
     const targetRoot = document.getElementById('host-fixture');
-    let controller = new HostFixtureLayoutController();
+    const controller = new HostFixtureLayoutController();
     // Note:  this is set BEFORE the controller is configured (in the following line).
     // The class is designed to support this.
     controller.layoutConfiguration = new FixtureLayoutConfiguration(jsonObject.config);
diff --git a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
index 5ea2f4a68a3..e4ac046e106 100644
--- a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
+++ b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
@@ -82,8 +82,8 @@ describe('Keyboard loading in DOM', function() {
 
     // TODO:  verify actual rule processing.
     const nullKeyEvent = jsKeyboard.constructNullKeyEvent(device);
-    const mock = new SyntheticTextStore();
-    const result = jsHarness.processKeystroke(mock, nullKeyEvent);
+    const textStore = new SyntheticTextStore();
+    const result = jsHarness.processKeystroke(textStore, nullKeyEvent);
 
     assert.isOk(result);
     assert.isOk(KeymanWeb);
diff --git a/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js b/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
index 66471f35ca9..e5bf59b2cde 100644
--- a/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
+++ b/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
@@ -82,7 +82,7 @@ describe("PredictionContext", () => {
     predictiveContext.on('update', updateFake);
 
     let textStore = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
-    const initialMock = SyntheticTextStore.from(textStore);
+    const initialTextStore = SyntheticTextStore.from(textStore);
     const promise = predictiveContext.setCurrentTarget(textStore);
 
     // Initial predictive state:  no suggestions.  context.initializeState() has not yet been called.
@@ -100,7 +100,7 @@ describe("PredictionContext", () => {
     assert.isNotOk(suggestions.find((obj) => obj.transform.deleteLeft != 0));
 
     textStore.insertTextBeforeCaret('e'); // appl| + e = apple
-    let transcription = textStore.buildTranscriptionFrom(initialMock, null, true);
+    let transcription = textStore.buildTranscriptionFrom(initialTextStore, null, true);
     await langProcessor.predict(transcription, dummiedGetLayer());
 
     // First predict call results:  our second set of dummy suggestions, the first of which includes
@@ -121,7 +121,7 @@ describe("PredictionContext", () => {
     predictiveContext.on('update', updateFake);
 
     let textStore = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
-    const initialMock = SyntheticTextStore.from(textStore);
+    const initialTextStore = SyntheticTextStore.from(textStore);
     const promise = predictiveContext.setCurrentTarget(textStore);
 
     // Initial predictive state:  no suggestions.  context.initializeState() has not yet been called.
@@ -138,14 +138,14 @@ describe("PredictionContext", () => {
     assert.isNotOk(suggestions.find((obj) => obj.tag == 'keep'));
     assert.isNotOk(suggestions.find((obj) => obj.transform.deleteLeft != 0));
 
-    const baseTranscription = textStore.buildTranscriptionFrom(initialMock, null, true);
+    const baseTranscription = textStore.buildTranscriptionFrom(initialTextStore, null, true);
 
     // Mocking:  corresponds to the second set of mocked predictions - round 2 of
     // 'apple', 'apply', 'apples'.
     const skippedPromise = langProcessor.predict(baseTranscription, dummiedGetLayer());
 
     textStore.insertTextBeforeCaret('e'); // appl| + e = apple
-    const finalTranscription = textStore.buildTranscriptionFrom(initialMock, null, true);
+    const finalTranscription = textStore.buildTranscriptionFrom(initialTextStore, null, true);
 
     // Mocking:  corresponds to the third set of mocked predictions - 'applied'.
     const expectedPromise = langProcessor.predict(finalTranscription, dummiedGetLayer());
diff --git a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
index 8d8b47137ca..bb0e0017f77 100644
--- a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
@@ -41,17 +41,17 @@ describe('Bundled ES Module for keyboard', function () {
 
   describe('SyntheticTextStore', () => {
     it('basic functionality test', () => {
-      let target = new KeyboardModule.SyntheticTextStore("aple", 2);  // ap | le
-      target.insertTextBeforeCaret('p');
-      assert.equal(target.getText(), "apple");
+      let textStore = new KeyboardModule.SyntheticTextStore("aple", 2);  // ap | le
+      textStore.insertTextBeforeCaret('p');
+      assert.equal(textStore.getText(), "apple");
     });
 
     it('smp test', () => {
       KMWString.enableSupplementaryPlane(true); // Declared & defined in web-utils.
       try {
-        let target = new KeyboardModule.SyntheticTextStore(u(0x1d5ba) + u(0x1d5c9) + u(0x1d5c5) + u(0x1d5be), 2);  // ap | le
-        target.insertTextBeforeCaret(u(0x1d5c9));
-        assert.equal(target.getText(), u(0x1d5ba) + u(0x1d5c9) + u(0x1d5c9) + u(0x1d5c5) + u(0x1d5be));
+        let textStore = new KeyboardModule.SyntheticTextStore(u(0x1d5ba) + u(0x1d5c9) + u(0x1d5c5) + u(0x1d5be), 2);  // ap | le
+        textStore.insertTextBeforeCaret(u(0x1d5c9));
+        assert.equal(textStore.getText(), u(0x1d5ba) + u(0x1d5c9) + u(0x1d5c9) + u(0x1d5c5) + u(0x1d5be));
       } finally {
         KMWString.enableSupplementaryPlane(false);
       }
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
index 1317fbf4456..0115e5e39ba 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
@@ -60,14 +60,14 @@ function runEngineRuleSet(ruleSet, defaultNoun) {
       var ruleSeq = new RecordedKeystrokeSequence(matchTest.sequence);
       let proctor = new NodeProctor(keyboardWithHarness, device, assert.equal);
 
-      // We want to specify the OutputTarget for this test; our actual concern is the resulting context.
-      var target = new SyntheticTextStore();
-      ruleSeq.test(proctor, target);
+      // We want to specify the TextStore for this test; our actual concern is the resulting context.
+      var textStore = new SyntheticTextStore();
+      ruleSeq.test(proctor, textStore);
 
       // Now for the real test!
       let processor = new JSKeyboardProcessor(device);
       processor.keyboardInterface = keyboardWithHarness;
-      var res = processor.keyboardInterface.fullContextMatch(ruleDef.n, target, ruleDef.rule);
+      var res = processor.keyboardInterface.fullContextMatch(ruleDef.n, textStore, ruleDef.rule);
 
       var msg = matchTest.msg;
       if(!msg) {
@@ -1111,20 +1111,19 @@ describe('Engine - Context Matching', function() {
   it('properly generates extended context data needed by context-matching checks below', function() {
     let matchDefs = FULL_RULE_SET;
 
-    for(var j = 0; j < matchDefs.length; j++) {
+    for(const ruleDef of matchDefs) {
       // Prepare the context!
-      var ruleDef = matchDefs[j];
-      var ruleSeq = new RecordedKeystrokeSequence(ruleDef.baseSequence);
+      const ruleSeq = new RecordedKeystrokeSequence(ruleDef.baseSequence);
       let proctor = new NodeProctor(keyboardWithHarness, device, assert.equal);
 
-      // We want to specify the OutputTarget for this test; our actual concern is the resulting context.
-      var target = new SyntheticTextStore();
-      ruleSeq.test(proctor, target);
+      // We want to specify the TextStore for this test; our actual concern is the resulting context.
+      const textStore = new SyntheticTextStore();
+      ruleSeq.test(proctor, textStore);
 
       // Now for the real test!
-      let processor = new JSKeyboardProcessor(device);
+      const processor = new JSKeyboardProcessor(device);
       processor.keyboardInterface = keyboardWithHarness;
-      var res = processor.keyboardInterface._BuildExtendedContext(ruleDef.n, ruleDef.ln, target);
+      const res = processor.keyboardInterface._BuildExtendedContext(ruleDef.n, ruleDef.ln, textStore);
 
       assert.sameOrderedMembers(res.valContext, ruleDef.contextCache);
     }
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
index b6ea7f1ab75..4676860f2f2 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
@@ -23,8 +23,8 @@ function runEngineRuleSet(ruleSet) {
     // Prepare the context!
     const ruleSeq = new RecordedKeystrokeSequence(ruleDef);
     const proctor = new NodeProctor(keyboardWithHarness, device, assert.equal);
-    const target = new SyntheticTextStore();
-    ruleSeq.test(proctor, target);
+    const textStore = new SyntheticTextStore();
+    ruleSeq.test(proctor, textStore);
   }
 }
 
diff --git a/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js b/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
index b0b540322df..9a11fc686fe 100644
--- a/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
@@ -41,7 +41,7 @@ describe('Engine - rule processing', function() {
 
     it('matches rules with mnemonic-specced KeyEvents', () => {
       // Note:  plain 'n' is produced from default key outputs for sil_ipa, not a keyboard rule.
-      let mockMnemonic = new SyntheticTextStore('n');
+      let mnemonicTextStore = new SyntheticTextStore('n');
       let mnemonicEvent = new KeyEvent({
         // sil_ipa is a mnenomic keyboard:  it expects codes based on the key's standard character output.
         Lcode: '>'.charCodeAt(0), // 62
@@ -53,16 +53,16 @@ describe('Engine - rule processing', function() {
         device: device
       });
 
-      const mnemonicResult = keyboardWithHarness.processKeystroke(mockMnemonic, mnemonicEvent);
+      const mnemonicResult = keyboardWithHarness.processKeystroke(mnemonicTextStore, mnemonicEvent);
 
       assert.isOk(mnemonicResult);
       assert.isFalse(mnemonicResult.triggerKeyDefault);
-      assert.equal(mockMnemonic.getText(), 'ŋ');
+      assert.equal(mnemonicTextStore.getText(), 'ŋ');
     });
 
     it('requires correct modifiers', () => {
       // Note:  plain 'n' is produced from default key outputs for sil_ipa, not a keyboard rule.
-      let mockMnemonic = new SyntheticTextStore('n');
+      let mnemonicTextStore = new SyntheticTextStore('n');
       let mnemonicEvent = new KeyEvent({
         // sil_ipa is a mnenomic keyboard:  it expects codes based on the key's standard character output.
         Lcode: '>'.charCodeAt(0), // 62
@@ -74,14 +74,14 @@ describe('Engine - rule processing', function() {
         device: device
       });
 
-      const mnemonicResult = keyboardWithHarness.processKeystroke(mockMnemonic, mnemonicEvent);
+      const mnemonicResult = keyboardWithHarness.processKeystroke(mnemonicTextStore, mnemonicEvent);
 
       assert.isOk(mnemonicResult);
       assert.isTrue(mnemonicResult.triggerKeyDefault);
     });
 
     it('does not match rules with positional-specced KeyEvents', () => {
-      let mockPositional = new SyntheticTextStore('n');
+      let positionalTextStore = new SyntheticTextStore('n');
       let positionalEvent = new KeyEvent({
         // If it were positional, we'd use this instead:
         Lcode: Codes.keyCodes.K_COMMA, // 188
@@ -93,11 +93,11 @@ describe('Engine - rule processing', function() {
         device: device
       });
 
-      const positionalResult = keyboardWithHarness.processKeystroke(mockPositional, positionalEvent);
+      const positionalResult = keyboardWithHarness.processKeystroke(positionalTextStore, positionalEvent);
 
       assert.isOk(positionalResult);
       assert.isTrue(positionalResult.triggerKeyDefault);
-      assert.notEqual(mockPositional.getText(), 'ŋ');
+      assert.notEqual(positionalTextStore.getText(), 'ŋ');
     });
   });
 
@@ -119,7 +119,7 @@ describe('Engine - rule processing', function() {
     });
 
     it('matches rules with legacy-specced KeyEvents', () => {
-      let mockLegacy = new SyntheticTextStore('');
+      let legacyTextStore = new SyntheticTextStore('');
       let legacyEvent = new KeyEvent({
         // armenian is a KMW 1.0 keyboard:  it expects codes based on the key's standard character output.
         Lcode: 'a'.charCodeAt(0),
@@ -131,15 +131,15 @@ describe('Engine - rule processing', function() {
         device: device
       });
 
-      const legacyResult = keyboardWithHarness.processKeystroke(mockLegacy, legacyEvent);
+      const legacyResult = keyboardWithHarness.processKeystroke(legacyTextStore, legacyEvent);
 
       assert.isOk(legacyResult);
       assert.isFalse(legacyResult.triggerKeyDefault);
-      assert.equal(mockLegacy.getText(), 'ա');
+      assert.equal(legacyTextStore.getText(), 'ա');
     });
 
     it('ignores current modifiers and states', () => {
-      let mockLegacy = new SyntheticTextStore('');
+      let legacyTextStore = new SyntheticTextStore('');
       let legacyEvent = new KeyEvent({
         // armenian is a KMW 1.0 keyboard:  it expects codes based on the key's standard character output.
         Lcode: 'a'.charCodeAt(0),
@@ -151,15 +151,15 @@ describe('Engine - rule processing', function() {
         device: device
       });
 
-      const legacyResult = keyboardWithHarness.processKeystroke(mockLegacy, legacyEvent);
+      const legacyResult = keyboardWithHarness.processKeystroke(legacyTextStore, legacyEvent);
 
       assert.isOk(legacyResult);
       assert.isFalse(legacyResult.triggerKeyDefault);
-      assert.equal(mockLegacy.getText(), 'ա');
+      assert.equal(legacyTextStore.getText(), 'ա');
     });
 
     it('does not match rules with mnemonic-specced KeyEvents', () => {
-      let mockMnemonic = new SyntheticTextStore('');
+      let mnemonicTextStore = new SyntheticTextStore('');
       let mnemonicEvent = new KeyEvent({
         // armenian is a KMW 1.0 keyboard:  it expects codes based on the key's standard character output.
         Lcode: 'a'.charCodeAt(0),
@@ -171,14 +171,14 @@ describe('Engine - rule processing', function() {
         device: device
       });
 
-      const mnemonicResult = keyboardWithHarness.processKeystroke(mockMnemonic, mnemonicEvent);
+      const mnemonicResult = keyboardWithHarness.processKeystroke(mnemonicTextStore, mnemonicEvent);
 
       assert.isOk(mnemonicResult);
       assert.isTrue(mnemonicResult.triggerKeyDefault);
     });
 
     it('does not match rules with positional-specced KeyEvents', () => {
-      let mockPositional = new SyntheticTextStore('');
+      let positionalTextStore = new SyntheticTextStore('');
       let positionalEvent = new KeyEvent({
         // If it were positional, we'd use this instead:
         Lcode: Codes.keyCodes.K_A,
@@ -190,7 +190,7 @@ describe('Engine - rule processing', function() {
         device: device
       });
 
-      const positionalResult = keyboardWithHarness.processKeystroke(mockPositional, positionalEvent);
+      const positionalResult = keyboardWithHarness.processKeystroke(positionalTextStore, positionalEvent);
 
       assert.isOk(positionalResult);
       assert.isTrue(positionalResult.triggerKeyDefault);
diff --git a/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js b/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js
index ce8ccbf1403..6275d800612 100644
--- a/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js
@@ -154,44 +154,45 @@ describe("Transcriptions and Transforms", function() {
   // Built in-line via function.  Looks functionally equivalent to "apple", but with non-BMP characters.
   let smpApple = u(0x1d5ba)+u(0x1d5c9)+u(0x1d5c9)+u(0x1d5c5)+u(0x1d5be);
 
-  it("does not store an alias for related OutputTargets", function() {
-    // We have other texts validating Mocks; by using them as our base 'element', this unit test file
-    // could eventually run in 'headless' mode.
-    var target = new SyntheticTextStore("apple");
-    var original = SyntheticTextStore.from(target);
-    target.insertTextBeforeCaret("s");
+  it("does not store an alias for related TextStores", function() {
+    // We have other texts validating SyntheticTextStores; by using them
+    // as our base 'element', this unit test file could eventually run
+    // in 'headless' mode.
+    const textStore = new SyntheticTextStore("apple");
+    const originalTextStore = SyntheticTextStore.from(textStore);
+    textStore.insertTextBeforeCaret("s");
 
     /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
      * Other modules coming later will need it, though.
      */
-    var transcription = target.buildTranscriptionFrom(original, null);
+    const transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
-    assert.notEqual(transcription.preInput, original, "The transcription's input snapshot is an alias");
-    assert.notEqual(transcription.preInput, target, "The transcription's input snapshot is an alias");
+    assert.notEqual(transcription.preInput, originalTextStore, "The transcription's input snapshot is an alias");
+    assert.notEqual(transcription.preInput, textStore, "The transcription's input snapshot is an alias");
   })
 
   describe("Plain text operations", function() {
     it("handles context-free single-char output rules", function() {
-      // We have other texts validating Mocks; by using them as our base 'element', this unit test file
+      // We have other texts validating SyntheticTextStores; by using them as our base 'element', this unit test file
       // could eventually run in 'headless' mode.
-      var target = new SyntheticTextStore("apple");
-      var original = SyntheticTextStore.from(target);
-      target.insertTextBeforeCaret("s");
+      const textStore = new SyntheticTextStore("apple");
+      const originalTextStore = SyntheticTextStore.from(textStore);
+      textStore.insertTextBeforeCaret("s");
 
       /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
       * Other modules coming later will need it, though.
       */
-      var transcription = target.buildTranscriptionFrom(original, null);
+      let transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
       assert.equal(transcription.transform.insert, "s", "Failed to recognize inserted text");
       assert.equal(transcription.transform.deleteLeft, 0, "Incorrectly detected left-of-caret deletions");
       assert.equal(transcription.transform.deleteRight, 0, "Incorrectly detected right-of-caret deletions");
 
-      target = new SyntheticTextStore("apple", 3);
-      original = SyntheticTextStore.from(target);
-      target.insertTextBeforeCaret("s"); // "appsle"
+      textStore = new SyntheticTextStore("apple", 3);
+      originalTextStore = SyntheticTextStore.from(textStore);
+      textStore.insertTextBeforeCaret("s"); // "appsle"
 
-      var transcription = target.buildTranscriptionFrom(original, null);
+      transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
       assert.equal(transcription.transform.insert, "s", "Failed to recognize inserted text when right-of-caret text exists");
       assert.equal(transcription.transform.deleteLeft, 0);
@@ -199,16 +200,16 @@ describe("Transcriptions and Transforms", function() {
     });
 
     it("handles operations with moderately long text", function() {
-      var target = new SyntheticTextStore("The quick brown cat jumped onto the lazy dog.", 19);
-      var original = SyntheticTextStore.from(target);
-      target.setSelection(30); // 19 + 11:  moves it to after "onto".
-      target.deleteCharsBeforeCaret(14); // delete:  "cat jumped onto"
-      target.insertTextBeforeCaret("fox jumped over");
+      const textStore = new SyntheticTextStore("The quick brown cat jumped onto the lazy dog.", 19);
+      const originalTextStore = SyntheticTextStore.from(textStore);
+      textStore.setSelection(30); // 19 + 11:  moves it to after "onto".
+      textStore.deleteCharsBeforeCaret(14); // delete:  "cat jumped onto"
+      textStore.insertTextBeforeCaret("fox jumped over");
 
       /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
       * Other modules coming later will need it, though.
       */
-      var transcription = target.buildTranscriptionFrom(original, null);
+      const transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
       assert.equal(transcription.transform.insert, "fox jumped over", "Reported inserted text when only deletions exist");
       assert.equal(transcription.transform.deleteLeft, 3, "Incorrect count for left-of-caret deletions");
@@ -228,15 +229,15 @@ he did. Unfortunately, he taught his apprentice everything he knew, then his
 apprentice killed him in his sleep. It's ironic he could save others from death,
 but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
-      var target = new SyntheticTextStore(text, text.length);
-      var original = SyntheticTextStore.from(target);
-      target.deleteCharsBeforeCaret(1);
-      target.insertTextBeforeCaret("!");
+      const textStore = new SyntheticTextStore(text, text.length);
+      const originalTextStore = SyntheticTextStore.from(textStore);
+      textStore.deleteCharsBeforeCaret(1);
+      textStore.insertTextBeforeCaret("!");
 
       /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
       * Other modules coming later will need it, though.
       */
-      var transcription = target.buildTranscriptionFrom(original, null);
+      const transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
       assert.equal(transcription.transform.insert, "!", "Reported inserted text when only deletions exist");
       assert.equal(transcription.transform.deleteLeft, 1, "Incorrect count for left-of-caret deletions");
@@ -244,15 +245,15 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
     });
 
     it("handles deletions around the caret without text insertion", function() {
-      var target = new SyntheticTextStore("apple", 2);
-      var original = SyntheticTextStore.from(target);
-      target.setSelection(3);
-      target.deleteCharsBeforeCaret(2); // "ale"
+      const textStore = new SyntheticTextStore("apple", 2);
+      const originalTextStore = SyntheticTextStore.from(textStore);
+      textStore.setSelection(3);
+      textStore.deleteCharsBeforeCaret(2); // "ale"
 
       /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
       * Other modules coming later will need it, though.
       */
-      var transcription = target.buildTranscriptionFrom(original, null);
+      const transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
       assert.equal(transcription.transform.insert, "", "Reported inserted text when only deletions exist");
       assert.equal(transcription.transform.deleteLeft, 1, "Incorrect count for left-of-caret deletions");
@@ -262,15 +263,15 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
     it("handles deletions around the caret without text insertion (non-BMP text)", function() {
       try {
         KMWString.enableSupplementaryPlane(true);
-        var target = new SyntheticTextStore(smpApple, 2);
-        var original = SyntheticTextStore.from(target);
-        target.setSelection(3);
-        target.deleteCharsBeforeCaret(2); // "ale"
+        const textStore = new SyntheticTextStore(smpApple, 2);
+        const originalTextStore = SyntheticTextStore.from(textStore);
+        textStore.setSelection(3);
+        textStore.deleteCharsBeforeCaret(2); // "ale"
 
         /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
         * Other modules coming later will need it, though.
         */
-        var transcription = target.buildTranscriptionFrom(original, null);
+        const transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
         assert.equal(transcription.transform.insert, "", "Reported inserted text when only deletions exist");
         assert.equal(transcription.transform.deleteLeft, 1, "Incorrect count for left-of-caret deletions");
@@ -281,18 +282,18 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
     });
 
     it("handles deletions around the caret with text insertion", function() {
-      // We have other texts validating Mocks; by using them as our base 'element', this unit test file
+      // We have other texts validating SyntheticTextStores; by using them as our base 'element', this unit test file
       // could eventually run in 'headless' mode.
-      var target = new SyntheticTextStore("apple", 2);
-      var original = SyntheticTextStore.from(target);
-      target.setSelection(3);
-      target.deleteCharsBeforeCaret(2);
-      target.insertTextBeforeCaret("PP"); // "aPPle"
+      let textStore = new SyntheticTextStore("apple", 2);
+      let originalTextStore = SyntheticTextStore.from(textStore);
+      textStore.setSelection(3);
+      textStore.deleteCharsBeforeCaret(2);
+      textStore.insertTextBeforeCaret("PP"); // "aPPle"
 
       /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
       * Other modules coming later will need it, though.
       */
-      var transcription = target.buildTranscriptionFrom(original, null);
+      let transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
       assert.equal(transcription.transform.insert, "PP", "Reported inserted text when only deletions exist");
       assert.equal(transcription.transform.deleteLeft, 1, "Incorrect count for left-of-caret deletions");
@@ -300,16 +301,16 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
       // CASE 2
 
-      var target = new SyntheticTextStore("apple", 2);
-      var original = SyntheticTextStore.from(target);
-      target.setSelection(4);
-      target.deleteCharsBeforeCaret(3);
-      target.insertTextBeforeCaret("P"); // "aPe"
+      textStore = new SyntheticTextStore("apple", 2);
+      originalTextStore = SyntheticTextStore.from(textStore);
+      textStore.setSelection(4);
+      textStore.deleteCharsBeforeCaret(3);
+      textStore.insertTextBeforeCaret("P"); // "aPe"
 
       /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
       * Other modules coming later will need it, though.
       */
-      var transcription = target.buildTranscriptionFrom(original, null);
+      transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
       assert.equal(transcription.transform.insert, "P", "Reported inserted text when only deletions exist");
       assert.equal(transcription.transform.deleteLeft, 1, "Incorrect count for left-of-caret deletions");
@@ -317,16 +318,16 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
       // CASE 3
 
-      var target = new SyntheticTextStore("apple", 2);
-      var original = SyntheticTextStore.from(target);
-      target.setSelection(4);
-      target.deleteCharsBeforeCaret(3);
-      target.insertTextBeforeCaret("aaaaaaaaaaaaaa"); // "aaaaaaaaaaaaaaae"
+      textStore = new SyntheticTextStore("apple", 2);
+      originalTextStore = SyntheticTextStore.from(textStore);
+      textStore.setSelection(4);
+      textStore.deleteCharsBeforeCaret(3);
+      textStore.insertTextBeforeCaret("aaaaaaaaaaaaaa"); // "aaaaaaaaaaaaaaae"
 
       /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
       * Other modules coming later will need it, though.
       */
-      var transcription = target.buildTranscriptionFrom(original, null);
+      transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
       assert.equal(transcription.transform.insert, "aaaaaaaaaaaaaa", "Reported inserted text when only deletions exist");
       assert.equal(transcription.transform.deleteLeft, 1, "Incorrect count for left-of-caret deletions");
@@ -334,18 +335,18 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
       // CASE 4
 
-      var target = new SyntheticTextStore("apple", 2);
-      var original = SyntheticTextStore.from(target);
-      target.setSelection(5);
-      target.deleteCharsBeforeCaret(4);
-      target.insertTextBeforeCaret("les"); // "ales" - since we've appended a letter at the very end, the whole right-hand is indeed an insertion.
+      textStore = new SyntheticTextStore("apple", 2);
+      originalTextStore = SyntheticTextStore.from(textStore);
+      textStore.setSelection(5);
+      textStore.deleteCharsBeforeCaret(4);
+      textStore.insertTextBeforeCaret("les"); // "ales" - since we've appended a letter at the very end, the whole right-hand is indeed an insertion.
 
       /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
         * Other modules coming later will need it, though.
         */
-      var transcription = target.buildTranscriptionFrom(original, null);
+      transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
-      // Again, while the "le" portion is original text, the appended "s" means it must have been re-inserted.
+      // Again, while the "le" portion is originalTextStore text, the appended "s" means it must have been re-inserted.
       assert.equal(transcription.transform.insert, "les", "Reported inserted text when only deletions exist");
       assert.equal(transcription.transform.deleteLeft, 1, "Incorrect count for left-of-caret deletions");
       assert.equal(transcription.transform.deleteRight, 3, "Incorrect count for right-of-caret deletions");
@@ -355,21 +356,21 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
       try {
         KMWString.enableSupplementaryPlane(true);
 
-        // We have other texts validating Mocks; by using them as our base 'element', this unit test file
+        // We have other texts validating SyntheticTextStores; by using them as our base 'element', this unit test file
         // could eventually run in 'headless' mode.
-        var target = new SyntheticTextStore(smpApple, 2);
+        let textStore = new SyntheticTextStore(smpApple, 2);
         let smpLE = u(0x1d5c5)+u(0x1d5be);
-        var original = SyntheticTextStore.from(target);
-        target.setSelection(3);
-        target.deleteCharsBeforeCaret(2);
-        target.insertTextBeforeCaret(smpLE); // "alele"
+        let originalTextStore = SyntheticTextStore.from(textStore);
+        textStore.setSelection(3);
+        textStore.deleteCharsBeforeCaret(2);
+        textStore.insertTextBeforeCaret(smpLE); // "alele"
 
         /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
         * Other modules coming later will need it, though.
         *
         * This will trigger the "step 1.2" component of buildTransformFrom.
         */
-        var transcription = target.buildTranscriptionFrom(original, null);
+        let transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
         assert.equal(transcription.transform.insert, smpLE, "Reported inserted text when only deletions exist");
         assert.equal(transcription.transform.deleteLeft, 1, "Incorrect count for left-of-caret deletions");
@@ -377,17 +378,17 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
         // CASE 2
 
-        var target = new SyntheticTextStore(smpApple, 2);
+        textStore = new SyntheticTextStore(smpApple, 2);
         let smpB = u(0x1d5bb);
-        var original = SyntheticTextStore.from(target);
-        target.setSelection(4);
-        target.deleteCharsBeforeCaret(3);
-        target.insertTextBeforeCaret(smpB); // "aPe"
+        originalTextStore = SyntheticTextStore.from(textStore);
+        textStore.setSelection(4);
+        textStore.deleteCharsBeforeCaret(3);
+        textStore.insertTextBeforeCaret(smpB); // "aPe"
 
         /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
         * Other modules coming later will need it, though.
         */
-        var transcription = target.buildTranscriptionFrom(original, null);
+        transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
         assert.equal(transcription.transform.insert, smpB, "Reported inserted text when only deletions exist");
         assert.equal(transcription.transform.deleteLeft, 1, "Incorrect count for left-of-caret deletions");
@@ -395,16 +396,16 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
         // CASE 3
 
-        var target = new SyntheticTextStore(smpApple, 2);
-        var original = SyntheticTextStore.from(target);
-        target.setSelection(4);
-        target.deleteCharsBeforeCaret(3);
-        target.insertTextBeforeCaret("aaaaaaaaaaaaaa"); // "aaaaaaaaaaaaaaae"
+        textStore = new SyntheticTextStore(smpApple, 2);
+        originalTextStore = SyntheticTextStore.from(textStore);
+        textStore.setSelection(4);
+        textStore.deleteCharsBeforeCaret(3);
+        textStore.insertTextBeforeCaret("aaaaaaaaaaaaaa"); // "aaaaaaaaaaaaaaae"
 
         /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
         * Other modules coming later will need it, though.
         */
-        var transcription = target.buildTranscriptionFrom(original, null);
+        transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
         assert.equal(transcription.transform.insert, "aaaaaaaaaaaaaa", "Reported inserted text when only deletions exist");
         assert.equal(transcription.transform.deleteLeft, 1, "Incorrect count for left-of-caret deletions");
@@ -412,19 +413,19 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
 
         // CASE 4
 
-        var target = new SyntheticTextStore(smpApple, 2);
+        textStore = new SyntheticTextStore(smpApple, 2);
         let smpLES = u(0x1d5c5)+u(0x1d5be)+u(0x1d5cb);
-        var original = SyntheticTextStore.from(target);
-        target.setSelection(5);
-        target.deleteCharsBeforeCaret(4);
-        target.insertTextBeforeCaret(smpLES); // "ales" - since we've appended a letter at the very end, the whole right-hand is indeed an insertion.
+        originalTextStore = SyntheticTextStore.from(textStore);
+        textStore.setSelection(5);
+        textStore.deleteCharsBeforeCaret(4);
+        textStore.insertTextBeforeCaret(smpLES); // "ales" - since we've appended a letter at the very end, the whole right-hand is indeed an insertion.
 
         /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
           * Other modules coming later will need it, though.
           */
-        var transcription = target.buildTranscriptionFrom(original, null);
+        transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
-        // Again, while the "le" portion is original text, the appended "s" means it must have been re-inserted.
+        // Again, while the "le" portion is originalTextStore text, the appended "s" means it must have been re-inserted.
         assert.equal(transcription.transform.insert, smpLES, "Reported inserted text when only deletions exist");
         assert.equal(transcription.transform.deleteLeft, 1, "Incorrect count for left-of-caret deletions");
         assert.equal(transcription.transform.deleteRight, 3, "Incorrect count for right-of-caret deletions");
@@ -433,14 +434,14 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
       }
     });
 
-    it('from targets with existing selection', () => {
+    it('from textStores with existing selection', () => {
       //                              |            |
-      const target = new SyntheticTextStore("testing testing one two three");
-      target.setSelection(8, 20)
-      const original = SyntheticTextStore.from(target);
-      target.clearSelection();
+      const textStore = new SyntheticTextStore("testing testing one two three");
+      textStore.setSelection(8, 20)
+      const originalTextStore = SyntheticTextStore.from(textStore);
+      textStore.clearSelection();
 
-      const transform = target.buildTransformFrom(original);
+      const transform = textStore.textStore(originalTextStore);
       assert.deepEqual(transform, {
         insert: '',
         deleteLeft: 0,
@@ -449,10 +450,10 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
       });
     });
 
-    it('to targets with existing selection', () => {
+    it('to textStore with existing selection', () => {
       //                              |            |
-      const target = new SyntheticTextStore("testing testing one two three");
-      target.setSelection(8, 20)
+      const textStore = new SyntheticTextStore("testing testing one two three");
+      textStore.setSelection(8, 20)
       const transform = {
         insert: '',
         deleteLeft: 0,
@@ -460,8 +461,8 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
         erasedSelection: true
       };
 
-      target.apply(transform);
-      assert.equal(target.getText(), 'testing two three');
+      textStore.apply(transform);
+      assert.equal(textStore.getText(), 'testing two three');
     });
   });
 
@@ -469,29 +470,29 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
     // Just one, less nuanced/subdivided; it's not a present priority for our work, but it should provide a decent basis if/when it's needed.
     it("Correctly recognizes deadkey set mutations", function() {
 
-      // We have other texts validating Mocks; by using them as our base 'element', this unit test file
+      // We have other texts validating SyntheticTextStores; by using them as our base 'element', this unit test file
       // could eventually run in 'headless' mode.
-      var target = new SyntheticTextStore("apple");
-      var original = SyntheticTextStore.from(target);
+      var textStore = new SyntheticTextStore("apple");
+      var originalTextStore = SyntheticTextStore.from(textStore);
 
-      target.setSelection(4);
-      target.insertDeadkeyBeforeCaret(0);
-      target.setSelection(1);
-      target.insertDeadkeyBeforeCaret(1);
-      target.setSelection(2);
-      target.insertDeadkeyBeforeCaret(2); // 'a' dk(1) 'p' dk(2) | 'p' 'l' dk(0) 'e'
+      textStore.setSelection(4);
+      textStore.insertDeadkeyBeforeCaret(0);
+      textStore.setSelection(1);
+      textStore.insertDeadkeyBeforeCaret(1);
+      textStore.setSelection(2);
+      textStore.insertDeadkeyBeforeCaret(2); // 'a' dk(1) 'p' dk(2) | 'p' 'l' dk(0) 'e'
 
-      var original = SyntheticTextStore.from(target);
+      var originalTextStore = SyntheticTextStore.from(textStore);
 
-      target.hasDeadkeyMatch(0, 2);
-      target.deadkeys().deleteMatched();
+      textStore.hasDeadkeyMatch(0, 2);
+      textStore.deadkeys().deleteMatched();
 
-      target.setSelection(3);
-      target.deleteCharsBeforeCaret(2);
-      target.insertTextBeforeCaret("b");
-      target.insertDeadkeyBeforeCaret(3); // In effect: 'a' dk(1) 'b' dk(3) | 'l' dk(0) 'e'
+      textStore.setSelection(3);
+      textStore.deleteCharsBeforeCaret(2);
+      textStore.insertTextBeforeCaret("b");
+      textStore.insertDeadkeyBeforeCaret(3); // In effect: 'a' dk(1) 'b' dk(3) | 'l' dk(0) 'e'
 
-      var transcription = target.buildTranscriptionFrom(original, null);
+      var transcription = textStore.buildTranscriptionFrom(originalTextStore, null);
 
       assert.equal(transcription.transform.insert, "b", "Reported inserted text when only deletions exist");
       assert.equal(transcription.transform.deleteLeft, 1, "Incorrect count for left-of-caret deletions");
diff --git a/web/src/test/auto/headless/engine/keyboard/mocks.tests.js b/web/src/test/auto/headless/engine/keyboard/mocks.tests.js
deleted file mode 100644
index eaf0f37a3b0..00000000000
--- a/web/src/test/auto/headless/engine/keyboard/mocks.tests.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import { assert } from 'chai';
-import { SyntheticTextStore } from 'keyman/engine/keyboard';
-
-describe('Mocks', function() {
-  describe('app|les', () => {
-    const testMock = new SyntheticTextStore('apples', 3);
-
-    it('Cloning with .from()', () => {
-      assert.deepEqual(SyntheticTextStore.from(testMock), testMock);
-      assert.notStrictEqual(SyntheticTextStore.from(testMock), testMock);
-    });
-
-    it('getText', () => {
-      assert.equal(testMock.getText(), 'apples');
-    });
-
-    it('getTextBeforeCaret', () => {
-      assert.equal(testMock.getTextBeforeCaret(), 'app');
-    });
-
-    it('getTextAfterCaret', () => {
-      assert.equal(testMock.getTextAfterCaret(), 'les');
-    });
-
-    it('getSelectedText', () => {
-      assert.equal(testMock.getSelectedText(), '');
-    });
-
-    it('isSelectionEmpty', () => {
-      assert.isTrue(testMock.isSelectionEmpty());
-    });
-
-    it('clearSelection', () => {
-      let editMock = SyntheticTextStore.from(testMock);
-      editMock.clearSelection();
-
-      assert.equal(editMock.getText(), testMock.getTextBeforeCaret() + testMock.getTextAfterCaret());
-      assert.equal(editMock.getTextBeforeCaret(), testMock.getTextBeforeCaret());
-      assert.equal(editMock.getTextAfterCaret(), testMock.getTextAfterCaret());
-      assert.isTrue(editMock.isSelectionEmpty());
-
-      let postClear = SyntheticTextStore.from(editMock);
-      editMock.clearSelection(); // on same object; make sure its internal selection stuff updates correctly!
-      assert.notStrictEqual(postClear, editMock);
-      assert.deepEqual(postClear, editMock);
-    });
-  });
-
-  describe('app|les and ba|nanas', () => {  // selection = 'les and ba'
-    const testMock = new SyntheticTextStore('apples and bananas', 3, 13);
-
-    it('Cloning with from()', () => {
-      assert.deepEqual(SyntheticTextStore.from(testMock), testMock);
-      assert.notStrictEqual(SyntheticTextStore.from(testMock), testMock);
-    });
-
-    it('getText', () => {
-      assert.equal(testMock.getText(), 'apples and bananas');
-    });
-
-    it('getTextBeforeCaret', () => {
-      assert.equal(testMock.getTextBeforeCaret(), 'app');
-    });
-
-    it('getTextAfterCaret', () => {
-      assert.equal(testMock.getTextAfterCaret(), 'nanas');
-    });
-
-    it('getSelectedText', () => {
-      assert.equal(testMock.getSelectedText(), 'les and ba');
-    });
-
-    it('isSelectionEmpty', () => {
-      assert.isFalse(testMock.isSelectionEmpty());
-    });
-
-    it('clearSelection', () => {
-      let editMock = SyntheticTextStore.from(testMock);
-      editMock.clearSelection();
-
-      assert.equal(editMock.getText(), testMock.getTextBeforeCaret() + testMock.getTextAfterCaret());
-      assert.equal(editMock.getTextBeforeCaret(), testMock.getTextBeforeCaret());
-      assert.equal(editMock.getTextAfterCaret(), testMock.getTextAfterCaret());
-      assert.isTrue(editMock.isSelectionEmpty());
-
-      let postClear = SyntheticTextStore.from(editMock);
-      editMock.clearSelection(); // on same object; make sure its internal selection stuff updates correctly!
-      assert.notStrictEqual(postClear, editMock);
-      assert.deepEqual(postClear, editMock);
-    });
-  });
-});
\ No newline at end of file
diff --git a/web/src/test/auto/headless/engine/keyboard/syntheticTextStore.tests.js b/web/src/test/auto/headless/engine/keyboard/syntheticTextStore.tests.js
new file mode 100644
index 00000000000..8ecc3c4c370
--- /dev/null
+++ b/web/src/test/auto/headless/engine/keyboard/syntheticTextStore.tests.js
@@ -0,0 +1,92 @@
+import { assert } from 'chai';
+import { SyntheticTextStore } from 'keyman/engine/keyboard';
+
+describe('SyntheticTextStoreTests', function() {
+  describe('app|les', () => {
+    const testTextStore = new SyntheticTextStore('apples', 3);
+
+    it('Cloning with .from()', () => {
+      assert.deepEqual(SyntheticTextStore.from(testTextStore), testTextStore);
+      assert.notStrictEqual(SyntheticTextStore.from(testTextStore), testTextStore);
+    });
+
+    it('getText', () => {
+      assert.equal(testTextStore.getText(), 'apples');
+    });
+
+    it('getTextBeforeCaret', () => {
+      assert.equal(testTextStore.getTextBeforeCaret(), 'app');
+    });
+
+    it('getTextAfterCaret', () => {
+      assert.equal(testTextStore.getTextAfterCaret(), 'les');
+    });
+
+    it('getSelectedText', () => {
+      assert.equal(testTextStore.getSelectedText(), '');
+    });
+
+    it('isSelectionEmpty', () => {
+      assert.isTrue(testTextStore.isSelectionEmpty());
+    });
+
+    it('clearSelection', () => {
+      let editTextStore = SyntheticTextStore.from(testTextStore);
+      editTextStore.clearSelection();
+
+      assert.equal(editTextStore.getText(), testTextStore.getTextBeforeCaret() + testTextStore.getTextAfterCaret());
+      assert.equal(editTextStore.getTextBeforeCaret(), testTextStore.getTextBeforeCaret());
+      assert.equal(editTextStore.getTextAfterCaret(), testTextStore.getTextAfterCaret());
+      assert.isTrue(editTextStore.isSelectionEmpty());
+
+      let postClear = SyntheticTextStore.from(editTextStore);
+      editTextStore.clearSelection(); // on same object; make sure its internal selection stuff updates correctly!
+      assert.notStrictEqual(postClear, editTextStore);
+      assert.deepEqual(postClear, editTextStore);
+    });
+  });
+
+  describe('app|les and ba|nanas', () => {  // selection = 'les and ba'
+    const testTextStore = new SyntheticTextStore('apples and bananas', 3, 13);
+
+    it('Cloning with from()', () => {
+      assert.deepEqual(SyntheticTextStore.from(testTextStore), testTextStore);
+      assert.notStrictEqual(SyntheticTextStore.from(testTextStore), testTextStore);
+    });
+
+    it('getText', () => {
+      assert.equal(testTextStore.getText(), 'apples and bananas');
+    });
+
+    it('getTextBeforeCaret', () => {
+      assert.equal(testTextStore.getTextBeforeCaret(), 'app');
+    });
+
+    it('getTextAfterCaret', () => {
+      assert.equal(testTextStore.getTextAfterCaret(), 'nanas');
+    });
+
+    it('getSelectedText', () => {
+      assert.equal(testTextStore.getSelectedText(), 'les and ba');
+    });
+
+    it('isSelectionEmpty', () => {
+      assert.isFalse(testTextStore.isSelectionEmpty());
+    });
+
+    it('clearSelection', () => {
+      let editTextStore = SyntheticTextStore.from(testTextStore);
+      editTextStore.clearSelection();
+
+      assert.equal(editTextStore.getText(), testTextStore.getTextBeforeCaret() + testTextStore.getTextAfterCaret());
+      assert.equal(editTextStore.getTextBeforeCaret(), testTextStore.getTextBeforeCaret());
+      assert.equal(editTextStore.getTextAfterCaret(), testTextStore.getTextAfterCaret());
+      assert.isTrue(editTextStore.isSelectionEmpty());
+
+      let postClear = SyntheticTextStore.from(editTextStore);
+      editTextStore.clearSelection(); // on same object; make sure its internal selection stuff updates correctly!
+      assert.notStrictEqual(postClear, editTextStore);
+      assert.deepEqual(postClear, editTextStore);
+    });
+  });
+});
\ No newline at end of file
diff --git a/web/src/tools/testing/recorder-core/src/index.ts b/web/src/tools/testing/recorder-core/src/index.ts
index 3d3fceacd8b..c1d9c44978f 100644
--- a/web/src/tools/testing/recorder-core/src/index.ts
+++ b/web/src/tools/testing/recorder-core/src/index.ts
@@ -216,15 +216,15 @@ export abstract class TestSequence<KeyRecord extends RecordedKeystroke | InputEv
 
   abstract hasOSKInteraction(): boolean;
 
-  async test(proctor: Proctor, target?: TextStore): Promise<{success: boolean, result: string}> {
+  async test(proctor: Proctor, textStore?: TextStore): Promise<{success: boolean, result: string}> {
     // Start with an empty TextStore and a fresh KeyboardProcessor.
-    if(!target) {
-      target = new SyntheticTextStore();
+    if(!textStore) {
+      textStore = new SyntheticTextStore();
     }
 
     proctor.before();
 
-    let result = await proctor.simulateSequence(this, target);
+    const result = await proctor.simulateSequence(this, textStore);
     proctor.assertEquals(result, this.output, this.msg);
 
     return {success: (result == this.output), result: result};
diff --git a/web/src/tools/testing/recorder-core/src/nodeProctor.ts b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
index a4039ee0abf..5bb98290b22 100644
--- a/web/src/tools/testing/recorder-core/src/nodeProctor.ts
+++ b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
@@ -91,7 +91,7 @@ export default class NodeProctor extends Proctor {
 
         if (this.debugMode) {
           console.log("Processing %d:", keyEvent.Lcode);
-          console.log("target=%s", JSON.stringify(textStore, null, '  '));
+          console.log("textStore=%s", JSON.stringify(textStore, null, '  '));
           console.log("ruleBehavior=%s", JSON.stringify(ruleBehavior, null, '  '));
         }
       }
diff --git a/web/src/tools/testing/recorder-core/src/proctor.ts b/web/src/tools/testing/recorder-core/src/proctor.ts
index d5cd1e461a2..549ffe618d5 100644
--- a/web/src/tools/testing/recorder-core/src/proctor.ts
+++ b/web/src/tools/testing/recorder-core/src/proctor.ts
@@ -49,5 +49,5 @@ export default abstract class Proctor {
    * Simulates the specified test sequence for use in testing.
    * @param sequence The recorded sequence, generally provided by a test set.
    */
-  abstract simulateSequence(sequence: TestSequence<any>, target?: TextStore): Promise<string>;
+  abstract simulateSequence(sequence: TestSequence<any>, textStore?: TextStore): Promise<string>;
 }
\ No newline at end of file
diff --git a/web/src/tools/testing/recorder/scribe.ts b/web/src/tools/testing/recorder/scribe.ts
index cef6e728255..1b37610d05b 100644
--- a/web/src/tools/testing/recorder/scribe.ts
+++ b/web/src/tools/testing/recorder/scribe.ts
@@ -28,7 +28,7 @@ declare let keyman: KeymanEngine;
 //   export namespace dom {
 //     export declare var DOMEventHandlers: any;
 //     export declare class Utils {
-//       static getOutputTarget(elem: HTMLElement): any; // text.TextStore;
+//       static getTextStore(elem: HTMLElement): any; // text.TextStore;
 //     }
 //   }
 
@@ -184,7 +184,7 @@ export class Scribe extends EventEmitter {
 
     keyman.hardKeyboard.on('keyevent', (e) => {
       const in_output = textStoreForElement(recordingElement);
-      if(!in_output || keyman.contextManager.activeTarget != in_output) {
+      if(!in_output || keyman.contextManager.activeTextStore != in_output) {
         return;
       }
 
@@ -200,7 +200,7 @@ export class Scribe extends EventEmitter {
 
     keyman.osk.on('keyevent', (e) => {
       const in_output = textStoreForElement(recordingElement);
-      if(!in_output || keyman.contextManager.activeTarget != in_output) {
+      if(!in_output || keyman.contextManager.activeTextStore != in_output) {
         return;
       }
 
@@ -230,7 +230,7 @@ export class Scribe extends EventEmitter {
 
       // What's the active stub immediately after our _SetActiveKeyboard call?
       const internalStub = kbdTuple.metadata;
-      if(internalStub && (keyman.contextManager.activeTarget == in_output)) {
+      if(internalStub && (keyman.contextManager.activeTextStore == in_output)) {
         const kbdRecord = Scribe.recordKeyboardStub(internalStub, 'resources/keyboards');
 
         recorderScribe.emit('stub-changed', JSON.stringify(kbdRecord));

From bd0ba61a6858440eb798be6b374b276380356e25 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 19 Nov 2025 19:49:53 +0100
Subject: [PATCH 149/254] refactor(web): introduce type `KeyboardInfoPair`

---
 web/src/app/browser/src/contextManager.ts      |  9 +++++----
 .../src/js-processor/jsKeyboardInterface.ts    |  6 ++++--
 web/src/engine/src/main/contextManagerBase.ts  | 18 ++++++++++++++++--
 web/src/engine/src/main/index.ts               |  2 +-
 web/src/test/auto/dom/kbdLoader.ts             | 13 ++++++-------
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index 82231aa9af0..75aaf2b3dbe 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -6,6 +6,7 @@ import { DomEventTracker, LegacyEventEmitter } from 'keyman/engine/events';
 import { DesignIFrameElementTextStore, AbstractElementTextStore, nestedInstanceOf } from 'keyman/engine/element-text-stores';
 import {
   ContextManagerBase,
+  type KeyboardInfoPair,
   type KeyboardInterfaceBase,
   LegacyAPIEvents
 } from 'keyman/engine/main';
@@ -43,14 +44,14 @@ function _SetTargDir(Ptarg: HTMLElement, activeKeyboard: Keyboard) {
 }
 
 export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
-  private _activeKeyboard: {keyboard: Keyboard, metadata: KeyboardStub};
+  private _activeKeyboard: KeyboardInfoPair;
   private cookieManager = new CookieSerializer<KeyboardCookie>('KeymanWeb_Keyboard');
   readonly focusAssistant = new FocusAssistant(() => this.activeTextStore?.isForcingScroll());
   readonly page: PageContextAttachment;
   private mostRecentTextStore: AbstractElementTextStore<any>;
   private currentTextStore: AbstractElementTextStore<any>;
 
-  private globalKeyboard: {keyboard: Keyboard, metadata: KeyboardStub};
+  private globalKeyboard: KeyboardInfoPair;
 
   private _eventsObj: () => LegacyEventEmitter<LegacyAPIEvents>;
   private domEventTracker = new DomEventTracker();
@@ -329,7 +330,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
     }
   }
 
-  public get activeKeyboard(): { keyboard: Keyboard, metadata: KeyboardStub } {
+  public get activeKeyboard(): KeyboardInfoPair {
     return this._activeKeyboard;
   }
 
@@ -387,7 +388,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
   }
 
   // Note:  is part of the keyboard activation process.  Not to be called directly by published API.
-  public activateKeyboardForTextStore(kbd: { keyboard: Keyboard, metadata: KeyboardStub }, textStore: AbstractElementTextStore<any>): void {
+  public activateKeyboardForTextStore(kbd: KeyboardInfoPair, textStore: AbstractElementTextStore<any>): void {
     const attachment = textStore?.getElement()._kmwAttachment;
 
     if(!attachment) {
diff --git a/web/src/engine/src/js-processor/jsKeyboardInterface.ts b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
index f1b117eb812..8bedf41de87 100644
--- a/web/src/engine/src/js-processor/jsKeyboardInterface.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
@@ -808,15 +808,17 @@ export class JSKeyboardInterface extends KeyboardHarness {
     this.output(dn, textStore, '');
   }
 
+  // TODO-web-core: Why is this function on the keyboard interface and not the
+  // text store or context manager?
   /**
    * Function     output        KO
    * Scope        Public
    * @param       {number}      dn            number of characters to overwrite
-   * @param       {Object}      textStore  element to output to
+   * @param       {Object}      textStore     element to output to
    * @param       {string}      s             string to output
    * Description  Keyboard output
    */
-  output(dn: number, textStore: TextStore, s:string): void {
+  output(dn: number, textStore: TextStore, s: string): void {
     this.resetContextCache();
 
     textStore.saveProperties();
diff --git a/web/src/engine/src/main/contextManagerBase.ts b/web/src/engine/src/main/contextManagerBase.ts
index 6ba861360e0..51f968390be 100644
--- a/web/src/engine/src/main/contextManagerBase.ts
+++ b/web/src/engine/src/main/contextManagerBase.ts
@@ -5,6 +5,8 @@ import { StubAndKeyboardCache, type KeyboardStub } from 'keyman/engine/keyboard-
 import { PredictionContext } from 'keyman/engine/interfaces';
 import { EngineConfiguration } from './engineConfiguration.js';
 
+export type KeyboardInfoPair = { keyboard: Keyboard, metadata: KeyboardStub };
+
 interface EventMap {
   // textStore, then keyboard.
   'textstorechange': (textStore: TextStore) => boolean;
@@ -99,6 +101,18 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
     this.keyboardCache = config.keyboardCache;
   }
 
+  /**
+   * Inserts the specified text and/or deadkey into the currently active text store
+   * using the provided keyboard interface.
+   *
+   * @param {JSKeyboardInterface}  kbdInterface  The keyboard interface used to
+   *                                             output text and deadkeys.
+   * @param {string}               text          The text string to insert.
+   * @param {number}               deadkey       The deadkey code to insert.
+   *
+   * @returns {boolean} True if the insertion was successful, false if there is
+   *                    no active text store.
+   */
   public insertText(kbdInterface: JSKeyboardInterface, text: string, deadkey: number): boolean {
     // Find the correct textStore to manipulate.
     const textStore = this.activeTextStore;
@@ -143,7 +157,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
    * @param kbd
    * @param textStore
    */
-  protected abstract activateKeyboardForTextStore(kbd: { keyboard: Keyboard, metadata: KeyboardStub }, textStore: TextStore): void;
+  protected abstract activateKeyboardForTextStore(kbd: KeyboardInfoPair, textStore: TextStore): void;
 
   /**
    * Checks the pending keyboard-activation array for an entry corresponding to the specified
@@ -263,7 +277,7 @@ export abstract class ContextManagerBase<MainConfig extends EngineConfiguration>
       this.emit('beforekeyboardchange', activatingKeyboard.metadata);
     }
 
-    let kbdStubPair: { keyboard: Keyboard, metadata: KeyboardStub } = null;
+    let kbdStubPair: KeyboardInfoPair = null;
     if(keyboard) {
       kbdStubPair = {
         keyboard: keyboard,
diff --git a/web/src/engine/src/main/index.ts b/web/src/engine/src/main/index.ts
index 8aaaa1cacf8..b80b9c5ae59 100644
--- a/web/src/engine/src/main/index.ts
+++ b/web/src/engine/src/main/index.ts
@@ -1,5 +1,5 @@
 export { EngineConfiguration, InitOptionDefaults, InitOptionSpec } from './engineConfiguration.js';
-export { ContextManagerBase, ContextManagerConfiguration } from './contextManagerBase.js';
+export { ContextManagerBase, ContextManagerConfiguration, type KeyboardInfoPair } from './contextManagerBase.js';
 export { HardKeyboardBase, processForMnemonicsAndLegacy } from './hardKeyboardBase.js';
 export { KeyboardInterfaceBase } from './keyboardInterfaceBase.js';
 export { KeymanEngineBase } from './keymanEngineBase.js';
diff --git a/web/src/test/auto/dom/kbdLoader.ts b/web/src/test/auto/dom/kbdLoader.ts
index 3c81dc887d4..3e43ab7ff7b 100644
--- a/web/src/test/auto/dom/kbdLoader.ts
+++ b/web/src/test/auto/dom/kbdLoader.ts
@@ -9,7 +9,7 @@ import {
 } from 'keyman/engine/keyboard';
 
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { KeyboardStub } from 'keyman/engine/keyboard-storage';
+import { KeyboardInfoPair } from 'keyman/engine/main';
 
 const loader = new DOMKeyboardLoader(new JSKeyboardInterface(window, MinimalKeymanGlobal));
 
@@ -17,14 +17,13 @@ export function loadKeyboardFromPath(path: string) {
   return loader.loadKeyboardFromPath(path);
 }
 
+export type KeyboardMap = {
+  [key: string]: KeyboardInfoPair & { keyboard: JSKeyboard }
+};
+
 export function loadKeyboardsFromStubs(apiStubs: any, baseDir: string) {
   baseDir = baseDir || './';
-  const keyboards: {
-    [key: string]: {
-      keyboard: JSKeyboard,
-      metadata: KeyboardStub
-    }
-  } = {};
+  const keyboards: KeyboardMap = {};
   let priorPromise: Promise<void | JSKeyboard> = Promise.resolve();
   for(const stub of apiStubs) {
     // We are keeping this strictly sequential because we don't have sandboxed

From c1e94bdca9fea7e512105a6b5081b031695f8ed8 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 19 Nov 2025 19:50:31 +0100
Subject: [PATCH 150/254] test(web): add unit tests for
 `ContextManager.insertText`

---
 .../dom/cases/browser/contextManager.tests.ts | 106 +++++++++++++++---
 1 file changed, 90 insertions(+), 16 deletions(-)

diff --git a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
index 6bc005d19dd..b334b4df016 100644
--- a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
+++ b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
@@ -1,13 +1,12 @@
+// import { BrowserConfiguration, ContextManager } from 'keyman/app/browser';
 import { ContextManager } from 'keyman/app/browser';
-import {
-  textStoreForElement
-} from 'keyman/engine/attachment';
+import { TextAreaElementTextStore, textStoreForElement } from 'keyman/engine/attachment';
 import { LegacyEventEmitter } from 'keyman/engine/events';
 import { StubAndKeyboardCache, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage';
+import { KeyboardInterfaceBase } from 'keyman/engine/main';
 
-import { KeyboardHarness, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { DOMKeyboardLoader } from 'keyman/engine/keyboard';
-import { loadKeyboardsFromStubs } from '../../kbdLoader.js';
+import { KeyboardHarness, MinimalKeymanGlobal, DOMKeyboardLoader  } from 'keyman/engine/keyboard';
+import { KeyboardMap, loadKeyboardsFromStubs } from '../../kbdLoader.js';
 
 import { DeviceSpec, ManagedPromise, timedPromise } from 'keyman/common/web-utils';
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
@@ -127,6 +126,18 @@ async function withDelayedFetching(keyboardLoader: any, time: number, closure: a
   await closure();
 }
 
+async function loadKeyboardsForTests(apiStubs: string[]): Promise<KeyboardMap> {
+  const kbdStubPromises = apiStubs.map((file: string) => {
+    return fetch(`common/test/resources/json/${file}.json`).then((response) => {
+      return response.json();
+    });
+  });
+
+  const kbdStubs = await Promise.all(kbdStubPromises);
+
+  return await loadKeyboardsFromStubs(kbdStubs, 'common/test/');
+}
+
 describe('app/browser:  ContextManager', function () {
   this.timeout(DEFAULT_BROWSER_TIMEOUT);
 
@@ -508,15 +519,7 @@ describe('app/browser:  ContextManager', function () {
         '/keyboards/test_deadkeys'
       ];
 
-      const kbdStubPromises = apiStubs.map((file: string) => {
-        return fetch(`common/test/resources/json/${file}.json`).then((response) => {
-          return response.json();
-        });
-      });
-
-      const kbdStubs = await Promise.all(kbdStubPromises);
-
-      KEYBOARDS = await loadKeyboardsFromStubs(kbdStubs, 'common/test/');
+      KEYBOARDS = await loadKeyboardsForTests(apiStubs);
     });
 
     beforeEach(() => {
@@ -1249,4 +1252,75 @@ describe('app/browser:  ContextManager', function () {
       });
     });
   });
-});
\ No newline at end of file
+
+  describe('ContextManager.insertText', () =>{
+    let KEYBOARDS: KeyboardMap;
+    let kbdInterface: KeyboardInterfaceBase<ContextManager>;
+
+    beforeEach(async () => {
+      KEYBOARDS = await loadKeyboardsForTests(['/keyboards/khmer_angkor']);
+      const keyboard = KEYBOARDS.khmer_angkor;
+      keyboardCache.addKeyboard(keyboard.keyboard);
+      keyboardCache.addStub(keyboard.metadata);
+      await contextManager.activateKeyboard('khmer_angkor', 'km');
+      kbdInterface = new KeyboardInterfaceBase<ContextManager>(new Object(), null, null);
+    });
+
+    it('returns false if no text store set', async () => {
+      // Execute
+      const ret = contextManager.insertText(kbdInterface, 'a', 0);
+
+      // Verify
+      assert.isFalse(ret);
+    });
+
+    it('returns true if current text store set', async () => {
+      // Setup
+      const element = document.getElementById('textarea') as HTMLTextAreaElement;
+      const textStore = new TextAreaElementTextStore(element);
+      (contextManager as any).currentTextStore = textStore;
+
+      // Execute
+      const ret = contextManager.insertText(kbdInterface, 'a', 0);
+
+      // Verify
+      assert.isTrue(ret);
+      const ts = contextManager.activeTextStore;
+      assert.equal(ts.getText(), 'a');
+    });
+
+    it('returns true if most recent text store set and maintaining focus', async () => {
+      // Setup
+      const element = document.getElementById('textarea') as HTMLTextAreaElement;
+      const textStore = new TextAreaElementTextStore(element);
+      (contextManager as any).currentTextStore = null;
+      (contextManager as any).mostRecentTextStore = textStore;
+      (contextManager as any).focusAssistant = { maintainingFocus: true, isTargetForcingScroll: () => false };
+
+      // Execute
+      const ret = contextManager.insertText(kbdInterface, 'a', 0);
+
+      // Verify
+      assert.isTrue(ret);
+      const ts = contextManager.activeTextStore;
+      assert.equal(ts.getText(), 'a');
+    });
+
+    it('returns true if most recent text store and not maintaing focus', async () => {
+      // Setup
+      const element = document.getElementById('textarea') as HTMLTextAreaElement;
+      const textStore = new TextAreaElementTextStore(element);
+      (contextManager as any).currentTextStore = null;
+      (contextManager as any).mostRecentTextStore = textStore;
+      (contextManager as any).focusAssistant = { maintainingFocus: false, isTargetForcingScroll: () => false };
+
+      // Execute
+      const ret = contextManager.insertText(kbdInterface, 'a', 0);
+
+      // Verify
+      assert.isTrue(ret);
+      const ts = contextManager.activeTextStore;
+      assert.equal(ts.getText(), 'a');
+    });
+  });
+});

From ee913792c06a4168a3223ded2d6a4cda847f8a56 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 19 Nov 2025 19:58:42 +0100
Subject: [PATCH 151/254] refactor(web): simplify `insertText`

Getting the textStore was done twice, without the second time changing
the result. Additionally, `insertText` in the super class also gets the
active text store and returns false if it is not set. This change
removes those additional code lines that are not needed.

Test-bot: skip
---
 web/src/app/browser/src/contextManager.ts | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index 75aaf2b3dbe..f10d1150bee 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -351,16 +351,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
     // original context element may have been lost.
     this.restoreLastActiveTextStore();
 
-    let textStore = this.activeTextStore;
-
-    if(textStore == null && this.mostRecentTextStore) {
-      textStore = this.activeTextStore;
-    }
-
-    if(textStore != null) {
-      return super.insertText(kbdInterface, text, deadkey);
-    }
-    return false;
+    return super.insertText(kbdInterface, text, deadkey);
   }
 
   /**

From 35c2507c3eb17b3220409c75e630fd8b482842ff Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 20 Nov 2025 16:02:07 +0100
Subject: [PATCH 152/254] refactor(web): remove duplicate exports

Previously we re-exported the exports of `element-text-stores` in
`attachment` because it was needed in unit tests. This change removes
this re-export - should be solved differently, but it turns out that
all current tests pass even without the re-export.

This comes out of
[a review comment in #15092](https://github.com/keymanapp/keyman/pull/15092#discussion_r2493048032).

Follow-up-of: #15092
Test-bot: skip
---
 web/src/engine/src/attachment/index.ts              | 11 -----------
 .../dom/cases/attachment/textStoreForElement.def.ts | 13 +++++++------
 .../auto/dom/cases/browser/contextManager.tests.ts  |  3 ++-
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/web/src/engine/src/attachment/index.ts b/web/src/engine/src/attachment/index.ts
index a8386b5200f..38cf2474fb7 100644
--- a/web/src/engine/src/attachment/index.ts
+++ b/web/src/engine/src/attachment/index.ts
@@ -1,16 +1,5 @@
 export { AttachmentInfo } from './attachmentInfo.js';
 
-/*
- * Note:  for `instanceof` the attachment objects returned by the next module's
- * to match that of the actual objects within the browser when bundled, the
- * **same bundle** must contain reference points for those classes' definitions.
- */
 export { textStoreForElement } from './textStoreForElement.js';
 export { textStoreForEvent } from './textStoreForEvent.js';
 export { PageContextAttachment, PageAttachmentOptions } from './pageContextAttachment.js';
-
-/*
- * Following from the prior "Note:", we republish `engine/element-text-stores` here -
- * this matters quite strongly for certain unit tests.
- */
-export * from 'keyman/engine/element-text-stores';
\ No newline at end of file
diff --git a/web/src/test/auto/dom/cases/attachment/textStoreForElement.def.ts b/web/src/test/auto/dom/cases/attachment/textStoreForElement.def.ts
index dda426748c4..c21a7da6ed3 100644
--- a/web/src/test/auto/dom/cases/attachment/textStoreForElement.def.ts
+++ b/web/src/test/auto/dom/cases/attachment/textStoreForElement.def.ts
@@ -1,16 +1,17 @@
 import {
-  // Exposed within the engine/attachment bundle b/c of unit tests requiring `instanceof` relations.
-  ContentEditableElementTextStore,
-  DesignIFrameElementTextStore,
-  InputElementTextStore,
-  TextAreaElementTextStore,
-
   textStoreForEvent,
   textStoreForElement,
   PageContextAttachment,
   PageAttachmentOptions,
 } from 'keyman/engine/attachment';
 
+import {
+  ContentEditableElementTextStore,
+  DesignIFrameElementTextStore,
+  InputElementTextStore,
+  TextAreaElementTextStore,
+} from 'keyman/engine/element-text-stores';
+
 import { timedPromise } from 'keyman/common/web-utils';
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
 import sinon from 'sinon';
diff --git a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
index b334b4df016..49f01c7cc18 100644
--- a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
+++ b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
@@ -1,6 +1,7 @@
 // import { BrowserConfiguration, ContextManager } from 'keyman/app/browser';
 import { ContextManager } from 'keyman/app/browser';
-import { TextAreaElementTextStore, textStoreForElement } from 'keyman/engine/attachment';
+import { textStoreForElement } from 'keyman/engine/attachment';
+import { TextAreaElementTextStore } from 'keyman/engine/element-text-stores';
 import { LegacyEventEmitter } from 'keyman/engine/events';
 import { StubAndKeyboardCache, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage';
 import { KeyboardInterfaceBase } from 'keyman/engine/main';

From 597e433a0fe40a01060ec9ddce3c7fd38de16b4e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 20 Nov 2025 16:03:17 +0100
Subject: [PATCH 153/254] test(web): add unit tests for `nestedInstanceOf`

Also rename file `utils.ts` to `nestedInstanceOf.ts`.

Test-bot: skip
---
 .../createTextStoreForElement.ts              |  2 +-
 .../engine/src/element-text-stores/index.ts   |  2 +-
 .../{utils.ts => nestedInstanceOf.ts}         |  0
 .../nestedInstanceOf.tests.ts                 | 47 +++++++++++++++++++
 4 files changed, 49 insertions(+), 2 deletions(-)
 rename web/src/engine/src/element-text-stores/{utils.ts => nestedInstanceOf.ts} (100%)
 create mode 100644 web/src/test/auto/dom/cases/element-text-stores/nestedInstanceOf.tests.ts

diff --git a/web/src/engine/src/element-text-stores/createTextStoreForElement.ts b/web/src/engine/src/element-text-stores/createTextStoreForElement.ts
index 0285d55b3b4..06dfe1b0054 100644
--- a/web/src/engine/src/element-text-stores/createTextStoreForElement.ts
+++ b/web/src/engine/src/element-text-stores/createTextStoreForElement.ts
@@ -3,7 +3,7 @@ import { InputElementTextStore } from './inputTextStore.js';
 import { TextAreaElementTextStore } from './textareaTextStore.js';
 import { DesignIFrameElementTextStore } from './designIFrameTextStore.js';
 import { ContentEditableElementTextStore } from './contentEditableTextStore.js';
-import { nestedInstanceOf } from './utils.js';
+import { nestedInstanceOf } from './nestedInstanceOf.js';
 
 export function createTextStoreForElement(e: HTMLElement): AbstractElementTextStore<any> {
   // Complex type scoping is implemented here so that kmwutils.ts is not a dependency for test compilations.
diff --git a/web/src/engine/src/element-text-stores/index.ts b/web/src/engine/src/element-text-stores/index.ts
index b8c0ac21476..809923a8c8e 100644
--- a/web/src/engine/src/element-text-stores/index.ts
+++ b/web/src/engine/src/element-text-stores/index.ts
@@ -4,4 +4,4 @@ export { DesignIFrameElementTextStore } from './designIFrameTextStore.js';
 export { InputElementTextStore } from './inputTextStore.js';
 export { AbstractElementTextStore } from './abstractElementTextStore.js';
 export { TextAreaElementTextStore } from './textareaTextStore.js';
-export { nestedInstanceOf } from './utils.js';
\ No newline at end of file
+export { nestedInstanceOf } from './nestedInstanceOf.js';
\ No newline at end of file
diff --git a/web/src/engine/src/element-text-stores/utils.ts b/web/src/engine/src/element-text-stores/nestedInstanceOf.ts
similarity index 100%
rename from web/src/engine/src/element-text-stores/utils.ts
rename to web/src/engine/src/element-text-stores/nestedInstanceOf.ts
diff --git a/web/src/test/auto/dom/cases/element-text-stores/nestedInstanceOf.tests.ts b/web/src/test/auto/dom/cases/element-text-stores/nestedInstanceOf.tests.ts
new file mode 100644
index 00000000000..d2833f3ce78
--- /dev/null
+++ b/web/src/test/auto/dom/cases/element-text-stores/nestedInstanceOf.tests.ts
@@ -0,0 +1,47 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import { assert } from 'chai';
+import { nestedInstanceOf } from 'keyman/engine/element-text-stores';
+
+describe('nestedInstanceOf', () => {
+  it('returns false for null input', () => {
+    assert.strictEqual(nestedInstanceOf(null as any, 'HTMLElement'), false);
+  });
+
+  it('returns true for Window object when className is "Window"', () => {
+    assert.strictEqual(nestedInstanceOf(window as any, 'Window'), true);
+  });
+
+  it('returns false for Window object when className is not "Window"', () => {
+    assert.strictEqual(nestedInstanceOf(window as any, 'Document'), false);
+  });
+
+  it('returns true for Document object when className is "Document"', () => {
+    assert.strictEqual(nestedInstanceOf(document as any, 'Document'), true);
+  });
+
+  it('returns false for Document object when className is not "Document"', () => {
+    assert.strictEqual(nestedInstanceOf(document as any, 'HTMLElement'), false);
+  });
+
+  it('returns true for HTMLElement when className is "HTMLElement"', () => {
+    const elem = document.createElement('div');
+    assert.strictEqual(nestedInstanceOf(elem, 'HTMLElement'), true);
+  });
+
+  it('returns false for HTMLElement when className is "HTMLInputElement"', () => {
+    const elem = document.createElement('div');
+    assert.strictEqual(nestedInstanceOf(elem, 'HTMLInputElement'), false);
+  });
+
+  it('returns true for HTMLInputElement when className is "HTMLInputElement"', () => {
+    const input = document.createElement('input');
+    assert.strictEqual(nestedInstanceOf(input, 'HTMLInputElement'), true);
+  });
+
+  it('returns false for unknown className', () => {
+    const elem = document.createElement('div');
+    assert.strictEqual(nestedInstanceOf(elem, 'NonExistentClass'), false);
+  });
+});

From cd52afc08494d84330ef66a79193bb787c17ab78 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 20 Nov 2025 16:28:23 +0100
Subject: [PATCH 154/254] docs(web): add clarifying comment for filename

Follow-up-of: #15092
Test-bot: skip
---
 .../test/auto/dom/cases/attachment/textStoreForElement.def.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/src/test/auto/dom/cases/attachment/textStoreForElement.def.ts b/web/src/test/auto/dom/cases/attachment/textStoreForElement.def.ts
index cfa0cdb4443..07dd38130b9 100644
--- a/web/src/test/auto/dom/cases/attachment/textStoreForElement.def.ts
+++ b/web/src/test/auto/dom/cases/attachment/textStoreForElement.def.ts
@@ -1,3 +1,6 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
 import {
   // Exposed within the engine/attachment bundle b/c of unit tests requiring `instanceof` relations.
   ContentEditableElementTextStore,
@@ -42,6 +45,7 @@ function promiseForIframeLoad(iframe: HTMLIFrameElement) {
   }
 }
 
+// NOTE: these tests are  included and run through textStoreForElement.tests.html!
 describe('textStoreForElement()', function () {
   this.timeout(DEFAULT_BROWSER_TIMEOUT);
 

From c9f8e880a8b7a4313cda6e382b48d4228973d24e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 21 Nov 2025 11:13:23 +0100
Subject: [PATCH 155/254] docs(web): address code review comments

Build-bot: skip
Test-bot: skip
---
 .../dom/cases/core-processor/coreKeyboardProcessor.tests.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/test/auto/dom/cases/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/dom/cases/core-processor/coreKeyboardProcessor.tests.ts
index d5b034867be..abc470cd70d 100644
--- a/web/src/test/auto/dom/cases/core-processor/coreKeyboardProcessor.tests.ts
+++ b/web/src/test/auto/dom/cases/core-processor/coreKeyboardProcessor.tests.ts
@@ -9,7 +9,7 @@ import { coreurl, loadKeyboardBlob } from '../../test_utils.js';
 import { Deadkey, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { CoreKeyboardProcessor } from 'keyman/engine/core-processor';
 
-// These tests would run headless if we'd additionally build WASM for node
+// TODO-web-core: These tests would run headless if we'd additionally build WASM for node
 
 describe('CoreKeyboardProcessor', function () {
   const loadKeyboard = async function (name: string): Promise<km_core_keyboard> {

From 78825730951d57dae556b8b12398e076eba7da83 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
Date: Fri, 21 Nov 2025 11:29:06 +0100
Subject: [PATCH 156/254] Update
 web/src/engine/src/element-text-stores/inputTextStore.ts

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 web/src/engine/src/element-text-stores/inputTextStore.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/engine/src/element-text-stores/inputTextStore.ts b/web/src/engine/src/element-text-stores/inputTextStore.ts
index 2f43a16cb9a..7109c53f095 100644
--- a/web/src/engine/src/element-text-stores/inputTextStore.ts
+++ b/web/src/engine/src/element-text-stores/inputTextStore.ts
@@ -214,7 +214,7 @@ export class InputElementTextStore extends AbstractElementTextStore<EventMap> {
 
   handleNewlineAtCaret(): void {
     const inputEle = this.root;
-    // Can't occur for SyntheticTextSTores - just Input types.
+    // Can't occur for SyntheticTextStores - just Input types.
     if (inputEle && (inputEle.type == 'search' || inputEle.type == 'submit')) {
       inputEle.disabled=false;
       inputEle.form.submit();

From 0cd87ba898c0fa8777099d310e14b20afa042e4c Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 24 Nov 2025 16:16:06 +0100
Subject: [PATCH 157/254] docs(web): add comment why `output()` is on keyboard
 interface

Follow-up-of: #15190
Build-bot: skip
Test-bot: skip
---
 web/src/engine/src/js-processor/jsKeyboardInterface.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/src/engine/src/js-processor/jsKeyboardInterface.ts b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
index 8bedf41de87..2ea921871ad 100644
--- a/web/src/engine/src/js-processor/jsKeyboardInterface.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
@@ -808,8 +808,6 @@ export class JSKeyboardInterface extends KeyboardHarness {
     this.output(dn, textStore, '');
   }
 
-  // TODO-web-core: Why is this function on the keyboard interface and not the
-  // text store or context manager?
   /**
    * Function     output        KO
    * Scope        Public
@@ -817,6 +815,10 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param       {Object}      textStore     element to output to
    * @param       {string}      s             string to output
    * Description  Keyboard output
+   *
+   * Note: it might seem more logical for this function to be part of TextStore
+   * or context manager, but it is here because it implements the JS-keyboard API function KO,
+   * used for the "output" portion of JS keyboard rule implementations for Keyman keyboards.
    */
   output(dn: number, textStore: TextStore, s: string): void {
     this.resetContextCache();

From cc12161d84a746bc7d1842f35cb07b998bf9927a Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 21 Nov 2025 13:30:55 +0100
Subject: [PATCH 158/254] refactor(web): make core adapter and processor tests
 headless

Also improve Core Adapter to detect if we're running in a browser or on
node.js and load the appropriate km-core module.

Follow-up-of: #13993
Test-bot: skip
---
 web/build.sh                                     |  3 ---
 web/src/engine/build.sh                          |  1 +
 web/src/engine/src/core-adapter/KM_Core.ts       |  8 +++++++-
 .../dom/cases/browser/contextManager.tests.ts    |  1 -
 web/src/test/auto/dom/test_utils.ts              | 12 ------------
 web/src/test/auto/dom/web-test-runner.config.mjs | 10 ----------
 .../engine/core-adapter/core-adapter.tests.ts}   |  6 +++++-
 .../coreKeyboardProcessor.tests.ts               | 16 +++++++---------
 .../auto/headless/engine/loadKeyboardHelper.ts   | 13 +++++++++++++
 9 files changed, 33 insertions(+), 37 deletions(-)
 rename web/src/test/auto/{dom/cases/core-adapter/basic.tests.ts => headless/engine/core-adapter/core-adapter.tests.ts} (92%)
 rename web/src/test/auto/{dom/cases => headless/engine}/core-processor/coreKeyboardProcessor.tests.ts (93%)
 create mode 100644 web/src/test/auto/headless/engine/loadKeyboardHelper.ts

diff --git a/web/build.sh b/web/build.sh
index dd68090334b..532c367895d 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -103,9 +103,6 @@ build_tests_action() {
 
   builder_echo "Copying some files"
 
-  mkdir -p "${KEYMAN_ROOT}/web/build/test/dom/cases/core-adapter/import/core/"
-  cp "${KEYMAN_ROOT}/web/src/engine/src/core-adapter/import/core/keymancore.d.ts" "${KEYMAN_ROOT}/web/build/test/dom/cases/core-adapter/import/core/"
-
   for dir in \
     "${KEYMAN_ROOT}/web/build/test/dom/cases"/*/ \
     "${KEYMAN_ROOT}/web/build/test/integrated/" \
diff --git a/web/src/engine/build.sh b/web/src/engine/build.sh
index 2ca80f0066b..2b5f6380b18 100755
--- a/web/src/engine/build.sh
+++ b/web/src/engine/build.sh
@@ -44,6 +44,7 @@ copy_deps() {
   mkdir -p "${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core/"
   cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/keymancore.d.ts" "${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core/"
   cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/"km-core{.js,.wasm} "${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core/"
+  cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/"km-core-node{.mjs,.wasm} "${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core/"
 
   cp "${KEYMAN_ROOT}/common/resources/fonts/keymanweb-osk.ttf" "${KEYMAN_ROOT}/web/src/resources/osk/"
 }
diff --git a/web/src/engine/src/core-adapter/KM_Core.ts b/web/src/engine/src/core-adapter/KM_Core.ts
index 4202ef74adb..f384de786ed 100644
--- a/web/src/engine/src/core-adapter/KM_Core.ts
+++ b/web/src/engine/src/core-adapter/KM_Core.ts
@@ -49,8 +49,14 @@ export class KM_Core {
     return this.km_core;
   }
 
+  private static isNode() {
+    // from https://stackoverflow.com/a/31456668
+    return (typeof process !== "undefined" && process?.versions?.node);
+  }
+
   public static async createCoreProcessor(baseurl: string): Promise<KMXCoreModule> {
-    const module = await import(baseurl + '/km-core.js');
+    const coreModuleName = this.isNode() ? 'km-core-node.mjs' : 'km-core.js';
+    const module = await import(`${baseurl}/${coreModuleName}`);
     const createCoreProcessor = module.default;
     const km_core = createCoreProcessor({
       locateFile: function (path: string, scriptDirectory: string) {
diff --git a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
index 49f01c7cc18..ce96c2a3561 100644
--- a/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
+++ b/web/src/test/auto/dom/cases/browser/contextManager.tests.ts
@@ -1,4 +1,3 @@
-// import { BrowserConfiguration, ContextManager } from 'keyman/app/browser';
 import { ContextManager } from 'keyman/app/browser';
 import { textStoreForElement } from 'keyman/engine/attachment';
 import { TextAreaElementTextStore } from 'keyman/engine/element-text-stores';
diff --git a/web/src/test/auto/dom/test_utils.ts b/web/src/test/auto/dom/test_utils.ts
index 4799520fd24..c015988707c 100644
--- a/web/src/test/auto/dom/test_utils.ts
+++ b/web/src/test/auto/dom/test_utils.ts
@@ -82,15 +82,3 @@ export class DynamicElements {
     return editable.id;
   }
 }
-
-export const coreurl = '/build/engine/obj/core-adapter/import/core';
-
-export async function loadKeyboardBlob(uri: string) {
-  const response = await fetch(uri);
-  if (!response.ok) {
-    throw new Error(`HTTP ${response.status} ${response.statusText}`);
-  }
-
-  const buffer = await response.arrayBuffer();
-  return new Uint8Array(buffer);
-}
diff --git a/web/src/test/auto/dom/web-test-runner.config.mjs b/web/src/test/auto/dom/web-test-runner.config.mjs
index 01e973d011c..881d428f4c2 100644
--- a/web/src/test/auto/dom/web-test-runner.config.mjs
+++ b/web/src/test/auto/dom/web-test-runner.config.mjs
@@ -58,16 +58,6 @@ export default {
       // Relative, from the containing package.json
       files: ['web/build/test/dom/cases/browser/**/*.tests.mjs']
     },
-    {
-      name: 'engine/core-adapter',
-      // Relative, from the containing package.json
-      files: ['web/src/test/auto/dom/cases/core-adapter/*.tests.ts']
-    },
-    {
-      name: 'engine/core-processor',
-      // Relative, from the containing package.json
-      files: ['web/src/test/auto/dom/cases/core-processor/*.tests.ts']
-    },
     {
       name: 'engine/dom-utils',
       // Relative, from the containing package.json
diff --git a/web/src/test/auto/dom/cases/core-adapter/basic.tests.ts b/web/src/test/auto/headless/engine/core-adapter/core-adapter.tests.ts
similarity index 92%
rename from web/src/test/auto/dom/cases/core-adapter/basic.tests.ts
rename to web/src/test/auto/headless/engine/core-adapter/core-adapter.tests.ts
index b28d3859118..c688214d259 100644
--- a/web/src/test/auto/dom/cases/core-adapter/basic.tests.ts
+++ b/web/src/test/auto/headless/engine/core-adapter/core-adapter.tests.ts
@@ -1,6 +1,10 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+
 import { assert } from 'chai';
 import { KM_Core, KM_CORE_STATUS } from 'keyman/engine/core-adapter';
-import { coreurl, loadKeyboardBlob } from '../../test_utils.js';
+import { coreurl, loadKeyboardBlob } from '../loadKeyboardHelper.js';
 
 // Test the KM_Core interface.
 describe('KM_Core', function () {
diff --git a/web/src/test/auto/dom/cases/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
similarity index 93%
rename from web/src/test/auto/dom/cases/core-processor/coreKeyboardProcessor.tests.ts
rename to web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
index abc470cd70d..dd661797c72 100644
--- a/web/src/test/auto/dom/cases/core-processor/coreKeyboardProcessor.tests.ts
+++ b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
@@ -5,23 +5,21 @@
 import { assert } from 'chai';
 import sinon from 'sinon';
 import { KM_Core, km_core_context, km_core_keyboard, km_core_state, KM_CORE_CT, KM_CORE_STATUS, km_core_context_items } from 'keyman/engine/core-adapter';
-import { coreurl, loadKeyboardBlob } from '../../test_utils.js';
+import { coreurl, loadKeyboardBlob } from '../loadKeyboardHelper.js';
 import { Deadkey, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { CoreKeyboardProcessor } from 'keyman/engine/core-processor';
 
-// TODO-web-core: These tests would run headless if we'd additionally build WASM for node
-
 describe('CoreKeyboardProcessor', function () {
-  const loadKeyboard = async function (name: string): Promise<km_core_keyboard> {
-    const blob = await loadKeyboardBlob(name)
+  const loadKeyboard = function (name: string): km_core_keyboard {
+    const blob = loadKeyboardBlob(name);
     const result = KM_Core.instance.keyboard_load_from_blob(name, blob);
     assert.equal(result.status, 0);
     assert.isOk(result.object);
     return result.object;
   };
 
-  const createState = async function (keyboardName: string): Promise<km_core_state> {
-    const keyboard = await loadKeyboard(keyboardName);
+  const createState = function (keyboardName: string): km_core_state {
+    const keyboard = loadKeyboard(keyboardName);
     const state = KM_Core.instance.state_create(keyboard, []);
     assert.equal(state.status, 0);
     assert.isOk(state.object);
@@ -52,7 +50,7 @@ describe('CoreKeyboardProcessor', function () {
     beforeEach(async function () {
       coreProcessor = new CoreKeyboardProcessor();
       await coreProcessor.init(coreurl);
-      state = await createState('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
+      state = createState('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
       context = KM_Core.instance.state_context(state);
       sandbox = sinon.createSandbox();
       Deadkey.ordinalSeed = 0;
@@ -133,7 +131,7 @@ describe('CoreKeyboardProcessor', function () {
     beforeEach(async function () {
       coreProcessor = new CoreKeyboardProcessor();
       await coreProcessor.init(coreurl);
-      state = await createState('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
+      state = createState('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
       context = KM_Core.instance.state_context(state);
     });
 
diff --git a/web/src/test/auto/headless/engine/loadKeyboardHelper.ts b/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
new file mode 100644
index 00000000000..d22e3e99ba4
--- /dev/null
+++ b/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
@@ -0,0 +1,13 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+
+import fs from 'node:fs';
+
+const KEYMAN_ROOT = process.env['KEYMAN_ROOT'];
+export const coreurl = `${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core`;
+
+export function loadKeyboardBlob(filename: string) {
+  const data = fs.readFileSync(`${KEYMAN_ROOT}${filename}`, null);
+  return new Uint8Array(data);
+}

From 8875a904a3c7273e29d385cc7f4f83abd6650b02 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 25 Nov 2025 19:03:09 +0100
Subject: [PATCH 159/254] fix(web): add text after last deadkey to context

Test-bot: skip
---
 .../core-processor/coreKeyboardProcessor.ts   |  45 ++++--
 .../coreKeyboardProcessor.tests.ts            | 142 ++++++++++++++++++
 2 files changed, 172 insertions(+), 15 deletions(-)

diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index 1b810ac7157..d5fa731313a 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -149,6 +149,33 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     this._layerStore.set(value);
   }
 
+  /**
+   * Adds context items from the given text to the contextItems collection, up
+   * to the caret position or the deadKey if present.
+   *
+   * @param {object}  contextInfo    The context information including textIndex,
+   *                                 caretPosition, and text.
+   * @param {Deadkey} deadkey        The deadkey to insert if present at the current index.
+   * @param {km_core_context_items}
+   *                  contextItems   The collection to which context items are added.
+   */
+  private addContextItemsFromText(contextInfo: { textIndex: number, caretPosition: number, text: string }, deadkey: Deadkey, contextItems: km_core_context_items): void {
+    for (; contextInfo.textIndex < contextInfo.text.length && (deadkey == null ? contextInfo.textIndex < contextInfo.caretPosition : contextInfo.textIndex <= contextInfo.caretPosition); contextInfo.textIndex++) {
+      const contextItem = new KM_Core.instance.km_core_context_item();
+      if (deadkey?.p == contextInfo.textIndex) {
+        contextItem.marker = deadkey.d;
+        contextItems.push_back(contextItem);
+        return;
+      }
+      contextItem.character = contextInfo.text.codePointAt(contextInfo.textIndex);
+      if (contextItem.character > 0xFFFF) {
+        // we have a surrogate pair, skip other half of surrogate
+        contextInfo.textIndex++;
+      }
+      contextItems.push_back(contextItem);
+    }
+  }
+
   /**
    * Retrieve context including deadkeys from TextStore and apply to Core's context
    *
@@ -174,23 +201,11 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     const deadkeys = textStore.deadkeys().dks.sort((a, b) => a.p != b.p ? a.p - b.p : a.o - b.o);
     const contextItems = new KM_Core.instance.km_core_context_items();
     const caretPosition = textStore.getCaret();
-    let textIndex = 0;
+    const contextInfo = { textIndex: 0, caretPosition: caretPosition, text: text };
     for (const deadkey of deadkeys) {
-      for (; textIndex < text.length && textIndex <= caretPosition; textIndex++) {
-        const contextItem = new KM_Core.instance.km_core_context_item();
-        if (deadkey.p == textIndex) {
-          contextItem.marker = deadkey.d;
-          contextItems.push_back(contextItem);
-          break;
-        }
-        contextItem.character = text.codePointAt(textIndex);
-        if (contextItem.character > 0xFFFF) {
-          // we have a surrogate pair, skip other half of surrogate
-          textIndex++;
-        }
-        contextItems.push_back(contextItem);
-      }
+      this.addContextItemsFromText(contextInfo, deadkey, contextItems);
     }
+    this.addContextItemsFromText(contextInfo, null, contextItems);
 
     // Add end element
     contextItems.push_back(KM_Core.instance.create_end_context());
diff --git a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
index dd661797c72..34cf1288133 100644
--- a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
+++ b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
@@ -125,8 +125,62 @@ describe('CoreKeyboardProcessor', function () {
       assert.equal(textStore.deadkeys().dks[1].toString(), 'Deadkey { p: 2, d: 2, o: 1, matched: 0}', 'dks[1]');
       assert.equal(textStore.deadkeys().dks[2].toString(), 'Deadkey { p: 6, d: 3, o: 2, matched: 0}', 'dks[2]');
     });
+
+    it('can save to TextStore without markers (BMP)', function () {
+      // Setup
+      textStore = new SyntheticTextStore('abcd', 3);
+      // Text index   : 0 1 2 3
+      // context index: 0 1 2 3
+      // ContextItems : a b c d
+      const contextItems = new KM_Core.instance.km_core_context_items();
+      addContextItem(contextItems, 'a', false);
+      addContextItem(contextItems, 'b', false);
+      addContextItem(contextItems, 'c', false);
+      addContextItem(contextItems, 'd', false);
+      contextItems.push_back(KM_Core.instance.create_end_context());
+
+      sandbox.stub(KM_Core.instance, 'context_get').returns({
+        status: KM_CORE_STATUS.OK,
+        object: contextItems,
+        delete: function (): void { }
+      });
+
+      // Execute
+      coreProcessor.unitTestEndPoints.saveMarkersToTextStore(context, textStore);
+
+      // Verify
+      assert.equal(textStore.deadkeys().count(), 0, 'Should have 0 deadkeys');
+    });
+
+    it('can save to TextStore without markers (SMP)', function () {
+      // Setup
+      textStore = new SyntheticTextStore('𐌀𐌁𐌂𐌃', 6); // U+10300 U+10301 U+10302 U+10303
+      // Text index   : 0 1 2 3 4 5
+      // context index: 0   1   2   3
+      // ContextItems : 𐌀   𐌁   𐌂   END
+      // ContextItem.character is a UTF-32 value!
+      const contextItems = new KM_Core.instance.km_core_context_items();
+      addContextItem(contextItems, '𐌀', false);
+      addContextItem(contextItems, '𐌁', false);
+      addContextItem(contextItems, '𐌂', false);
+      addContextItem(contextItems, '𐌃', false);
+      contextItems.push_back(KM_Core.instance.create_end_context());
+
+      sandbox.stub(KM_Core.instance, 'context_get').returns({
+        status: KM_CORE_STATUS.OK,
+        object: contextItems,
+        delete: function (): void { }
+      });
+
+      // Execute
+      coreProcessor.unitTestEndPoints.saveMarkersToTextStore(context, textStore);
+
+      // Verify
+      assert.equal(textStore.deadkeys().count(), 0, 'Should have 0 deadkeys');
+    });
   });
 
+
   describe('applyContextFromTextStore', function () {
     beforeEach(async function () {
       coreProcessor = new CoreKeyboardProcessor();
@@ -209,5 +263,93 @@ describe('CoreKeyboardProcessor', function () {
       assert.equal(items.get(6).type, KM_CORE_CT.END, 'Item 6 should be END');
       result.delete();
     });
+
+    it('applies text from TextStore to Core context without deadkeys (BMP)', function () {
+      // Setup
+      textStore = new SyntheticTextStore('abcd', 3);
+
+      // Execute
+      coreProcessor.unitTestEndPoints.applyContextFromTextStore(context, textStore);
+
+      // Verify
+      const result = KM_Core.instance.context_get(context);
+      assert.equal(result.status, KM_CORE_STATUS.OK);
+      const items = result.object;
+
+      // Text index   : 0 1 2   3
+      // Text:        : a b c | d
+      // context index: 0 1 2 3
+      // ContextItems : a b c END
+      assert.equal(items.size(), 4, 'Should have 4 context items');
+      assert.equal(items.get(0).type, KM_CORE_CT.CHAR, 'Item 0 should be CHAR');
+      assert.equal(items.get(0).character, 'a'.charCodeAt(0), 'Item 0 should be "a"');
+      assert.equal(items.get(1).type, KM_CORE_CT.CHAR, 'Item 1 should be CHAR');
+      assert.equal(items.get(1).character, 'b'.charCodeAt(0), 'Item 1 should be "b"');
+      assert.equal(items.get(2).type, KM_CORE_CT.CHAR, 'Item 2 should be CHAR');
+      assert.equal(items.get(2).character, 'c'.charCodeAt(0), 'Item 2 should be "c"');
+      assert.equal(items.get(3).type, KM_CORE_CT.END, 'Item 3 should be END');
+      result.delete();
+    });
+
+    it('applies text from TextStore to Core context without deadkeys  (SMP)', function () {
+      // Setup
+      // Use a string with Old Italic letters which will consist of surrogate pairs
+      // in a UTF-16 string.
+      textStore = new SyntheticTextStore('𐌀𐌁𐌂𐌃', 6); // U+10300 U+10301 U+10302 U+10303
+
+      // Execute
+      coreProcessor.unitTestEndPoints.applyContextFromTextStore(context, textStore);
+
+      // Verify
+      const result = KM_Core.instance.context_get(context);
+      assert.equal(result.status, KM_CORE_STATUS.OK);
+      const items = result.object;
+
+      // Text index   : 0 1 2 3 4 5   6 7
+      // Text:        : 𐌀   𐌁   𐌂   | 𐌃
+      // context index: 0   1   2   3
+      // ContextItems : 𐌀   𐌁   𐌂   END
+      // ContextItem.character is a UTF-32 value!
+      assert.equal(items.size(), 4, 'Should have 4 context items');
+      assert.equal(items.get(0).type, KM_CORE_CT.CHAR, 'Item 0 should be CHAR');
+      assert.equal(items.get(0).character, 0x10300, 'Item 0 should be "𐌀"');
+      assert.equal(items.get(1).type, KM_CORE_CT.CHAR, 'Item 1 should be CHAR');
+      assert.equal(items.get(1).character, 0x10301, 'Item 1 should be "𐌁"');
+      assert.equal(items.get(2).type, KM_CORE_CT.CHAR, 'Item 2 should be CHAR');
+      assert.equal(items.get(2).character, 0x10302, 'Item 2 should be "𐌂"');
+      assert.equal(items.get(3).type, KM_CORE_CT.END, 'Item 3 should be END');
+      result.delete();
+    });
+
+    it('applies text from TextStore to Core context also after deadkeys', function () {
+      // Setup
+      textStore = new SyntheticTextStore('abcd', 3);
+      textStore.deadkeys().add(new Deadkey(1, 1)); // before 'b'
+
+      // Execute
+      coreProcessor.unitTestEndPoints.applyContextFromTextStore(context, textStore);
+
+      // Verify
+      const result = KM_Core.instance.context_get(context);
+      assert.equal(result.status, KM_CORE_STATUS.OK);
+      const items = result.object;
+
+      // Text index   : 0 1   1 2   3
+      // Text:        : a     b c | d
+      // context index: 0 1   2 3 4
+      // ContextItems : a dk1 b c END
+      assert.equal(items.size(), 5, 'Should have 5 context items');
+      assert.equal(items.get(0).type, KM_CORE_CT.CHAR, 'Item 0 should be CHAR');
+      assert.equal(items.get(0).character, 'a'.charCodeAt(0), 'Item 0 should be "a"');
+      assert.equal(items.get(1).type, KM_CORE_CT.MARKER, 'Item 1 should be MARKER');
+      assert.equal(items.get(1).marker, 1, 'Item 1 should be marker 1');
+      assert.equal(items.get(2).type, KM_CORE_CT.CHAR, 'Item 2 should be CHAR');
+      assert.equal(items.get(2).character, 'b'.charCodeAt(0), 'Item 2 should be "b"');
+      assert.equal(items.get(3).type, KM_CORE_CT.CHAR, 'Item 3 should be CHAR');
+      assert.equal(items.get(3).character, 'c'.charCodeAt(0), 'Item 3 should be "c"');
+      assert.equal(items.get(4).type, KM_CORE_CT.END, 'Item 4 should be END');
+      result.delete();
+    });
+
   });
 });

From a5c243b7e264a1c0ee608020f307de66415aabd0 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 26 Nov 2025 18:31:33 +0100
Subject: [PATCH 160/254] fix(web): address code review comments

---
 .../core-processor/coreKeyboardProcessor.ts   | 28 ++++++-
 .../coreKeyboardProcessor.tests.ts            | 77 +++++++++++++++++++
 2 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index d5fa731313a..763cd242f1e 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -160,9 +160,33 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
    *                  contextItems   The collection to which context items are added.
    */
   private addContextItemsFromText(contextInfo: { textIndex: number, caretPosition: number, text: string }, deadkey: Deadkey, contextItems: km_core_context_items): void {
-    for (; contextInfo.textIndex < contextInfo.text.length && (deadkey == null ? contextInfo.textIndex < contextInfo.caretPosition : contextInfo.textIndex <= contextInfo.caretPosition); contextInfo.textIndex++) {
+    const textLim = (() => {
+      // Determine the first index that should not be included in context. This value is the
+      // minimum of the text length and the caret position (or caret position + 1 if we have a
+      // deadkey). If we don't have a deadkey we know that the last context item will be a
+      // character and the last possible index for that is before the caret. If we do have a
+      // deadkey it could be after the last character, i.e. at the caret position so we have to
+      // use caret position + 1 so that the caret position itself is a possible index.
+      const caretPosition = deadkey === null
+        ? contextInfo.caretPosition
+        : contextInfo.caretPosition + 1;
+      return Math.min(contextInfo.text.length, caretPosition);
+    })();
+
+    if (deadkey !== null && textLim === 0) {
       const contextItem = new KM_Core.instance.km_core_context_item();
-      if (deadkey?.p == contextInfo.textIndex) {
+      if (deadkey?.p === contextInfo.textIndex) {
+        contextItem.marker = deadkey.d;
+        contextItems.push_back(contextItem);
+      } else {
+        console.warn(`Can't add deadkey at position ${deadkey.p} when text limit is 0`);
+      }
+      return;
+    }
+
+    for (; contextInfo.textIndex < textLim; contextInfo.textIndex++) {
+      const contextItem = new KM_Core.instance.km_core_context_item();
+      if (deadkey?.p === contextInfo.textIndex) {
         contextItem.marker = deadkey.d;
         contextItems.push_back(contextItem);
         return;
diff --git a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
index 34cf1288133..f3efa110472 100644
--- a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
+++ b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
@@ -351,5 +351,82 @@ describe('CoreKeyboardProcessor', function () {
       result.delete();
     });
 
+    it('works with empty text', function () {
+      // Setup
+      textStore = new SyntheticTextStore('', 0);
+
+      // Execute
+      coreProcessor.unitTestEndPoints.applyContextFromTextStore(context, textStore);
+
+      // Verify
+      const result = KM_Core.instance.context_get(context);
+      assert.equal(result.status, KM_CORE_STATUS.OK);
+      const items = result.object;
+
+      // Text index   : 0
+      // Text:        : |
+      // context index: 0
+      // ContextItems : END
+      assert.equal(items.size(), 1, 'Should have 1 context item');
+      assert.equal(items.get(0).type, KM_CORE_CT.END, 'Item 0 should be END');
+      result.delete();
+    });
+
+    it('works with deadkey before the text', function () {
+      // Setup
+      textStore = new SyntheticTextStore('abcd', 3);
+      textStore.deadkeys().add(new Deadkey(0, 1)); // before 'a'
+
+      // Execute
+      coreProcessor.unitTestEndPoints.applyContextFromTextStore(context, textStore);
+
+      // Verify
+      const result = KM_Core.instance.context_get(context);
+      assert.equal(result.status, KM_CORE_STATUS.OK);
+      const items = result.object;
+
+      // Text index   : 0   0 1 2   3
+      // Text:        :     a b c | d
+      // context index: 0   1 2 3 4
+      // ContextItems : dk1 a b c END
+      assert.equal(items.size(), 5, 'Should have 5 context items');
+      assert.equal(items.get(0).type, KM_CORE_CT.MARKER, 'Item 0 should be MARKER');
+      assert.equal(items.get(0).marker, 1, 'Item 0 should be marker 1');
+      assert.equal(items.get(1).type, KM_CORE_CT.CHAR, 'Item 1 should be CHAR');
+      assert.equal(items.get(1).character, 'a'.charCodeAt(0), 'Item 1 should be "a"');
+      assert.equal(items.get(2).type, KM_CORE_CT.CHAR, 'Item 2 should be CHAR');
+      assert.equal(items.get(2).character, 'b'.charCodeAt(0), 'Item 2 should be "b"');
+      assert.equal(items.get(3).type, KM_CORE_CT.CHAR, 'Item 3 should be CHAR');
+      assert.equal(items.get(3).character, 'c'.charCodeAt(0), 'Item 3 should be "c"');
+      assert.equal(items.get(4).type, KM_CORE_CT.END, 'Item 4 should be END');
+      result.delete();
+    });
+
+    it('works with deadkeys before empty text', function () {
+      // Setup
+      textStore = new SyntheticTextStore('', 0);
+      textStore.deadkeys().add(new Deadkey(0, 1)); // before caret
+      textStore.deadkeys().add(new Deadkey(0, 2)); // before caret
+
+      // Execute
+      coreProcessor.unitTestEndPoints.applyContextFromTextStore(context, textStore);
+
+      // Verify
+      const result = KM_Core.instance.context_get(context);
+      assert.equal(result.status, KM_CORE_STATUS.OK);
+      const items = result.object;
+
+      // Text index   : 0
+      // Text:        : |
+      // context index: 0   1   2
+      // ContextItems : dk1 dk2 END
+      assert.equal(items.size(), 3, 'Should have 3 context items');
+      assert.equal(items.get(0).type, KM_CORE_CT.MARKER, 'Item 0 should be MARKER');
+      assert.equal(items.get(0).marker, 1, 'Item 0 should be marker 1');
+      assert.equal(items.get(1).type, KM_CORE_CT.MARKER, 'Item 1 should be MARKER');
+      assert.equal(items.get(1).marker, 2, 'Item 1 should be marker 2');
+      assert.equal(items.get(2).type, KM_CORE_CT.END, 'Item 2 should be END');
+      result.delete();
+    });
   });
 });

From e4f7e1bc4066a12af27a0e96dcf26a286a18de1b Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 26 Nov 2025 18:37:24 +0100
Subject: [PATCH 161/254] test(web): add test for saving markers with empty
 text

---
 .../coreKeyboardProcessor.tests.ts            | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
index f3efa110472..4c1ea84317a 100644
--- a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
+++ b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
@@ -178,6 +178,32 @@ describe('CoreKeyboardProcessor', function () {
       // Verify
       assert.equal(textStore.deadkeys().count(), 0, 'Should have 0 deadkeys');
     });
+
+    it('saves markers to TextStore for empty text', function () {
+      // Setup
+      textStore = new SyntheticTextStore('', 0);
+      // Text index   : 0   0   0
+      // context index: 0   1   2
+      // ContextItems : dk1 dk2 END
+      const contextItems = new KM_Core.instance.km_core_context_items();
+      addContextItem(contextItems, 1, true); // deadkey 1
+      addContextItem(contextItems, 2, true); // deadkey 2
+      contextItems.push_back(KM_Core.instance.create_end_context());
+
+      sandbox.stub(KM_Core.instance, 'context_get').returns({
+        status: KM_CORE_STATUS.OK,
+        object: contextItems,
+        delete: function (): void { }
+      });
+
+      // Execute
+      coreProcessor.unitTestEndPoints.saveMarkersToTextStore(context, textStore);
+
+      // Verify
+      assert.equal(textStore.deadkeys().count(), 2, 'Should have 2 deadkeys');
+      assert.equal(textStore.deadkeys().dks[0].toString(), 'Deadkey { p: 0, d: 1, o: 0, matched: 0}', 'dks[0]');
+      assert.equal(textStore.deadkeys().dks[1].toString(), 'Deadkey { p: 0, d: 2, o: 1, matched: 0}', 'dks[1]');
+    });
   });
 
 

From e442fc36d66ce822a1ced51eaa9548a263181be5 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 27 Nov 2025 17:46:03 +0100
Subject: [PATCH 162/254] fix(web): simplify function

Addresses code review comments.

Co-authored-by: Marc Durdin <marc@durdin.net>
Test-bot: skip
---
 .../core-processor/coreKeyboardProcessor.ts   | 98 ++++++++-----------
 1 file changed, 41 insertions(+), 57 deletions(-)

diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index 763cd242f1e..a6f4b19f280 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -149,57 +149,6 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     this._layerStore.set(value);
   }
 
-  /**
-   * Adds context items from the given text to the contextItems collection, up
-   * to the caret position or the deadKey if present.
-   *
-   * @param {object}  contextInfo    The context information including textIndex,
-   *                                 caretPosition, and text.
-   * @param {Deadkey} deadkey        The deadkey to insert if present at the current index.
-   * @param {km_core_context_items}
-   *                  contextItems   The collection to which context items are added.
-   */
-  private addContextItemsFromText(contextInfo: { textIndex: number, caretPosition: number, text: string }, deadkey: Deadkey, contextItems: km_core_context_items): void {
-    const textLim = (() => {
-      // Determine the first index that should not be included in context. This value is the
-      // minimum of the text length and the caret position (or caret position + 1 if we have a
-      // deadkey). If we don't have a deadkey we know that the last context item will be a
-      // character and the last possible index for that is before the caret. If we do have a
-      // deadkey it could be after the last character, i.e. at the caret position so we have to
-      // use caret position + 1 so that the caret position itself is a possible index.
-      const caretPosition = deadkey === null
-        ? contextInfo.caretPosition
-        : contextInfo.caretPosition + 1;
-      return Math.min(contextInfo.text.length, caretPosition);
-    })();
-
-    if (deadkey !== null && textLim === 0) {
-      const contextItem = new KM_Core.instance.km_core_context_item();
-      if (deadkey?.p === contextInfo.textIndex) {
-        contextItem.marker = deadkey.d;
-        contextItems.push_back(contextItem);
-      } else {
-        console.warn(`Can't add deadkey at position ${deadkey.p} when text limit is 0`);
-      }
-      return;
-    }
-
-    for (; contextInfo.textIndex < textLim; contextInfo.textIndex++) {
-      const contextItem = new KM_Core.instance.km_core_context_item();
-      if (deadkey?.p === contextInfo.textIndex) {
-        contextItem.marker = deadkey.d;
-        contextItems.push_back(contextItem);
-        return;
-      }
-      contextItem.character = contextInfo.text.codePointAt(contextInfo.textIndex);
-      if (contextItem.character > 0xFFFF) {
-        // we have a surrogate pair, skip other half of surrogate
-        contextInfo.textIndex++;
-      }
-      contextItems.push_back(contextItem);
-    }
-  }
-
   /**
    * Retrieve context including deadkeys from TextStore and apply to Core's context
    *
@@ -221,15 +170,50 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     // managed entirely within Core, KeymanWeb does not need to have knowledge
     // of markers, and then we better align with the desktop Engines.
 
-    const text = textStore.getText();
+    const caretPosition = textStore.getCaret();
+    const text = textStore.getText().substring(0, caretPosition);
     const deadkeys = textStore.deadkeys().dks.sort((a, b) => a.p != b.p ? a.p - b.p : a.o - b.o);
     const contextItems = new KM_Core.instance.km_core_context_items();
-    const caretPosition = textStore.getCaret();
-    const contextInfo = { textIndex: 0, caretPosition: caretPosition, text: text };
-    for (const deadkey of deadkeys) {
-      this.addContextItemsFromText(contextInfo, deadkey, contextItems);
+
+    const deadkeyIterator = deadkeys.values();
+    let deadkey = deadkeyIterator.next();
+    const textMax = Math.min(text.length, caretPosition + 1);
+    let textIndex = 0;
+    while (!deadkey.done || textIndex < textMax) {
+      // insert 0 or more deadkeys at current index
+      while (!deadkey.done && deadkey.value.p <= textIndex) {
+        if (deadkey.value.p < textIndex) {
+          // this should never happen -- it would mean that
+          // a deadkey position was < 0 or in the middle of a
+          // surrogate pair. We'll silently drop it
+          console.warn(`invalid deadkey '${deadkey.value.d}' position ${deadkey.value.p}`);
+        } else {
+          const contextItem = new KM_Core.instance.km_core_context_item();
+          contextItem.marker = deadkey.value.d;
+          contextItems.push_back(contextItem);
+        }
+        deadkey = deadkeyIterator.next();
+      }
+
+      // flush out invalid deadkeys
+      while (!deadkey.done && deadkey.value.p > textMax) {
+        console.warn(`invalid deadkey '${deadkey.value.d}' position ${deadkey.value.p} after end of text ${textMax}`);
+        deadkey = deadkeyIterator.next();
+      }
+
+      // insert next character
+      if (textIndex < textMax) {
+        const contextItem = new KM_Core.instance.km_core_context_item();
+        contextItem.character = text.codePointAt(textIndex);
+        contextItems.push_back(contextItem);
+        textIndex++;
+        if (contextItem.character > 0xFFFF) {
+          // we have a surrogate pair, skip other half of surrogate, codePointAt()
+          // already handled that for us
+          textIndex++;
+        }
+      }
     }
-    this.addContextItemsFromText(contextInfo, null, contextItems);
 
     // Add end element
     contextItems.push_back(KM_Core.instance.create_end_context());

From bf652fb18c77414545112e0367e5c308b0727d63 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 28 Nov 2025 12:03:11 +0100
Subject: [PATCH 163/254] fix(web): another simplification

Plus another unit test.

Test-bot: skip
---
 .../core-processor/coreKeyboardProcessor.ts   | 30 +++++++----------
 .../coreKeyboardProcessor.tests.ts            | 32 +++++++++++++++++++
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index a6f4b19f280..85bba451784 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -177,32 +177,26 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
 
     const deadkeyIterator = deadkeys.values();
     let deadkey = deadkeyIterator.next();
-    const textMax = Math.min(text.length, caretPosition + 1);
     let textIndex = 0;
-    while (!deadkey.done || textIndex < textMax) {
-      // insert 0 or more deadkeys at current index
-      while (!deadkey.done && deadkey.value.p <= textIndex) {
-        if (deadkey.value.p < textIndex) {
-          // this should never happen -- it would mean that
-          // a deadkey position was < 0 or in the middle of a
-          // surrogate pair. We'll silently drop it
-          console.warn(`invalid deadkey '${deadkey.value.d}' position ${deadkey.value.p}`);
-        } else {
-          const contextItem = new KM_Core.instance.km_core_context_item();
-          contextItem.marker = deadkey.value.d;
-          contextItems.push_back(contextItem);
-        }
+    while (!deadkey.done || textIndex < text.length) {
+      // flush out invalid deadkeys
+      while (!deadkey.done && (deadkey.value.p < textIndex || deadkey.value.p > text.length)) {
+        // this should never happen -- it would mean that a deadkey position was < 0, in the
+        // middle of a surrogate pair, or after the caret.
+        console.warn(`invalid deadkey '${deadkey.value.d}' position ${deadkey.value.p}`);
         deadkey = deadkeyIterator.next();
       }
 
-      // flush out invalid deadkeys
-      while (!deadkey.done && deadkey.value.p > textMax) {
-        console.warn(`invalid deadkey '${deadkey.value.d}' position ${deadkey.value.p} after end of text ${textMax}`);
+      // insert 0 or more deadkeys at current index
+      while (!deadkey.done && deadkey.value.p == textIndex) {
+        const contextItem = new KM_Core.instance.km_core_context_item();
+        contextItem.marker = deadkey.value.d;
+        contextItems.push_back(contextItem);
         deadkey = deadkeyIterator.next();
       }
 
       // insert next character
-      if (textIndex < textMax) {
+      if (textIndex < text.length) {
         const contextItem = new KM_Core.instance.km_core_context_item();
         contextItem.character = text.codePointAt(textIndex);
         contextItems.push_back(contextItem);
diff --git a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
index 4c1ea84317a..8090308eb65 100644
--- a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
+++ b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
@@ -454,5 +454,37 @@ describe('CoreKeyboardProcessor', function () {
       assert.equal(items.get(2).type, KM_CORE_CT.END, 'Item 2 should be END');
       result.delete();
     });
+
+    it('skips invalid deadkeys', function () {
+      // Setup
+      textStore = new SyntheticTextStore('abcde', 3);
+      textStore.deadkeys().add(new Deadkey(-1, 1)); // invalid
+      textStore.deadkeys().add(new Deadkey(1, 2));  // after 'b'
+      textStore.deadkeys().add(new Deadkey(4, 3));  // invalid (after caret)
+
+      // Execute
+      coreProcessor.unitTestEndPoints.applyContextFromTextStore(context, textStore);
+
+      // Verify
+      const result = KM_Core.instance.context_get(context);
+      assert.equal(result.status, KM_CORE_STATUS.OK);
+      const items = result.object;
+
+      // Text index   : 0 1   1 2 3
+      // Text:        :           |
+      // context index: 0 1   2 3 4
+      // ContextItems : a dk2 b c END
+      assert.equal(items.size(), 5, 'Should have 5 context items');
+      assert.equal(items.get(0).type, KM_CORE_CT.CHAR, 'Item 0 should be CHAR');
+      assert.equal(items.get(0).character, 'a'.charCodeAt(0), 'Item 0 should be "a"');
+      assert.equal(items.get(1).type, KM_CORE_CT.MARKER, 'Item 1 should be MARKER');
+      assert.equal(items.get(1).marker, 2, 'Item 1 should be marker 2');
+      assert.equal(items.get(2).type, KM_CORE_CT.CHAR, 'Item 2 should be CHAR');
+      assert.equal(items.get(2).character, 'b'.charCodeAt(0), 'Item 2 should be "b"');
+      assert.equal(items.get(3).type, KM_CORE_CT.CHAR, 'Item 3 should be CHAR');
+      assert.equal(items.get(3).character, 'c'.charCodeAt(0), 'Item 3 should be "c"');
+      assert.equal(items.get(4).type, KM_CORE_CT.END, 'Item 4 should be END');
+      result.delete();
+    });
   });
 });

From fcee30530c06092c716e0b51672de2c2bb1e018a Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 1 Dec 2025 13:32:28 +0100
Subject: [PATCH 164/254] fix(web): fix running tests on Windows machines

This change allows the headless core-adapter and CoreKeyboardProcessor
tests to run on Windows.

Follow-up-of: #15220
Test-bot: skip
---
 web/src/test/auto/headless/engine/loadKeyboardHelper.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/src/test/auto/headless/engine/loadKeyboardHelper.ts b/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
index d22e3e99ba4..920dd6755c2 100644
--- a/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
+++ b/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
@@ -3,9 +3,10 @@
  */
 
 import fs from 'node:fs';
+import { pathToFileURL } from 'node:url';
 
 const KEYMAN_ROOT = process.env['KEYMAN_ROOT'];
-export const coreurl = `${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core`;
+export const coreurl = pathToFileURL(`${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core`).toString();
 
 export function loadKeyboardBlob(filename: string) {
   const data = fs.readFileSync(`${KEYMAN_ROOT}${filename}`, null);

From 7467584364d41bee7e8bbb533a411871e2b6935d Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 25 Nov 2025 18:19:26 +0100
Subject: [PATCH 165/254] feat(web): add `km_core_actions_wasm.toString()`

---
 core/src/wasm.cpp | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/core/src/wasm.cpp b/core/src/wasm.cpp
index 2aa0946d04e..f32ae336c35 100644
--- a/core/src/wasm.cpp
+++ b/core/src/wasm.cpp
@@ -5,6 +5,7 @@
 #include <emscripten/emscripten.h>
 #include <emscripten/bind.h>
 #include <vector>
+#include <sstream>
 
 #ifdef __cplusplus
 #define EXTERN extern "C" EMSCRIPTEN_KEEPALIVE
@@ -87,6 +88,15 @@ class km_core_keyboard_attrs_wasm {
 };
 
 class km_core_actions_wasm {
+private:
+  std::string getCodePoints(const std::u32string& str) const {
+    std::stringstream result;
+    for (char32_t codePoint : str) {
+      result << "U+" << std::hex << codePoint << " ";
+    }
+    return result.str();
+  }
+
 public:
   unsigned int code_points_to_delete;
   std::u32string output;
@@ -95,6 +105,26 @@ class km_core_actions_wasm {
   bool emit_keystroke;
   int new_caps_lock_state;
   std::u32string deleted_context;
+
+  std::string toString() const {
+    std::string result = "Actions(delete=" + std::to_string(this->code_points_to_delete) +
+                         ", output=\"" + std::string(this->output.begin(), this->output.end()) + "\" (" + getCodePoints(this->output) + ")" +
+                         ", do_alert=" + (this->do_alert ? "true" : "false") +
+                         ", emit_keystroke=" + (this->emit_keystroke ? "true" : "false") +
+                         ", new_caps_lock_state=" + std::to_string(this->new_caps_lock_state) +
+                         ", deleted_context=\"" + std::string(this->deleted_context.begin(), this->deleted_context.end()) + "\"" +
+                         ", persist_options=[";
+    for (size_t i = 0; i < this->persist_options.size(); ++i) {
+      result += "{" + std::string(this->persist_options[i].key.begin(), this->persist_options[i].key.end()) +
+                ": " + std::string(this->persist_options[i].value.begin(), this->persist_options[i].value.end()) +
+                ", scope=" + std::to_string(this->persist_options[i].scope) + "}";
+      if (i + 1 < this->persist_options.size()) {
+        result += ", ";
+      }
+    }
+    result += "])";
+    return result;
+  }
 };
 
 class km_core_context_item_wasm: public km_core_context_item {
@@ -396,7 +426,8 @@ EMSCRIPTEN_BINDINGS(core_interface) {
     .property("do_alert", &km_core_actions_wasm::do_alert)
     .property("emit_keystroke", &km_core_actions_wasm::emit_keystroke)
     .property("new_caps_lock_state", &km_core_actions_wasm::new_caps_lock_state)
-    .property("deleted_context", &km_core_actions_wasm::deleted_context);
+    .property("deleted_context", &km_core_actions_wasm::deleted_context)
+    .function("toString", &km_core_actions_wasm::toString);
 
   em::class_<km_core_state>("km_core_state");
   em::class_<CoreReturn<km_core_state>>("CoreStateReturn")

From 133f46330d1f4e15f22c2e73344098b3031c207e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 4 Dec 2025 15:57:08 +0100
Subject: [PATCH 166/254] chore(web): add issue# for some todos

Also use const instead of let in `renderer_core.ts`.

Test-bot: skip
---
 web/src/app/browser/src/contextManager.ts       |  2 +-
 .../src/core-processor/coreKeyboardProcessor.ts | 16 ++++++++--------
 web/src/engine/src/keyboard-storage/index.ts    |  2 +-
 web/src/engine/src/keyboard/index.ts            |  2 +-
 .../src/keyboard/keyboards/kmxKeyboard.ts       | 12 ++++++------
 .../engine/src/keyboard/syntheticTextStore.ts   |  4 ++--
 web/src/engine/src/keyboard/textStore.ts        |  2 +-
 web/src/engine/src/main/keymanEngineBase.ts     |  2 +-
 web/src/engine/src/osk/index.ts                 |  2 +-
 .../testing/bulk_rendering/renderer_core.ts     | 17 +++++++++--------
 10 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index f10d1150bee..30729b34dfb 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -28,7 +28,7 @@ export interface KeyboardCookie {
  * @param       {Keyboard}    activeKeyboard  The active keyboard
  */
 function _SetTargDir(Ptarg: HTMLElement, activeKeyboard: Keyboard) {
-  // TODO-web-core: we need to support RTL in Core. Means supporting km_core_keyboard_get_named_attr(KMX.KMXFile.TSS_KMW_RTL)
+  // TODO-web-core: we need to support RTL in Core. Means supporting km_core_keyboard_get_named_attr(KMX.KMXFile.TSS_KMW_RTL) (#15288)
   const elDir = activeKeyboard instanceof JSKeyboard && activeKeyboard?.isRTL ? 'rtl' : 'ltr';
 
   if(Ptarg) {
diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index 85bba451784..48cf3892475 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -113,7 +113,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
    * @type {MutableSystemStore}
    */
   public get layerStore(): MutableSystemStore {
-    // TODO-web-core: link to .kmx layer store
+    // TODO-web-core: link to .kmx layer store (#15284)
     return this._layerStore;
   }
 
@@ -123,7 +123,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
    * @type {MutableSystemStore}
    */
   public get newLayerStore(): MutableSystemStore {
-    // TODO-web-core: link to .kmx new-layer store
+    // TODO-web-core: link to .kmx new-layer store (#15284)
     return this._newLayerStore;
   }
 
@@ -133,7 +133,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
    * @type {MutableSystemStore}
    */
   public get oldLayerStore(): MutableSystemStore {
-    // TODO-web-core: link to .kmx old-layer store
+    // TODO-web-core: link to .kmx old-layer store (#15284)
     return this._oldLayerStore;
   }
 
@@ -262,7 +262,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     this.applyContextFromTextStore(coreContext, textStore);
 
     const status = KM_Core.instance.process_event(activeKeyboard.state, keyEvent.Lcode, keyEvent.Lmodifiers, 1, 0);
-    // TODO-web-core: properly set keyDown and flags
+    // TODO-web-core: properly set keyDown and flags (#15283)
     if (status != KM_CORE_STATUS.OK) {
       console.error('KeymanWeb: km_core_process_event failed with status: ' + status);
       return null;
@@ -279,7 +279,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
 
     // TODO-web-core: Implement options (#13426)
     // process_persist_action(engine, actions->persist_options);
-    // TODO-web-core: do we have to do anything with the new_caps_lock_state?
+    // TODO-web-core: do we have to do anything with the new_caps_lock_state? (#15285)
     // process_capslock_action(actions->new_caps_lock_state);
 
     processorAction.transcription = textStore.buildTranscriptionFrom(preInput, keyEvent, false);
@@ -297,7 +297,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
    * @returns {ProcessorAction} The resulting processor action, or null if not applicable.
    */
   public processPostKeystroke(device: DeviceSpec, textStore: TextStore): ProcessorAction {
-    // TODO-web-core: Implement this method
+    // TODO-web-core: Implement this method (#15286)
     return null;
   }
 
@@ -312,7 +312,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
    * @returns {boolean} True if the event is a modifier key press, false otherwise.
    */
   public doModifierPress(keyEvent: KeyEvent, textStore: TextStore, isKeyDown: boolean): boolean {
-    // TODO-web-core: Implement this method
+    // TODO-web-core: Implement this method (#15287)
     return false;
   }
 
@@ -342,7 +342,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
    * @returns {boolean} True if the keyboard layer changed, false otherwise.
    */
   public selectLayer(keyEvent: KeyEvent): boolean {
-    // TODO-web-core: Implement this method
+    // TODO-web-core: Implement this method (#15284)
     return false;
   }
 
diff --git a/web/src/engine/src/keyboard-storage/index.ts b/web/src/engine/src/keyboard-storage/index.ts
index f2b7bfb26ff..80073844db1 100644
--- a/web/src/engine/src/keyboard-storage/index.ts
+++ b/web/src/engine/src/keyboard-storage/index.ts
@@ -1,4 +1,4 @@
-// TODO-web-core: remove 'export default' to eliminate more aliases
+// TODO-web-core: remove 'export default' to eliminate more aliases (#15292)
 export {
   ErrorStub,
   type KeyboardAPISpec,
diff --git a/web/src/engine/src/keyboard/index.ts b/web/src/engine/src/keyboard/index.ts
index 7d327785878..c8ea67593fd 100644
--- a/web/src/engine/src/keyboard/index.ts
+++ b/web/src/engine/src/keyboard/index.ts
@@ -48,7 +48,7 @@ export const unitTestEndpoints = {
   DeadkeyTracker,
 };
 
-// TODO-web-core: why do we export these here?
+// TODO-web-core: why do we export these here? (#15292)
 export * from "keyman/common/web-utils";
 
 // At the top level, there should be no default export.
diff --git a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
index 27be600c458..73b62558dc2 100644
--- a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
@@ -20,7 +20,7 @@ export class KMXKeyboard {
         {
           scope: KM_CORE_OPTION_SCOPE.OPT_ENVIRONMENT,
           key: KM_CORE_KMX_ENV.PLATFORM,
-          // TODO-web-core: Turn touch off for non-touch targets; read proper platform string from web
+          // TODO-web-core: Turn touch off for non-touch targets; read proper platform string from web (#15289)
           value: "web iphone ipad androidphone androidtablet mobile touch hardware android phone"
         }, {
           scope: KM_CORE_OPTION_SCOPE.OPT_ENVIRONMENT,
@@ -54,7 +54,7 @@ export class KMXKeyboard {
   }
 
   public constructKeyEvent(key: ActiveKey | ActiveSubKey, device: DeviceSpec, stateKeys: StateKeyMap): KeyEvent {
-    // TODO-web-core: Implement this method
+    // TODO-web-core: Implement this method (#15290)
     return null;
   }
 
@@ -85,7 +85,7 @@ export class KMXKeyboard {
   }
 
   public get isChiral(): boolean {
-    // TODO-web-core: Implement this method
+    // TODO-web-core: Implement this method (#15290)
     return false;
   }
 
@@ -94,18 +94,18 @@ export class KMXKeyboard {
    * @return  {boolean}
    */
   public get emulatesAltGr(): boolean {
-    // TODO-web-core: Implement this method
+    // TODO-web-core: Implement this method (#15290)
     return false;
   }
 
   /**
-   * @param       {number}    eventCode     event code (16,17,18) or 0 // TODO-web-core: document meaning of these!
+   * @param       {number}    eventCode     event code (16,17,18) or 0 // TODO-web-core: document meaning of these! (#15290)
    * @param       {TextStore} textStore     textStore
    * @param       {number}    data          1 or 0
    * Notifies keyboard of keystroke or other event
    */
   public notify(eventCode: 16|17|18|0, textStore: TextStore, data: number) { // I2187
-    // TODO-web-core: do we need to support this?
+    // TODO-web-core: do we need to support this? (#15290)
   }
 
 }
diff --git a/web/src/engine/src/keyboard/syntheticTextStore.ts b/web/src/engine/src/keyboard/syntheticTextStore.ts
index e5c47f39cb0..7e547399b1b 100644
--- a/web/src/engine/src/keyboard/syntheticTextStore.ts
+++ b/web/src/engine/src/keyboard/syntheticTextStore.ts
@@ -58,8 +58,8 @@ export class SyntheticTextStore extends TextStore {
       clone = new SyntheticTextStore(text, selectionStart, selectionEnd);
     }
 
-    // TODO-web-core: we need to support saving Core markers here (km_core_context_get / km_core_context_set)
-    // Also duplicate deadkey state!  (Needed for fat-finger ops.)
+    // TODO-web-core: we need to support saving Core markers here (km_core_context_get / km_core_context_set) (#15291)
+    // Also duplicate deadkey state!  (Needed for fat-finger ops.) (#15291)
     clone.setDeadkeys(textStore.deadkeys());
 
     return clone;
diff --git a/web/src/engine/src/keyboard/textStore.ts b/web/src/engine/src/keyboard/textStore.ts
index 5aa5212e3bc..eff1b88c555 100644
--- a/web/src/engine/src/keyboard/textStore.ts
+++ b/web/src/engine/src/keyboard/textStore.ts
@@ -123,7 +123,7 @@ export abstract class TextStore {
     this.setTextAfterCaret(original.getTextAfterCaret());
 
     // Also, restore the deadkeys!
-    // TODO-web-core: km_core_context_set or similar?
+    // TODO-web-core: km_core_context_set or similar? (#15291)
     this.setDeadkeys(original._deadkeys);
   }
 
diff --git a/web/src/engine/src/main/keymanEngineBase.ts b/web/src/engine/src/main/keymanEngineBase.ts
index 484d77820c4..dd4aa09af20 100644
--- a/web/src/engine/src/main/keymanEngineBase.ts
+++ b/web/src/engine/src/main/keymanEngineBase.ts
@@ -1,6 +1,6 @@
 import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction, KMXKeyboard } from "keyman/engine/keyboard";
 import { ProcessorInitOptions } from 'keyman/engine/js-processor';
-// TODO-web-core: remove alias
+// TODO-web-core: remove alias (#15292)
 import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard";
 import { WorkerFactory } from "@keymanapp/lexical-model-layer/web"
 import { InputProcessor } from './headless/inputProcessor.js';
diff --git a/web/src/engine/src/osk/index.ts b/web/src/engine/src/osk/index.ts
index 1755d5b2b95..447ba91cda1 100644
--- a/web/src/engine/src/osk/index.ts
+++ b/web/src/engine/src/osk/index.ts
@@ -30,7 +30,7 @@ export { PredictionContext } from 'keyman/engine/interfaces';
 export * from './corrections.js';
 export * from './correctionLayout.js';
 
-// TODO-web-core: use a unitTestEndpoints pattern here
+// TODO-web-core: use a unitTestEndpoints pattern here (#15292)
 export * as testIndex from './test-index.js';
 
 // More things will likely need to be added.
\ No newline at end of file
diff --git a/web/src/tools/testing/bulk_rendering/renderer_core.ts b/web/src/tools/testing/bulk_rendering/renderer_core.ts
index 9086c7b4ec5..1eb3046d2dd 100644
--- a/web/src/tools/testing/bulk_rendering/renderer_core.ts
+++ b/web/src/tools/testing/bulk_rendering/renderer_core.ts
@@ -1,3 +1,4 @@
+/* eslint-disable prefer-const */
 // Includes KeymanWeb's Device class, as it's quite a useful resource for KMW-related projects.
 import { DeviceDetector } from 'keyman/engine/main';
 import { type DeviceSpec } from 'keyman/common/web-utils';
@@ -141,22 +142,22 @@ export class BatchRenderer {
   }
 
   private processKeyboard(kbd: KeyboardData) {
-    let p: Promise<any> = keyman.setActiveKeyboard(kbd.InternalName);
-    const formFactor = keyman.config.hostDevice.formFactor;
-    let isMobile = formFactor != 'desktop';
+    const p: Promise<any> = keyman.setActiveKeyboard(kbd.InternalName);
+    const {formFactor} = keyman.config.hostDevice;
+    const isMobile = formFactor != 'desktop';
 
     // Establish common keyboard header info.
-    let divSummary = document.createElement('div');
+    const divSummary = document.createElement('div');
     // Establishes a linkable target for this keyboard's data.
     divSummary.id = "summary-" + kbd.InternalName;
     BatchRenderer.divMaster.insertAdjacentElement('afterbegin', divSummary);
 
     // A nice, closure-friendly reference for use in our callbacks.
-    let renderer = this;
+    const renderer = this;
 
     // Once the keyboard's loaded, we can really get started.
     return p.then(function() {
-      let box: HTMLDivElement = keyman.osk._Box;
+      const box: HTMLDivElement = keyman.osk._Box;
 
       BatchRenderer.boundingRect = box.getBoundingClientRect();
 
@@ -167,7 +168,7 @@ export class BatchRenderer {
 
       divSummary.appendChild(renderer.createKeyboardHeader(kbd, formFactor, true));
 
-      let divRenders = document.createElement('div');
+      const divRenders = document.createElement('div');
       divSummary.appendChild(divRenders);
 
       // Uses 'private' APIs that may be subject to change in the future.  Keep it updated!
@@ -184,7 +185,7 @@ export class BatchRenderer {
       // Note:  vkbd will be null for keyboards with desktop help-text, such as sil_euro_latin.
       layers = layers || Object.keys(keyman.osk.vkbd?.layerGroup.layers);
 
-      let renderLayer = function(i: number) {
+      const renderLayer = function(i: number) {
         return new Promise(function(resolve) {
           // (Private API) Directly sets the keyboard layer within KMW, then uses .show to force-display it.
           if(keyman.osk.vkbd) {

From 6b24bbdd3103eea6448caf015d927bf2ff4a7287 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 5 Dec 2025 11:31:14 +0100
Subject: [PATCH 167/254] chore(web): address code review comments, and more
 consts

---
 .../testing/bulk_rendering/renderer_core.ts   | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/web/src/tools/testing/bulk_rendering/renderer_core.ts b/web/src/tools/testing/bulk_rendering/renderer_core.ts
index 1eb3046d2dd..fa90283838a 100644
--- a/web/src/tools/testing/bulk_rendering/renderer_core.ts
+++ b/web/src/tools/testing/bulk_rendering/renderer_core.ts
@@ -1,4 +1,6 @@
-/* eslint-disable prefer-const */
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
 // Includes KeymanWeb's Device class, as it's quite a useful resource for KMW-related projects.
 import { DeviceDetector } from 'keyman/engine/main';
 import { type DeviceSpec } from 'keyman/common/web-utils';
@@ -6,7 +8,7 @@ import { type DeviceSpec } from 'keyman/common/web-utils';
 import type { KeymanEngine } from 'keyman/app/browser';
 import { JSKeyboard, type FloatingOSKView } from 'keyman/engine/osk';
 
-declare var keyman: KeymanEngine;
+declare const keyman: KeymanEngine;
 
 type KeyboardData = ReturnType<KeymanEngine['getKeyboard']>;
 type KeyboardMap = {[id: string]: KeyboardData};
@@ -54,12 +56,12 @@ export class BatchRenderer {
 
   // Filters the keyboard array to ensure only a single entry remains, rather than an entry per language.
   private filterKeyboards(): KeyboardMap {
-    let kbds = keyman.getKeyboards();
+    const kbds = keyman.getKeyboards();
 
-    let keyboardMap: Record<string, ReturnType<typeof keyman['getKeyboards']>[0]> = {};
+    const keyboardMap: Record<string, ReturnType<typeof keyman['getKeyboards']>[0]> = {};
 
-    for(var i = 0; i < kbds.length; i++) {
-      let id: string = kbds[i].InternalName;
+    for(let i = 0; i < kbds.length; i++) {
+      const id: string = kbds[i].InternalName;
       if(!id.match(BatchRenderer.keyboardMatch)) continue;
       if(id.match(/^Keyboard_bod/)) continue; // bod keyboards currently don't load on Chrome and break the test run; they need rebuild.
       if(keyboardMap[id]) {
@@ -74,7 +76,7 @@ export class BatchRenderer {
 
   private render(ele: HTMLElement, isMobile?: boolean): Promise<HTMLImageElement> {
     const capture = async () => {
-      const result = await new Promise<HTMLImageElement>((resolve, reject) => {
+      return await new Promise<HTMLImageElement>((resolve, reject) => {
         // from: https://github.com/kasprownik/electron-screencapture/blob/master/index.js
         const canvas = document.createElement('canvas');
         canvas.width = BatchRenderer.boundingRect.width;
@@ -88,26 +90,24 @@ export class BatchRenderer {
             0, 0, canvas.width, canvas.height);
 
         const frame = canvas.toDataURL("image/png");
-        let imgOut = document.createElement('img');
+        const imgOut = document.createElement('img');
         imgOut.src = frame;
 
         resolve(imgOut);
       });
-
-      return result;
     }
 
     return capture();
   }
 
   createKeyboardHeader(kbd: KeyboardData, formFactor: DeviceSpec.FormFactor, loaded: boolean): HTMLDivElement {
-    let divHeader = document.createElement('div');
-    let eleName = document.createElement('h2');
+    const divHeader = document.createElement('div');
+    const eleName = document.createElement('h2');
 
     eleName.textContent = 'ID:  ' + kbd.InternalName;
     divHeader.appendChild(eleName);
 
-    let eleDescription = document.createElement('p');
+    const eleDescription = document.createElement('p');
 
     if(loaded) {
 
@@ -143,7 +143,7 @@ export class BatchRenderer {
 
   private processKeyboard(kbd: KeyboardData) {
     const p: Promise<any> = keyman.setActiveKeyboard(kbd.InternalName);
-    const {formFactor} = keyman.config.hostDevice;
+    const formFactor = keyman.config.hostDevice.formFactor;
     const isMobile = formFactor != 'desktop';
 
     // Establish common keyboard header info.
@@ -203,8 +203,8 @@ export class BatchRenderer {
           (document as any).fonts.ready.then(function() {
             window.setTimeout(function() {
               renderer.render(box, isMobile).then(function(imgEle: HTMLImageElement) {
-                let eleLayer = document.createElement('div');
-                let eleLayerId = document.createElement('p');
+                const eleLayer = document.createElement('div');
+                const eleLayerId = document.createElement('p');
                 eleLayerId.textContent = 'Layer ID:  ' + Object.keys(layers)[i];
 
                 eleLayer.appendChild(eleLayerId);
@@ -232,9 +232,9 @@ export class BatchRenderer {
   // Synchronously performs asynchronous operations across a loop, one at a time.
   // Necessary due to the nature of KMW OSK rendering.
   private arrayPromiseIteration(promiseGenerator: (i: number) => Promise<any>, length: number): Promise<any> {
-    let iteration = function(index: number): Promise<any> {
+    const iteration = function(index: number): Promise<any> {
       if(index < length) {
-        var promise = promiseGenerator(index);
+        const promise = promiseGenerator(index);
         return promise.then(function(index: number) {
           return iteration(++index);
         })
@@ -247,8 +247,8 @@ export class BatchRenderer {
   }
 
   fillDeviceNotes() {
-    let description = document.createElement('p');
-    let device = new DeviceDetector();
+    const description = document.createElement('p');
+    const device = new DeviceDetector();
     device.detect();
 
     description.appendChild(document.createTextNode('Browser: ' + device.browser));
@@ -271,7 +271,7 @@ export class BatchRenderer {
     BatchRenderer.keyboardMatch = new RegExp('^Keyboard_('+filter+')', 'i');
 
     if(keyman) {
-      let cc = await this.startCapture();
+      const cc = await this.startCapture();
       BatchRenderer.captureStream = cc.captureStream;
       BatchRenderer.video = cc.video;
 
@@ -293,13 +293,13 @@ export class BatchRenderer {
       }
 
       // Assumes that the keyboards have been preloaded for us.
-      let kbds = this.filterKeyboards();
+      const kbds = this.filterKeyboards();
 
       console.log("Unique keyboard ids detected: " + Object.keys(kbds).length);
 
-      let renderer = this;
+      const renderer = this;
 
-      let keyboardIterator = function(i: number) {
+      const keyboardIterator = function(i: number) {
         return new Promise(function(resolve) {
           renderer.processKeyboard(kbds[Object.keys(kbds)[i]]).then(function () {
             //console.log("Keyboard " + i + " processed!");

From 490add936fea68fc373915d787d8489a7cbafdc4 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 5 Dec 2025 15:01:18 +0100
Subject: [PATCH 168/254] maint(web): remove file that sneaked in through wrong
 merge

A previous PR (#15092) renamed `outputTargetForElement.ts` to
`textStoreForElement.ts`, another PR (#15093) moved files around. In the
end we ended up having both files. This change removes the unused file.

Follow-up-of: #15092
Follow-up-of: #15093
Test-bot: skip
---
 .../src/attachment/outputTargetForElement.ts  | 37 -------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 web/src/engine/src/attachment/outputTargetForElement.ts

diff --git a/web/src/engine/src/attachment/outputTargetForElement.ts b/web/src/engine/src/attachment/outputTargetForElement.ts
deleted file mode 100644
index 3e8229ec976..00000000000
--- a/web/src/engine/src/attachment/outputTargetForElement.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { nestedInstanceOf } from "keyman/engine/element-text-stores";
-
-/**
- * Given a DOM event related to an KMW-attached element, this function determines
- * the corresponding TextStore.
- * @param e
- * @returns
- */
-export function textStoreForElement(Ltarg: HTMLElement) {
-  if (Ltarg == null) {
-    return null;
-  }
-  // ... determine the element expected to hold the KMW attachment object based on
-  // its typing, properties, etc.
-
-  // @ts-ignore
-  if(Ltarg['body']) {
-    // @ts-ignore
-    Ltarg = Ltarg['body']; // Occurs in Firefox for design-mode iframes.
-  }
-
-  if (Ltarg.nodeType == 3) { // defeat Safari bug
-    Ltarg = Ltarg.parentNode as HTMLElement;
-  }
-
-  // Verify that the element does correspond to a remappable input field
-  if(nestedInstanceOf(Ltarg, "HTMLInputElement")) {
-    const et=(Ltarg as HTMLInputElement).type.toLowerCase();
-    if(!(et == 'text' || et == 'search')) {
-      return null;
-    }
-  }
-
-  // Step 2:  With the most likely host element determined, obtain the corresponding TextStore
-  // instance.
-  return Ltarg._kmwAttachment?.textStore;
-}
\ No newline at end of file

From 12d56453a43769656ee96f8b51b91a6e12e005af Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 24 Nov 2025 20:02:17 +0100
Subject: [PATCH 169/254] test(web): add e2e tests for KMX keyboard with
 web-core

Also add similar tests for a JS keyboard.

Test-bot: skip
---
 package-lock.json                          | 17 +++++
 web/.gitignore                             |  6 +-
 web/build.sh                               | 27 ++++++-
 web/package.json                           |  3 +-
 web/src/test/auto/e2e/README.md            | 18 +++++
 web/src/test/auto/e2e/keyboard.tests.ts    | 66 +++++++++++++++++
 web/src/test/auto/e2e/playwright.config.ts | 84 ++++++++++++++++++++++
 web/src/test/manual/web/kmxkeyboard.html   | 63 ++++++++--------
 web/test.sh                                |  8 ++-
 9 files changed, 257 insertions(+), 35 deletions(-)
 create mode 100644 web/src/test/auto/e2e/README.md
 create mode 100644 web/src/test/auto/e2e/keyboard.tests.ts
 create mode 100644 web/src/test/auto/e2e/playwright.config.ts

diff --git a/package-lock.json b/package-lock.json
index bd0d3903d12..68a5a5cd994 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2404,6 +2404,22 @@
         "node": ">=14"
       }
     },
+    "node_modules/@playwright/test": {
+      "version": "1.46.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.46.1.tgz",
+      "integrity": "sha512-Fq6SwLujA/DOIvNC2EL/SojJnkKf/rAwJ//APpJJHRyMi1PdKrY3Az+4XNQ51N4RTbItbIByQ0jgd1tayq1aeA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright": "1.46.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@puppeteer/browsers": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
@@ -14161,6 +14177,7 @@
       },
       "devDependencies": {
         "@keymanapp/resources-gosh": "*",
+        "@playwright/test": "^1.46.1",
         "@sentry/cli": "^2.31.0",
         "@zip.js/zip.js": "^2.7.32",
         "c8": "^7.12.0",
diff --git a/web/.gitignore b/web/.gitignore
index d7d1e040369..7e33d0cd875 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -11,4 +11,8 @@ node_modules/
 source/environment.inc.ts
 **/.idea/**/*.xml
 **/*.iml
-**/*.kpj.user
\ No newline at end of file
+**/*.kpj.user
+
+# Playwright
+playwright-report/
+test-results/
diff --git a/web/build.sh b/web/build.sh
index 532c367895d..d047b7dece0 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -40,6 +40,7 @@ builder_describe "Builds engine modules for Keyman Engine for Web (KMW)." \
   \
   "--test-dom-only           For test, run only DOM-oriented unit tests (reduced footprint, nothing browser-specific)" \
   "--test-integrated-only    For test, run only KMW's integration test suite" \
+  "--test-e2e-only           For test, run only KMW's end-to-end test suite" \
   "--test-inspect            For test, run browser-based unit tests in an inspectable mode"
 
 builder_parse "$@"
@@ -168,6 +169,24 @@ builder_run_action build:_all build_tests_action
 # Run tests
 builder_run_child_actions test
 
+function is_test_included() {
+  local test_opt=$1
+  local run_dom_tests=true run_integrated_tests=true run_e2e_tests=true
+  local var_name="run_${test_opt}_tests"
+
+  if builder_has_option --test-integrated-only || builder_has_option --test-e2e-only; then
+    run_dom_tests=false
+  fi
+  if builder_has_option --test-dom-only || builder_has_option --test-e2e-only; then
+    run_integrated_tests=false
+  fi
+  if builder_has_option --test-dom-only || builder_has_option --test-integrated-only; then
+    run_e2e_tests=false
+  fi
+
+  ${!var_name}
+}
+
 function do_browser_tests() {
   # Browser-based tests: common configs & kill-switches
 
@@ -175,6 +194,7 @@ function do_browser_tests() {
   local WTR_CONFIG=
   if builder_is_ci_build; then
     WTR_CONFIG=.CI
+    export KEYMAN_IS_CI_BUILD=1
   fi
 
   # Prepare the flags for the karma command.
@@ -184,12 +204,15 @@ function do_browser_tests() {
   fi
 
   pushd "${KEYMAN_ROOT}"
-  if builder_has_option --test-dom-only || ! builder_has_option --test-integrated-only; then
+  if is_test_included dom; then
     web-test-runner --config "web/src/test/auto/dom/web-test-runner${WTR_CONFIG}.config.mjs" ${WTR_INSPECT}
   fi
-  if builder_has_option --test-integrated-only || ! builder_has_option --test-dom-only; then
+  if is_test_included integrated; then
     web-test-runner --config "web/src/test/auto/integrated/web-test-runner${WTR_CONFIG}.config.mjs" ${WTR_INSPECT}
   fi
+  if is_test_included e2e; then
+    npx playwright test --config "web/src/test/auto/e2e/playwright.config.ts"
+  fi
   popd
 }
 
diff --git a/web/package.json b/web/package.json
index 5567e44f485..219b2ddac95 100644
--- a/web/package.json
+++ b/web/package.json
@@ -104,6 +104,7 @@
   "homepage": "https://github.com/keymanapp/keyman#readme",
   "devDependencies": {
     "@keymanapp/resources-gosh": "*",
+    "@playwright/test": "^1.46.1",
     "@sentry/cli": "^2.31.0",
     "@zip.js/zip.js": "^2.7.32",
     "c8": "^7.12.0",
@@ -116,9 +117,9 @@
     "test": "gosh ./test.sh"
   },
   "dependencies": {
+    "@keymanapp/common-types": "*",
     "@keymanapp/keyman-version": "*",
     "@keymanapp/lexical-model-layer": "*",
-    "@keymanapp/common-types": "*",
     "@keymanapp/recorder-core": "*",
     "core-js": "^3.34.0",
     "eventemitter3": "^5.0.0",
diff --git a/web/src/test/auto/e2e/README.md b/web/src/test/auto/e2e/README.md
new file mode 100644
index 00000000000..39880c6deca
--- /dev/null
+++ b/web/src/test/auto/e2e/README.md
@@ -0,0 +1,18 @@
+# Keyman Engine for Web e2e tests
+
+These tests are run as part of the regular build, but can be run separately
+with:
+
+```bash
+web/test.sh test:e2e
+```
+
+The Playwright Test for VSCode extension (ms-playwright.playwright) allows to run
+the tests in VSCode.
+
+It's also possible to run them with a UI that shows screenshots
+captured while running the tests:
+
+```bash
+npx playwright test --config "web/src/test/auto/e2e/playwright.config.ts" --ui
+```
diff --git a/web/src/test/auto/e2e/keyboard.tests.ts b/web/src/test/auto/e2e/keyboard.tests.ts
new file mode 100644
index 00000000000..b51dc3cbcb7
--- /dev/null
+++ b/web/src/test/auto/e2e/keyboard.tests.ts
@@ -0,0 +1,66 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import { test, expect, Page, Locator } from '@playwright/test';
+
+test.describe('KMX keyboards', function () {
+  let textarea: Locator;
+  const beforeEach = async (page: Page) => {
+    await page.goto('http://localhost:3000/src/test/manual/web/kmxkeyboard.html?keyboard=kmx');
+    await page.evaluate(async () => { await window.KmwLoaded; });
+    textarea = page.locator('#inputarea');
+    await textarea.click();
+    // we don't have a OSK yet, so don't wait for it to appear
+  }
+
+  test('can type on a (simulated) hardware keyboard', async ({ page }) => {
+    await beforeEach(page);
+    await page.keyboard.press('x');
+    await page.keyboard.press('j');
+    await page.keyboard.press('m');
+    await page.keyboard.press('Shift+e');
+    await page.keyboard.press('r');
+    await expect(textarea).toHaveValue('ខ្មែរ', { timeout: 500 });
+  });
+
+  test('can type on a (simulated) hardware keyboard with reordering', async ({ page }) => {
+    await beforeEach(page);
+    await page.keyboard.press('x');
+    await page.keyboard.press('Shift+e');
+    await page.keyboard.press('j');
+    await page.keyboard.press('m');
+    await page.keyboard.press('r');
+    await expect(textarea).toHaveValue('ខ្មែរ', { timeout: 500 });
+  });
+});
+
+test.describe('JS keyboards', function () {
+  let textarea: Locator;
+  const beforeEach = async (page: Page) => {
+    await page.goto('http://localhost:3000/src/test/manual/web/kmxkeyboard.html?keyboard=js');
+    await page.evaluate(async () => { await window.KmwLoaded; });
+    textarea = page.locator('#inputarea');
+    await textarea.click();
+    await page.evaluate(async () => { await window.OskShown; });
+  };
+
+  test('can type on a (simulated) hardware keyboard', async ({ page }) => {
+    await beforeEach(page);
+    await page.keyboard.press('x');
+    await page.keyboard.press('j');
+    await page.keyboard.press('m');
+    await page.keyboard.press('Shift+e');
+    await page.keyboard.press('r');
+    await expect(textarea).toHaveValue('ខ្មែរ', { timeout: 500 });
+  });
+
+  test('can type on a (simulated) hardware keyboard with reordering', async ({ page }) => {
+    await beforeEach(page);
+    await page.keyboard.press('x');
+    await page.keyboard.press('Shift+e');
+    await page.keyboard.press('j');
+    await page.keyboard.press('m');
+    await page.keyboard.press('r');
+    await expect(textarea).toHaveValue('ខ្មែរ', { timeout: 500 });
+  });
+});
\ No newline at end of file
diff --git a/web/src/test/auto/e2e/playwright.config.ts b/web/src/test/auto/e2e/playwright.config.ts
new file mode 100644
index 00000000000..47b6ceac4d1
--- /dev/null
+++ b/web/src/test/auto/e2e/playwright.config.ts
@@ -0,0 +1,84 @@
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { defineConfig, devices } from '@playwright/test';
+
+const dir = dirname(fileURLToPath(import.meta.url));
+const KEYMAN_ROOT = resolve(dir, '../../../../../');
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+export default defineConfig({
+  rootDir: KEYMAN_ROOT,
+  testDir: '.',
+  testMatch: '*.tests.ts',
+  /* Run tests in files in parallel */
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.KEYMAN_IS_CI_BUILD,
+  /* Retry on CI only */
+  retries: process.env.KEYMAN_IS_CI_BUILD ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.KEYMAN_IS_CI_BUILD ? 1 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  // reporter: process.env.KEYMAN_IS_CI_BUILD ? [
+  //   [KEYMAN_ROOT + '/common/test/resources/playwright-TC-reporter.ts', { parentFlow: 'web_tests' }]
+  // ] : [
+  reporter: [
+    ['list'],
+    ['html', { open: 'never' }],
+  ],
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Base URL to use in actions like `await page.goto('')`. */
+    // baseURL: 'http://localhost:3000',
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: 'on-first-retry',
+  },
+
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+
+    // {
+    //   name: 'firefox',
+    //   use: { ...devices['Desktop Firefox'] },
+    // },
+
+    // {
+    //   name: 'webkit',
+    //   use: { ...devices['Desktop Safari'] },
+    // },
+
+    /* Test against mobile viewports. */
+    // {
+    //   name: 'Mobile Chrome',
+    //   use: { ...devices['Pixel 5'] },
+    // },
+    // {
+    //   name: 'Mobile Safari',
+    //   use: { ...devices['iPhone 12'] },
+    // },
+
+    /* Test against branded browsers. */
+    // {
+    //   name: 'Microsoft Edge',
+    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
+    // },
+    // {
+    //   name: 'Google Chrome',
+    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
+    // },
+  ],
+
+  /* Run your local dev server before starting the tests */
+  webServer: {
+    command: `${KEYMAN_ROOT}/web/build.sh start`,
+    url: 'http://localhost:3000',
+    reuseExistingServer: !process.env.KEYMAN_IS_CI_BUILD,
+  },
+});
diff --git a/web/src/test/manual/web/kmxkeyboard.html b/web/src/test/manual/web/kmxkeyboard.html
index 8510324f9f7..c5a083b990e 100644
--- a/web/src/test/manual/web/kmxkeyboard.html
+++ b/web/src/test/manual/web/kmxkeyboard.html
@@ -12,7 +12,7 @@
     <!-- Enable IE9 Standards mode -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <title>KeymanWeb Sample Page - Unminified Source</title>
+    <title>KeymanWeb Khmer KMX/JS test page</title>
 
     <!-- Your page CSS -->
     <style type='text/css'>
@@ -36,19 +36,35 @@
 
     <!-- Initialization: set paths to keyboards, resources and fonts as required -->
     <script>
-      window.addEventListener('load', function () {
-        keyman.init().then(function () {
-          keyman.addKeyboards({
+        const searchParams = new URLSearchParams(window.location.search);
+        const kmx = {
             id: 'khmer_angkor',
             name: 'Khmer Angkor',
-            languages: {
-              id: 'km',
-              name: 'Khmer'
-            },
-            filename: '/build/test-resources/keyboards/khmer_angkor.kmx'
+            languages: { id: 'km', name: 'Khmer' }, filename: '/build/test-resources/keyboards/khmer_angkor.kmx' };
+        let keyboard;
+        switch (searchParams.get('keyboard')) {
+          case 'js':
+            keyboard = { id: 'khmer_angkor', name: 'Khmer Angkor', languages: { id: 'km' } };
+            break;
+          case 'kmx':
+          default:
+            keyboard = kmx;
+            break;
+        };
+        // allow to wait on KMW being fully initialized
+        window.KmwLoaded = new Promise((resolve) => {
+          window.addEventListener('load', async function () {
+            await keyman.init();
+            await keyman.addKeyboards(keyboard);
+            // allow to wait on OSK being visible
+            window.OskShown = new Promise((resolve) => {
+              keyman.osk.addEventListener('show', async function () {
+                resolve(true);
+              });
+            });
+            resolve(true);
           });
         });
-      });
     </script>
 
     <!-- Add keyboard management script for local selection of keyboards to use -->
@@ -58,7 +74,7 @@
 
 <!-- Sample page HTML -->
   <body>
-    <h2>KeymanWeb Sample Page - KMX Keyboards</h2>
+    <h2>KeymanWeb Sample Page - Khmer Angkor KMX and JS Keyboards</h2>
 
     <div>
     <!--
@@ -68,24 +84,13 @@ <h2>KeymanWeb Sample Page - KMX Keyboards</h2>
     -->
     <div id='KeymanWebControl'></div>
 
-    <h3>Type in your language in this text area:</h3>
-    <textarea id='ta1' class='test' placeholder='Type here'></textarea>
-
-    <h3>or in this input field:</h3>
-    <input class='test' value='' placeholder='or here'/>
-
-    <!--  The following elements show how the language menu can be dynamically extended at any time -->
-    <h3>Add a keyboard by keyboard name:</h3>
-    <input type='input' id='kbd_id1' class='kmw-disabled' onkeypress="clickOnEnter(event,1);"/>
-    <input type='button' id='btn1' onclick='addKeyboard(1);' value='Add' />
-
-    <h3>Add a keyboard by BCP-47 language code:</h3>
-    <input type='input' id='kbd_id2' class='kmw-disabled' onkeypress="clickOnEnter(event,2);"/>
-    <input type='button' id='btn2' onclick='addKeyboard(2);' value='Add' />
-
-    <h3>Add a keyboard by language name(s):</h3>
-    <input type='input' id='kbd_id3' class='kmw-disabled' onkeypress="clickOnEnter(event,3);"/>
-    <input type='button' id='btn3' onclick='addKeyboard(3);' value='Add' />
+    <p>This page allows to use either the .kmx or the .js version of the Khmer Angkor keyboard.
+      Which one can be selected by the <code>keyboard</code> query parameter:
+      append <code>?keyboard=kmx</code> or <code>?keyboard=js</code> to the URL..
+      The default is to use the .kmx version.
+    </p>
+    <h3>Type Khmer in this text area:</h3>
+    <textarea id='inputarea' class='test' placeholder='Type here'></textarea>
 
     <h3><a href="./">Return to testing home page</a></h3>
   </div>
diff --git a/web/test.sh b/web/test.sh
index e1133f826c6..103cb1d7fc1 100755
--- a/web/test.sh
+++ b/web/test.sh
@@ -20,6 +20,7 @@ builder_describe "Runs the Keyman Engine for Web unit-testing suites" \
   "test+" \
   ":dom                  Runs DOM-oriented unit tests (reduced footprint, nothing browser-specific)" \
   ":integrated           Runs KMW's integration test suite" \
+  ":e2e                  Runs KMW's end-to-end test suite" \
   "--inspect             Runs browser-based unit tests in an inspectable mode"
 
 builder_parse "$@"
@@ -30,6 +31,7 @@ builder_parse "$@"
 WTR_CONFIG=
 if builder_is_ci_build; then
   WTR_CONFIG=.CI
+  export KEYMAN_IS_CI_BUILD=1
 fi
 
 # Prepare the flags for the karma command.
@@ -42,6 +44,8 @@ fi
 
 cd "${KEYMAN_ROOT}"
 
-builder_run_action test:dom web-test-runner --config "web/src/test/auto/dom/web-test-runner${WTR_CONFIG}.config.mjs" ${WTR_INSPECT}
+builder_run_action test:dom         web-test-runner --config "web/src/test/auto/dom/web-test-runner${WTR_CONFIG}.config.mjs" ${WTR_INSPECT}
 
-builder_run_action test:integrated web-test-runner --config "web/src/test/auto/integrated/web-test-runner${WTR_CONFIG}.config.mjs" ${WTR_INSPECT}
+builder_run_action test:integrated  web-test-runner --config "web/src/test/auto/integrated/web-test-runner${WTR_CONFIG}.config.mjs" ${WTR_INSPECT}
+
+builder_run_action test:e2e         npx playwright test --config "web/src/test/auto/e2e/playwright.config.ts"

From 8784e0aacf519666c0f1228ee7e22d4993b08b00 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 28 Nov 2025 11:29:40 +0100
Subject: [PATCH 170/254] test(web): add baseline tests

---
 .../keyboard-storage/keyboardRequisitioner.ts |   2 +-
 .../auto/e2e/baseline/baseline.tests.html     |  47 +++++
 .../test/auto/e2e/baseline/baseline.tests.ts  | 109 +++++++++++
 web/src/test/auto/e2e/baseline/keyHandling.ts | 185 ++++++++++++++++++
 .../test/auto/e2e/baseline/kmxTestSource.ts   | 138 +++++++++++++
 web/src/tools/testing/test-server/index.cjs   |   4 +-
 6 files changed, 483 insertions(+), 2 deletions(-)
 create mode 100644 web/src/test/auto/e2e/baseline/baseline.tests.html
 create mode 100644 web/src/test/auto/e2e/baseline/baseline.tests.ts
 create mode 100644 web/src/test/auto/e2e/baseline/keyHandling.ts
 create mode 100644 web/src/test/auto/e2e/baseline/kmxTestSource.ts

diff --git a/web/src/engine/src/keyboard-storage/keyboardRequisitioner.ts b/web/src/engine/src/keyboard-storage/keyboardRequisitioner.ts
index e1391b56986..b629d2abbb5 100644
--- a/web/src/engine/src/keyboard-storage/keyboardRequisitioner.ts
+++ b/web/src/engine/src/keyboard-storage/keyboardRequisitioner.ts
@@ -145,7 +145,7 @@ export default class KeyboardRequisitioner {
           apiSpecEntry.languages ||= apiSpecEntry.language;
 
           if(typeof apiSpecEntry.languages === 'undefined') {
-            const msg = 'To use keyboard \'' + apiSpecEntry.id + '\', you must specify languages.';
+            const msg = `To use keyboard '${apiSpecEntry.id}', you must specify languages.`;
             errorStubs.push(convertToErrorStub(apiSpecEntry, msg));
           } else if(Array.isArray(apiSpecEntry.languages)) {
             const splitStubs = KeyboardStub.toStubs(apiSpecEntry, this.pathConfig.keyboards, this.pathConfig.fonts);
diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.html b/web/src/test/auto/e2e/baseline/baseline.tests.html
new file mode 100644
index 00000000000..b736f4cccb2
--- /dev/null
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width,user-scalable=no" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+
+    <title>KeymanWeb Baseline Tests</title>
+
+    <!-- Insert uncompiled KeymanWeb source scripts -->
+    <script src="../../../../../build/publish/debug/keymanweb.js"></script>
+    <script src="../../../../../build/publish/debug/kmwuitoggle.js"></script>
+
+    <!-- Initialization: set paths to keyboards, resources and fonts as required -->
+    <script>
+        const searchParams = new URLSearchParams(window.location.search);
+        const keyboard = {
+          id: 'test',
+          name: 'Test Keyboard',
+          languages: { id: 'en', name: 'English' },
+          filename: searchParams.get('keyboard')
+        };
+        // allow to wait on KMW being fully initialized
+        window.KmwLoaded = new Promise((resolve) => {
+          window.addEventListener('load', async function () {
+            await keyman.init();
+            await keyman.addKeyboards(keyboard);
+            resolve(true);
+          });
+        });
+    </script>
+  </head>
+
+  <body>
+    <h2>KeymanWeb Baseline Tests</h2>
+
+    <div>
+      <div id='KeymanWebControl'></div>
+      <textarea id='inputarea' class='test' placeholder='Type here'></textarea>
+    </div>
+
+    <!-- include a blank div to enable scrolling -->
+    <div style="height:1000px"></div>
+    <p>--End of Document--</p>
+  </body>
+</html>
diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.ts b/web/src/test/auto/e2e/baseline/baseline.tests.ts
new file mode 100644
index 00000000000..543c0bf1dc0
--- /dev/null
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.ts
@@ -0,0 +1,109 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { expect, test, /*expect, Page, Locator */} from '@playwright/test';
+import { KmxTestSource } from './kmxTestSource.js';
+import { pressKeys } from './keyHandling';
+
+function KeymanRoot(): string {
+  // Find the Keyman root directory, i.e. the directory containing .git
+  let dir = process.cwd();
+  while (true) {
+    if (fs.existsSync(dir + '/.git')) {
+      return dir;
+    }
+    dir = path.dirname(dir);
+    if (dir === '/' || dir.match(/^[A-Za-z]:[\/\\]?$/)) {
+      throw new Error('Could not find Keyman root directory');
+    }
+  }
+}
+
+// Tests that are not supported in Web due to missing functionality
+const testsToSkip = new Map([
+  ['k_038___punctkeys.kmn', 'Playwright does not support 102nd key']
+]);
+
+// Tests that should work but fail due to not-yet implemented functionality
+// TODO-web-core: fix these tests
+const testsToFix = [
+  'k_000___null_keyboard.kmn',
+  'k_006___vkey_input__shift_ctrl_.kmn',
+  'k_007___vkey_input__ctrl_alt_.kmn',
+  'k_008___vkey_input__ctrl_alt_2_.kmn',
+  'k_012___ralt.kmn',
+  'k_014___groups_and_virtual_keys.kmn',
+  'k_015___ralt_2.kmn',
+  'k_022___options_with_preset.kmn',
+  'k_024___options_with_save_and_preset.kmn',
+  'k_025___options_with_reset.kmn',
+  'k_026___system_stores.kmn',
+  'k_027___system_stores_2.kmn',
+  'k_028___smp.kmn',
+  'k_031___caps_lock.kmn',
+  'k_032___caps_control.kmn',
+  'k_034___options_double_set_reset.kmn',
+  'k_035___options_double_set_staged.kmn',
+  'k_036___options___double_reset_staged.kmn',
+  'k_037___options___double_reset.kmn',
+  'k_039___generic_ctrlalt.kmn',
+  'k_049___enter_invalidates_context.kmn',
+  'k_055___deadkey_cancelled_by_arrow.kmn',
+];
+
+test.describe('Baseline tests', () => {
+  const testDir = '/common/test/keyboards/baseline';
+
+  // Find all k_*.kmn files in testDir
+  const files = fs.readdirSync(KeymanRoot() + testDir).filter(f => f.match(/^k_.*\.kmn$/));
+  for (const file of files) {
+    test(file, async ({ page }) => {
+      const kmxFile = file.replace(/\.kmn$/, '.kmx');
+      const testSource = new KmxTestSource();
+      const result = testSource.loadSource(path.join(KeymanRoot(), testDir, file));
+      if (result !== 0) {
+        throw new Error(`Error loading KMX test source ${file} at line ${result}`);
+      }
+
+      // Setup
+      test.info().annotations.push({ type: 'name', description: test.info().title });
+      test.info().annotations.push({ type: 'description', description: testSource.description });
+
+      if (testsToSkip.has(file)) {
+        const msg = `Skipping ${file} test - ${testsToSkip.get(file)}`;
+        console.log(msg);
+        test.skip(true, msg);
+        return;
+      }
+
+      if (testsToFix.includes(file)) {
+        const msg = `Skipping ${file} test - requires not-yet implemented functionality`;
+        console.log(msg);
+        test.fixme(true, msg);
+        return;
+      }
+
+      await page.goto(`http://localhost:3000/src/test/auto/e2e/baseline/baseline.tests.html?keyboard=${testDir}/${kmxFile}`);
+      await page.evaluate(async () => { await window.KmwLoaded; });
+      const textarea = page.locator('#inputarea');
+      await textarea.click();
+
+      // TODO-web-core: set options from test source
+      // TODO-web-core: set capslock state
+
+      // set context
+      if (testSource.context) {
+        await textarea.fill(testSource.context);
+      }
+
+      // type keys
+      await pressKeys(page, testSource.keys);
+
+      // verify output
+      await expect(textarea).toHaveValue(testSource.expected, { timeout: 500 });
+    });
+
+  }
+});
\ No newline at end of file
diff --git a/web/src/test/auto/e2e/baseline/keyHandling.ts b/web/src/test/auto/e2e/baseline/keyHandling.ts
new file mode 100644
index 00000000000..2063025d5b7
--- /dev/null
+++ b/web/src/test/auto/e2e/baseline/keyHandling.ts
@@ -0,0 +1,185 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+
+import { Page } from '@playwright/test';
+
+function getKeycodeFromVk(vk: string): string {
+  const virtualKeyToKeyCodeMap = new Map([
+    ['K_BKSP', 'Backspace'],
+    ['K_TAB', 'Tab'],
+    ['K_ENTER', 'Enter'],
+    ['K_SHIFT', 'Shift'],
+    ['SHIFT', 'Shift'],
+    ['K_CONTROL', 'Control'],
+    ['CTRL', 'Control'],
+    ['K_ALT', 'Alt'],
+    ['K_PAUSE', 'Pause'],
+    ['K_CAPS', 'CapsLock'],
+    ['CAPSLOCK', 'CapsLock'],
+    ['K_ESC', 'Escape'],
+    ['K_SPACE', 'Space'],
+    ['K_PGUP', 'PageUp'],
+    ['K_PGDN', 'PageDown'],
+    ['K_END', 'End'],
+    ['K_HOME', 'Home'],
+    ['K_LEFT', 'ArrowLeft'],
+    ['K_UP', 'ArrowUp'],
+    ['K_RIGHT', 'ArrowRight'],
+    ['K_DOWN', 'ArrowDown'],
+    ['K_SEL', 'Select'],
+    ['K_PRINT', 'PrintScreen'],
+    ['K_EXEC', 'Execute'],
+    ['K_INS', 'Insert'],
+    ['K_DEL', 'Delete'],
+    ['K_HELP', 'Help'],
+    ['K_0', 'Digit0'],
+    ['K_1', 'Digit1'],
+    ['K_2', 'Digit2'],
+    ['K_3', 'Digit3'],
+    ['K_4', 'Digit4'],
+    ['K_5', 'Digit5'],
+    ['K_6', 'Digit6'],
+    ['K_7', 'Digit7'],
+    ['K_8', 'Digit8'],
+    ['K_9', 'Digit9'],
+    ['K_A', 'KeyA'],
+    ['K_B', 'KeyB'],
+    ['K_C', 'KeyC'],
+    ['K_D', 'KeyD'],
+    ['K_E', 'KeyE'],
+    ['K_F', 'KeyF'],
+    ['K_G', 'KeyG'],
+    ['K_H', 'KeyH'],
+    ['K_I', 'KeyI'],
+    ['K_J', 'KeyJ'],
+    ['K_K', 'KeyK'],
+    ['K_L', 'KeyL'],
+    ['K_M', 'KeyM'],
+    ['K_N', 'KeyN'],
+    ['K_O', 'KeyO'],
+    ['K_P', 'KeyP'],
+    ['K_Q', 'KeyQ'],
+    ['K_R', 'KeyR'],
+    ['K_S', 'KeyS'],
+    ['K_T', 'KeyT'],
+    ['K_U', 'KeyU'],
+    ['K_V', 'KeyV'],
+    ['K_W', 'KeyW'],
+    ['K_X', 'KeyX'],
+    ['K_Y', 'KeyY'],
+    ['K_Z', 'KeyZ'],
+    ['K_NP0', 'Numpad0'],
+    ['K_NP1', 'Numpad1'],
+    ['K_NP2', 'Numpad2'],
+    ['K_NP3', 'Numpad3'],
+    ['K_NP4', 'Numpad4'],
+    ['K_NP5', 'Numpad5'],
+    ['K_NP6', 'Numpad6'],
+    ['K_NP7', 'Numpad7'],
+    ['K_NP8', 'Numpad8'],
+    ['K_NP9', 'Numpad9'],
+    ['K_NPSTAR', 'NumpadMultiply'],
+    ['K_NPPLUS', 'NumpadAdd'],
+    ['K_SEPARATOR', 'NumpadComma'],
+    ['K_NPMINUS', 'NumpadSubtract'],
+    ['K_NPDOT', 'NumpadDecimal'],
+    ['K_NPSLASH', 'NumpadDivide'],
+    ['K_F1', 'F1'],
+    ['K_F2', 'F2'],
+    ['K_F3', 'F3'],
+    ['K_F4', 'F4'],
+    ['K_F5', 'F5'],
+    ['K_F6', 'F6'],
+    ['K_F7', 'F7'],
+    ['K_F8', 'F8'],
+    ['K_F9', 'F9'],
+    ['K_F10', 'F10'],
+    ['K_F11', 'F11'],
+    ['K_F12', 'F12'],
+    ['K_NUMLOCK', 'NumLock'],
+    ['K_SCROLL', 'Scroll'],
+    ['K_LSHIFT', 'ShiftLeft'],
+    ['K_RSHIFT', 'ShiftRight'],
+    ['LCTRL', 'ControlLeft'],
+    ['K_LCONTROL', 'ControlLeft'],
+    ['RCTRL', 'ControlRight'],
+    ['K_RCONTROL', 'ControlRight'],
+    ['LALT', 'Alt'],
+    ['K_LALT', 'Alt'],
+    ['RALT', 'AltGraph'],
+    ['K_RALT', 'AltGraph'],
+    ['K_COLON', 'Semicolon'],
+    ['K_EQUAL', 'Equal'],
+    ['K_COMMA', 'Comma'],
+    ['K_HYPHEN', 'Minus'],
+    ['K_PERIOD', 'Period'],
+    ['K_SLASH', 'Slash'],
+    ['K_BKQUOTE', 'Backquote'],
+    ['K_LBRKT', 'BracketLeft'],
+    ['K_BKSLASH', 'Backslash'],
+    ['K_RBRKT', 'BracketRight'],
+    ['K_QUOTE', 'Quote'],
+    ['K_oE2', 'IntlBackslash'],
+    ['K_OE2', 'IntlBackslash'],
+    // ['K_oC1', ''],
+    // ['K_OC1', ''],
+    // ['K_?C1', ''],
+    // ['k_?C1', ''],
+    // ['K_oDF', ''],
+    // ['K_ODF', ''],
+    // ['K_LOPT', ''],
+    // ['K_ROPT', ''],
+    // ['K_NUMERALS', ''],
+    // ['K_SYMBOLS', ''],
+    // ['K_CURRENCIES', ''],
+    // ['K_UPPER', ''],
+    // ['K_LOWER', ''],
+    // ['K_ALPHA', ''],
+    // ['K_SHIFTED', ''],
+    ['K_ALTGR', 'AltGraph'],
+    // ['K_TABBACK', ''],
+    // ['K_TABFWD', ''],
+  ]);
+  if (virtualKeyToKeyCodeMap.has(vk)) {
+    return virtualKeyToKeyCodeMap.get(vk);
+  } else {
+    throw new Error(`Unknown virtual key: ${vk}`);
+  }
+}
+
+function getKeySequences(keys: string): string[][] {
+  // e.g. [K_A][SHIFT K_B][K_PERIOD][RALT K_C][LCTRL K_D]
+  const keyEvents = keys.match(/\[([^\]]+)\]/g);
+  if (!keyEvents) {
+    return [];
+  }
+
+  const result: string[][]= [];
+
+  for (const keyEvent of keyEvents) {
+    const parts = keyEvent.slice(1, -1).trim().split(' ');
+
+    const eventKeys: string[] = [];
+    for (const vk of parts) {
+      eventKeys.push(getKeycodeFromVk(vk));
+    }
+    result.push(eventKeys);
+  }
+  return result;
+}
+
+export async function pressKeys(page: Page, keys: string): Promise<void> {
+  const keySequences = getKeySequences(keys);
+  for (const keySequence of keySequences) {
+    for (let i = 0; i < keySequence.length - 1; i++) {
+      await page.keyboard.down(keySequence[i]);
+    }
+    await page.keyboard.down(keySequence[keySequence.length - 1]);
+
+    await page.keyboard.up(keySequence[keySequence.length - 1]);
+    for (let i = keySequence.length - 2; i >= 0; i--) {
+      await page.keyboard.up(keySequence[i]);
+    }
+  }
+}
\ No newline at end of file
diff --git a/web/src/test/auto/e2e/baseline/kmxTestSource.ts b/web/src/test/auto/e2e/baseline/kmxTestSource.ts
new file mode 100644
index 00000000000..58793bf8e36
--- /dev/null
+++ b/web/src/test/auto/e2e/baseline/kmxTestSource.ts
@@ -0,0 +1,138 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import * as fs from 'fs';
+import * as path from 'path';
+
+// Helper types
+type KmxOptionType = 'input' | 'output' | 'saved';
+
+interface KmxOption {
+  type: KmxOptionType;
+  key: string;
+  value: string;
+}
+
+type KmxOptions = KmxOption[];
+
+export class KmxTestSource {
+  public description = '';
+  public keys = '';
+  public expected = '';
+  public expectedContext = '';
+  public context = '';
+  public options: KmxOptions = [];
+  public expectedBeep = false;
+  private _capsLockOn = false;
+
+  public constructor() {}
+
+  // String trim functions
+  private static ltrim(s: string): string {
+    return s.replace(/^\s+/, '');
+  }
+
+  private static rtrim(s: string): string {
+    return s.replace(/\s+$/, '');
+  }
+
+  private static trim(s: string): string {
+    return KmxTestSource.ltrim(KmxTestSource.rtrim(s));
+  }
+
+  private parseSourceString(s: string): string {
+    let t = '';
+    for (let i = 0; i < s.length; i++) {
+      if (s[i] === '\\') {
+        i++;
+        if (i >= s.length) throw new Error('Unexpected end of string after \\');
+        if (s[i] === 'u' || s[i] === 'U') {
+          i++;
+          const hex = s.substring(i, i+8).match(/^[0-9a-fA-F]+/);
+          if (!hex) throw new Error('Invalid unicode escape');
+          const v = parseInt(hex[0], 16);
+          if (v < 0x0001 || v > 0x10FFFF) throw new Error('Unicode out of range');
+          i += hex[0].length - 1;
+          t += String.fromCodePoint(v);
+        } else if (s[i] === 'd') {
+          throw new Error('Deadkey not supported');
+        }
+      } else {
+        t += s[i];
+      }
+    }
+    return t;
+  }
+
+  private parseOptionString(line: string, options: KmxOptions, type: KmxOptionType): boolean {
+    const x = line.indexOf('=');
+    if (x === -1) return false;
+    const key = this.parseSourceString(line.substring(0, x));
+    const value = this.parseSourceString(line.substring(x + 1));
+    options.push({ type, key, value });
+    return true;
+  }
+
+  private isToken(token: string, lineObj: { line: string }): boolean {
+    const {line} = lineObj;
+    if (line.startsWith(token)) {
+      lineObj.line = KmxTestSource.trim(line.substring(token.length));
+      return true;
+    }
+    return false;
+  }
+
+  public loadSource(filePath: string): number{
+    let lines: string[];
+    try {
+      lines = fs.readFileSync(filePath, 'utf-8').split(/\r?\n/);
+    } catch (e) {
+      console.error(`could not open file: ${filePath}`);
+      return -1;
+    }
+
+    let lineNo = 0;
+    for (const rawLine of lines) {
+      lineNo++;
+      const lineObj = { line: KmxTestSource.trim(rawLine) };
+      if (!lineObj.line.length) continue;
+
+
+      if (lineObj.line.startsWith('c Description:')) {
+        this.description = KmxTestSource.trim(lineObj.line.substring('c Description:'.length));
+      }  else if (lineObj.line.startsWith('c keys:')) {
+        this.keys = KmxTestSource.trim(lineObj.line.substring('c keys:'.length));
+      } else if (this.isToken('c expected:', lineObj)) {
+        if (lineObj.line === '\\b') {
+          this.expectedBeep = true;
+        } else {
+          this.expected = this.parseSourceString(lineObj.line);
+        }
+      } else if (this.isToken('c expected context:', lineObj)) {
+        this.expectedContext = this.parseSourceString(lineObj.line);
+      } else if (this.isToken('c context:', lineObj)) {
+        this.context = this.parseSourceString(lineObj.line);
+      } else if (this.isToken('c option:', lineObj)) {
+        if (!this.parseOptionString(lineObj.line, this.options, 'input')) {
+          return lineNo;
+        }
+      } else if (this.isToken('c expected option:', lineObj)) {
+        if (!this.parseOptionString(lineObj.line, this.options, 'output')) {
+          return lineNo;
+        }
+      } else if (this.isToken('c saved option:', lineObj)) {
+        if (!this.parseOptionString(lineObj.line, this.options, 'saved')) {
+          return lineNo;
+        }
+      } else if (this.isToken('c capsLock:', lineObj)) {
+        this._capsLockOn = this.parseSourceString(lineObj.line) === '1';
+      }
+    }
+
+    if (!this.keys) {
+      return lineNo;
+    }
+
+    return 0;
+  }
+}
diff --git a/web/src/tools/testing/test-server/index.cjs b/web/src/tools/testing/test-server/index.cjs
index 810b6632dc9..119a18f5c72 100644
--- a/web/src/tools/testing/test-server/index.cjs
+++ b/web/src/tools/testing/test-server/index.cjs
@@ -4,6 +4,8 @@ const app = express()
 const port = 3000
 
 app.use(express.static(path.join(__dirname, '../../../../')))
+// Also serve /common for shared test resources
+app.use('/common', express.static(path.join(__dirname, '../../../../../common/')))
 
 // for testing timeout error in web/src/test/manual/web/keyboard-errors
 const router = express.Router()
@@ -21,5 +23,5 @@ router.get('/src/test/manual/web/keyboard-errors/timeout.js', async (req, res, n
 app.use(router)
 
 app.listen(port, () => {
-  console.log(`Keyman test app listening on port ${port}`)
+  console.log(`Keyman test app listening on port ${port}: http://localhost:${port}`)
 })

From 8cea94dd8ceb0c0e014eb36010e6f303dff89db7 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 3 Dec 2025 15:47:37 +0100
Subject: [PATCH 171/254] test(web): add TC reporter for Playwright tests

This adds a custom reporter used when building on TeamCity that outputs
the test results in a form that TeamCity can show them nicely.

Build-bot: skip:all build:web
Test-bot: skip
---
 .../test/resources/playwright-TC-reporter.ts  | 194 ++++++++++++++++++
 web/src/test/auto/e2e/playwright.config.ts    |   7 +-
 2 files changed, 197 insertions(+), 4 deletions(-)
 create mode 100644 common/test/resources/playwright-TC-reporter.ts

diff --git a/common/test/resources/playwright-TC-reporter.ts b/common/test/resources/playwright-TC-reporter.ts
new file mode 100644
index 00000000000..f550a48d2cf
--- /dev/null
+++ b/common/test/resources/playwright-TC-reporter.ts
@@ -0,0 +1,194 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+
+import type {
+  FullConfig, FullResult, Reporter, Suite, TestCase, TestResult
+} from '@playwright/test/reporter';
+
+
+class TestNode {
+  public static Nodes = new Map<string, TestNode>();
+  private static OpenNodes: string[] = [];
+  public static RootFlow: string;
+  private id: string;
+  private suiteOrTest: Suite | TestCase;
+  private flowId: number;
+  private parent: TestNode;
+  private childrenToVisit: TestNode[] = [];
+
+  public constructor(suiteOrTest: Suite | TestCase) {
+    this.suiteOrTest = suiteOrTest;
+    this.id = this.suiteOrTest.titlePath().toString();
+    this.flowId = Math.floor(Math.random() * 100000 + 1);
+    this.parent = null; // will be set by parent
+    if (!this.isTest) {
+      for (const child of (<Suite>suiteOrTest).entries()) {
+        const node = new TestNode(child);
+        this.childrenToVisit.push(node);
+        node.parent = this;
+      }
+    }
+    TestNode.Nodes.set(this.id, this);
+  }
+
+  private get isTest(): boolean {
+    return this.suiteOrTest.type == 'test';
+  }
+
+  public get parentFlowId(): number | string {
+    return this.parent?.flowId ?? TestNode.RootFlow;
+  }
+
+  private start(): void {
+    this.parent?.start();
+    if (TestNode.OpenNodes.includes(this.id)) {
+      // already started, nothing to do
+      if (this.isTest) {
+        console.error(`Test '${this.suiteOrTest.title}' is already started!`)
+      }
+      return;
+    }
+
+    if (this.suiteOrTest.title !== '') {
+      console.log(`##teamcity[flowStarted flowId='${this.flowId}' parent='${this.parentFlowId}']`);
+      if (this.isTest) {
+        console.log(`##teamcity[testStarted name='${this.suiteOrTest.title}' captureStandardOutput='true']`);
+      } else {
+        console.log(`##teamcity[testSuiteStarted name='${this.suiteOrTest.title}']`);
+      }
+    }
+
+    TestNode.OpenNodes.push(this.id);
+  }
+
+  private getTestResult(result: TestResult): { msgTitle: string, details: string } {
+    if (!result) {
+      return null;
+    }
+    switch (result.status) {
+      case 'passed':
+        return { msgTitle: 'testFinished', details: `duration='${result.duration}'` };
+      case 'failed':
+      case 'interrupted':
+      case 'timedOut':
+        return { msgTitle: 'testFailed', details: `message='${result.error?.message}' details='${result.error?.value ?? result.error?.cause}'` };
+      case 'skipped':
+        return { msgTitle: 'testIgnored', details: `message='${result.annotations?.toString() ?? ''}'` };
+    }
+  }
+
+  private end(result: TestResult, force: boolean = false): void {
+    if (this.childrenToVisit.length > 0 && force) {
+      while (this.childrenToVisit.length > 0) {
+        const child = this.childrenToVisit[0];
+        child.end(result, force);
+      }
+    }
+
+    if (!force) {
+      if (this.suiteOrTest.title !== '') {
+        if (this.isTest) {
+          const { msgTitle, details } = this.getTestResult(result) ?? { msgTitle: 'testFinished', details: '' };
+          console.log(`##teamcity[${msgTitle} name='${this.suiteOrTest.title}' ${details}]`);
+        } else {
+          console.log(`##teamcity[testSuiteFinished name='${this.suiteOrTest.title}']`);
+        }
+        console.log(`##teamcity[flowFinished flowId = '${this.flowId}']`);
+      }
+      this.removeFromOpenNodes();
+
+      this.parent?.removeChild(this);
+      TestNode.Nodes.delete(this.id);
+    }
+  }
+
+  private removeFromOpenNodes(): void {
+    const ourIndex = TestNode.OpenNodes.indexOf(this.id);
+    if (ourIndex < 0) {
+      console.error(`Can't find '${this.id}' in open nodes`);
+      return;
+    }
+    TestNode.OpenNodes.splice(ourIndex, 1);
+  }
+
+  private removeChild(child: TestNode) {
+    const childIndex = this.childrenToVisit.indexOf(child);
+    if (childIndex < 0) {
+      console.error(`Can't find child '${child.id}' in parent '${this.id}'`);
+      return;
+    }
+    this.childrenToVisit.splice(childIndex, 1);
+
+    if (this.childrenToVisit.length > 0) {
+      return;
+    }
+
+    // No more children, so close this node
+    this.end(null, false);
+  }
+
+  public static startTest(test: TestCase): void {
+    const node = TestNode.Nodes.get(test.titlePath().toString());
+    if (!node) {
+      console.error(`Can't find test node for ${test.titlePath().toString()}`);
+      return;
+    }
+    node.start();
+  }
+
+  public static endTest(test: TestCase, result: TestResult): void {
+    const node = TestNode.Nodes.get(test.titlePath().toString());
+    if (!node) {
+      console.error(`Can't find test node for ${test.titlePath().toString()}`);
+      return;
+    }
+    node.end(result);
+  }
+
+  public endAll(): void {
+    if (this.childrenToVisit.length > 0) {
+      console.error(`Root node still has ${this.childrenToVisit.length} open children`);
+    }
+    this.end(null, true);
+    if (TestNode.OpenNodes.length > 0) {
+      console.error(`Still have ${TestNode.OpenNodes.length} open nodes`);
+      while (TestNode.OpenNodes.length > 0) {
+        const id = TestNode.OpenNodes[TestNode.OpenNodes.length - 1];
+        console.log(`Closing '${id}'`);
+        const node = TestNode.Nodes.get(id);
+        node.end(null);
+      }
+    }
+    if (TestNode.Nodes.size > 0) {
+      console.error(`Still have ${TestNode.Nodes.size} nodes hanging around`);
+      for (const [id, node] of Array.from(TestNode.Nodes.entries())) {
+        console.error(`Remaining node title: '${node.suiteOrTest.title}'`);
+      }
+    }
+  }
+}
+
+export default class PlaywrightTeamcityReporter implements Reporter {
+  private root: TestNode = null;
+
+  public constructor(options: { parentFlow?: string } = {}) {
+    TestNode.RootFlow = options.parentFlow ?? 'unit_tests';
+  }
+
+  public onBegin(config: FullConfig, suite: Suite) {
+    this.root = new TestNode(suite);
+  }
+
+  public onTestBegin(test: TestCase, result: TestResult) {
+    TestNode.startTest(test);
+  }
+
+  public onTestEnd(test: TestCase, result: TestResult) {
+    TestNode.endTest(test, result);
+  }
+
+  public onEnd(result: FullResult) {
+    this.root.endAll();
+  }
+}
diff --git a/web/src/test/auto/e2e/playwright.config.ts b/web/src/test/auto/e2e/playwright.config.ts
index 47b6ceac4d1..b81e89ffe4b 100644
--- a/web/src/test/auto/e2e/playwright.config.ts
+++ b/web/src/test/auto/e2e/playwright.config.ts
@@ -21,10 +21,9 @@ export default defineConfig({
   /* Opt out of parallel tests on CI. */
   workers: process.env.KEYMAN_IS_CI_BUILD ? 1 : undefined,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  // reporter: process.env.KEYMAN_IS_CI_BUILD ? [
-  //   [KEYMAN_ROOT + '/common/test/resources/playwright-TC-reporter.ts', { parentFlow: 'web_tests' }]
-  // ] : [
-  reporter: [
+  reporter: process.env.KEYMAN_IS_CI_BUILD ? [
+    [KEYMAN_ROOT + '/common/test/resources/playwright-TC-reporter.ts', { parentFlow: 'web_tests' }]
+  ] : [
     ['list'],
     ['html', { open: 'never' }],
   ],

From 191964260f0c47039fd067d7eaf081a3f2b03a78 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 4 Dec 2025 18:47:39 +0100
Subject: [PATCH 172/254] feat(web): properly set keyDown flag

This change passes the right value to the `is_key_down` parameter of
Core's `process_event`. It also updates the WASM interface to accept
a boolean instead of a number, and adds the enum values for the core
event flags.

Fixes: #15283
Test-bot: skip
---
 core/src/wasm.cpp                             | 13 ++++-
 web/src/engine/src/core-adapter/KM_Core.ts    |  5 ++
 .../core-processor/coreKeyboardProcessor.ts   |  5 +-
 web/src/engine/src/keyboard/keyEvent.ts       | 21 ++++----
 .../coreKeyboardProcessor.tests.ts            | 49 ++++++++++++++++++-
 5 files changed, 78 insertions(+), 15 deletions(-)

diff --git a/core/src/wasm.cpp b/core/src/wasm.cpp
index f32ae336c35..05dc9dbb567 100644
--- a/core/src/wasm.cpp
+++ b/core/src/wasm.cpp
@@ -370,6 +370,17 @@ km_core_context_set_wasm(
   return km_core_context_set((km_core_context*)context, items.data());
 }
 
+km_core_status
+km_core_process_event_wasm(
+  km_core_state const *state_,
+  km_core_virtual_key vk,
+  uint16_t modifier_state,
+  bool is_key_down,
+  uint16_t event_flags
+) {
+  return km_core_process_event(state_, vk, modifier_state, is_key_down ? 1 : 0, event_flags);
+}
+
 EMSCRIPTEN_BINDINGS(core_interface) {
 
   em::value_object<km_core_attr>("km_core_attr")
@@ -460,7 +471,7 @@ EMSCRIPTEN_BINDINGS(core_interface) {
   em::function("state_create(keyboard, env)", &km_core_state_create_wasm, em::allow_raw_pointers());
   em::function("state_clone(state)", &km_core_state_clone_wasm, em::allow_raw_pointers());
   em::function("state_dispose(state)", &km_core_state_dispose, em::allow_raw_pointers());
-  em::function("process_event(state, vk, modifier_state, is_key_down, event_flags)", &km_core_process_event, em::allow_raw_pointers());
+  em::function("process_event(state, vk, modifier_state, is_key_down, event_flags)", &km_core_process_event_wasm, em::allow_raw_pointers());
 
   em::function("state_context(state)", &km_core_state_context, em::allow_raw_pointers());
   em::function("state_context_set_if_needed(state, application_context)", &km_core_state_context_set_if_needed_wasm, em::allow_raw_pointers());
diff --git a/web/src/engine/src/core-adapter/KM_Core.ts b/web/src/engine/src/core-adapter/KM_Core.ts
index f384de786ed..f0acae06522 100644
--- a/web/src/engine/src/core-adapter/KM_Core.ts
+++ b/web/src/engine/src/core-adapter/KM_Core.ts
@@ -42,6 +42,11 @@ export enum KM_CORE_CT {
   MARKER = 2,
 }
 
+export enum KM_CORE_EVENT_FLAG {
+  DEFAULT = 0,
+  TOUCH = 1,
+};
+
 export class KM_Core {
   private static km_core: KMXCoreModule = null;
 
diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index 85bba451784..4c8a3bec2dd 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -11,6 +11,7 @@ import {
   StateKeyMap,
   Deadkey
 } from "keyman/engine/keyboard";
+import { KM_CORE_EVENT_FLAG } from '../core-adapter/KM_Core.js';
 
 export class CoreKeyboardInterface implements KeyboardMinimalInterface {
   public activeKeyboard: Keyboard;
@@ -261,8 +262,8 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
 
     this.applyContextFromTextStore(coreContext, textStore);
 
-    const status = KM_Core.instance.process_event(activeKeyboard.state, keyEvent.Lcode, keyEvent.Lmodifiers, 1, 0);
-    // TODO-web-core: properly set keyDown and flags
+    const status = KM_Core.instance.process_event(activeKeyboard.state, keyEvent.Lcode, keyEvent.Lmodifiers, keyEvent.source?.type === 'keydown', KM_CORE_EVENT_FLAG.DEFAULT);
+    // TODO-web-core: properly set flags
     if (status != KM_CORE_STATUS.OK) {
       console.error('KeymanWeb: km_core_process_event failed with status: ' + status);
       return null;
diff --git a/web/src/engine/src/keyboard/keyEvent.ts b/web/src/engine/src/keyboard/keyEvent.ts
index a403bdd0348..363212bb04f 100644
--- a/web/src/engine/src/keyboard/keyEvent.ts
+++ b/web/src/engine/src/keyboard/keyEvent.ts
@@ -112,7 +112,7 @@ export class KeyEvent implements KeyEventSpec {
   isSynthetic: boolean = true;
 
   public constructor(keyEventSpec: KeyEventSpec) {
-    for(let key in keyEventSpec) {
+    for(const key in keyEventSpec) {
       // @ts-ignore
       if(keyEventSpec[key] !== undefined) {
         // @ts-ignore
@@ -122,16 +122,15 @@ export class KeyEvent implements KeyEventSpec {
   }
 
   public static constructNullKeyEvent(device: DeviceSpec): KeyEvent {
-    const keyEvent = new KeyEvent({
-      Lcode: 0,
-      kName: '',
-      device: device,
-      Lstates: undefined,
-      Lmodifiers: undefined,
-      vkCode: undefined,
-      LisVirtualKey: undefined
-    });
-    return keyEvent;
+    return new KeyEvent({
+          Lcode: 0,
+          kName: '',
+          device: device,
+          Lstates: undefined,
+          Lmodifiers: undefined,
+          vkCode: undefined,
+          LisVirtualKey: undefined
+        });
   }
 
   get isModifier(): boolean {
diff --git a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
index 8090308eb65..42c20db423e 100644
--- a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
+++ b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
@@ -6,7 +6,7 @@ import { assert } from 'chai';
 import sinon from 'sinon';
 import { KM_Core, km_core_context, km_core_keyboard, km_core_state, KM_CORE_CT, KM_CORE_STATUS, km_core_context_items } from 'keyman/engine/core-adapter';
 import { coreurl, loadKeyboardBlob } from '../loadKeyboardHelper.js';
-import { Deadkey, SyntheticTextStore } from 'keyman/engine/keyboard';
+import { Codes, Deadkey, KeyEvent, KMXKeyboard, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { CoreKeyboardProcessor } from 'keyman/engine/core-processor';
 
 describe('CoreKeyboardProcessor', function () {
@@ -487,4 +487,51 @@ describe('CoreKeyboardProcessor', function () {
       result.delete();
     });
   });
+
+  describe('processKeystroke', function () {
+    let process_event_spy: any;
+
+    beforeEach(async function () {
+      coreProcessor = new CoreKeyboardProcessor();
+      await coreProcessor.init(coreurl);
+      state = createState('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
+      context = KM_Core.instance.state_context(state);
+      sandbox = sinon.createSandbox();
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+      sandbox = null;
+    })
+
+    for (const eventType of ['keydown', 'keyup']) {
+      const isKeyDown = eventType === 'keydown';
+
+      it(`passes the correct value for a ${eventType} event`, function () {
+        // Setup
+        const keyEvent = new KeyEvent({
+          Lcode: Codes.keyCodes.K_A,
+          Lmodifiers: Codes.modifierCodes.SHIFT,
+          Lstates: Codes.modifierCodes.NO_CAPS | Codes.modifierCodes.NO_NUM_LOCK | Codes.modifierCodes.NO_SCROLL_LOCK,
+          LisVirtualKey: true,
+          device: null,
+          kName: 'K_A'
+        });
+        keyEvent.source = { type: eventType };
+
+        const coreKeyboard = loadKeyboard('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
+        const kmxKeyboard = new KMXKeyboard(coreKeyboard);
+        sandbox.replaceGetter(coreProcessor, 'activeKeyboard', () => { return kmxKeyboard; });
+        // We return a non-ok value just so that we can return early from
+        // processKeyStroke()
+        process_event_spy = sandbox.spy(KM_Core.instance, 'process_event');
+
+        // Execute
+        coreProcessor.processKeystroke(keyEvent, new SyntheticTextStore());
+
+        // Verify - check fourth argument (is_key_down)
+        assert.equal(process_event_spy.args[0][3], isKeyDown);
+      });
+    }
+  });
 });

From 0b244690a02992acdecf9891179bea71e84debfd Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
Date: Tue, 9 Dec 2025 17:26:08 +0100
Subject: [PATCH 173/254] Apply suggestions from code review

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 web/src/test/manual/web/kmxkeyboard.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/src/test/manual/web/kmxkeyboard.html b/web/src/test/manual/web/kmxkeyboard.html
index c5a083b990e..4ac384dcb4a 100644
--- a/web/src/test/manual/web/kmxkeyboard.html
+++ b/web/src/test/manual/web/kmxkeyboard.html
@@ -56,7 +56,8 @@
           window.addEventListener('load', async function () {
             await keyman.init();
             await keyman.addKeyboards(keyboard);
-            // allow to wait on OSK being visible
+            // allow to wait on OSK being visible; `window.OskShown` waited on
+            // by keyboard.tests.ts
             window.OskShown = new Promise((resolve) => {
               keyman.osk.addEventListener('show', async function () {
                 resolve(true);

From 588d08cb90a0fd6462f1218ac097363828e7ce2e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 9 Dec 2025 17:28:11 +0100
Subject: [PATCH 174/254] test(web): address code review comments

- include `km_core_actions_wasm.toString` only for debug builds
- simplify waiting on KMW fully initialized

Test-bot: skip
---
 core/src/wasm.cpp                        |  8 ++++++--
 web/src/test/manual/web/kmxkeyboard.html | 10 ++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/src/wasm.cpp b/core/src/wasm.cpp
index f32ae336c35..dc51de368d3 100644
--- a/core/src/wasm.cpp
+++ b/core/src/wasm.cpp
@@ -106,6 +106,7 @@ class km_core_actions_wasm {
   int new_caps_lock_state;
   std::u32string deleted_context;
 
+#ifndef NDEBUG
   std::string toString() const {
     std::string result = "Actions(delete=" + std::to_string(this->code_points_to_delete) +
                          ", output=\"" + std::string(this->output.begin(), this->output.end()) + "\" (" + getCodePoints(this->output) + ")" +
@@ -125,6 +126,7 @@ class km_core_actions_wasm {
     result += "])";
     return result;
   }
+#endif
 };
 
 class km_core_context_item_wasm: public km_core_context_item {
@@ -420,14 +422,16 @@ EMSCRIPTEN_BINDINGS(core_interface) {
     .property("id", &km_core_keyboard_attrs_wasm::id)
     .property("default_options", &km_core_keyboard_attrs_wasm::default_options);
   em::class_<km_core_actions_wasm>("km_core_actions")
+#ifndef NDEBUG
+    .function("toString", &km_core_actions_wasm::toString)
+#endif
     .property("code_points_to_delete", &km_core_actions_wasm::code_points_to_delete)
     .property("output", &km_core_actions_wasm::output)
     .property("persist_options", &km_core_actions_wasm::persist_options)
     .property("do_alert", &km_core_actions_wasm::do_alert)
     .property("emit_keystroke", &km_core_actions_wasm::emit_keystroke)
     .property("new_caps_lock_state", &km_core_actions_wasm::new_caps_lock_state)
-    .property("deleted_context", &km_core_actions_wasm::deleted_context)
-    .function("toString", &km_core_actions_wasm::toString);
+    .property("deleted_context", &km_core_actions_wasm::deleted_context);
 
   em::class_<km_core_state>("km_core_state");
   em::class_<CoreReturn<km_core_state>>("CoreStateReturn")
diff --git a/web/src/test/manual/web/kmxkeyboard.html b/web/src/test/manual/web/kmxkeyboard.html
index 4ac384dcb4a..01629764b04 100644
--- a/web/src/test/manual/web/kmxkeyboard.html
+++ b/web/src/test/manual/web/kmxkeyboard.html
@@ -52,18 +52,16 @@
             break;
         };
         // allow to wait on KMW being fully initialized
-        window.KmwLoaded = new Promise((resolve) => {
+        window.KmwLoaded = new Promise((resolveKmwLoaded) => {
           window.addEventListener('load', async function () {
             await keyman.init();
             await keyman.addKeyboards(keyboard);
             // allow to wait on OSK being visible; `window.OskShown` waited on
             // by keyboard.tests.ts
-            window.OskShown = new Promise((resolve) => {
-              keyman.osk.addEventListener('show', async function () {
-                resolve(true);
-              });
+            window.OskShown = new Promise(resolveOskShown => {
+              keyman.osk.addEventListener('show', resolveOskShown);
             });
-            resolve(true);
+            resolveKmwLoaded(true);
           });
         });
     </script>

From 78cd9f8663438b97cc3b58d76abc2af0f82f3aac Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 9 Dec 2025 17:37:01 +0100
Subject: [PATCH 175/254] test(web): address code review comments

---
 web/src/test/auto/e2e/baseline/keyHandling.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/web/src/test/auto/e2e/baseline/keyHandling.ts b/web/src/test/auto/e2e/baseline/keyHandling.ts
index 2063025d5b7..5b2de53951b 100644
--- a/web/src/test/auto/e2e/baseline/keyHandling.ts
+++ b/web/src/test/auto/e2e/baseline/keyHandling.ts
@@ -172,13 +172,11 @@ function getKeySequences(keys: string): string[][] {
 export async function pressKeys(page: Page, keys: string): Promise<void> {
   const keySequences = getKeySequences(keys);
   for (const keySequence of keySequences) {
-    for (let i = 0; i < keySequence.length - 1; i++) {
+    for (let i = 0; i < keySequence.length; i++) {
       await page.keyboard.down(keySequence[i]);
     }
-    await page.keyboard.down(keySequence[keySequence.length - 1]);
 
-    await page.keyboard.up(keySequence[keySequence.length - 1]);
-    for (let i = keySequence.length - 2; i >= 0; i--) {
+    for (let i = keySequence.length - 1; i >= 0; i--) {
       await page.keyboard.up(keySequence[i]);
     }
   }

From 79ad53f9cf8960449a90512e0b986536c069194c Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 8 Dec 2025 19:40:24 +0100
Subject: [PATCH 176/254] refactor(web): document and cleanup parameters of
 `Keyboard.notify()`

Document what values are possible for the `eventCode` parameter and what
these values mean. Also change `data` parameter to a `boolean`.

Test-bot: skip
---
 web/src/app/browser/src/contextManager.ts             |  4 ++--
 .../engine/src/js-processor/jsKeyboardProcessor.ts    |  4 ++--
 web/src/engine/src/keyboard/keyboards/jsKeyboard.ts   |  6 +++---
 web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts  | 11 +++++++----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index 30729b34dfb..8004e743d84 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -613,7 +613,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
     const activeKeyboard = this.activeKeyboard?.keyboard;
     if(!focusAssistant.restoringFocus) {
       textStore?.deadkeys().clear();
-      activeKeyboard?.notify(0, textStore, 1);  // I2187
+      activeKeyboard?.notify(0, textStore, true);  // I2187
     }
 
     if(!focusAssistant.restoringFocus && this.mostRecentTextStore != textStore) {
@@ -711,7 +711,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
     const {activeKeyboard} = this;
     const {maintainingFocus} = this.focusAssistant;
     if(!maintainingFocus && activeKeyboard) {
-      activeKeyboard.keyboard.notify(0, textStore, 0);  // I2187
+      activeKeyboard.keyboard.notify(0, textStore, false);  // I2187
     }
     if(previousTextStore && !this.activeTextStore) {
       this.emit('textstorechange', null);
diff --git a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
index a42ecc70673..5b2bd705acd 100644
--- a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
@@ -539,7 +539,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
     }
 
     if(Levent.isModifier) {
-      this.activeKeyboard.notify(Levent.Lcode, textStore, isKeyDown ? 1 : 0);
+      this.activeKeyboard.notify(Levent.Lcode, textStore, isKeyDown);
       // For eventual integration - we bypass an OSK update for physical keystrokes when in touch mode.
       if(!Levent.device.touchable) {
         return this._UpdateVKShift(Levent); // I2187
@@ -549,7 +549,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
     }
 
     if(Levent.LmodifierChange) {
-      this.activeKeyboard.notify(0, textStore, 1);
+      this.activeKeyboard.notify(0, textStore, true);
       if(!Levent.device.touchable) {
         this._UpdateVKShift(Levent);
       }
diff --git a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
index 90b45f3ba59..4c6631a1a82 100644
--- a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
@@ -358,12 +358,12 @@ export class JSKeyboard {
    *
    * @param       {number}    command     event code (16,17,18) or 0
    * @param       {TextStore} textStore   textStore
-   * @param       {number}    data        1 or 0
+   * @param       {boolean}   data        1 or 0
    */
-  public notify(command: number, textStore: TextStore, data: number): void { // I2187
+  public notify(command: number, textStore: TextStore, data: boolean): void { // I2187
     // Good example use case - the Japanese CJK-picker keyboard
     if(typeof(this.scriptObject['KNS']) == 'function') {
-      this.scriptObject['KNS'](command, textStore, data);
+      this.scriptObject['KNS'](command, textStore, data ? 1 : 0);
     }
   }
 
diff --git a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
index 73b62558dc2..ba78dc4e016 100644
--- a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
@@ -99,12 +99,15 @@ export class KMXKeyboard {
   }
 
   /**
-   * @param       {number}    eventCode     event code (16,17,18) or 0 // TODO-web-core: document meaning of these! (#15290)
-   * @param       {TextStore} textStore     textStore
-   * @param       {number}    data          1 or 0
    * Notifies keyboard of keystroke or other event
+   *
+   * @param       {number}    eventCode     key code (16-18: Shift, Control or Alt),
+   *                                        or 0 for focus
+   * @param       {TextStore} textStore     textStore
+   * @param       {number}    boolean       true for KeyDown or FocusReceived,
+   *                                        false for KeyUp or FocusLost
    */
-  public notify(eventCode: 16|17|18|0, textStore: TextStore, data: number) { // I2187
+  public notify(eventCode: number, textStore: TextStore, data: boolean): void { // I2187
     // TODO-web-core: do we need to support this? (#15290)
   }
 

From d1ddff8b567b80c10abda7c7f6473669e50c1501 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 8 Dec 2025 19:43:35 +0100
Subject: [PATCH 177/254] refactor(web): cleanup and clarifications

Build-bot: skip
Test-bot: skip
---
 web/common.inc.sh                    | 3 ++-
 web/src/test/auto/headless/README.md | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/common.inc.sh b/web/common.inc.sh
index b587bf99ab7..b4a3c47d7eb 100644
--- a/web/common.inc.sh
+++ b/web/common.inc.sh
@@ -91,7 +91,7 @@ function test-headless() {
   TEST_FOLDER=$1
   TEST_BASE="${KEYMAN_ROOT}/web/src/test/auto/headless/"
   TEST_EXTENSIONS=${2:-}
-  if [ ! -z "${2:-}" ]; then
+  if [[ ! -z "${2:-}" ]]; then
     TEST_BASE="${KEYMAN_ROOT}/web/build/test/headless/"
 
     # Ensure the compiled tests are available.
@@ -104,6 +104,7 @@ function test-headless() {
     echo "##teamcity[flowStarted flowId='unit_tests']"
   fi
   if [[ -n "${TEST_EXTENSIONS}" ]]; then
+    # file extension of test files
     TEST_OPTS+=(--extension "${TEST_EXTENSIONS}")
   fi
 
diff --git a/web/src/test/auto/headless/README.md b/web/src/test/auto/headless/README.md
index e496cf8a2a5..58e1a4107f9 100644
--- a/web/src/test/auto/headless/README.md
+++ b/web/src/test/auto/headless/README.md
@@ -5,4 +5,4 @@ under `src`.
 
 For example, `src/test/auto/headless/engine/js-processor` are the tests
 for `src/engine/js-processor` and will be run from
-`src/engine/js-processor/build.sh`.
+`src/engine/build.sh`.

From dbb05e3fcc0b56ed332cb2c67dd9852610c9341d Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 11 Dec 2025 17:52:14 +0100
Subject: [PATCH 178/254] refactor(web): use constants instead of hard coded
 values

And some other refactorings.

Test-bot: skip
---
 .../app/browser/src/hardwareEventKeyboard.ts  | 40 ++++++++++++-------
 .../src/main/headless/inputProcessor.ts       | 19 ++++-----
 .../coreKeyboardProcessor.tests.ts            |  8 ++--
 3 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts
index 7057bd9df98..8564c6a7993 100644
--- a/web/src/app/browser/src/hardwareEventKeyboard.ts
+++ b/web/src/app/browser/src/hardwareEventKeyboard.ts
@@ -14,6 +14,12 @@ type KeyboardState = {
   baseLayout: string
 }
 
+const DOM_KEY_LOCATION = {
+  STANDARD: 0,
+  LEFT: 1,
+  RIGHT: 2,
+};
+
 // Important:  the following two lines should not cause a compile error if left uncommented.
 // let dummy1: KeyboardProcessor;
 // let dummy2: KeyboardState = dummy1;
@@ -51,9 +57,9 @@ export function _GetEventKeyCode(e: KeyboardEvent) {
  * @param  {KeyboardEvent}  e              Event object
  * @param  {KeyboardState}  keyboardState  Keyboard state object
  * @param  {DeviceSpec}     device         Device object
- * @return {KeyEvent}                      KeymanWeb KeyEvent object, or null
- *                                         for duplicate/spurious events or if
- *                                         there is no key code.
+ *
+ * @return {KeyEvent}       KeymanWeb KeyEvent object, or null for duplicate/spurious
+ *                          events or if there is no key code.
  */
 export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: KeyboardState, device: DeviceSpec): KeyEvent {
   if(e.cancelBubble === true) {
@@ -104,17 +110,21 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar
    */
 
   let curModState = 0x0000;
-  curModState |= (e.getModifierState("Shift") ? 0x10 : 0);
+  curModState |= (e.getModifierState("Shift") ? ModifierKeyConstants.K_SHIFTFLAG : 0);
 
   if(e.getModifierState("Control")) {
-    curModState |= ((e.location != 0 && ctrlEvent) ?
-      (e.location == 1 ? ModifierKeyConstants.LCTRLFLAG : ModifierKeyConstants.RCTRLFLAG) : // Condition 1
-      prevModState & 0x0003 /* LCTRLFLAG | RCTRLFLAG */);                                   // Condition 2
+    curModState |= ((e.location != DOM_KEY_LOCATION.STANDARD && ctrlEvent)
+      ? (e.location == DOM_KEY_LOCATION.LEFT
+        ? ModifierKeyConstants.LCTRLFLAG
+        : ModifierKeyConstants.RCTRLFLAG) // Condition 1
+      : prevModState & (ModifierKeyConstants.LCTRLFLAG | ModifierKeyConstants.RCTRLFLAG)); // Condition 2
   }
   if(e.getModifierState("Alt")) {
-    curModState |= ((e.location != 0 && altEvent) ?
-      (e.location == 1 ? ModifierKeyConstants.LALTFLAG : ModifierKeyConstants.RALTFLAG) :   // Condition 1
-      prevModState & 0x000C /* LALTFLAG | RALTFLAG */);                                     // Condition 2
+    curModState |= ((e.location != DOM_KEY_LOCATION.STANDARD && altEvent)
+      ? (e.location == DOM_KEY_LOCATION.LEFT
+        ? ModifierKeyConstants.LALTFLAG
+        : ModifierKeyConstants.RALTFLAG)   // Condition 1
+      : prevModState & (ModifierKeyConstants.LALTFLAG | ModifierKeyConstants.RALTFLAG));  // Condition 2
   }
 
   // Stage 2 - detect state key information.  It can be looked up per keypress with no issue.
@@ -143,7 +153,7 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar
     curModState &= ~ altGrMask;
   }
   // Perform basic filtering for Windows-based ALT_GR emulation on European keyboards.
-  if(curModState & ModifierKeyConstants.RALTFLAG) {
+  if((curModState & ModifierKeyConstants.RALTFLAG) != 0) {
     curModState &= ~ModifierKeyConstants.LCTRLFLAG;
   }
 
@@ -151,7 +161,7 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar
   const modifierBitmasks = Codes.modifierBitmasks;
   const activeKeyboard = keyboardState.activeKeyboard;
   let Lmodifiers: number;
-  if(activeKeyboard && activeKeyboard.isChiral) {
+  if(activeKeyboard?.isChiral) {
     Lmodifiers = curModState & modifierBitmasks.CHIRAL;
 
     // Note for future - embedding a kill switch here would facilitate disabling AltGr / Right-alt simulation.
@@ -162,9 +172,9 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar
   } else {
     // No need to sim AltGr here; we don't need chiral ALTs.
     Lmodifiers =
-      (curModState & 0x10) | // SHIFT
-      ((curModState & (ModifierKeyConstants.LCTRLFLAG | ModifierKeyConstants.RCTRLFLAG)) ? 0x20 : 0) |
-      ((curModState & (ModifierKeyConstants.LALTFLAG | ModifierKeyConstants.RALTFLAG))   ? 0x40 : 0);
+      (curModState & ModifierKeyConstants.K_SHIFTFLAG) |
+      ((curModState & (ModifierKeyConstants.LCTRLFLAG | ModifierKeyConstants.RCTRLFLAG)) != 0 ? ModifierKeyConstants.K_CTRLFLAG : 0) |
+      ((curModState & (ModifierKeyConstants.LALTFLAG | ModifierKeyConstants.RALTFLAG)) != 0 ? ModifierKeyConstants.K_ALTFLAG : 0);
   }
 
 
diff --git a/web/src/engine/src/main/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
index ffcb282a69b..426bd186edb 100644
--- a/web/src/engine/src/main/headless/inputProcessor.ts
+++ b/web/src/engine/src/main/headless/inputProcessor.ts
@@ -170,24 +170,21 @@ export class InputProcessor {
     const formFactor = keyEvent.device.formFactor;
     const fromOSK = keyEvent.isSynthetic;
 
-    // The default OSK layout for desktop devices does not include nextlayer info, relying on modifier detection here.
+    // The default OSK layout for desktop devices does not include nextlayer info, relying on
+    // modifier detection here.
     // It's the OSK equivalent to doModifierPress on 'desktop' form factors.
-    if((formFactor == DeviceSpec.FormFactor.Desktop || !this.activeKeyboard || (this.activeKeyboard instanceof JSKeyboard && this.activeKeyboard.usesDesktopLayoutOnDevice(keyEvent.device))) && fromOSK) {
+    if((formFactor == DeviceSpec.FormFactor.Desktop || !this.activeKeyboard || (this.activeKeyboard instanceof JSKeyboard && this.activeKeyboard.usesDesktopLayoutOnDevice(keyEvent.device))) && fromOSK && this.keyboardProcessor.selectLayer(keyEvent)) {
       // If it's a desktop OSK style and this triggers a layer change,
       // a modifier key was clicked.  No output expected, so it's safe to instantly exit.
-      if(this.keyboardProcessor.selectLayer(keyEvent)) {
-        return new ProcessorAction();
-      }
+      return new ProcessorAction();
     }
 
-    // Will handle keystroke-based non-layer change modifier & state keys, mapping them through the physical keyboard's version
-    // of state management.  `doModifierPress` must always run.
-    if (this.keyboardProcessor.doModifierPress(keyEvent, textStore, !fromOSK)) {
+    // Will handle keystroke-based non-layer change modifier & state keys, mapping them through
+    // the physical keyboard's version of state management.  `doModifierPress` must always run.
+    if (this.keyboardProcessor.doModifierPress(keyEvent, textStore, !fromOSK) && !fromOSK) {
       // If run on a desktop platform, we know that modifier & state key presses may not
       // produce output, so we may make an immediate return safely.
-      if(!fromOSK) {
-        return new ProcessorAction();
-      }
+      return new ProcessorAction();
     }
 
     // If suggestions exist AND space is pressed, accept the suggestion and do not process the keystroke.
diff --git a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
index 42c20db423e..f01cba232e0 100644
--- a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
+++ b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
@@ -30,12 +30,10 @@ describe('CoreKeyboardProcessor', function () {
     const item = new KM_Core.instance.km_core_context_item();
     if (isMarker) {
       item.marker = c as number;
+    } else if (typeof c == 'number') {
+      item.character = c;
     } else {
-      if (typeof (c) == 'number') {
-        item.character = c;
-      } else {
-        item.character = c.codePointAt(0);
-      }
+      item.character = c.codePointAt(0);
     }
     contextItems.push_back(item);
   };

From 878b8ab2f024fda00df65e96a65f33f20c3f92d3 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 11 Dec 2025 17:52:39 +0100
Subject: [PATCH 179/254] chore(web): remove `default` from hardware keyboard

Test-bot: skip
---
 web/src/app/browser/src/hardwareEventKeyboard.ts | 2 +-
 web/src/app/browser/src/keymanEngine.ts          | 2 +-
 web/src/app/browser/src/test-index.ts            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts
index 8564c6a7993..22f47544d7d 100644
--- a/web/src/app/browser/src/hardwareEventKeyboard.ts
+++ b/web/src/app/browser/src/hardwareEventKeyboard.ts
@@ -220,7 +220,7 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar
   return processedEvent;
 }
 
-export default class HardwareEventKeyboard extends HardKeyboardBase {
+export class HardwareEventKeyboard extends HardKeyboardBase {
   private readonly hardDevice: DeviceSpec;
 
   // Needed properties & methods:
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index c5e44512c5c..2695cee82c3 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -14,7 +14,7 @@ import * as views from './viewsAnchorpoint.js';
 import { BrowserConfiguration, BrowserInitOptionDefaults, BrowserInitOptionSpec } from './configuration.js';
 import { ContextManager } from './contextManager.js';
 import DefaultBrowserRules from './defaultBrowserRules.js';
-import HardwareEventKeyboard from './hardwareEventKeyboard.js';
+import { HardwareEventKeyboard } from './hardwareEventKeyboard.js';
 import { FocusStateAPIObject } from './context/focusAssistant.js';
 import { PageIntegrationHandlers } from './context/pageIntegrationHandlers.js';
 import { LanguageMenu } from './languageMenu.js';
diff --git a/web/src/app/browser/src/test-index.ts b/web/src/app/browser/src/test-index.ts
index d094fe7c258..6f010f494e5 100644
--- a/web/src/app/browser/src/test-index.ts
+++ b/web/src/app/browser/src/test-index.ts
@@ -1,6 +1,6 @@
 export { BrowserConfiguration, BrowserInitOptionSpec } from './configuration.js';
 export { ContextManager, KeyboardCookie } from "./contextManager.js";
-export { preprocessKeyboardEvent, default as HardwareEventKeyboard } from './hardwareEventKeyboard.js';
+export { preprocessKeyboardEvent, HardwareEventKeyboard } from './hardwareEventKeyboard.js';
 
 export { KeymanEngine } from './keymanEngine.js';
 export { KeyboardInterface } from './keyboardInterface.js';

From 68de61ad9c93163dbd9c824907d474fbc17c1a3c Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 4 Dec 2025 19:36:10 +0100
Subject: [PATCH 180/254] feat(web): implement `doModifierPress`

Fixes: #15287
Test-bot: skip
---
 .../core-processor/coreKeyboardProcessor.ts   | 116 +++++++++++++++++-
 web/src/engine/src/keyboard/keyEvent.ts       |  19 ++-
 .../coreKeyboardProcessor.tests.ts            |  85 ++++++++++++-
 3 files changed, 211 insertions(+), 9 deletions(-)

diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index 625a7255a71..529f35d87f4 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -9,9 +9,11 @@ import {
   DeviceSpec, EventMap, Keyboard, KeyboardMinimalInterface, KeyboardProcessor,
   KeyEvent, KMXKeyboard, SyntheticTextStore, MutableSystemStore, TextStore, ProcessorAction,
   StateKeyMap,
-  Deadkey
+  Deadkey,
+  Codes
 } from "keyman/engine/keyboard";
 import { KM_CORE_EVENT_FLAG } from '../core-adapter/KM_Core.js';
+import { ModifierKeyConstants } from '@keymanapp/common-types';
 
 export class CoreKeyboardInterface implements KeyboardMinimalInterface {
   public activeKeyboard: Keyboard;
@@ -150,6 +152,12 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     this._layerStore.set(value);
   }
 
+  private getLayerId(modifier: number): string {
+    // TODO-web-core: implement
+    // return Layouts.getLayerId(modifier);
+    return 'default'; // TODO-web-core: put into LayerNames enum
+  }
+
   /**
    * Retrieve context including deadkeys from TextStore and apply to Core's context
    *
@@ -302,6 +310,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     return null;
   }
 
+  // TODO-web-core: this could be shared with JsKeyboardProcessor
   /**
    * Determines if the given key event is a modifier key press.
    * Returns true if the event corresponds to a modifier key, otherwise false.
@@ -313,10 +322,113 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
    * @returns {boolean} True if the event is a modifier key press, false otherwise.
    */
   public doModifierPress(keyEvent: KeyEvent, textStore: TextStore, isKeyDown: boolean): boolean {
-    // TODO-web-core: Implement this method (#15287)
+    if(!this.activeKeyboard) {
+      return false;
+    }
+
+    if(keyEvent.isModifier) {
+      this.activeKeyboard.notify(keyEvent.Lcode, textStore, isKeyDown);
+      // For eventual integration - we bypass an OSK update for physical keystrokes when in touch mode.
+      if(!keyEvent.device.touchable) {
+        return this._UpdateVKShift(keyEvent); // I2187
+      } else {
+        return true;
+      }
+    }
+
+    if(keyEvent.LmodifierChange) {
+      this.activeKeyboard.notify(0, textStore, true);
+      if(!keyEvent.device.touchable) {
+        this._UpdateVKShift(keyEvent);
+      }
+    }
+
+    // No modifier keypresses detected.
     return false;
   }
 
+
+  // TODO-web-core: this could be shared with JsKeyboardProcessor
+  /**
+   * Updates the virtual keyboard shift state based on the provided key event.
+   * Handles modifier key simulation, state key updates, and layer selection for the OSK.
+   *
+   * @param {KeyEvent} e - The key event used to update the shift state.
+   *
+   * @returns {boolean} True if the update was processed, otherwise true if no active keyboard.
+   */
+  private _UpdateVKShift(e: KeyEvent): boolean {
+    let keyShiftState=0;
+
+    const lockNames  = ['CAPS', 'NUM_LOCK', 'SCROLL_LOCK'] as const;
+    const lockKeys = ['K_CAPS', 'K_NUMLOCK', 'K_SCROLL'] as const;
+    const lockModifiers = [ModifierKeyConstants.CAPITALFLAG, ModifierKeyConstants.NUMLOCKFLAG, ModifierKeyConstants.SCROLLFLAG] as const;
+
+    if(!this.activeKeyboard) {
+      return true;
+    }
+
+    if(e) {
+      // read shift states from event
+      keyShiftState = e.Lmodifiers;
+
+      // Are we simulating AltGr?  If it's a simulation and not real, time to un-simulate for the OSK.
+      if(this.activeKeyboard.isChiral && this.activeKeyboard.emulatesAltGr &&
+          (this.modStateFlags & Codes.modifierBitmasks['ALT_GR_SIM']) == Codes.modifierBitmasks['ALT_GR_SIM']) {
+        keyShiftState |= Codes.modifierBitmasks['ALT_GR_SIM'];
+        keyShiftState &= ~ModifierKeyConstants.RALTFLAG;
+      }
+
+      // Set stateKeys where corresponding value is passed in e.Lstates
+      let stateMutation = false;
+      for(let i=0; i < lockNames.length; i++) {
+        if((e.Lstates & Codes.stateBitmasks[lockNames[i]]) != 0) {
+          this.stateKeys[lockKeys[i]] = ((e.Lstates & lockModifiers[i]) != 0);
+          stateMutation = true;
+        }
+      }
+
+      if(stateMutation) {
+        this.emit('statekeychange', this.stateKeys);
+      }
+    }
+
+    this.updateStates();
+
+    if (this.activeKeyboard.isMnemonic && this.stateKeys['K_CAPS'] && (!e || !e.isModifier)) {
+      // Modifier keypresses don't trigger mnemonic manipulation of modifier state.
+      // Only an output key does; active use of Caps will also flip the SHIFT flag.
+      // Mnemonic keystrokes manipulate the SHIFT property based on CAPS state.
+      // We need to unflip them when tracking the OSK layer.
+      keyShiftState ^= ModifierKeyConstants.K_SHIFTFLAG;
+    }
+
+    this.layerId = this.getLayerId(keyShiftState);
+    return true;
+  }
+
+  // TODO-web-core: this could be shared with JsKeyboardProcessor
+  private updateStates(): void {
+    const lockKeys = ['K_CAPS', 'K_NUMLOCK', 'K_SCROLL'] as const;
+    const lockModifiers = [ModifierKeyConstants.CAPITALFLAG, ModifierKeyConstants.NUMLOCKFLAG, ModifierKeyConstants.SCROLLFLAG] as const;
+    const noLockModifers = [ModifierKeyConstants.NOTCAPITALFLAG, ModifierKeyConstants.NOTNUMLOCKFLAG, ModifierKeyConstants.NOTSCROLLFLAG] as const;
+
+    for (let i = 0; i < lockKeys.length; i++) {
+      const key = lockKeys[i];
+      const flag = this.stateKeys[key];
+
+      // Ensures that the current mod-state info properly matches the currently-simulated
+      // state key states.
+      if (flag) {
+        this.modStateFlags |= lockModifiers[i];
+        this.modStateFlags &= ~noLockModifers[i];
+      } else {
+        this.modStateFlags &= ~lockModifiers[i];
+        this.modStateFlags |= noLockModifers[i];
+      }
+    }
+  }
+
   /**
    * Resets the keyboard context, optionally using the provided text store.
    * Clears or reinitializes the context for subsequent keyboard processing.
diff --git a/web/src/engine/src/keyboard/keyEvent.ts b/web/src/engine/src/keyboard/keyEvent.ts
index 363212bb04f..471541d3019 100644
--- a/web/src/engine/src/keyboard/keyEvent.ts
+++ b/web/src/engine/src/keyboard/keyEvent.ts
@@ -135,12 +135,19 @@ export class KeyEvent implements KeyEventSpec {
 
   get isModifier(): boolean {
     switch(this.Lcode) {
-      case 16: //"K_SHIFT":16,"K_CONTROL":17,"K_ALT":18
-      case 17:
-      case 18:
-      case 20: //"K_CAPS":20, "K_NUMLOCK":144,"K_SCROLL":145
-      case 144:
-      case 145:
+      case Codes.keyCodes.K_SHIFT:
+      case Codes.keyCodes.K_CONTROL:
+      case Codes.keyCodes.K_ALT:
+      case Codes.keyCodes.K_CAPS:
+      case Codes.keyCodes.K_NUMLOCK:
+      case Codes.keyCodes.K_SCROLL:
+      case Codes.keyCodes.K_LSHIFT:
+      case Codes.keyCodes.K_RSHIFT:
+      case Codes.keyCodes.K_LCTRL:
+      case Codes.keyCodes.K_RCTRL:
+      case Codes.keyCodes.K_LALT:
+      case Codes.keyCodes.K_RALT:
+      case Codes.keyCodes.K_ALTGR:
         return true;
       default:
         return false;
diff --git a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
index f01cba232e0..7d619f4dc43 100644
--- a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
+++ b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
@@ -6,7 +6,7 @@ import { assert } from 'chai';
 import sinon from 'sinon';
 import { KM_Core, km_core_context, km_core_keyboard, km_core_state, KM_CORE_CT, KM_CORE_STATUS, km_core_context_items } from 'keyman/engine/core-adapter';
 import { coreurl, loadKeyboardBlob } from '../loadKeyboardHelper.js';
-import { Codes, Deadkey, KeyEvent, KMXKeyboard, SyntheticTextStore } from 'keyman/engine/keyboard';
+import { Codes, Deadkey, DeviceSpec, KeyEvent, KMXKeyboard, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { CoreKeyboardProcessor } from 'keyman/engine/core-processor';
 
 describe('CoreKeyboardProcessor', function () {
@@ -532,4 +532,87 @@ describe('CoreKeyboardProcessor', function () {
       });
     }
   });
+
+  describe('doModifierPress', function () {
+    // const touchable = true;
+    const nonTouchable = false;
+
+    beforeEach(async function () {
+      coreProcessor = new CoreKeyboardProcessor();
+      await coreProcessor.init(coreurl);
+      state = createState('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
+      context = KM_Core.instance.state_context(state);
+      sandbox = sinon.createSandbox();
+      const coreKeyboard = loadKeyboard('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
+      coreProcessor.activeKeyboard = new KMXKeyboard(coreKeyboard);
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+      sandbox = null;
+    })
+
+    for (const key of [
+      { code: Codes.keyCodes.K_SHIFT, name: 'Shift' },
+      { code: Codes.keyCodes.K_CONTROL, name: 'Control' },
+      { code: Codes.keyCodes.K_ALT, name: 'Alt' },
+      { code: Codes.keyCodes.K_CAPS, name: 'CapsLock' },
+      { code: Codes.keyCodes.K_NUMLOCK, name: 'NumLock' },
+      { code: Codes.keyCodes.K_SCROLL, name: 'ScrollLock' },
+      // TODO-web-core: should LSHIFT/RSHIFT etc also be detected as modifier?
+      // Currently .js keyboards don't don't support distinguishing
+      // between left and right keys, but should KMX keyboards in Web?
+      // { code: Codes.keyCodes.K_LSHIFT, name: 'LeftShift' },
+      // { code: Codes.keyCodes.K_RSHIFT, name: 'RightShift' },
+      // { code: Codes.keyCodes.K_LCTRL, name: 'LeftControl' },
+      // { code: Codes.keyCodes.K_RCTRL, name: 'RightControl' },
+      // { code: Codes.keyCodes.K_LALT, name: 'LeftAlt' },
+      // { code: Codes.keyCodes.K_RALT, name: 'RightAlt' },
+      // { code: Codes.keyCodes.K_ALTGR, name: 'AltGr'},
+    ]) {
+      it(`recognizes ${key.name} as modifier`, function () {
+        // Setup
+        const keyEvent = new KeyEvent({
+          Lcode: key.code,
+          Lmodifiers: 0,
+          Lstates: Codes.modifierCodes.NO_CAPS | Codes.modifierCodes.NO_NUM_LOCK | Codes.modifierCodes.NO_SCROLL_LOCK,
+          LisVirtualKey: true,
+          device: new DeviceSpec('chrome', 'desktop', 'windows', nonTouchable),
+          kName: key.name
+        });
+        keyEvent.source = { type: 'keydown' };
+
+        // Execute
+        const result = coreProcessor.doModifierPress(keyEvent, new SyntheticTextStore(), true);
+
+        // Verify
+        assert.isTrue(result);
+      });
+    }
+
+    for (const key of [
+      { modifiers: 0, name: 'a' },
+      { modifiers: Codes.modifierCodes.SHIFT, name: 'A' }
+    ]) {
+      it(`recognizes ${key.name} not as modifier`, function () {
+        // Setup
+        const keyEvent = new KeyEvent({
+          Lcode: Codes.keyCodes.K_A,
+          Lmodifiers: key.modifiers,
+          Lstates: Codes.modifierCodes.NO_CAPS | Codes.modifierCodes.NO_NUM_LOCK | Codes.modifierCodes.NO_SCROLL_LOCK,
+          LisVirtualKey: true,
+          device: new DeviceSpec('chrome', 'desktop', 'windows', nonTouchable),
+          kName: 'K_A'
+        });
+        keyEvent.source = { type: 'keydown' };
+
+        // Execute
+        const result = coreProcessor.doModifierPress(keyEvent, new SyntheticTextStore(), true);
+
+        // Verify
+        assert.isFalse(result);
+      });
+    }
+
+  });
 });

From 1b04772bb99869db87c4e736ebbd0e52a68857c6 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 12 Dec 2025 11:31:55 +0100
Subject: [PATCH 181/254] refactor(web): address code review comments

---
 web/src/engine/src/main/headless/inputProcessor.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/src/engine/src/main/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
index 426bd186edb..f8bc1725ba7 100644
--- a/web/src/engine/src/main/headless/inputProcessor.ts
+++ b/web/src/engine/src/main/headless/inputProcessor.ts
@@ -168,20 +168,21 @@ export class InputProcessor {
    */
   private _processKeyEvent(keyEvent: KeyEvent, textStore: TextStore): ProcessorAction {
     const formFactor = keyEvent.device.formFactor;
-    const fromOSK = keyEvent.isSynthetic;
 
     // The default OSK layout for desktop devices does not include nextlayer info, relying on
     // modifier detection here.
     // It's the OSK equivalent to doModifierPress on 'desktop' form factors.
-    if((formFactor == DeviceSpec.FormFactor.Desktop || !this.activeKeyboard || (this.activeKeyboard instanceof JSKeyboard && this.activeKeyboard.usesDesktopLayoutOnDevice(keyEvent.device))) && fromOSK && this.keyboardProcessor.selectLayer(keyEvent)) {
+    if ((formFactor == DeviceSpec.FormFactor.Desktop || !this.activeKeyboard || (this.activeKeyboard instanceof JSKeyboard && this.activeKeyboard.usesDesktopLayoutOnDevice(keyEvent.device))) && keyEvent.isSynthetic) {
       // If it's a desktop OSK style and this triggers a layer change,
       // a modifier key was clicked.  No output expected, so it's safe to instantly exit.
-      return new ProcessorAction();
+      if (this.keyboardProcessor.selectLayer(keyEvent)) {
+        return new ProcessorAction();
+      }
     }
 
     // Will handle keystroke-based non-layer change modifier & state keys, mapping them through
     // the physical keyboard's version of state management.  `doModifierPress` must always run.
-    if (this.keyboardProcessor.doModifierPress(keyEvent, textStore, !fromOSK) && !fromOSK) {
+    if (this.keyboardProcessor.doModifierPress(keyEvent, textStore, !keyEvent.isSynthetic) && !keyEvent.isSynthetic) {
       // If run on a desktop platform, we know that modifier & state key presses may not
       // produce output, so we may make an immediate return safely.
       return new ProcessorAction();

From d147fa9b0b24850575092b67f17ff745b7b562fd Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 12 Dec 2025 06:11:33 +1100
Subject: [PATCH 182/254] fix(windows): use Thai Kedmanee instead of Arabic 101
 in RightAltEmulationCheck.tests.cpp

Fixes: #15345
Test-bot: skip
---
 .../keyman32/RightAltEmulationCheck.cpp       | 13 +++++++-----
 .../tests/RightAltEmulationCheck.tests.cpp    | 21 ++++++++++++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/windows/src/engine/keyman32/RightAltEmulationCheck.cpp b/windows/src/engine/keyman32/RightAltEmulationCheck.cpp
index 7c1caed8aa1..ef10d88aa04 100644
--- a/windows/src/engine/keyman32/RightAltEmulationCheck.cpp
+++ b/windows/src/engine/keyman32/RightAltEmulationCheck.cpp
@@ -65,7 +65,7 @@ typedef PKBDTABLES_WOW64 (WINAPI *PKBDLAYERDESCRIPTORWOW64FUNC)(VOID);
 #endif
 
 HMODULE LoadKbdLibrary(const char* keyboardLayoutName);
-BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName);
+BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName, BOOL& result);
 
 typedef PKBDTABLES (WINAPI *PKBDLAYERDESCRIPTORFUNC)(VOID);
 
@@ -92,14 +92,15 @@ BOOL KeyboardGivesCtrlRAltForRAlt() {
 		char keyboardLayoutName[KL_NAMELENGTH+1];
 		GetKeyboardLayoutName(keyboardLayoutName);
 
-		altGrFlag = ReadAltGrFlagFromKbdDll(keyboardLayoutName);
+		ReadAltGrFlagFromKbdDll(keyboardLayoutName, altGrFlag);
   }
 
 	return altGrFlag;
 }
 
-BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName) {
-	BOOL result = FALSE;
+BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName, BOOL& result) {
+  BOOL success = FALSE;
+  result = FALSE;
 
   HMODULE hKbdLibrary = LoadKbdLibrary(keyboardLayoutName);
   if(!hKbdLibrary) {
@@ -118,6 +119,7 @@ BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName) {
 			PKBDTABLES_WOW64 KbdTables = (*KbdLayerDescriptorFunc)();
 			if(KbdTables) {
 				result = (KbdTables->fLocaleFlags & KLLF_ALTGR) ? TRUE : FALSE;
+        success = TRUE;
 			}
 		}
   }	else {
@@ -130,13 +132,14 @@ BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName) {
 			PKBDTABLES KbdTables = (*KbdLayerDescriptorFunc)();
 			if(KbdTables) {
 				result = (KbdTables->fLocaleFlags & KLLF_ALTGR) ? TRUE : FALSE;
+        success = TRUE;
 			}
 		}
 	}
 
   FreeLibrary(hKbdLibrary);
 
-	return result;
+	return success;
 }
 
 HMODULE LoadKbdLibrary(const char* keyboardLayoutName) {
diff --git a/windows/src/engine/keyman32/tests/RightAltEmulationCheck.tests.cpp b/windows/src/engine/keyman32/tests/RightAltEmulationCheck.tests.cpp
index 7cede5bc9a9..abee7c5c101 100644
--- a/windows/src/engine/keyman32/tests/RightAltEmulationCheck.tests.cpp
+++ b/windows/src/engine/keyman32/tests/RightAltEmulationCheck.tests.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 
-extern BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName);
+extern BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName, BOOL& result);
 
 
 TEST(RightAltEmulationCheck, ReadAltGrFlagFromKbdDll) {
@@ -9,12 +9,23 @@ TEST(RightAltEmulationCheck, ReadAltGrFlagFromKbdDll) {
   // a known keyboard layout
 
   // These keyboards do not use AltGr
+  BOOL result = FALSE;
 
-  EXPECT_EQ(ReadAltGrFlagFromKbdDll("00000409"), FALSE); // kbdus.dll - English (US)
-  EXPECT_EQ(ReadAltGrFlagFromKbdDll("00000401"), FALSE); // kbda1.dll - Arabic 101
+  // kbdus.dll - English (US)
+  EXPECT_EQ(ReadAltGrFlagFromKbdDll("00000409", result), TRUE);
+  EXPECT_EQ(result, FALSE);
+
+  // kbda1.dll - Thai Kedmanee
+  EXPECT_EQ(ReadAltGrFlagFromKbdDll("0000041e", result), TRUE);
+  EXPECT_EQ(result, FALSE);
 
   // These keyboards use AltGr
 
-  EXPECT_EQ(ReadAltGrFlagFromKbdDll("0000040C"), TRUE); // kbdfr.dll - French AZERTY (Legacy)
-  EXPECT_EQ(ReadAltGrFlagFromKbdDll("00000405"), TRUE); // kbdcz.dll - Czech
+  // kbdfr.dll - French AZERTY (Legacy)
+  EXPECT_EQ(ReadAltGrFlagFromKbdDll("0000040C", result), TRUE);
+  EXPECT_EQ(result, TRUE);
+
+  // kbdcz.dll - Czech
+  EXPECT_EQ(ReadAltGrFlagFromKbdDll("00000405", result), TRUE);
+  EXPECT_EQ(result, TRUE);
 }

From 80c1f8864a4b2d66c9683f2dd9e1326932d7d847 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 11 Dec 2025 16:58:26 +0100
Subject: [PATCH 183/254] test(web): add baseline tests for .js keyboards

Test-bot: skip
---
 .../baseline/k_000___null_keyboard.js         |   1 +
 .../baseline/k_001___basic_input_unicodei.js  |   1 +
 .../baseline/k_002___basic_input_unicode.js   |   1 +
 common/test/keyboards/baseline/k_003___nul.js |   1 +
 .../baseline/k_004___basic_input__shift_2_.js |   1 +
 .../k_005___nul_with_initial_context.js       |   1 +
 .../k_006___vkey_input__shift_ctrl_.js        |   1 +
 .../baseline/k_007___vkey_input__ctrl_alt_.js |   1 +
 .../k_008___vkey_input__ctrl_alt_2_.js        |   1 +
 .../test/keyboards/baseline/k_012___ralt.js   |   1 +
 .../keyboards/baseline/k_013___deadkeys.js    |   1 +
 .../k_014___groups_and_virtual_keys.js        |   1 +
 .../test/keyboards/baseline/k_015___ralt_2.js |   1 +
 .../baseline/k_017___space_mnemonic_kbd.js    |   1 +
 .../keyboards/baseline/k_018___nul_testing.js |   1 +
 .../baseline/k_019___multiple_deadkeys.js     |   1 +
 .../k_020___deadkeys_and_backspace.js         |   1 +
 .../keyboards/baseline/k_021___options.js     |   1 +
 .../baseline/k_022___options_with_preset.js   |   1 +
 .../baseline/k_023___options_with_save.js     |   1 +
 .../k_024___options_with_save_and_preset.js   |   1 +
 .../baseline/k_025___options_with_reset.js    |   1 +
 .../baseline/k_026___system_stores.js         |   1 +
 .../baseline/k_027___system_stores_2.js       |   1 +
 common/test/keyboards/baseline/k_028___smp.js |   1 +
 .../test/keyboards/baseline/k_029___beep.js   |   1 +
 .../baseline/k_030___multiple_groups.js       |   1 +
 .../keyboards/baseline/k_031___caps_lock.js   |   1 +
 .../baseline/k_032___caps_control.js          |   1 +
 .../baseline/k_033___caps_always_off.js       |   1 +
 .../k_034___options_double_set_reset.js       |   1 +
 .../k_035___options_double_set_staged.js      |   1 +
 .../k_036___options___double_reset_staged.js  |   1 +
 .../k_037___options___double_reset.js         |   1 +
 .../keyboards/baseline/k_038___punctkeys.js   |   1 +
 .../baseline/k_039___generic_ctrlalt.js       |   1 +
 .../baseline/k_040___long_context.js          |   1 +
 .../k_041___long_context_and_deadkeys.js      |   1 +
 ...k_042___long_context_and_split_deadkeys.js |   1 +
 .../baseline/k_043___output_and_keystroke.js  |   1 +
 .../baseline/k_044___if_and_context.js        |   1 +
 .../baseline/k_045___deadkey_and_context.js   |   1 +
 .../baseline/k_046___deadkey_and_contextex.js |   1 +
 .../k_047___caps_always_off_initially_on.js   |   1 +
 .../k_048___modifier_keys_keep_context.js     |   1 +
 .../k_049___enter_invalidates_context.js      |   1 +
 .../baseline/k_050___nul_and_context.js       |   1 +
 .../baseline/k_051___if_and_context.js        |   1 +
 .../baseline/k_052___nul_and_index.js         |   1 +
 .../baseline/k_053___if_and_index.js          |   1 +
 .../k_055___deadkey_cancelled_by_arrow.js     |   1 +
 .../test/auto/e2e/baseline/baseline.tests.ts  | 185 +++++++++++-------
 52 files changed, 170 insertions(+), 66 deletions(-)
 create mode 100755 common/test/keyboards/baseline/k_000___null_keyboard.js
 create mode 100755 common/test/keyboards/baseline/k_001___basic_input_unicodei.js
 create mode 100755 common/test/keyboards/baseline/k_002___basic_input_unicode.js
 create mode 100755 common/test/keyboards/baseline/k_003___nul.js
 create mode 100755 common/test/keyboards/baseline/k_004___basic_input__shift_2_.js
 create mode 100755 common/test/keyboards/baseline/k_005___nul_with_initial_context.js
 create mode 100755 common/test/keyboards/baseline/k_006___vkey_input__shift_ctrl_.js
 create mode 100755 common/test/keyboards/baseline/k_007___vkey_input__ctrl_alt_.js
 create mode 100755 common/test/keyboards/baseline/k_008___vkey_input__ctrl_alt_2_.js
 create mode 100755 common/test/keyboards/baseline/k_012___ralt.js
 create mode 100755 common/test/keyboards/baseline/k_013___deadkeys.js
 create mode 100755 common/test/keyboards/baseline/k_014___groups_and_virtual_keys.js
 create mode 100755 common/test/keyboards/baseline/k_015___ralt_2.js
 create mode 100755 common/test/keyboards/baseline/k_017___space_mnemonic_kbd.js
 create mode 100755 common/test/keyboards/baseline/k_018___nul_testing.js
 create mode 100755 common/test/keyboards/baseline/k_019___multiple_deadkeys.js
 create mode 100755 common/test/keyboards/baseline/k_020___deadkeys_and_backspace.js
 create mode 100755 common/test/keyboards/baseline/k_021___options.js
 create mode 100755 common/test/keyboards/baseline/k_022___options_with_preset.js
 create mode 100755 common/test/keyboards/baseline/k_023___options_with_save.js
 create mode 100755 common/test/keyboards/baseline/k_024___options_with_save_and_preset.js
 create mode 100755 common/test/keyboards/baseline/k_025___options_with_reset.js
 create mode 100755 common/test/keyboards/baseline/k_026___system_stores.js
 create mode 100755 common/test/keyboards/baseline/k_027___system_stores_2.js
 create mode 100755 common/test/keyboards/baseline/k_028___smp.js
 create mode 100755 common/test/keyboards/baseline/k_029___beep.js
 create mode 100755 common/test/keyboards/baseline/k_030___multiple_groups.js
 create mode 100755 common/test/keyboards/baseline/k_031___caps_lock.js
 create mode 100755 common/test/keyboards/baseline/k_032___caps_control.js
 create mode 100755 common/test/keyboards/baseline/k_033___caps_always_off.js
 create mode 100755 common/test/keyboards/baseline/k_034___options_double_set_reset.js
 create mode 100755 common/test/keyboards/baseline/k_035___options_double_set_staged.js
 create mode 100755 common/test/keyboards/baseline/k_036___options___double_reset_staged.js
 create mode 100755 common/test/keyboards/baseline/k_037___options___double_reset.js
 create mode 100755 common/test/keyboards/baseline/k_038___punctkeys.js
 create mode 100755 common/test/keyboards/baseline/k_039___generic_ctrlalt.js
 create mode 100755 common/test/keyboards/baseline/k_040___long_context.js
 create mode 100755 common/test/keyboards/baseline/k_041___long_context_and_deadkeys.js
 create mode 100755 common/test/keyboards/baseline/k_042___long_context_and_split_deadkeys.js
 create mode 100755 common/test/keyboards/baseline/k_043___output_and_keystroke.js
 create mode 100755 common/test/keyboards/baseline/k_044___if_and_context.js
 create mode 100755 common/test/keyboards/baseline/k_045___deadkey_and_context.js
 create mode 100755 common/test/keyboards/baseline/k_046___deadkey_and_contextex.js
 create mode 100755 common/test/keyboards/baseline/k_047___caps_always_off_initially_on.js
 create mode 100755 common/test/keyboards/baseline/k_048___modifier_keys_keep_context.js
 create mode 100755 common/test/keyboards/baseline/k_049___enter_invalidates_context.js
 create mode 100755 common/test/keyboards/baseline/k_050___nul_and_context.js
 create mode 100755 common/test/keyboards/baseline/k_051___if_and_context.js
 create mode 100755 common/test/keyboards/baseline/k_052___nul_and_index.js
 create mode 100755 common/test/keyboards/baseline/k_053___if_and_index.js
 create mode 100755 common/test/keyboards/baseline/k_055___deadkey_cancelled_by_arrow.js

diff --git a/common/test/keyboards/baseline/k_000___null_keyboard.js b/common/test/keyboards/baseline/k_000___null_keyboard.js
new file mode 100755
index 00000000000..d22b7f3287d
--- /dev/null
+++ b/common/test/keyboards/baseline/k_000___null_keyboard.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_000___null_keyboard());function Keyboard_k_000___null_keyboard(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_000___null_keyboard";this.KN="000 - null keyboard";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_001___basic_input_unicodei.js b/common/test/keyboards/baseline/k_001___basic_input_unicodei.js
new file mode 100755
index 00000000000..2c6ff5d98aa
--- /dev/null
+++ b/common/test/keyboards/baseline/k_001___basic_input_unicodei.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_001___basic_input_unicodei());function Keyboard_k_001___basic_input_unicodei(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_001___basic_input_unicodei";this.KN="001 - basic input UnicodeI";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0010;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,65)) {if(1){r=m=1;k.KO(0,t,"a");}}else if(k.KKM(e,16400,66)) {if(1){r=m=1;k.KO(0,t,"b");}}else if(k.KKM(e,16400,67)) {if(1){r=m=1;k.KO(0,t,"c");}}else if(k.KKM(e,16400,70)) {if(k.KCM(2,t,"DE",2)){r=m=1;k.KO(2,t,"def");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_002___basic_input_unicode.js b/common/test/keyboards/baseline/k_002___basic_input_unicode.js
new file mode 100755
index 00000000000..660dbc905e8
--- /dev/null
+++ b/common/test/keyboards/baseline/k_002___basic_input_unicode.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_002___basic_input_unicode());function Keyboard_k_002___basic_input_unicode(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_002___basic_input_unicode";this.KN="002 - basic input Unicode";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0010;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,65)) {if(1){r=m=1;k.KO(0,t,"ก");}}else if(k.KKM(e,16400,66)) {if(1){r=m=1;k.KO(0,t,"ข");}}else if(k.KKM(e,16400,67)) {if(1){r=m=1;k.KO(0,t,"ฃ");}}else if(k.KKM(e,16400,70)) {if(k.KCM(2,t,"DE",2)){r=m=1;k.KO(2,t,"คฅฆ");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_003___nul.js b/common/test/keyboards/baseline/k_003___nul.js
new file mode 100755
index 00000000000..8adf3b1c69d
--- /dev/null
+++ b/common/test/keyboards/baseline/k_003___nul.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_003___nul());function Keyboard_k_003___nul(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_003___nul";this.KN="003 - nul";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(k.KN(0,t)){r=m=1;k.KO(0,t,"b");}else if(k.KCM(1,t,"b",1)){r=m=1;k.KO(1,t,"c");}else if(1){r=m=1;k.KO(0,t,"d");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_004___basic_input__shift_2_.js b/common/test/keyboards/baseline/k_004___basic_input__shift_2_.js
new file mode 100755
index 00000000000..de9374fe920
--- /dev/null
+++ b/common/test/keyboards/baseline/k_004___basic_input__shift_2_.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_004___basic_input__shift_2_());function Keyboard_k_004___basic_input__shift_2_(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_004___basic_input__shift_2_";this.KN="004 - basic input (shift 2)";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0010;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,65)) {if(1){r=m=1;k.KO(0,t,"ก");}}else if(k.KKM(e,16400,66)) {if(1){r=m=1;k.KO(0,t,"ข");}}else if(k.KKM(e,16400,67)) {if(1){r=m=1;k.KO(0,t,"ฃ");}}else if(k.KKM(e,16400,70)) {if(k.KCM(2,t,"DE",2)){r=m=1;k.KO(2,t,"คฅฆ");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_005___nul_with_initial_context.js b/common/test/keyboards/baseline/k_005___nul_with_initial_context.js
new file mode 100755
index 00000000000..114018d2f4b
--- /dev/null
+++ b/common/test/keyboards/baseline/k_005___nul_with_initial_context.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_005___nul_with_initial_context());function Keyboard_k_005___nul_with_initial_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_005___nul_with_initial_context";this.KN="005 - nul with initial context";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(k.KN(0,t)){r=m=1;k.KO(0,t,"b");}else if(k.KCM(1,t,"b",1)){r=m=1;k.KO(1,t,"c");}else if(1){r=m=1;k.KO(0,t,"d");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_006___vkey_input__shift_ctrl_.js b/common/test/keyboards/baseline/k_006___vkey_input__shift_ctrl_.js
new file mode 100755
index 00000000000..28e7b1525d3
--- /dev/null
+++ b/common/test/keyboards/baseline/k_006___vkey_input__shift_ctrl_.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_006___vkey_input__shift_ctrl_());function Keyboard_k_006___vkey_input__shift_ctrl_(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_006___vkey_input__shift_ctrl_";this.KN="006 - vkey input (shift ctrl)";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0030;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16432,65)) {if(1){r=m=1;k.KO(0,t,"ก");}}else if(k.KKM(e,16400,66)) {if(1){r=m=1;k.KO(0,t,"ข");}}else if(k.KKM(e,16432,67)) {if(1){r=m=1;k.KO(0,t,"ฃ");}}else if(k.KKM(e,16400,70)) {if(k.KCM(2,t,"DE",2)){r=m=1;k.KO(2,t,"คฅฆ");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_007___vkey_input__ctrl_alt_.js b/common/test/keyboards/baseline/k_007___vkey_input__ctrl_alt_.js
new file mode 100755
index 00000000000..e4b0e5f291c
--- /dev/null
+++ b/common/test/keyboards/baseline/k_007___vkey_input__ctrl_alt_.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_007___vkey_input__ctrl_alt_());function Keyboard_k_007___vkey_input__ctrl_alt_(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_007___vkey_input__ctrl_alt_";this.KN="007 - vkey input (ctrl alt)";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0060;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16480,65)) {if(1){r=m=1;k.KO(0,t,"ก");}}else if(k.KKM(e,16384,66)) {if(1){r=m=1;k.KO(0,t,"ข");}}else if(k.KKM(e,16480,67)) {if(1){r=m=1;k.KO(0,t,"ฃ");}}else if(k.KKM(e,16480,70)) {if(k.KCM(2,t,"de",2)){r=m=1;k.KO(2,t,"คฅฆ");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_008___vkey_input__ctrl_alt_2_.js b/common/test/keyboards/baseline/k_008___vkey_input__ctrl_alt_2_.js
new file mode 100755
index 00000000000..11ca6ba19f4
--- /dev/null
+++ b/common/test/keyboards/baseline/k_008___vkey_input__ctrl_alt_2_.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_008___vkey_input__ctrl_alt_2_());function Keyboard_k_008___vkey_input__ctrl_alt_2_(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_008___vkey_input__ctrl_alt_2_";this.KN="008 - vkey input (ctrl alt 2)";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0060;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16480,65)) {if(1){r=m=1;k.KO(0,t,"ก");}}else if(k.KKM(e,16480,67)) {if(1){r=m=1;k.KO(0,t,"ฃ");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_012___ralt.js b/common/test/keyboards/baseline/k_012___ralt.js
new file mode 100755
index 00000000000..5df180316b2
--- /dev/null
+++ b/common/test/keyboards/baseline/k_012___ralt.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_012___ralt());function Keyboard_k_012___ralt(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_012___ralt";this.KN="012 - ralt";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0060;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(1){r=m=1;k.KO(0,t,"ז");}}else if(k.KKM(e,16384,79)) {if(1){r=m=1;k.KO(0,t,"ר");}}else if(k.KKM(e,16480,65)) {if(1){r=m=1;k.KO(0,t,"b");}}else if(k.KKM(e,16480,79)) {if(1){r=m=1;k.KO(0,t,"c");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_013___deadkeys.js b/common/test/keyboards/baseline/k_013___deadkeys.js
new file mode 100755
index 00000000000..377100493fe
--- /dev/null
+++ b/common/test/keyboards/baseline/k_013___deadkeys.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_013___deadkeys());function Keyboard_k_013___deadkeys(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_013___deadkeys";this.KN="013 - deadkeys";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0010;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,54)) {if(1){r=m=1;k.KDO(0,t,0);}}else if(k.KKM(e,16384,65)) {if(k.KDM(0,t,0)){r=m=1;k.KO(0,t,"â");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_014___groups_and_virtual_keys.js b/common/test/keyboards/baseline/k_014___groups_and_virtual_keys.js
new file mode 100755
index 00000000000..65d043fda04
--- /dev/null
+++ b/common/test/keyboards/baseline/k_014___groups_and_virtual_keys.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_014___groups_and_virtual_keys());function Keyboard_k_014___groups_and_virtual_keys(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_014___groups_and_virtual_keys";this.KN="014 - groups and virtual keys";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0070;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16416,50)) {if(1){r=m=1;k.KDO(0,t,0);}}else if(k.KKM(e,16448,50)) {if(1){r=m=1;k.KDO(0,t,0);}}else if(k.KKM(e,16400,50)) {if(1){r=m=1;k.KDO(0,t,1);}}else if(k.KKM(e,16384,65)) {if(1){r=m=1;k.KO(0,t,"α");}}if(m==1) {r=this.g1(t,e);m=2;}return r;};this.g1=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KDM(1,t,0)&&k.KCM(1,t,"α",1)){m=1;k.KO(1,t,"ᾱ");}else if(k.KDM(1,t,1)&&k.KCM(1,t,"α",1)){m=1;k.KO(1,t,"ᾰ");}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_015___ralt_2.js b/common/test/keyboards/baseline/k_015___ralt_2.js
new file mode 100755
index 00000000000..741a0871845
--- /dev/null
+++ b/common/test/keyboards/baseline/k_015___ralt_2.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_015___ralt_2());function Keyboard_k_015___ralt_2(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_015___ralt_2";this.KN="015 - ralt 2";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(k.KCM(1,t,"c",1)){r=m=1;k.KO(1,t,"cd");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_017___space_mnemonic_kbd.js b/common/test/keyboards/baseline/k_017___space_mnemonic_kbd.js
new file mode 100755
index 00000000000..489675682d0
--- /dev/null
+++ b/common/test/keyboards/baseline/k_017___space_mnemonic_kbd.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_017___space_mnemonic_kbd());function Keyboard_k_017___space_mnemonic_kbd(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_017___space_mnemonic_kbd";this.KN="017 - space mnemonic kbd";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=1;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,32)) {if(k.KCM(2,t,"ab",2)){r=m=1;k.KO(2,t,"X");}}else if(k.KKM(e,16384,100)) {if(k.KCM(2,t,"c ",2)){r=m=1;k.KO(2,t,"Y");}}else if(k.KKM(e,16384,101)) {if(k.KCM(2,t," d",2)){r=m=1;k.KO(2,t,"Z");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_018___nul_testing.js b/common/test/keyboards/baseline/k_018___nul_testing.js
new file mode 100755
index 00000000000..09e69468dbf
--- /dev/null
+++ b/common/test/keyboards/baseline/k_018___nul_testing.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_018___nul_testing());function Keyboard_k_018___nul_testing(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_018___nul_testing";this.KN="018 - nul testing";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(k.KN(0,t)){r=m=1;k.KO(0,t,"OK");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_019___multiple_deadkeys.js b/common/test/keyboards/baseline/k_019___multiple_deadkeys.js
new file mode 100755
index 00000000000..4e928ab0a58
--- /dev/null
+++ b/common/test/keyboards/baseline/k_019___multiple_deadkeys.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_019___multiple_deadkeys());function Keyboard_k_019___multiple_deadkeys(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_019___multiple_deadkeys";this.KN="019 - multiple deadkeys";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDO(0,t,0);}}else if(k.KKM(e,16384,50)) {if(1){r=m=1;k.KO(0,t,"a");k.KDO(-1,t,1);}}else if(k.KKM(e,16384,51)) {if(1){r=m=1;k.KDO(0,t,2);k.KO(-1,t,"a");}}else if(k.KKM(e,16384,52)) {if(1){r=m=1;k.KDO(0,t,3);k.KDO(-1,t,4);}}else if(k.KKM(e,16384,53)) {if(1){r=m=1;k.KO(0,t,"a");k.KDO(-1,t,5);k.KDO(-1,t,6);}}else if(k.KKM(e,16384,54)) {if(1){r=m=1;k.KO(0,t,"a");k.KDO(-1,t,7);k.KDO(-1,t,8);k.KO(-1,t,"b");}}else if(k.KKM(e,16384,55)) {if(1){r=m=1;k.KDO(0,t,9);k.KDO(-1,t,10);k.KO(-1,t,"a");}}else if(k.KKM(e,16384,56)) {if(1){r=m=1;k.KDO(0,t,11);k.KDO(-1,t,12);k.KDO(-1,t,13);}}else if(k.KKM(e,16384,57)) {if(1){r=m=1;k.KO(0,t,"{");k.KDO(-1,t,14);k.KDO(-1,t,15);k.KO(-1,t,"}");k.KDO(-1,t,16);k.KDO(-1,t,17);}}else if(k.KKM(e,16384,88)) {if(k.KCM(2,t,"{",1)&&k.KDM(1,t,14)&&k.KDM(1,t,18)&&k.KCM(1,t,"}",1)&&k.KDM(0,t,19)&&k.KDM(0,t,20)){r=m=1;k.KO(2,t,"9=OK");}else if(k.KCM(2,t,"a",1)&&k.KDM(1,t,7)&&k.KDM(1,t,8)&&k.KCM(1,t,"b",1)){r=m=1;k.KO(2,t,"6=OK ");}else if(k.KDM(1,t,15)&&k.KCM(1,t,"}",1)&&k.KDM(0,t,16)&&k.KDM(0,t,17)){r=m=1;k.KDO(1,t,18);k.KO(-1,t,"}");k.KDO(-1,t,19);k.KDO(-1,t,20);}else if(k.KCM(1,t,"a",1)&&k.KDM(0,t,5)&&k.KDM(0,t,6)){r=m=1;k.KO(1,t,"5=OK ");}else if(k.KDM(1,t,9)&&k.KDM(1,t,10)&&k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"7=OK ");}else if(k.KDM(0,t,11)&&k.KDM(0,t,12)&&k.KDM(0,t,13)){r=m=1;k.KO(0,t,"8=OK ");}else if(k.KCM(1,t,"a",1)&&k.KDM(0,t,1)){r=m=1;k.KO(1,t,"2=OK ");}else if(k.KDM(1,t,2)&&k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"3=OK ");}else if(k.KDM(0,t,3)&&k.KDM(0,t,4)){r=m=1;k.KO(0,t,"4=OK ");}else if(k.KDM(1,t,9)&&k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"7=Fail1 ");}else if(k.KDM(1,t,10)&&k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"7=Fail2 ");}else if(k.KDM(0,t,11)&&k.KDM(0,t,12)){r=m=1;k.KO(0,t,"8=Fail4 ");}else if(k.KDM(0,t,11)&&k.KDM(0,t,13)){r=m=1;k.KO(0,t,"8=Fail5 ");}else if(k.KDM(0,t,12)&&k.KDM(0,t,13)){r=m=1;k.KO(0,t,"8=Fail6 ");}else if(k.KDM(0,t,0)){r=m=1;k.KO(0,t,"1=OK ");}else if(k.KDM(0,t,11)){r=m=1;k.KO(0,t,"8=Fail1 ");}else if(k.KDM(0,t,12)){r=m=1;k.KO(0,t,"8=Fail2 ");}else if(k.KDM(0,t,13)){r=m=1;k.KO(0,t,"8=Fail3 ");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.js b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.js
new file mode 100755
index 00000000000..85742c0edd8
--- /dev/null
+++ b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_020___deadkeys_and_backspace());function Keyboard_k_020___deadkeys_and_backspace(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_020___deadkeys_and_backspace";this.KN="020 - deadkeys and backspace";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,8)) {if(k.KCM(2,t,"c",1)&&k.KDM(1,t,11)&&k.KCM(1,t,"d",1)){r=m=1;k.KO(2,t," ok");}else if(k.KCM(2,t,"cd",2)){r=m=1;k.KO(2,t," fail");}}else if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDO(0,t,0);}}else if(k.KKM(e,16384,50)) {if(1){r=m=1;k.KO(0,t,"a");k.KDO(-1,t,1);}}else if(k.KKM(e,16384,51)) {if(1){r=m=1;k.KDO(0,t,2);k.KO(-1,t,"a");}}else if(k.KKM(e,16384,52)) {if(1){r=m=1;k.KDO(0,t,3);k.KDO(-1,t,4);}}else if(k.KKM(e,16384,53)) {if(1){r=m=1;k.KO(0,t,"a");k.KDO(-1,t,5);k.KDO(-1,t,6);k.KO(-1,t,"b");}}else if(k.KKM(e,16384,54)) {if(1){r=m=1;k.KO(0,t,"a");k.KDO(-1,t,7);k.KDO(-1,t,8);k.KO(-1,t,"b");k.KDO(-1,t,9);k.KDO(-1,t,10);}}else if(k.KKM(e,16384,55)) {if(1){r=m=1;k.KO(0,t,"c");k.KDO(-1,t,11);k.KO(-1,t,"de");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_021___options.js b/common/test/keyboards/baseline/k_021___options.js
new file mode 100755
index 00000000000..8d0463e8219
--- /dev/null
+++ b/common/test/keyboards/baseline/k_021___options.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_021___options());}function Keyboard_k_021___options(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_021___options";this.KN="021 - options";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="0";this.s10="1";this.s11="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,48)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s11;}}else if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s10;}}else if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");}else if(this.s5===this.s9){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_022___options_with_preset.js b/common/test/keyboards/baseline/k_022___options_with_preset.js
new file mode 100755
index 00000000000..2e85641ef38
--- /dev/null
+++ b/common/test/keyboards/baseline/k_022___options_with_preset.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_022___options_with_preset());}function Keyboard_k_022___options_with_preset(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_022___options_with_preset";this.KN="022 - options with preset";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="0";this.s10="1";this.s11="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,48)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s11;k.KSAVE("foo",this.s5);}}else if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s10;k.KSAVE("foo",this.s5);}}else if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");}else if(this.s5===this.s9){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_023___options_with_save.js b/common/test/keyboards/baseline/k_023___options_with_save.js
new file mode 100755
index 00000000000..39fc6dba75a
--- /dev/null
+++ b/common/test/keyboards/baseline/k_023___options_with_save.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_023___options_with_save());}function Keyboard_k_023___options_with_save(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_023___options_with_save";this.KN="023 - options with save";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="0";this.s10="1";this.s11="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,48)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s11;}}else if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s10;}}else if(k.KKM(e,16384,50)) {if(1){r=m=1;k.KDC(0,t);k.KSAVE("foo",this.s5);}}else if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");}else if(this.s5===this.s9){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_024___options_with_save_and_preset.js b/common/test/keyboards/baseline/k_024___options_with_save_and_preset.js
new file mode 100755
index 00000000000..81152ece466
--- /dev/null
+++ b/common/test/keyboards/baseline/k_024___options_with_save_and_preset.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_024___options_with_save_and_preset());}function Keyboard_k_024___options_with_save_and_preset(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_024___options_with_save_and_preset";this.KN="024 - options with save and preset";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="0";this.s10="1";this.s11="0";this.s12="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,48)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s11;}}else if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s10;}}else if(k.KKM(e,16384,50)) {if(this.s5===this.s12){r=m=1;k.KDC(0,t);k.KSAVE("foo",this.s5);}}else if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");}else if(this.s5===this.s9){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_025___options_with_reset.js b/common/test/keyboards/baseline/k_025___options_with_reset.js
new file mode 100755
index 00000000000..e8a48164b00
--- /dev/null
+++ b/common/test/keyboards/baseline/k_025___options_with_reset.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_025___options_with_reset());}function Keyboard_k_025___options_with_reset(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_025___options_with_reset";this.KN="025 - options with reset";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="0";this.s10="1";this.s11="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,48)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s11;}}else if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s10;}}else if(k.KKM(e,16384,51)) {if(1){r=m=1;k.KDC(0,t);this.s5=k.KLOAD(this.KI,"foo","0");}}else if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");}else if(this.s5===this.s9){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_026___system_stores.js b/common/test/keyboards/baseline/k_026___system_stores.js
new file mode 100755
index 00000000000..b49711fb248
--- /dev/null
+++ b/common/test/keyboards/baseline/k_026___system_stores.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_026___system_stores());}function Keyboard_k_026___system_stores(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_026___system_stores";this.KN="026 - system stores";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5="1234567890";this.s6="abcdefghij";this.s9="windows";this.s10="desktop";this.s11="hardware";this.s12="native";this.s13="en-US";this.s14="kbdus.dll";this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,48)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,49)) {if(k.KIFS(31,this.s9,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"windows.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,50)) {if(k.KIFS(31,this.s10,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"desktop.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,51)) {if(k.KIFS(31,this.s11,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"hardware.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,52)) {if(k.KIFS(31,this.s12,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"native.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,53)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,54)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,55)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,56)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,57)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,65)) {if(k.KIFS(32,this.s13,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"en-US.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,66)) {if(k.KIFS(32,this.s14,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"kbdus.dll.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,67)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,68)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,69)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,70)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,71)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,72)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,73)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,74)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_027___system_stores_2.js b/common/test/keyboards/baseline/k_027___system_stores_2.js
new file mode 100755
index 00000000000..47da49cf681
--- /dev/null
+++ b/common/test/keyboards/baseline/k_027___system_stores_2.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_027___system_stores_2());}function Keyboard_k_027___system_stores_2(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_027___system_stores_2";this.KN="027 - system stores 2";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5="1234567890";this.s6="abcdefghij";this.s9="linux";this.s10="desktop";this.s11="hardware";this.s12="native";this.s13="fr-FR";this.s14="kbdfr.dll";this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,48)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,49)) {if(k.KIFS(31,this.s9,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"linux.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,50)) {if(k.KIFS(31,this.s10,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"desktop.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,51)) {if(k.KIFS(31,this.s11,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"hardware.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,52)) {if(k.KIFS(31,this.s12,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"native.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,53)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,54)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,55)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,56)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,57)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,65)) {if(k.KIFS(32,this.s13,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"fr-FR.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,66)) {if(k.KIFS(32,this.s14,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"kbdfr.dll.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,67)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,68)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,69)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,70)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,71)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,72)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,73)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,74)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_028___smp.js b/common/test/keyboards/baseline/k_028___smp.js
new file mode 100755
index 00000000000..236cd0e638e
--- /dev/null
+++ b/common/test/keyboards/baseline/k_028___smp.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_028___smp());}function Keyboard_k_028___smp(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_028___smp";this.KN="028 - smp";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KS=1;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"🙂");}}else if(k.KKM(e,16384,50)) {if(k.KFCM(1,t,['🙂'])){r=m=1;k.KDC(1,t);k.KO(-1,t,"🙂hi😀");}}else if(k.KKM(e,16384,51)) {if(k.KFCM(1,t,['😀'])){r=m=1;k.KDC(1,t);k.KO(-1,t,"x");}}else if(k.KKM(e,16384,52)) {if(k.KFCM(4,t,['🙂','h','i','x'])){r=m=1;k.KDC(4,t);k.KO(-1,t,"😁y");}}else if(k.KKM(e,16384,53)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"𐌳");r=this.g1(t,e);m=2;}}return r;};this.g1=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KFCM(1,t,['𐌳'])){m=1;k.KDC(1,t);k.KO(-1,t,"x");}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_029___beep.js b/common/test/keyboards/baseline/k_029___beep.js
new file mode 100755
index 00000000000..7862cedc629
--- /dev/null
+++ b/common/test/keyboards/baseline/k_029___beep.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_029___beep());}function Keyboard_k_029___beep(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_029___beep";this.KN="029 - beep";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);k.KB(t);}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_030___multiple_groups.js b/common/test/keyboards/baseline/k_030___multiple_groups.js
new file mode 100755
index 00000000000..4eeb812c493
--- /dev/null
+++ b/common/test/keyboards/baseline/k_030___multiple_groups.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_030___multiple_groups());}function Keyboard_k_030___multiple_groups(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_030___multiple_groups";this.KN="030 - multiple groups";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"a");}}else if(k.KKM(e,16384,50)) {if(k.KFCM(1,t,['b'])){r=m=1;k.KDC(1,t);k.KO(-1,t,"b");r=this.g2(t,e);m=2;}}if(m==1) {k.KDC(-1,t);r=this.g1(t,e);m=2;}return r;};this.g1=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KFCM(1,t,['a'])){m=1;k.KDC(1,t);k.KO(-1,t,"b");}return r;};this.g2=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KFCM(1,t,['b'])){m=1;k.KDC(1,t);k.KO(-1,t,"abc");}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_031___caps_lock.js b/common/test/keyboards/baseline/k_031___caps_lock.js
new file mode 100755
index 00000000000..d3147ae65e0
--- /dev/null
+++ b/common/test/keyboards/baseline/k_031___caps_lock.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_031___caps_lock());}function Keyboard_k_031___caps_lock(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_031___caps_lock";this.KN="031 - caps lock";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0310;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16896,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16640,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16384,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16912,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16656,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16400,65)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16400,66)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16384,65)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16384,66)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_032___caps_control.js b/common/test/keyboards/baseline/k_032___caps_control.js
new file mode 100755
index 00000000000..d8afdda31d8
--- /dev/null
+++ b/common/test/keyboards/baseline/k_032___caps_control.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_032___caps_control());}function Keyboard_k_032___caps_control(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_032___caps_control";this.KN="032 - caps control";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0310;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16912,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16656,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16640,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16896,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16640,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16640,52)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,52)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16896,53)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16640,53)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16896,54)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16640,54)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16640,55)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,55)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_033___caps_always_off.js b/common/test/keyboards/baseline/k_033___caps_always_off.js
new file mode 100755
index 00000000000..da223fb088e
--- /dev/null
+++ b/common/test/keyboards/baseline/k_033___caps_always_off.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_033___caps_always_off());}function Keyboard_k_033___caps_always_off(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_033___caps_always_off";this.KN="033 - caps always off";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0300;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16640,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16640,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16640,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_034___options_double_set_reset.js b/common/test/keyboards/baseline/k_034___options_double_set_reset.js
new file mode 100755
index 00000000000..b8e2dba019d
--- /dev/null
+++ b/common/test/keyboards/baseline/k_034___options_double_set_reset.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_034___options_double_set_reset());}function Keyboard_k_034___options_double_set_reset(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_034___options_double_set_reset";this.KN="034 - options double set reset";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="2";this.s10="3";this.s11="2";this.s12="3";this.s13="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");this.s5=this.s9;this.s5=k.KLOAD(this.KI,"foo","0");this.s5=this.s10;this.s5=k.KLOAD(this.KI,"foo","0");}else if(this.s5===this.s11){r=m=1;k.KDC(0,t);k.KO(-1,t,"bar.");}else if(this.s5===this.s12){r=m=1;k.KDC(0,t);k.KO(-1,t,"baz.");}else if(this.s5===this.s13){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_035___options_double_set_staged.js b/common/test/keyboards/baseline/k_035___options_double_set_staged.js
new file mode 100755
index 00000000000..8d7f0a57a6c
--- /dev/null
+++ b/common/test/keyboards/baseline/k_035___options_double_set_staged.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_035___options_double_set_staged());}function Keyboard_k_035___options_double_set_staged(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_035___options_double_set_staged";this.KN="035 - options double set staged";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="2";this.s10="3";this.s11="2";this.s12="3";this.s13="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");this.s5=this.s9;}else if(this.s5===this.s11){r=m=1;k.KDC(0,t);k.KO(-1,t,"bar.");}else if(this.s5===this.s12){r=m=1;k.KDC(0,t);k.KO(-1,t,"baz.");}else if(this.s5===this.s13){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}else if(k.KKM(e,16384,66)) {if(1){r=m=1;k.KDC(0,t);this.s5=k.KLOAD(this.KI,"foo","0");}}else if(k.KKM(e,16384,67)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s10;}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_036___options___double_reset_staged.js b/common/test/keyboards/baseline/k_036___options___double_reset_staged.js
new file mode 100755
index 00000000000..9427fcf1683
--- /dev/null
+++ b/common/test/keyboards/baseline/k_036___options___double_reset_staged.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_036___options___double_reset_staged());}function Keyboard_k_036___options___double_reset_staged(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_036___options___double_reset_staged";this.KN="036 - options - double reset staged";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="2";this.s10="2";this.s11="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");this.s5=this.s9;}else if(this.s5===this.s10){r=m=1;k.KDC(0,t);k.KO(-1,t,"bar.");}else if(this.s5===this.s11){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}else if(k.KKM(e,16384,66)) {if(1){r=m=1;k.KDC(0,t);this.s5=k.KLOAD(this.KI,"foo","0");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_037___options___double_reset.js b/common/test/keyboards/baseline/k_037___options___double_reset.js
new file mode 100755
index 00000000000..a4e26a633f5
--- /dev/null
+++ b/common/test/keyboards/baseline/k_037___options___double_reset.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_037___options___double_reset());}function Keyboard_k_037___options___double_reset(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_037___options___double_reset";this.KN="037 - options - double reset";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="2";this.s10="2";this.s11="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");this.s5=this.s9;this.s5=k.KLOAD(this.KI,"foo","0");this.s5=k.KLOAD(this.KI,"foo","0");}else if(this.s5===this.s10){r=m=1;k.KDC(0,t);k.KO(-1,t,"bar.");}else if(this.s5===this.s11){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_038___punctkeys.js b/common/test/keyboards/baseline/k_038___punctkeys.js
new file mode 100755
index 00000000000..8992c4c2945
--- /dev/null
+++ b/common/test/keyboards/baseline/k_038___punctkeys.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_038___punctkeys());function Keyboard_k_038___punctkeys(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_038___punctkeys";this.KN="038 - punctkeys";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,226)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"p");}}else if(k.KKM(e,16384,222)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"o");}}else if(k.KKM(e,16384,188)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"g");}}else if(k.KKM(e,16384,189)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"h");}}else if(k.KKM(e,16384,190)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"i");}}else if(k.KKM(e,16384,191)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"j");}}else if(k.KKM(e,16384,186)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"e");}}else if(k.KKM(e,16384,187)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"f");}}else if(k.KKM(e,16384,219)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"l");}}else if(k.KKM(e,16384,220)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"m");}}else if(k.KKM(e,16384,221)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"n");}}else if(k.KKM(e,16384,192)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"k");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_039___generic_ctrlalt.js b/common/test/keyboards/baseline/k_039___generic_ctrlalt.js
new file mode 100755
index 00000000000..014fc69a24c
--- /dev/null
+++ b/common/test/keyboards/baseline/k_039___generic_ctrlalt.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_039___generic_ctrlalt());function Keyboard_k_039___generic_ctrlalt(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_039___generic_ctrlalt";this.KN="039 - generic ctrlalt";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0060;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16416,66)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"b");}}else if(k.KKM(e,16448,67)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"c");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_040___long_context.js b/common/test/keyboards/baseline/k_040___long_context.js
new file mode 100755
index 00000000000..39d43abebc5
--- /dev/null
+++ b/common/test/keyboards/baseline/k_040___long_context.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_040___long_context());function Keyboard_k_040___long_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_040___long_context";this.KN="040 - long context";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,32)) {if(1){r=m=1;k.KO(0,t," ");}}else if(k.KKM(e,16384,70)) {if(k.KCM(1,t," ",1)){r=m=1;k.KO(1,t," ");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_041___long_context_and_deadkeys.js b/common/test/keyboards/baseline/k_041___long_context_and_deadkeys.js
new file mode 100755
index 00000000000..86542bbac7b
--- /dev/null
+++ b/common/test/keyboards/baseline/k_041___long_context_and_deadkeys.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_041___long_context_and_deadkeys());function Keyboard_k_041___long_context_and_deadkeys(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_041___long_context_and_deadkeys";this.KN="041 - long context and deadkeys";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,49)) {if(k.KDM(60,t,0)&&k.KCM(60,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh",60)){r=m=1;k.KO(-1,t,"1");}}else if(k.KKM(e,16384,50)) {if(k.KCM(63,t,"\x08\x01abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh1",63)){r=m=1;k.KO(63,t,"FAIL TEST 2");}else if(k.KCM(62,t,"\x01abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh1",62)){r=m=1;k.KO(62,t,"FAIL TEST 2");}else if(k.KCM(61,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh1",61)){r=m=1;k.KO(-1,t,"2");}}else if(k.KKM(e,16384,51)) {if(k.KCM(64,t,"\x08\x01abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh12",64)){r=m=1;k.KO(64,t,"FAIL TEST 3");}else if(k.KCM(63,t,"\x01abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh12",63)){r=m=1;k.KO(63,t,"FAIL TEST 3");}else if(k.KCM(62,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh12",62)){r=m=1;k.KO(62,t,"abcdefghijklmnopqrstuvwxyz123");}}else if(k.KKM(e,16384,52)) {if(k.KDM(29,t,0)&&k.KCM(29,t,"abcdefghijklmnopqrstuvwxyz123",29)){r=m=1;k.KO(29,t,"PASS");}}else if(k.KKM(e,16384,90)) {if(1){r=m=1;k.KDO(0,t,0);k.KO(-1,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_042___long_context_and_split_deadkeys.js b/common/test/keyboards/baseline/k_042___long_context_and_split_deadkeys.js
new file mode 100755
index 00000000000..da7e2138ff2
--- /dev/null
+++ b/common/test/keyboards/baseline/k_042___long_context_and_split_deadkeys.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_042___long_context_and_split_deadkeys());function Keyboard_k_042___long_context_and_split_deadkeys(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_042___long_context_and_split_deadkeys";this.KN="042 - long context and split deadkeys";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,32)) {if(k.KCM(64,t,"\x01abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk",64)){r=m=1;k.KO(64,t,"FAIL");}else if(k.KDM(63,t,0)&&k.KCM(63,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk",63)){r=m=1;k.KO(63,t,"UNEXPECTED");}}else if(k.KKM(e,16384,49)) {if(k.KCM(61,t,"defghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk ",61)){r=m=1;k.KO(61,t,"def");}}else if(k.KKM(e,16384,50)) {if(k.KDM(6,t,0)&&k.KCM(6,t,"abcdef",6)){r=m=1;k.KO(6,t,"PASS");}}else if(k.KKM(e,16384,90)) {if(1){r=m=1;k.KDO(0,t,0);k.KO(-1,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_043___output_and_keystroke.js b/common/test/keyboards/baseline/k_043___output_and_keystroke.js
new file mode 100755
index 00000000000..3e6941c7db0
--- /dev/null
+++ b/common/test/keyboards/baseline/k_043___output_and_keystroke.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_043___output_and_keystroke());}function Keyboard_k_043___output_and_keystroke(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_043___output_and_keystroke";this.KN="043 - output and keystroke";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"a");}}else if(k.KKM(e,16384,50)) {if(k.KFCM(1,t,['b'])){r=m=1;k.KDC(1,t);k.KO(-1,t,"b");r=this.g2(t,e);m=2;}}else if(k.KKM(e,16384,51)) {if(k.KFCM(3,t,['a','b','c'])){r=m=1;k.KDC(3,t);k.KO(-1,t,"a");k.KO(-1,t,"bd");r=this.g3(t,e);m=2;}}if(m==1) {k.KDC(-1,t);r=this.g1(t,e);m=2;}return r;};this.g1=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KFCM(1,t,['a'])){m=1;k.KDC(1,t);k.KO(-1,t,"b");}return r;};this.g2=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KFCM(1,t,['b'])){m=1;k.KDC(1,t);k.KO(-1,t,"abc");}return r;};this.g3=function(t,e) {var k=KeymanWeb,r=0,m=0;return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_044___if_and_context.js b/common/test/keyboards/baseline/k_044___if_and_context.js
new file mode 100755
index 00000000000..c08dc3c67c4
--- /dev/null
+++ b/common/test/keyboards/baseline/k_044___if_and_context.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_044___if_and_context());}function Keyboard_k_044___if_and_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_044___if_and_context";this.KN="044 - if and context";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s6=KeymanWeb.KLOAD(this.KI,"nfc","0");this.s7="ae";this.s9="0";this.KVER="16.0.138.0";this.KVS=['s6'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"exay");}}else if(k.KKM(e,16384,66)) {if(k.KFCM(4,t,[{t:'a',a:this.s7},'x',{t:'a',a:this.s7},'y'])&&this.s6===this.s9){r=m=1;k.KDC(4,t);k.KIO(-1,this.s7,1,t);k.KO(-1,t,"x");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_045___deadkey_and_context.js b/common/test/keyboards/baseline/k_045___deadkey_and_context.js
new file mode 100755
index 00000000000..750277ccbe6
--- /dev/null
+++ b/common/test/keyboards/baseline/k_045___deadkey_and_context.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_045___deadkey_and_context());}function Keyboard_k_045___deadkey_and_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_045___deadkey_and_context";this.KN="045 - deadkey and context";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0010;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,191)) {if(k.KFCM(7,t,['<',{t:'d',d:0},'a',{t:'d',d:1},'b',{t:'d',d:2},'>'])){r=m=1;k.KDC(7,t);k.KO(-1,t,"correct");}}else if(k.KKM(e,16384,89)) {if(1){r=m=1;k.KDC(0,t);k.KDO(-1,t,0);k.KO(-1,t,"a");k.KDO(-1,t,1);k.KO(-1,t,"b");k.KDO(-1,t,2);}}else if(k.KKM(e,16384,90)) {if(k.KFCM(5,t,[{t:'d',d:0},'a',{t:'d',d:1},'b',{t:'d',d:2}])){r=m=1;k.KDC(5,t);k.KO(-1,t,"<");k.KDO(-1,t,0);k.KO(-1,t,"a");k.KDO(-1,t,1);k.KO(-1,t,"b");k.KDO(-1,t,2);k.KO(-1,t,">");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_046___deadkey_and_contextex.js b/common/test/keyboards/baseline/k_046___deadkey_and_contextex.js
new file mode 100755
index 00000000000..45dc72f186d
--- /dev/null
+++ b/common/test/keyboards/baseline/k_046___deadkey_and_contextex.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_046___deadkey_and_contextex());}function Keyboard_k_046___deadkey_and_contextex(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_046___deadkey_and_contextex";this.KN="046 - deadkey and contextex";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0010;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,191)) {if(k.KFCM(3,t,['<',{t:'d',d:0},'>'])){r=m=1;k.KDC(3,t);k.KO(-1,t,"correct");}}else if(k.KKM(e,16400,77)) {if(k.KFCM(5,t,[{t:'d',d:0},'a',{t:'d',d:1},'b',{t:'d',d:2}])){r=m=1;k.KDC(5,t);k.KO(-1,t,"<");k.KDO(-1,t,0);k.KO(-1,t,">");}}else if(k.KKM(e,16384,89)) {if(1){r=m=1;k.KDC(0,t);k.KDO(-1,t,0);k.KO(-1,t,"a");k.KDO(-1,t,1);k.KO(-1,t,"b");k.KDO(-1,t,2);}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_047___caps_always_off_initially_on.js b/common/test/keyboards/baseline/k_047___caps_always_off_initially_on.js
new file mode 100755
index 00000000000..3775e99174d
--- /dev/null
+++ b/common/test/keyboards/baseline/k_047___caps_always_off_initially_on.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_047___caps_always_off_initially_on());}function Keyboard_k_047___caps_always_off_initially_on(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_047___caps_always_off_initially_on";this.KN="047 - caps always off initially on";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0300;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16640,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16640,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16640,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_048___modifier_keys_keep_context.js b/common/test/keyboards/baseline/k_048___modifier_keys_keep_context.js
new file mode 100755
index 00000000000..5b171674cfe
--- /dev/null
+++ b/common/test/keyboards/baseline/k_048___modifier_keys_keep_context.js
@@ -0,0 +1 @@
+KeymanWeb.KR(new Keyboard_k_048___modifier_keys_keep_context());function Keyboard_k_048___modifier_keys_keep_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_048___modifier_keys_keep_context";this.KN="048 - modifier keys keep context";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(1){r=m=1;k.KO(0,t,"a");}}else if(k.KKM(e,16384,66)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"pass.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_049___enter_invalidates_context.js b/common/test/keyboards/baseline/k_049___enter_invalidates_context.js
new file mode 100755
index 00000000000..fdc476f8918
--- /dev/null
+++ b/common/test/keyboards/baseline/k_049___enter_invalidates_context.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_049___enter_invalidates_context());}function Keyboard_k_049___enter_invalidates_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_049___enter_invalidates_context";this.KN="049 - enter_invalidates_context";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,67)) {if(k.KFCM(2,t,['a','b'])){r=m=1;k.KDC(2,t);k.KO(-1,t,"abd");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_050___nul_and_context.js b/common/test/keyboards/baseline/k_050___nul_and_context.js
new file mode 100755
index 00000000000..4d29aa66854
--- /dev/null
+++ b/common/test/keyboards/baseline/k_050___nul_and_context.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_050___nul_and_context());}function Keyboard_k_050___nul_and_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_050___nul_and_context";this.KN="050 - nul_and_context";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5="mnpqrstv";this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,66)) {if(k.KFCM(2,t,[{t:'n'},{t:'a',a:this.s5}])){r=m=1;k.KDC(1,t);k.KO(-1,t,"2");k.KIO(-1,this.s5,1,t);k.KO(-1,t,"3");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_051___if_and_context.js b/common/test/keyboards/baseline/k_051___if_and_context.js
new file mode 100755
index 00000000000..b43ca031c48
--- /dev/null
+++ b/common/test/keyboards/baseline/k_051___if_and_context.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_051___if_and_context());}function Keyboard_k_051___if_and_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_051___if_and_context";this.KN="051 - if_and_context";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5="mnpqrstv";this.s6=KeymanWeb.KLOAD(this.KI,"ifx","1");this.s9="1";this.KVER="16.0.138.0";this.KVS=['s6'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,68)) {if(k.KFCM(1,t,[{t:'a',a:this.s5}])&&this.s6===this.s9){r=m=1;k.KDC(1,t);k.KO(-1,t,"4");k.KIO(-1,this.s5,1,t);k.KO(-1,t,"5");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_052___nul_and_index.js b/common/test/keyboards/baseline/k_052___nul_and_index.js
new file mode 100755
index 00000000000..1094d1b56ae
--- /dev/null
+++ b/common/test/keyboards/baseline/k_052___nul_and_index.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_052___nul_and_index());}function Keyboard_k_052___nul_and_index(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_052___nul_and_index";this.KN="052 - nul_and_index";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5="mnpqrstv";this.s6="MNPQRSTV";this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,66)) {if(k.KFCM(2,t,[{t:'n'},{t:'a',a:this.s5}])){r=m=1;k.KDC(1,t);k.KO(-1,t,"2");k.KIO(-1,this.s6,1,t);k.KO(-1,t,"3");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_053___if_and_index.js b/common/test/keyboards/baseline/k_053___if_and_index.js
new file mode 100755
index 00000000000..eb1710226be
--- /dev/null
+++ b/common/test/keyboards/baseline/k_053___if_and_index.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_053___if_and_index());}function Keyboard_k_053___if_and_index(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_053___if_and_index";this.KN="053 - if_and_index";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5="mnpqrstv";this.s6="MNPQRSTV";this.s7=KeymanWeb.KLOAD(this.KI,"ifx","1");this.s10="1";this.KVER="16.0.138.0";this.KVS=['s7'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,68)) {if(k.KFCM(1,t,[{t:'a',a:this.s5}])&&this.s7===this.s10){r=m=1;k.KDC(1,t);k.KO(-1,t,"4");k.KIO(-1,this.s6,1,t);k.KO(-1,t,"5");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_055___deadkey_cancelled_by_arrow.js b/common/test/keyboards/baseline/k_055___deadkey_cancelled_by_arrow.js
new file mode 100755
index 00000000000..e6913c358e4
--- /dev/null
+++ b/common/test/keyboards/baseline/k_055___deadkey_cancelled_by_arrow.js
@@ -0,0 +1 @@
+if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_055___deadkey_cancelled_by_arrow());}function Keyboard_k_055___deadkey_cancelled_by_arrow(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_055___deadkey_cancelled_by_arrow";this.KN="050 - deadkey cancelled by arrow";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0010;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,54)) {if(1){r=m=1;k.KDC(0,t);k.KDO(-1,t,0);}}else if(k.KKM(e,16384,69)) {if(k.KFCM(1,t,[{t:'d',d:0}])){r=m=1;k.KDC(1,t);k.KO(-1,t,"FAIL.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"PASS.");}}return r;};}
\ No newline at end of file
diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.ts b/web/src/test/auto/e2e/baseline/baseline.tests.ts
index 543c0bf1dc0..8a9994fb04a 100644
--- a/web/src/test/auto/e2e/baseline/baseline.tests.ts
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.ts
@@ -22,88 +22,141 @@ function KeymanRoot(): string {
 }
 
 // Tests that are not supported in Web due to missing functionality
-const testsToSkip = new Map([
-  ['k_038___punctkeys.kmn', 'Playwright does not support 102nd key']
-]);
+const testsToSkip = {
+  'all': new Map([
+    ['k_038___punctkeys.kmn', 'Playwright does not support 102nd key']
+  ]),
+  '.kmx': new Map([
+  ]),
+  '.js': new Map([
+    ['k_054___nul_and_contextex.kmn', 'contextex is not supported in context() match in Web']
+  ]),
+};
 
 // Tests that should work but fail due to not-yet implemented functionality
-// TODO-web-core: fix these tests
-const testsToFix = [
-  'k_000___null_keyboard.kmn',
-  'k_006___vkey_input__shift_ctrl_.kmn',
-  'k_007___vkey_input__ctrl_alt_.kmn',
-  'k_008___vkey_input__ctrl_alt_2_.kmn',
-  'k_012___ralt.kmn',
-  'k_014___groups_and_virtual_keys.kmn',
-  'k_015___ralt_2.kmn',
-  'k_022___options_with_preset.kmn',
-  'k_024___options_with_save_and_preset.kmn',
-  'k_025___options_with_reset.kmn',
-  'k_026___system_stores.kmn',
-  'k_027___system_stores_2.kmn',
-  'k_028___smp.kmn',
-  'k_031___caps_lock.kmn',
-  'k_032___caps_control.kmn',
-  'k_034___options_double_set_reset.kmn',
-  'k_035___options_double_set_staged.kmn',
-  'k_036___options___double_reset_staged.kmn',
-  'k_037___options___double_reset.kmn',
-  'k_039___generic_ctrlalt.kmn',
-  'k_049___enter_invalidates_context.kmn',
-  'k_055___deadkey_cancelled_by_arrow.kmn',
-];
+const testsToFix = {
+  // TODO-web-core: fix these tests
+  '.kmx': [
+    'k_000___null_keyboard.kmn',
+    'k_006___vkey_input__shift_ctrl_.kmn',
+    'k_007___vkey_input__ctrl_alt_.kmn',
+    'k_008___vkey_input__ctrl_alt_2_.kmn',
+    'k_012___ralt.kmn',
+    'k_014___groups_and_virtual_keys.kmn',
+    'k_015___ralt_2.kmn', // kmx only
+    'k_022___options_with_preset.kmn',
+    'k_024___options_with_save_and_preset.kmn',
+    'k_025___options_with_reset.kmn',
+    'k_026___system_stores.kmn',
+    'k_027___system_stores_2.kmn',
+    'k_028___smp.kmn', // kmx only
+    'k_031___caps_lock.kmn',
+    'k_032___caps_control.kmn',
+    'k_034___options_double_set_reset.kmn',
+    'k_035___options_double_set_staged.kmn',
+    'k_036___options___double_reset_staged.kmn',
+    'k_037___options___double_reset.kmn',
+    'k_039___generic_ctrlalt.kmn',
+    'k_049___enter_invalidates_context.kmn',
+    'k_055___deadkey_cancelled_by_arrow.kmn',
+  ],
+  // TODO: fix these tests (#15342)
+  '.js': [
+    'k_000___null_keyboard.kmn',
+    'k_006___vkey_input__shift_ctrl_.kmn',
+    'k_007___vkey_input__ctrl_alt_.kmn',
+    'k_008___vkey_input__ctrl_alt_2_.kmn',
+    'k_012___ralt.kmn',
+    'k_014___groups_and_virtual_keys.kmn',
+    'k_022___options_with_preset.kmn',
+    'k_024___options_with_save_and_preset.kmn',
+    'k_025___options_with_reset.kmn',
+    'k_026___system_stores.kmn',
+    'k_027___system_stores_2.kmn',
+    'k_031___caps_lock.kmn',
+    'k_032___caps_control.kmn',
+    'k_034___options_double_set_reset.kmn',
+    'k_035___options_double_set_staged.kmn',
+    'k_036___options___double_reset_staged.kmn',
+    'k_037___options___double_reset.kmn',
+    'k_039___generic_ctrlalt.kmn',
+    'k_041___long_context_and_deadkeys.kmn', // js only
+    'k_042___long_context_and_split_deadkeys.kmn', // js only
+    'k_049___enter_invalidates_context.kmn',
+    'k_050___nul_and_context.kmn', // js only
+    'k_052___nul_and_index.kmn', // js only
+    'k_055___deadkey_cancelled_by_arrow.kmn',
+  ]
+};
 
 test.describe('Baseline tests', () => {
   const testDir = '/common/test/keyboards/baseline';
 
   // Find all k_*.kmn files in testDir
   const files = fs.readdirSync(KeymanRoot() + testDir).filter(f => f.match(/^k_.*\.kmn$/));
-  for (const file of files) {
-    test(file, async ({ page }) => {
-      const kmxFile = file.replace(/\.kmn$/, '.kmx');
-      const testSource = new KmxTestSource();
-      const result = testSource.loadSource(path.join(KeymanRoot(), testDir, file));
-      if (result !== 0) {
-        throw new Error(`Error loading KMX test source ${file} at line ${result}`);
-      }
+  for (const ext of ['.kmx', '.js']) {
+    test.describe(`${ext} tests`, () => {
+      for (const file of files) {
+        test(file, async ({ page }) => {
+          // Setup
+          test.info().annotations.push({ type: 'name', description: test.info().title });
 
-      // Setup
-      test.info().annotations.push({ type: 'name', description: test.info().title });
-      test.info().annotations.push({ type: 'description', description: testSource.description });
+          const kbdFile = file.replace(/\.kmn$/, ext);
+          if (!fs.existsSync(path.join(KeymanRoot(), testDir, kbdFile))) {
+            const msg = `Skipping ${file} test - ${ext} file doesn't exist`;
+            console.log(msg);
+            test.skip(true, msg);
+            return;
+          }
 
-      if (testsToSkip.has(file)) {
-        const msg = `Skipping ${file} test - ${testsToSkip.get(file)}`;
-        console.log(msg);
-        test.skip(true, msg);
-        return;
-      }
+          const testSource = new KmxTestSource();
+          const result = testSource.loadSource(path.join(KeymanRoot(), testDir, file));
+          if (result !== 0) {
+            throw new Error(`Error loading ${ext} test source ${file} at line ${result}`);
+          }
 
-      if (testsToFix.includes(file)) {
-        const msg = `Skipping ${file} test - requires not-yet implemented functionality`;
-        console.log(msg);
-        test.fixme(true, msg);
-        return;
-      }
+          test.info().annotations.push({ type: 'description', description: testSource.description });
 
-      await page.goto(`http://localhost:3000/src/test/auto/e2e/baseline/baseline.tests.html?keyboard=${testDir}/${kmxFile}`);
-      await page.evaluate(async () => { await window.KmwLoaded; });
-      const textarea = page.locator('#inputarea');
-      await textarea.click();
+          if (testsToSkip[ext].has(file)) {
+            const msg = `Skipping ${file} test - ${testsToSkip[ext].get(file)}`;
+            console.log(msg);
+            test.skip(true, msg);
+            return;
+          }
+          if (testsToSkip['all'].has(file)) {
+            const msg = `Skipping ${file} test - ${testsToSkip['all'].get(file)}`;
+            console.log(msg);
+            test.skip(true, msg);
+            return;
+          }
+          if (testsToFix[ext].includes(file)) {
+            const msg = `Skipping ${file} test - requires not-yet implemented functionality`;
+            console.log(msg);
+            test.fixme(true, msg);
+            return;
+          }
 
-      // TODO-web-core: set options from test source
-      // TODO-web-core: set capslock state
+          await page.goto(`http://localhost:3000/src/test/auto/e2e/baseline/baseline.tests.html?keyboard=${testDir}/${kbdFile}`);
+          await page.evaluate(async () => { await window.KmwLoaded; });
+          const textarea = page.locator('#inputarea');
+          await textarea.click();
 
-      // set context
-      if (testSource.context) {
-        await textarea.fill(testSource.context);
-      }
+          // TODO-web-core: set options from test source
+          // TODO-web-core: set capslock state
 
-      // type keys
-      await pressKeys(page, testSource.keys);
+          // set context
+          if (testSource.context) {
+            await textarea.fill(testSource.context);
+          }
 
-      // verify output
-      await expect(textarea).toHaveValue(testSource.expected, { timeout: 500 });
-    });
+          // type keys
+          await pressKeys(page, testSource.keys);
+
+          // verify output
+          await expect(textarea).toHaveValue(testSource.expected, { timeout: 500 });
+        });
 
+      }
+    });
   }
 });
\ No newline at end of file

From 4d644cd00e2c28f84f34dde90f8f9c72355d0ef6 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
Date: Mon, 15 Dec 2025 15:44:42 +0100
Subject: [PATCH 184/254] Apply suggestions from code review

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 web/src/engine/src/main/headless/inputProcessor.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/src/engine/src/main/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
index f8bc1725ba7..88168a54f46 100644
--- a/web/src/engine/src/main/headless/inputProcessor.ts
+++ b/web/src/engine/src/main/headless/inputProcessor.ts
@@ -172,7 +172,11 @@ export class InputProcessor {
     // The default OSK layout for desktop devices does not include nextlayer info, relying on
     // modifier detection here.
     // It's the OSK equivalent to doModifierPress on 'desktop' form factors.
-    if ((formFactor == DeviceSpec.FormFactor.Desktop || !this.activeKeyboard || (this.activeKeyboard instanceof JSKeyboard && this.activeKeyboard.usesDesktopLayoutOnDevice(keyEvent.device))) && keyEvent.isSynthetic) {
+    if ((formFactor == DeviceSpec.FormFactor.Desktop || !this.activeKeyboard || 
+      (this.activeKeyboard instanceof JSKeyboard && 
+      this.activeKeyboard.usesDesktopLayoutOnDevice(keyEvent.device))) && 
+      keyEvent.isSynthetic
+    ) {
       // If it's a desktop OSK style and this triggers a layer change,
       // a modifier key was clicked.  No output expected, so it's safe to instantly exit.
       if (this.keyboardProcessor.selectLayer(keyEvent)) {
@@ -182,7 +186,8 @@ export class InputProcessor {
 
     // Will handle keystroke-based non-layer change modifier & state keys, mapping them through
     // the physical keyboard's version of state management.  `doModifierPress` must always run.
-    if (this.keyboardProcessor.doModifierPress(keyEvent, textStore, !keyEvent.isSynthetic) && !keyEvent.isSynthetic) {
+    const wasModifierPress = this.keyboardProcessor.doModifierPress(keyEvent, textStore, !keyEvent.isSynthetic);
+    if (wasModifierPress && !keyEvent.isSynthetic) {
       // If run on a desktop platform, we know that modifier & state key presses may not
       // produce output, so we may make an immediate return safely.
       return new ProcessorAction();

From 6de40e903b9f20a919b8ef47d5d32bdf72a2378b Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 12 Dec 2025 17:13:14 +0100
Subject: [PATCH 185/254] test(common): better group baseline tests

This change groups similar tests together. Also update `build.sh` to
compile .js files.

Follow-up-of: #15341
Test-bot: skip
---
 common/test/keyboards/baseline/README.md      |  14 +-
 common/test/keyboards/baseline/baseline.kpj   | 276 +++++++++---------
 common/test/keyboards/baseline/build.sh       |  12 +-
 .../baseline/k_0000___null_keyboard.js        |  28 ++
 ...eyboard.kmn => k_0000___null_keyboard.kmn} |   2 +-
 .../baseline/k_0000___null_keyboard.kmx       | Bin 0 -> 318 bytes
 .../test/keyboards/baseline/k_0001___nul.js   |  42 +++
 .../{k_003___nul.kmn => k_0001___nul.kmn}     |   4 +-
 .../test/keyboards/baseline/k_0001___nul.kmx  | Bin 0 -> 380 bytes
 .../k_0002___nul_with_initial_context.js      |  42 +++
 ... => k_0002___nul_with_initial_context.kmn} |   2 +-
 .../k_0002___nul_with_initial_context.kmx     | Bin 0 -> 422 bytes
 .../baseline/k_0003___nul_testing.js          |  34 +++
 ...l_testing.kmn => k_0003___nul_testing.kmn} |   2 +-
 .../baseline/k_0003___nul_testing.kmx         | Bin 0 -> 386 bytes
 .../baseline/k_0004___space_mnemonic_kbd.js   |  46 +++
 ...bd.kmn => k_0004___space_mnemonic_kbd.kmn} |   2 +-
 .../baseline/k_0004___space_mnemonic_kbd.kmx  | Bin 0 -> 508 bytes
 .../test/keyboards/baseline/k_0005___beep.js  |  40 +++
 .../{k_029___beep.kmn => k_0005___beep.kmn}   |   4 +-
 .../test/keyboards/baseline/k_0005___beep.kmx | Bin 0 -> 328 bytes
 .../baseline/k_000___null_keyboard.js         |   1 -
 .../baseline/k_000___null_keyboard.kmx        | Bin 316 -> 0 bytes
 .../baseline/k_001___basic_input_unicodei.js  |   1 -
 .../baseline/k_001___basic_input_unicodei.kmx | Bin 440 -> 0 bytes
 .../baseline/k_002___basic_input_unicode.js   |   1 -
 .../baseline/k_002___basic_input_unicode.kmx  | Bin 438 -> 0 bytes
 common/test/keyboards/baseline/k_003___nul.js |   1 -
 .../test/keyboards/baseline/k_003___nul.kmx   | Bin 378 -> 0 bytes
 .../baseline/k_004___basic_input__shift_2_.js |   1 -
 .../k_004___basic_input__shift_2_.kmx         | Bin 442 -> 0 bytes
 .../k_005___nul_with_initial_context.js       |   1 -
 .../k_005___nul_with_initial_context.kmx      | Bin 420 -> 0 bytes
 .../k_006___vkey_input__shift_ctrl_.js        |   1 -
 .../k_006___vkey_input__shift_ctrl_.kmx       | Bin 446 -> 0 bytes
 .../baseline/k_007___vkey_input__ctrl_alt_.js |   1 -
 .../k_007___vkey_input__ctrl_alt_.kmx         | Bin 442 -> 0 bytes
 .../k_008___vkey_input__ctrl_alt_2_.js        |   1 -
 .../k_008___vkey_input__ctrl_alt_2_.kmx       | Bin 388 -> 0 bytes
 .../baseline/k_0100___basic_input_unicodei.js |  52 ++++
 ....kmn => k_0100___basic_input_unicodei.kmn} |   4 +-
 .../k_0100___basic_input_unicodei.kmx         | Bin 0 -> 442 bytes
 .../baseline/k_0101___basic_input_unicode.js  |  52 ++++
 ...e.kmn => k_0101___basic_input_unicode.kmn} |   2 +-
 .../baseline/k_0101___basic_input_unicode.kmx | Bin 0 -> 440 bytes
 .../k_0102___basic_input__shift_2_.js         |  52 ++++
 ...kmn => k_0102___basic_input__shift_2_.kmn} |   6 +-
 .../k_0102___basic_input__shift_2_.kmx        | Bin 0 -> 444 bytes
 .../k_0103___vkey_input__shift_ctrl_.js       |  52 ++++
 ...n => k_0103___vkey_input__shift_ctrl_.kmn} |   6 +-
 .../k_0103___vkey_input__shift_ctrl_.kmx      | Bin 0 -> 448 bytes
 .../k_0104___vkey_input__ctrl_alt_.js         |  52 ++++
 ...kmn => k_0104___vkey_input__ctrl_alt_.kmn} |   6 +-
 .../k_0104___vkey_input__ctrl_alt_.kmx        | Bin 0 -> 444 bytes
 .../k_0105___vkey_input__ctrl_alt_2_.js       |  40 +++
 ...n => k_0105___vkey_input__ctrl_alt_2_.kmn} |   2 +-
 .../k_0105___vkey_input__ctrl_alt_2_.kmx      | Bin 0 -> 390 bytes
 .../test/keyboards/baseline/k_0106___smp.js   |  80 +++++
 .../{k_028___smp.kmn => k_0106___smp.kmn}     |   2 +-
 .../test/keyboards/baseline/k_0106___smp.kmx  | Bin 0 -> 576 bytes
 .../keyboards/baseline/k_0107___punctkeys.js  | 100 +++++++
 ...__punctkeys.kmn => k_0107___punctkeys.kmn} |   6 +-
 .../keyboards/baseline/k_0107___punctkeys.kmx | Bin 0 -> 644 bytes
 .../test/keyboards/baseline/k_012___ralt.js   |   1 -
 .../test/keyboards/baseline/k_012___ralt.kmx  | Bin 402 -> 0 bytes
 .../keyboards/baseline/k_013___deadkeys.js    |   1 -
 .../keyboards/baseline/k_013___deadkeys.kmx   | Bin 394 -> 0 bytes
 .../k_014___groups_and_virtual_keys.js        |   1 -
 .../k_014___groups_and_virtual_keys.kmx       | Bin 764 -> 0 bytes
 .../test/keyboards/baseline/k_015___ralt_2.js |   1 -
 .../keyboards/baseline/k_015___ralt_2.kmx     | Bin 330 -> 0 bytes
 .../baseline/k_017___space_mnemonic_kbd.js    |   1 -
 .../baseline/k_017___space_mnemonic_kbd.kmx   | Bin 506 -> 0 bytes
 .../keyboards/baseline/k_018___nul_testing.js |   1 -
 .../baseline/k_018___nul_testing.kmx          | Bin 384 -> 0 bytes
 .../baseline/k_019___multiple_deadkeys.js     |   1 -
 .../baseline/k_019___multiple_deadkeys.kmx    | Bin 2192 -> 0 bytes
 .../test/keyboards/baseline/k_0200___ralt.js  |  52 ++++
 .../{k_012___ralt.kmn => k_0200___ralt.kmn}   |   8 +-
 .../test/keyboards/baseline/k_0200___ralt.kmx | Bin 0 -> 404 bytes
 .../keyboards/baseline/k_0201___ralt_2.js     |  34 +++
 ...k_015___ralt_2.kmn => k_0201___ralt_2.kmn} |   5 +-
 .../keyboards/baseline/k_0201___ralt_2.kmx    | Bin 0 -> 370 bytes
 .../baseline/k_0203___generic_ctrlalt.js      |  40 +++
 ...rlalt.kmn => k_0203___generic_ctrlalt.kmn} |   4 +-
 .../baseline/k_0203___generic_ctrlalt.kmx     | Bin 0 -> 376 bytes
 .../k_020___deadkeys_and_backspace.js         |   1 -
 .../keyboards/baseline/k_021___options.js     |   1 -
 .../keyboards/baseline/k_021___options.kmx    | Bin 556 -> 0 bytes
 .../baseline/k_022___options_with_preset.js   |   1 -
 .../baseline/k_022___options_with_preset.kmx  | Bin 592 -> 0 bytes
 .../baseline/k_023___options_with_save.js     |   1 -
 .../baseline/k_023___options_with_save.kmx    | Bin 606 -> 0 bytes
 .../k_024___options_with_save_and_preset.js   |   1 -
 .../k_024___options_with_save_and_preset.kmx  | Bin 656 -> 0 bytes
 .../baseline/k_025___options_with_reset.js    |   1 -
 .../baseline/k_025___options_with_reset.kmx   | Bin 608 -> 0 bytes
 .../baseline/k_026___system_stores.js         |   1 -
 .../baseline/k_026___system_stores.kmx        | Bin 1972 -> 0 bytes
 .../baseline/k_027___system_stores_2.js       |   1 -
 .../baseline/k_027___system_stores_2.kmx      | Bin 1968 -> 0 bytes
 common/test/keyboards/baseline/k_028___smp.js |   1 -
 .../test/keyboards/baseline/k_028___smp.kmx   | Bin 574 -> 0 bytes
 .../test/keyboards/baseline/k_029___beep.js   |   1 -
 .../test/keyboards/baseline/k_029___beep.kmx  | Bin 326 -> 0 bytes
 .../keyboards/baseline/k_0300___deadkeys.js   |  40 +++
 ...3___deadkeys.kmn => k_0300___deadkeys.kmn} |   2 +-
 .../keyboards/baseline/k_0300___deadkeys.kmx  | Bin 0 -> 396 bytes
 .../baseline/k_0301___multiple_deadkeys.js    | 176 +++++++++++
 ...eys.kmn => k_0301___multiple_deadkeys.kmn} |   2 +-
 .../baseline/k_0301___multiple_deadkeys.kmx   | Bin 0 -> 2194 bytes
 .../k_0302___deadkeys_and_backspace.js        |  93 ++++++
 ...mn => k_0302___deadkeys_and_backspace.kmn} |   2 +-
 ...mx => k_0302___deadkeys_and_backspace.kmx} | Bin 1026 -> 1026 bytes
 .../baseline/k_030___multiple_groups.js       |   1 -
 .../keyboards/baseline/k_031___caps_lock.js   |   1 -
 .../keyboards/baseline/k_031___caps_lock.kmx  | Bin 650 -> 0 bytes
 .../baseline/k_032___caps_control.js          |   1 -
 .../baseline/k_032___caps_control.kmx         | Bin 880 -> 0 bytes
 .../baseline/k_033___caps_always_off.js       |   1 -
 .../baseline/k_033___caps_always_off.kmx      | Bin 572 -> 0 bytes
 .../k_034___options_double_set_reset.js       |   1 -
 .../k_034___options_double_set_reset.kmx      | Bin 674 -> 0 bytes
 .../k_035___options_double_set_staged.js      |   1 -
 .../k_035___options_double_set_staged.kmx     | Bin 718 -> 0 bytes
 .../k_036___options___double_reset_staged.js  |   1 -
 .../k_037___options___double_reset.js         |   1 -
 .../k_037___options___double_reset.kmx        | Bin 584 -> 0 bytes
 .../keyboards/baseline/k_038___punctkeys.js   |   1 -
 .../keyboards/baseline/k_038___punctkeys.kmx  | Bin 642 -> 0 bytes
 .../baseline/k_039___generic_ctrlalt.js       |   1 -
 .../baseline/k_039___generic_ctrlalt.kmx      | Bin 374 -> 0 bytes
 .../k_0400___groups_and_virtual_keys.js       |  69 +++++
 ...n => k_0400___groups_and_virtual_keys.kmn} |   2 +-
 .../k_0400___groups_and_virtual_keys.kmx      | Bin 0 -> 766 bytes
 .../baseline/k_0401___multiple_groups.js      |  73 +++++
 ...roups.kmn => k_0401___multiple_groups.kmn} |   2 +-
 ...roups.kmx => k_0401___multiple_groups.kmx} | Bin 596 -> 596 bytes
 .../baseline/k_0402___output_and_keystroke.js |  87 ++++++
 ....kmn => k_0402___output_and_keystroke.kmn} |   2 +-
 .../k_0402___output_and_keystroke.kmx         | Bin 0 -> 726 bytes
 .../baseline/k_040___long_context.js          |   1 -
 .../baseline/k_040___long_context.kmx         | Bin 366 -> 0 bytes
 .../k_041___long_context_and_deadkeys.js      |   1 -
 .../k_041___long_context_and_deadkeys.kmx     | Bin 1816 -> 0 bytes
 ...k_042___long_context_and_split_deadkeys.js |   1 -
 ..._042___long_context_and_split_deadkeys.kmx | Bin 1072 -> 0 bytes
 .../baseline/k_043___output_and_keystroke.js  |   1 -
 .../baseline/k_043___output_and_keystroke.kmx | Bin 724 -> 0 bytes
 .../baseline/k_044___if_and_context.js        |   1 -
 .../baseline/k_044___if_and_context.kmx       | Bin 500 -> 0 bytes
 .../baseline/k_045___deadkey_and_context.js   |   1 -
 .../baseline/k_045___deadkey_and_context.kmx  | Bin 576 -> 0 bytes
 .../baseline/k_046___deadkey_and_contextex.js |   1 -
 .../k_046___deadkey_and_contextex.kmx         | Bin 566 -> 0 bytes
 .../k_047___caps_always_off_initially_on.js   |   1 -
 .../k_047___caps_always_off_initially_on.kmx  | Bin 598 -> 0 bytes
 .../k_048___modifier_keys_keep_context.js     |   1 -
 .../k_048___modifier_keys_keep_context.kmx    | Bin 402 -> 0 bytes
 .../k_049___enter_invalidates_context.js      |   1 -
 .../k_049___enter_invalidates_context.kmx     | Bin 376 -> 0 bytes
 .../keyboards/baseline/k_0500___options.js    |  64 ++++
 ...021___options.kmn => k_0500___options.kmn} |   4 +-
 .../keyboards/baseline/k_0500___options.kmx   | Bin 0 -> 558 bytes
 .../baseline/k_0501___options_with_preset.js  |  66 +++++
 ...t.kmn => k_0501___options_with_preset.kmn} |   4 +-
 .../baseline/k_0501___options_with_preset.kmx | Bin 0 -> 594 bytes
 .../baseline/k_0502___options_with_save.js    |  71 +++++
 ...ave.kmn => k_0502___options_with_save.kmn} |   4 +-
 .../baseline/k_0502___options_with_save.kmx   | Bin 0 -> 608 bytes
 .../k_0503___options_with_save_and_preset.js  |  72 +++++
 ...k_0503___options_with_save_and_preset.kmn} |   4 +-
 .../k_0503___options_with_save_and_preset.kmx | Bin 0 -> 658 bytes
 .../baseline/k_0504___options_with_reset.js   |  71 +++++
 ...et.kmn => k_0504___options_with_reset.kmn} |   4 +-
 .../baseline/k_0504___options_with_reset.kmx  | Bin 0 -> 610 bytes
 .../k_0505___options_double_set_reset.js      |  66 +++++
 ... => k_0505___options_double_set_reset.kmn} |   4 +-
 .../k_0505___options_double_set_reset.kmx     | Bin 0 -> 676 bytes
 .../k_0506___options_double_set_staged.js     |  77 +++++
 ...=> k_0506___options_double_set_staged.kmn} |   2 +-
 .../k_0506___options_double_set_staged.kmx    | Bin 0 -> 720 bytes
 .../k_0507___options___double_reset_staged.js |  63 ++++
 ..._0507___options___double_reset_staged.kmn} |   2 +-
 ..._0507___options___double_reset_staged.kmx} | Bin 616 -> 616 bytes
 .../k_0508___options___double_reset.js        |  58 ++++
 ...mn => k_0508___options___double_reset.kmn} |   4 +-
 .../k_0508___options___double_reset.kmx       | Bin 0 -> 586 bytes
 .../baseline/k_050___nul_and_context.js       |   1 -
 .../baseline/k_050___nul_and_context.kmx      | Bin 404 -> 0 bytes
 .../baseline/k_051___if_and_context.js        |   1 -
 .../baseline/k_051___if_and_context.kmx       | Bin 450 -> 0 bytes
 .../baseline/k_052___nul_and_index.js         |   1 -
 .../baseline/k_052___nul_and_index.kmx        | Bin 442 -> 0 bytes
 .../baseline/k_053___if_and_index.js          |   1 -
 .../baseline/k_053___if_and_index.kmx         | Bin 488 -> 0 bytes
 .../baseline/k_054___nul_and_contextex.kmx    | Bin 420 -> 0 bytes
 .../k_055___deadkey_cancelled_by_arrow.js     |   1 -
 .../k_055___deadkey_cancelled_by_arrow.kmx    | Bin 474 -> 0 bytes
 .../baseline/k_0600___system_stores.js        | 211 +++++++++++++
 ..._stores.kmn => k_0600___system_stores.kmn} |   4 +-
 .../baseline/k_0600___system_stores.kmx       | Bin 0 -> 1974 bytes
 .../baseline/k_0601___system_stores_2.js      | 211 +++++++++++++
 ...res_2.kmn => k_0601___system_stores_2.kmn} |   4 +-
 .../baseline/k_0601___system_stores_2.kmx     | Bin 0 -> 1970 bytes
 .../keyboards/baseline/k_0700___caps_lock.js  | 103 +++++++
 ...__caps_lock.kmn => k_0700___caps_lock.kmn} |   2 +-
 .../keyboards/baseline/k_0700___caps_lock.kmx | Bin 0 -> 652 bytes
 .../baseline/k_0701___caps_control.js         | 131 +++++++++
 ..._control.kmn => k_0701___caps_control.kmn} |   2 +-
 .../baseline/k_0701___caps_control.kmx        | Bin 0 -> 882 bytes
 .../baseline/k_0702___caps_always_off.js      |  75 +++++
 ...s_off.kmn => k_0702___caps_always_off.kmn} |   2 +-
 .../baseline/k_0702___caps_always_off.kmx     | Bin 0 -> 574 bytes
 .../k_0703___caps_always_off_initially_on.js  |  75 +++++
 ...k_0703___caps_always_off_initially_on.kmn} |   2 +-
 .../k_0703___caps_always_off_initially_on.kmx | Bin 0 -> 600 bytes
 .../baseline/k_0800___long_context.js         |  40 +++
 ..._context.kmn => k_0800___long_context.kmn} |   2 +-
 .../baseline/k_0800___long_context.kmx        | Bin 0 -> 368 bytes
 .../k_0801___long_context_and_deadkeys.js     |  75 +++++
 ...=> k_0801___long_context_and_deadkeys.kmn} |   2 +-
 .../k_0801___long_context_and_deadkeys.kmx    | Bin 0 -> 1818 bytes
 ..._0802___long_context_and_split_deadkeys.js |  57 ++++
 ...802___long_context_and_split_deadkeys.kmn} |   2 +-
 ...0802___long_context_and_split_deadkeys.kmx | Bin 0 -> 1074 bytes
 .../baseline/k_0803___if_and_context.js       |  51 ++++
 ...ontext.kmn => k_0803___if_and_context.kmn} |   2 +-
 .../baseline/k_0803___if_and_context.kmx      | Bin 0 -> 502 bytes
 .../baseline/k_0804___deadkey_and_context.js  |  64 ++++
 ...t.kmn => k_0804___deadkey_and_context.kmn} |   2 +-
 .../baseline/k_0804___deadkey_and_context.kmx | Bin 0 -> 578 bytes
 .../k_0805___deadkey_and_contextex.js         |  60 ++++
 ...kmn => k_0805___deadkey_and_contextex.kmn} |   2 +-
 .../k_0805___deadkey_and_contextex.kmx        | Bin 0 -> 568 bytes
 .../k_0806___modifier_keys_keep_context.js    |  40 +++
 ...> k_0806___modifier_keys_keep_context.kmn} |   2 +-
 .../k_0806___modifier_keys_keep_context.kmx   | Bin 0 -> 404 bytes
 .../k_0807___enter_invalidates_context.js     |  40 +++
 ...=> k_0807___enter_invalidates_context.kmn} |   2 +-
 .../k_0807___enter_invalidates_context.kmx    | Bin 0 -> 378 bytes
 .../baseline/k_0808___nul_and_context.js      |  43 +++
 ...ntext.kmn => k_0808___nul_and_context.kmn} |   2 +-
 .../baseline/k_0808___nul_and_context.kmx     | Bin 0 -> 406 bytes
 .../baseline/k_0809___if_and_context.js       |  45 +++
 ...ontext.kmn => k_0809___if_and_context.kmn} |   2 +-
 .../baseline/k_0809___if_and_context.kmx      | Bin 0 -> 452 bytes
 .../baseline/k_0810___nul_and_index.js        |  44 +++
 ...d_index.kmn => k_0810___nul_and_index.kmn} |   2 +-
 .../baseline/k_0810___nul_and_index.kmx       | Bin 0 -> 444 bytes
 .../baseline/k_0811___if_and_index.js         |  46 +++
 ...nd_index.kmn => k_0811___if_and_index.kmn} |   2 +-
 .../baseline/k_0811___if_and_index.kmx        | Bin 0 -> 490 bytes
 ...tex.kmn => k_0812___nul_and_contextex.kmn} |   2 +-
 .../baseline/k_0812___nul_and_contextex.kmx   | Bin 0 -> 422 bytes
 .../k_0813___deadkey_cancelled_by_arrow.js    |  52 ++++
 ...> k_0813___deadkey_cancelled_by_arrow.kmn} |   2 +-
 .../k_0813___deadkey_cancelled_by_arrow.kmx   | Bin 0 -> 476 bytes
 .../resources/keyboards/options_with_save.js  |   4 +-
 .../keyboards/test_8568_deadkeys.kmn          |   2 +-
 .../tests/unit/km_core_keyboard_api.tests.cpp |   2 +-
 .../unit/kmnkbd/action_set_api.tests.cpp      |   2 +-
 core/tests/unit/kmnkbd/debug_api.tests.cpp    |  18 +-
 .../unit/kmnkbd/state_context_api.tests.cpp   |  36 +--
 core/tests/unit/kmx/README.md                 |   4 +-
 core/tests/unit/kmx/meson.build               | 106 +++----
 core/tests/unit/wasm/wasm.tests.js            |  22 +-
 developer/src/kmc-kmn/test/compiler.tests.ts  |   6 +-
 .../test/fixtures/kmw/test_options.kmn        |   2 +-
 developer/src/kmcmplib/tests/meson.build      | 103 +++----
 docs/settings/linux/launch.json               |   6 +-
 linux/ibus-keyman/tests/README.md             |   4 +-
 linux/ibus-keyman/tests/testfixture.cpp       |   4 +-
 resources/docker-images/README.md             |   2 +-
 .../test/auto/e2e/baseline/baseline.tests.ts  |  96 +++---
 275 files changed, 3892 insertions(+), 482 deletions(-)
 create mode 100644 common/test/keyboards/baseline/k_0000___null_keyboard.js
 rename common/test/keyboards/baseline/{k_000___null_keyboard.kmn => k_0000___null_keyboard.kmn} (84%)
 create mode 100644 common/test/keyboards/baseline/k_0000___null_keyboard.kmx
 create mode 100644 common/test/keyboards/baseline/k_0001___nul.js
 rename common/test/keyboards/baseline/{k_003___nul.kmn => k_0001___nul.kmn} (83%)
 create mode 100644 common/test/keyboards/baseline/k_0001___nul.kmx
 create mode 100644 common/test/keyboards/baseline/k_0002___nul_with_initial_context.js
 rename common/test/keyboards/baseline/{k_005___nul_with_initial_context.kmn => k_0002___nul_with_initial_context.kmn} (83%)
 create mode 100644 common/test/keyboards/baseline/k_0002___nul_with_initial_context.kmx
 create mode 100644 common/test/keyboards/baseline/k_0003___nul_testing.js
 rename common/test/keyboards/baseline/{k_018___nul_testing.kmn => k_0003___nul_testing.kmn} (87%)
 create mode 100644 common/test/keyboards/baseline/k_0003___nul_testing.kmx
 create mode 100644 common/test/keyboards/baseline/k_0004___space_mnemonic_kbd.js
 rename common/test/keyboards/baseline/{k_017___space_mnemonic_kbd.kmn => k_0004___space_mnemonic_kbd.kmn} (90%)
 create mode 100644 common/test/keyboards/baseline/k_0004___space_mnemonic_kbd.kmx
 create mode 100644 common/test/keyboards/baseline/k_0005___beep.js
 rename common/test/keyboards/baseline/{k_029___beep.kmn => k_0005___beep.kmn} (79%)
 create mode 100644 common/test/keyboards/baseline/k_0005___beep.kmx
 delete mode 100755 common/test/keyboards/baseline/k_000___null_keyboard.js
 delete mode 100644 common/test/keyboards/baseline/k_000___null_keyboard.kmx
 delete mode 100755 common/test/keyboards/baseline/k_001___basic_input_unicodei.js
 delete mode 100644 common/test/keyboards/baseline/k_001___basic_input_unicodei.kmx
 delete mode 100755 common/test/keyboards/baseline/k_002___basic_input_unicode.js
 delete mode 100644 common/test/keyboards/baseline/k_002___basic_input_unicode.kmx
 delete mode 100755 common/test/keyboards/baseline/k_003___nul.js
 delete mode 100644 common/test/keyboards/baseline/k_003___nul.kmx
 delete mode 100755 common/test/keyboards/baseline/k_004___basic_input__shift_2_.js
 delete mode 100644 common/test/keyboards/baseline/k_004___basic_input__shift_2_.kmx
 delete mode 100755 common/test/keyboards/baseline/k_005___nul_with_initial_context.js
 delete mode 100644 common/test/keyboards/baseline/k_005___nul_with_initial_context.kmx
 delete mode 100755 common/test/keyboards/baseline/k_006___vkey_input__shift_ctrl_.js
 delete mode 100644 common/test/keyboards/baseline/k_006___vkey_input__shift_ctrl_.kmx
 delete mode 100755 common/test/keyboards/baseline/k_007___vkey_input__ctrl_alt_.js
 delete mode 100644 common/test/keyboards/baseline/k_007___vkey_input__ctrl_alt_.kmx
 delete mode 100755 common/test/keyboards/baseline/k_008___vkey_input__ctrl_alt_2_.js
 delete mode 100644 common/test/keyboards/baseline/k_008___vkey_input__ctrl_alt_2_.kmx
 create mode 100644 common/test/keyboards/baseline/k_0100___basic_input_unicodei.js
 rename common/test/keyboards/baseline/{k_001___basic_input_unicodei.kmn => k_0100___basic_input_unicodei.kmn} (85%)
 create mode 100644 common/test/keyboards/baseline/k_0100___basic_input_unicodei.kmx
 create mode 100644 common/test/keyboards/baseline/k_0101___basic_input_unicode.js
 rename common/test/keyboards/baseline/{k_002___basic_input_unicode.kmn => k_0101___basic_input_unicode.kmn} (90%)
 create mode 100644 common/test/keyboards/baseline/k_0101___basic_input_unicode.kmx
 create mode 100644 common/test/keyboards/baseline/k_0102___basic_input__shift_2_.js
 rename common/test/keyboards/baseline/{k_004___basic_input__shift_2_.kmn => k_0102___basic_input__shift_2_.kmn} (85%)
 create mode 100644 common/test/keyboards/baseline/k_0102___basic_input__shift_2_.kmx
 create mode 100644 common/test/keyboards/baseline/k_0103___vkey_input__shift_ctrl_.js
 rename common/test/keyboards/baseline/{k_006___vkey_input__shift_ctrl_.kmn => k_0103___vkey_input__shift_ctrl_.kmn} (86%)
 create mode 100644 common/test/keyboards/baseline/k_0103___vkey_input__shift_ctrl_.kmx
 create mode 100644 common/test/keyboards/baseline/k_0104___vkey_input__ctrl_alt_.js
 rename common/test/keyboards/baseline/{k_007___vkey_input__ctrl_alt_.kmn => k_0104___vkey_input__ctrl_alt_.kmn} (85%)
 create mode 100644 common/test/keyboards/baseline/k_0104___vkey_input__ctrl_alt_.kmx
 create mode 100644 common/test/keyboards/baseline/k_0105___vkey_input__ctrl_alt_2_.js
 rename common/test/keyboards/baseline/{k_008___vkey_input__ctrl_alt_2_.kmn => k_0105___vkey_input__ctrl_alt_2_.kmn} (87%)
 create mode 100644 common/test/keyboards/baseline/k_0105___vkey_input__ctrl_alt_2_.kmx
 create mode 100644 common/test/keyboards/baseline/k_0106___smp.js
 rename common/test/keyboards/baseline/{k_028___smp.kmn => k_0106___smp.kmn} (94%)
 create mode 100644 common/test/keyboards/baseline/k_0106___smp.kmx
 create mode 100644 common/test/keyboards/baseline/k_0107___punctkeys.js
 rename common/test/keyboards/baseline/{k_038___punctkeys.kmn => k_0107___punctkeys.kmn} (92%)
 create mode 100644 common/test/keyboards/baseline/k_0107___punctkeys.kmx
 delete mode 100755 common/test/keyboards/baseline/k_012___ralt.js
 delete mode 100644 common/test/keyboards/baseline/k_012___ralt.kmx
 delete mode 100755 common/test/keyboards/baseline/k_013___deadkeys.js
 delete mode 100644 common/test/keyboards/baseline/k_013___deadkeys.kmx
 delete mode 100755 common/test/keyboards/baseline/k_014___groups_and_virtual_keys.js
 delete mode 100644 common/test/keyboards/baseline/k_014___groups_and_virtual_keys.kmx
 delete mode 100755 common/test/keyboards/baseline/k_015___ralt_2.js
 delete mode 100644 common/test/keyboards/baseline/k_015___ralt_2.kmx
 delete mode 100755 common/test/keyboards/baseline/k_017___space_mnemonic_kbd.js
 delete mode 100644 common/test/keyboards/baseline/k_017___space_mnemonic_kbd.kmx
 delete mode 100755 common/test/keyboards/baseline/k_018___nul_testing.js
 delete mode 100644 common/test/keyboards/baseline/k_018___nul_testing.kmx
 delete mode 100755 common/test/keyboards/baseline/k_019___multiple_deadkeys.js
 delete mode 100644 common/test/keyboards/baseline/k_019___multiple_deadkeys.kmx
 create mode 100644 common/test/keyboards/baseline/k_0200___ralt.js
 rename common/test/keyboards/baseline/{k_012___ralt.kmn => k_0200___ralt.kmn} (78%)
 create mode 100644 common/test/keyboards/baseline/k_0200___ralt.kmx
 create mode 100644 common/test/keyboards/baseline/k_0201___ralt_2.js
 rename common/test/keyboards/baseline/{k_015___ralt_2.kmn => k_0201___ralt_2.kmn} (71%)
 create mode 100644 common/test/keyboards/baseline/k_0201___ralt_2.kmx
 create mode 100644 common/test/keyboards/baseline/k_0203___generic_ctrlalt.js
 rename common/test/keyboards/baseline/{k_039___generic_ctrlalt.kmn => k_0203___generic_ctrlalt.kmn} (84%)
 create mode 100644 common/test/keyboards/baseline/k_0203___generic_ctrlalt.kmx
 delete mode 100755 common/test/keyboards/baseline/k_020___deadkeys_and_backspace.js
 delete mode 100755 common/test/keyboards/baseline/k_021___options.js
 delete mode 100644 common/test/keyboards/baseline/k_021___options.kmx
 delete mode 100755 common/test/keyboards/baseline/k_022___options_with_preset.js
 delete mode 100644 common/test/keyboards/baseline/k_022___options_with_preset.kmx
 delete mode 100755 common/test/keyboards/baseline/k_023___options_with_save.js
 delete mode 100644 common/test/keyboards/baseline/k_023___options_with_save.kmx
 delete mode 100755 common/test/keyboards/baseline/k_024___options_with_save_and_preset.js
 delete mode 100644 common/test/keyboards/baseline/k_024___options_with_save_and_preset.kmx
 delete mode 100755 common/test/keyboards/baseline/k_025___options_with_reset.js
 delete mode 100644 common/test/keyboards/baseline/k_025___options_with_reset.kmx
 delete mode 100755 common/test/keyboards/baseline/k_026___system_stores.js
 delete mode 100644 common/test/keyboards/baseline/k_026___system_stores.kmx
 delete mode 100755 common/test/keyboards/baseline/k_027___system_stores_2.js
 delete mode 100644 common/test/keyboards/baseline/k_027___system_stores_2.kmx
 delete mode 100755 common/test/keyboards/baseline/k_028___smp.js
 delete mode 100644 common/test/keyboards/baseline/k_028___smp.kmx
 delete mode 100755 common/test/keyboards/baseline/k_029___beep.js
 delete mode 100644 common/test/keyboards/baseline/k_029___beep.kmx
 create mode 100644 common/test/keyboards/baseline/k_0300___deadkeys.js
 rename common/test/keyboards/baseline/{k_013___deadkeys.kmn => k_0300___deadkeys.kmn} (87%)
 create mode 100644 common/test/keyboards/baseline/k_0300___deadkeys.kmx
 create mode 100644 common/test/keyboards/baseline/k_0301___multiple_deadkeys.js
 rename common/test/keyboards/baseline/{k_019___multiple_deadkeys.kmn => k_0301___multiple_deadkeys.kmn} (97%)
 create mode 100644 common/test/keyboards/baseline/k_0301___multiple_deadkeys.kmx
 create mode 100644 common/test/keyboards/baseline/k_0302___deadkeys_and_backspace.js
 rename common/test/keyboards/baseline/{k_020___deadkeys_and_backspace.kmn => k_0302___deadkeys_and_backspace.kmn} (96%)
 rename common/test/keyboards/baseline/{k_020___deadkeys_and_backspace.kmx => k_0302___deadkeys_and_backspace.kmx} (87%)
 delete mode 100755 common/test/keyboards/baseline/k_030___multiple_groups.js
 delete mode 100755 common/test/keyboards/baseline/k_031___caps_lock.js
 delete mode 100644 common/test/keyboards/baseline/k_031___caps_lock.kmx
 delete mode 100755 common/test/keyboards/baseline/k_032___caps_control.js
 delete mode 100644 common/test/keyboards/baseline/k_032___caps_control.kmx
 delete mode 100755 common/test/keyboards/baseline/k_033___caps_always_off.js
 delete mode 100644 common/test/keyboards/baseline/k_033___caps_always_off.kmx
 delete mode 100755 common/test/keyboards/baseline/k_034___options_double_set_reset.js
 delete mode 100644 common/test/keyboards/baseline/k_034___options_double_set_reset.kmx
 delete mode 100755 common/test/keyboards/baseline/k_035___options_double_set_staged.js
 delete mode 100644 common/test/keyboards/baseline/k_035___options_double_set_staged.kmx
 delete mode 100755 common/test/keyboards/baseline/k_036___options___double_reset_staged.js
 delete mode 100755 common/test/keyboards/baseline/k_037___options___double_reset.js
 delete mode 100644 common/test/keyboards/baseline/k_037___options___double_reset.kmx
 delete mode 100755 common/test/keyboards/baseline/k_038___punctkeys.js
 delete mode 100644 common/test/keyboards/baseline/k_038___punctkeys.kmx
 delete mode 100755 common/test/keyboards/baseline/k_039___generic_ctrlalt.js
 delete mode 100644 common/test/keyboards/baseline/k_039___generic_ctrlalt.kmx
 create mode 100644 common/test/keyboards/baseline/k_0400___groups_and_virtual_keys.js
 rename common/test/keyboards/baseline/{k_014___groups_and_virtual_keys.kmn => k_0400___groups_and_virtual_keys.kmn} (92%)
 create mode 100644 common/test/keyboards/baseline/k_0400___groups_and_virtual_keys.kmx
 create mode 100644 common/test/keyboards/baseline/k_0401___multiple_groups.js
 rename common/test/keyboards/baseline/{k_030___multiple_groups.kmn => k_0401___multiple_groups.kmn} (90%)
 rename common/test/keyboards/baseline/{k_030___multiple_groups.kmx => k_0401___multiple_groups.kmx} (67%)
 create mode 100644 common/test/keyboards/baseline/k_0402___output_and_keystroke.js
 rename common/test/keyboards/baseline/{k_043___output_and_keystroke.kmn => k_0402___output_and_keystroke.kmn} (90%)
 create mode 100644 common/test/keyboards/baseline/k_0402___output_and_keystroke.kmx
 delete mode 100755 common/test/keyboards/baseline/k_040___long_context.js
 delete mode 100644 common/test/keyboards/baseline/k_040___long_context.kmx
 delete mode 100755 common/test/keyboards/baseline/k_041___long_context_and_deadkeys.js
 delete mode 100644 common/test/keyboards/baseline/k_041___long_context_and_deadkeys.kmx
 delete mode 100755 common/test/keyboards/baseline/k_042___long_context_and_split_deadkeys.js
 delete mode 100644 common/test/keyboards/baseline/k_042___long_context_and_split_deadkeys.kmx
 delete mode 100755 common/test/keyboards/baseline/k_043___output_and_keystroke.js
 delete mode 100644 common/test/keyboards/baseline/k_043___output_and_keystroke.kmx
 delete mode 100755 common/test/keyboards/baseline/k_044___if_and_context.js
 delete mode 100644 common/test/keyboards/baseline/k_044___if_and_context.kmx
 delete mode 100755 common/test/keyboards/baseline/k_045___deadkey_and_context.js
 delete mode 100644 common/test/keyboards/baseline/k_045___deadkey_and_context.kmx
 delete mode 100755 common/test/keyboards/baseline/k_046___deadkey_and_contextex.js
 delete mode 100644 common/test/keyboards/baseline/k_046___deadkey_and_contextex.kmx
 delete mode 100755 common/test/keyboards/baseline/k_047___caps_always_off_initially_on.js
 delete mode 100644 common/test/keyboards/baseline/k_047___caps_always_off_initially_on.kmx
 delete mode 100755 common/test/keyboards/baseline/k_048___modifier_keys_keep_context.js
 delete mode 100644 common/test/keyboards/baseline/k_048___modifier_keys_keep_context.kmx
 delete mode 100755 common/test/keyboards/baseline/k_049___enter_invalidates_context.js
 delete mode 100644 common/test/keyboards/baseline/k_049___enter_invalidates_context.kmx
 create mode 100644 common/test/keyboards/baseline/k_0500___options.js
 rename common/test/keyboards/baseline/{k_021___options.kmn => k_0500___options.kmn} (88%)
 create mode 100644 common/test/keyboards/baseline/k_0500___options.kmx
 create mode 100644 common/test/keyboards/baseline/k_0501___options_with_preset.js
 rename common/test/keyboards/baseline/{k_022___options_with_preset.kmn => k_0501___options_with_preset.kmn} (88%)
 create mode 100644 common/test/keyboards/baseline/k_0501___options_with_preset.kmx
 create mode 100644 common/test/keyboards/baseline/k_0502___options_with_save.js
 rename common/test/keyboards/baseline/{k_023___options_with_save.kmn => k_0502___options_with_save.kmn} (88%)
 create mode 100644 common/test/keyboards/baseline/k_0502___options_with_save.kmx
 create mode 100644 common/test/keyboards/baseline/k_0503___options_with_save_and_preset.js
 rename common/test/keyboards/baseline/{k_024___options_with_save_and_preset.kmn => k_0503___options_with_save_and_preset.kmn} (86%)
 create mode 100644 common/test/keyboards/baseline/k_0503___options_with_save_and_preset.kmx
 create mode 100644 common/test/keyboards/baseline/k_0504___options_with_reset.js
 rename common/test/keyboards/baseline/{k_025___options_with_reset.kmn => k_0504___options_with_reset.kmn} (87%)
 create mode 100644 common/test/keyboards/baseline/k_0504___options_with_reset.kmx
 create mode 100644 common/test/keyboards/baseline/k_0505___options_double_set_reset.js
 rename common/test/keyboards/baseline/{k_034___options_double_set_reset.kmn => k_0505___options_double_set_reset.kmn} (87%)
 create mode 100644 common/test/keyboards/baseline/k_0505___options_double_set_reset.kmx
 create mode 100644 common/test/keyboards/baseline/k_0506___options_double_set_staged.js
 rename common/test/keyboards/baseline/{k_035___options_double_set_staged.kmn => k_0506___options_double_set_staged.kmn} (90%)
 create mode 100644 common/test/keyboards/baseline/k_0506___options_double_set_staged.kmx
 create mode 100644 common/test/keyboards/baseline/k_0507___options___double_reset_staged.js
 rename common/test/keyboards/baseline/{k_036___options___double_reset_staged.kmn => k_0507___options___double_reset_staged.kmn} (88%)
 rename common/test/keyboards/baseline/{k_036___options___double_reset_staged.kmx => k_0507___options___double_reset_staged.kmx} (79%)
 create mode 100644 common/test/keyboards/baseline/k_0508___options___double_reset.js
 rename common/test/keyboards/baseline/{k_037___options___double_reset.kmn => k_0508___options___double_reset.kmn} (86%)
 create mode 100644 common/test/keyboards/baseline/k_0508___options___double_reset.kmx
 delete mode 100755 common/test/keyboards/baseline/k_050___nul_and_context.js
 delete mode 100644 common/test/keyboards/baseline/k_050___nul_and_context.kmx
 delete mode 100755 common/test/keyboards/baseline/k_051___if_and_context.js
 delete mode 100644 common/test/keyboards/baseline/k_051___if_and_context.kmx
 delete mode 100755 common/test/keyboards/baseline/k_052___nul_and_index.js
 delete mode 100644 common/test/keyboards/baseline/k_052___nul_and_index.kmx
 delete mode 100755 common/test/keyboards/baseline/k_053___if_and_index.js
 delete mode 100644 common/test/keyboards/baseline/k_053___if_and_index.kmx
 delete mode 100644 common/test/keyboards/baseline/k_054___nul_and_contextex.kmx
 delete mode 100755 common/test/keyboards/baseline/k_055___deadkey_cancelled_by_arrow.js
 delete mode 100644 common/test/keyboards/baseline/k_055___deadkey_cancelled_by_arrow.kmx
 create mode 100644 common/test/keyboards/baseline/k_0600___system_stores.js
 rename common/test/keyboards/baseline/{k_026___system_stores.kmn => k_0600___system_stores.kmn} (94%)
 create mode 100644 common/test/keyboards/baseline/k_0600___system_stores.kmx
 create mode 100644 common/test/keyboards/baseline/k_0601___system_stores_2.js
 rename common/test/keyboards/baseline/{k_027___system_stores_2.kmn => k_0601___system_stores_2.kmn} (93%)
 create mode 100644 common/test/keyboards/baseline/k_0601___system_stores_2.kmx
 create mode 100644 common/test/keyboards/baseline/k_0700___caps_lock.js
 rename common/test/keyboards/baseline/{k_031___caps_lock.kmn => k_0700___caps_lock.kmn} (93%)
 create mode 100644 common/test/keyboards/baseline/k_0700___caps_lock.kmx
 create mode 100644 common/test/keyboards/baseline/k_0701___caps_control.js
 rename common/test/keyboards/baseline/{k_032___caps_control.kmn => k_0701___caps_control.kmn} (96%)
 create mode 100644 common/test/keyboards/baseline/k_0701___caps_control.kmx
 create mode 100644 common/test/keyboards/baseline/k_0702___caps_always_off.js
 rename common/test/keyboards/baseline/{k_033___caps_always_off.kmn => k_0702___caps_always_off.kmn} (90%)
 create mode 100644 common/test/keyboards/baseline/k_0702___caps_always_off.kmx
 create mode 100644 common/test/keyboards/baseline/k_0703___caps_always_off_initially_on.js
 rename common/test/keyboards/baseline/{k_047___caps_always_off_initially_on.kmn => k_0703___caps_always_off_initially_on.kmn} (90%)
 create mode 100644 common/test/keyboards/baseline/k_0703___caps_always_off_initially_on.kmx
 create mode 100644 common/test/keyboards/baseline/k_0800___long_context.js
 rename common/test/keyboards/baseline/{k_040___long_context.kmn => k_0800___long_context.kmn} (91%)
 create mode 100644 common/test/keyboards/baseline/k_0800___long_context.kmx
 create mode 100644 common/test/keyboards/baseline/k_0801___long_context_and_deadkeys.js
 rename common/test/keyboards/baseline/{k_041___long_context_and_deadkeys.kmn => k_0801___long_context_and_deadkeys.kmn} (96%)
 create mode 100644 common/test/keyboards/baseline/k_0801___long_context_and_deadkeys.kmx
 create mode 100644 common/test/keyboards/baseline/k_0802___long_context_and_split_deadkeys.js
 rename common/test/keyboards/baseline/{k_042___long_context_and_split_deadkeys.kmn => k_0802___long_context_and_split_deadkeys.kmn} (93%)
 create mode 100644 common/test/keyboards/baseline/k_0802___long_context_and_split_deadkeys.kmx
 create mode 100644 common/test/keyboards/baseline/k_0803___if_and_context.js
 rename common/test/keyboards/baseline/{k_044___if_and_context.kmn => k_0803___if_and_context.kmn} (91%)
 create mode 100644 common/test/keyboards/baseline/k_0803___if_and_context.kmx
 create mode 100644 common/test/keyboards/baseline/k_0804___deadkey_and_context.js
 rename common/test/keyboards/baseline/{k_045___deadkey_and_context.kmn => k_0804___deadkey_and_context.kmn} (90%)
 create mode 100644 common/test/keyboards/baseline/k_0804___deadkey_and_context.kmx
 create mode 100644 common/test/keyboards/baseline/k_0805___deadkey_and_contextex.js
 rename common/test/keyboards/baseline/{k_046___deadkey_and_contextex.kmn => k_0805___deadkey_and_contextex.kmn} (89%)
 create mode 100644 common/test/keyboards/baseline/k_0805___deadkey_and_contextex.kmx
 create mode 100644 common/test/keyboards/baseline/k_0806___modifier_keys_keep_context.js
 rename common/test/keyboards/baseline/{k_048___modifier_keys_keep_context.kmn => k_0806___modifier_keys_keep_context.kmn} (85%)
 create mode 100644 common/test/keyboards/baseline/k_0806___modifier_keys_keep_context.kmx
 create mode 100644 common/test/keyboards/baseline/k_0807___enter_invalidates_context.js
 rename common/test/keyboards/baseline/{k_049___enter_invalidates_context.kmn => k_0807___enter_invalidates_context.kmn} (89%)
 create mode 100644 common/test/keyboards/baseline/k_0807___enter_invalidates_context.kmx
 create mode 100644 common/test/keyboards/baseline/k_0808___nul_and_context.js
 rename common/test/keyboards/baseline/{k_050___nul_and_context.kmn => k_0808___nul_and_context.kmn} (87%)
 create mode 100644 common/test/keyboards/baseline/k_0808___nul_and_context.kmx
 create mode 100644 common/test/keyboards/baseline/k_0809___if_and_context.js
 rename common/test/keyboards/baseline/{k_051___if_and_context.kmn => k_0809___if_and_context.kmn} (88%)
 create mode 100644 common/test/keyboards/baseline/k_0809___if_and_context.kmx
 create mode 100644 common/test/keyboards/baseline/k_0810___nul_and_index.js
 rename common/test/keyboards/baseline/{k_052___nul_and_index.kmn => k_0810___nul_and_index.kmn} (88%)
 create mode 100644 common/test/keyboards/baseline/k_0810___nul_and_index.kmx
 create mode 100644 common/test/keyboards/baseline/k_0811___if_and_index.js
 rename common/test/keyboards/baseline/{k_053___if_and_index.kmn => k_0811___if_and_index.kmn} (89%)
 create mode 100644 common/test/keyboards/baseline/k_0811___if_and_index.kmx
 rename common/test/keyboards/baseline/{k_054___nul_and_contextex.kmn => k_0812___nul_and_contextex.kmn} (88%)
 create mode 100644 common/test/keyboards/baseline/k_0812___nul_and_contextex.kmx
 create mode 100644 common/test/keyboards/baseline/k_0813___deadkey_cancelled_by_arrow.js
 rename common/test/keyboards/baseline/{k_055___deadkey_cancelled_by_arrow.kmn => k_0813___deadkey_cancelled_by_arrow.kmn} (88%)
 create mode 100644 common/test/keyboards/baseline/k_0813___deadkey_cancelled_by_arrow.kmx

diff --git a/common/test/keyboards/baseline/README.md b/common/test/keyboards/baseline/README.md
index cede1070851..7894490d9bc 100644
--- a/common/test/keyboards/baseline/README.md
+++ b/common/test/keyboards/baseline/README.md
@@ -4,11 +4,13 @@ This folder contains a set of keyboards that are used by multiple projects to
 verify behaviour, both for compilation, and for runtime tests.
 
 The following projects are known to use these keyboards:
+
 * core -- .kmn files only, compiled with kmc during tests
 * developer/kmcmplib -- .kmn files, compiled for tests, and .kmx as reference
 * linux -- .kmn files for test steps only, .kmx files
+* web -- .kmn files for test steps, .kmx and .js files
 
-The .kmx files were built with kmcomp, not kmc, in order to ensure that
+The .kmx and .js files were built with kmcomp, not kmc, in order to ensure that
 developer/kmcmplib gets a valid baseline reference.
 
 Once kmc is stable, it is possible that we will be able to use the kmc npm
@@ -16,9 +18,11 @@ module to build .kmx for all projects that need them.
 
 ## Build parameters
 
-Keyboards were built with debug information and no compiler version embedded,
-with kmcomp 16.0.138:
+The keyboards can be built with:
 
-```bat
-for %d in (*.kmn) do kmcomp -no-compiler-version -d %d
+```bash
+./build.sh build
 ```
+
+This builds the keyboards with debug information and no compiler version
+embedded.
diff --git a/common/test/keyboards/baseline/baseline.kpj b/common/test/keyboards/baseline/baseline.kpj
index 3ce7e9b83c1..5e7c461aac6 100644
--- a/common/test/keyboards/baseline/baseline.kpj
+++ b/common/test/keyboards/baseline/baseline.kpj
@@ -9,324 +9,324 @@
   </Options>
   <Files>
     <File>
-      <ID>id_k_000___null_keyboard</ID>
-      <Filename>k_000___null_keyboard.kmn</Filename>
-      <Filepath>k_000___null_keyboard.kmn</Filepath>
+      <ID>id_k_0000___null_keyboard</ID>
+      <Filename>k_0000___null_keyboard.kmn</Filename>
+      <Filepath>k_0000___null_keyboard.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_001___basic_input_unicodei</ID>
-      <Filename>k_001___basic_input_unicodei.kmn</Filename>
-      <Filepath>k_001___basic_input_unicodei.kmn</Filepath>
+      <ID>id_k_0100___basic_input_unicodei</ID>
+      <Filename>k_0100___basic_input_unicodei.kmn</Filename>
+      <Filepath>k_0100___basic_input_unicodei.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_002___basic_input_unicode</ID>
-      <Filename>k_002___basic_input_unicode.kmn</Filename>
-      <Filepath>k_002___basic_input_unicode.kmn</Filepath>
+      <ID>id_k_0101___basic_input_unicode</ID>
+      <Filename>k_0101___basic_input_unicode.kmn</Filename>
+      <Filepath>k_0101___basic_input_unicode.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_003___nul</ID>
-      <Filename>k_003___nul.kmn</Filename>
-      <Filepath>k_003___nul.kmn</Filepath>
+      <ID>id_k_0001___nul</ID>
+      <Filename>k_0001___nul.kmn</Filename>
+      <Filepath>k_0001___nul.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_004___basic_input__shift_2_</ID>
-      <Filename>k_004___basic_input__shift_2_.kmn</Filename>
-      <Filepath>k_004___basic_input__shift_2_.kmn</Filepath>
+      <ID>id_k_0102___basic_input__shift_2_</ID>
+      <Filename>k_0102___basic_input__shift_2_.kmn</Filename>
+      <Filepath>k_0102___basic_input__shift_2_.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_005___nul_with_initial_context</ID>
-      <Filename>k_005___nul_with_initial_context.kmn</Filename>
-      <Filepath>k_005___nul_with_initial_context.kmn</Filepath>
+      <ID>id_k_0002___nul_with_initial_context</ID>
+      <Filename>k_0002___nul_with_initial_context.kmn</Filename>
+      <Filepath>k_0002___nul_with_initial_context.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_006___vkey_input__shift_ctrl_</ID>
-      <Filename>k_006___vkey_input__shift_ctrl_.kmn</Filename>
-      <Filepath>k_006___vkey_input__shift_ctrl_.kmn</Filepath>
+      <ID>id_k_0103___vkey_input__shift_ctrl_</ID>
+      <Filename>k_0103___vkey_input__shift_ctrl_.kmn</Filename>
+      <Filepath>k_0103___vkey_input__shift_ctrl_.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_007___vkey_input__ctrl_alt_</ID>
-      <Filename>k_007___vkey_input__ctrl_alt_.kmn</Filename>
-      <Filepath>k_007___vkey_input__ctrl_alt_.kmn</Filepath>
+      <ID>id_k_0104___vkey_input__ctrl_alt_</ID>
+      <Filename>k_0104___vkey_input__ctrl_alt_.kmn</Filename>
+      <Filepath>k_0104___vkey_input__ctrl_alt_.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_008___vkey_input__ctrl_alt_2_</ID>
-      <Filename>k_008___vkey_input__ctrl_alt_2_.kmn</Filename>
-      <Filepath>k_008___vkey_input__ctrl_alt_2_.kmn</Filepath>
+      <ID>id_k_0105___vkey_input__ctrl_alt_2_</ID>
+      <Filename>k_0105___vkey_input__ctrl_alt_2_.kmn</Filename>
+      <Filepath>k_0105___vkey_input__ctrl_alt_2_.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_012___ralt</ID>
-      <Filename>k_012___ralt.kmn</Filename>
-      <Filepath>k_012___ralt.kmn</Filepath>
+      <ID>id_k_0200___ralt</ID>
+      <Filename>k_0200___ralt.kmn</Filename>
+      <Filepath>k_0200___ralt.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_013___deadkeys</ID>
-      <Filename>k_013___deadkeys.kmn</Filename>
-      <Filepath>k_013___deadkeys.kmn</Filepath>
+      <ID>id_k_0300___deadkeys</ID>
+      <Filename>k_0300___deadkeys.kmn</Filename>
+      <Filepath>k_0300___deadkeys.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_014___groups_and_virtual_keys</ID>
-      <Filename>k_014___groups_and_virtual_keys.kmn</Filename>
-      <Filepath>k_014___groups_and_virtual_keys.kmn</Filepath>
+      <ID>id_k_0400___groups_and_virtual_keys</ID>
+      <Filename>k_0400___groups_and_virtual_keys.kmn</Filename>
+      <Filepath>k_0400___groups_and_virtual_keys.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_015___ralt_2</ID>
-      <Filename>k_015___ralt_2.kmn</Filename>
-      <Filepath>k_015___ralt_2.kmn</Filepath>
+      <ID>id_k_0201___ralt_2</ID>
+      <Filename>k_0201___ralt_2.kmn</Filename>
+      <Filepath>k_0201___ralt_2.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_017___space_mnemonic_kbd</ID>
-      <Filename>k_017___space_mnemonic_kbd.kmn</Filename>
-      <Filepath>k_017___space_mnemonic_kbd.kmn</Filepath>
+      <ID>id_k_0004___space_mnemonic_kbd</ID>
+      <Filename>k_0004___space_mnemonic_kbd.kmn</Filename>
+      <Filepath>k_0004___space_mnemonic_kbd.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_018___nul_testing</ID>
-      <Filename>k_018___nul_testing.kmn</Filename>
-      <Filepath>k_018___nul_testing.kmn</Filepath>
+      <ID>id_k_0003___nul_testing</ID>
+      <Filename>k_0003___nul_testing.kmn</Filename>
+      <Filepath>k_0003___nul_testing.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_019___multiple_deadkeys</ID>
-      <Filename>k_019___multiple_deadkeys.kmn</Filename>
-      <Filepath>k_019___multiple_deadkeys.kmn</Filepath>
+      <ID>id_k_0301___multiple_deadkeys</ID>
+      <Filename>k_0301___multiple_deadkeys.kmn</Filename>
+      <Filepath>k_0301___multiple_deadkeys.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_020___deadkeys_and_backspace</ID>
-      <Filename>k_020___deadkeys_and_backspace.kmn</Filename>
-      <Filepath>k_020___deadkeys_and_backspace.kmn</Filepath>
+      <ID>id_k_0302___deadkeys_and_backspace</ID>
+      <Filename>k_0302___deadkeys_and_backspace.kmn</Filename>
+      <Filepath>k_0302___deadkeys_and_backspace.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_021___options</ID>
-      <Filename>k_021___options.kmn</Filename>
-      <Filepath>k_021___options.kmn</Filepath>
+      <ID>id_k_0500___options</ID>
+      <Filename>k_0500___options.kmn</Filename>
+      <Filepath>k_0500___options.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_022___options_with_preset</ID>
-      <Filename>k_022___options_with_preset.kmn</Filename>
-      <Filepath>k_022___options_with_preset.kmn</Filepath>
+      <ID>id_k_0501___options_with_preset</ID>
+      <Filename>k_0501___options_with_preset.kmn</Filename>
+      <Filepath>k_0501___options_with_preset.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_023___options_with_save</ID>
-      <Filename>k_023___options_with_save.kmn</Filename>
-      <Filepath>k_023___options_with_save.kmn</Filepath>
+      <ID>id_k_0502___options_with_save</ID>
+      <Filename>k_0502___options_with_save.kmn</Filename>
+      <Filepath>k_0502___options_with_save.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_024___options_with_save_and_preset</ID>
-      <Filename>k_024___options_with_save_and_preset.kmn</Filename>
-      <Filepath>k_024___options_with_save_and_preset.kmn</Filepath>
+      <ID>id_k_0503___options_with_save_and_preset</ID>
+      <Filename>k_0503___options_with_save_and_preset.kmn</Filename>
+      <Filepath>k_0503___options_with_save_and_preset.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_025___options_with_reset</ID>
-      <Filename>k_025___options_with_reset.kmn</Filename>
-      <Filepath>k_025___options_with_reset.kmn</Filepath>
+      <ID>id_k_0504___options_with_reset</ID>
+      <Filename>k_0504___options_with_reset.kmn</Filename>
+      <Filepath>k_0504___options_with_reset.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_026___system_stores</ID>
-      <Filename>k_026___system_stores.kmn</Filename>
-      <Filepath>k_026___system_stores.kmn</Filepath>
+      <ID>id_k_0600___system_stores</ID>
+      <Filename>k_0600___system_stores.kmn</Filename>
+      <Filepath>k_0600___system_stores.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_027___system_stores_2</ID>
-      <Filename>k_027___system_stores_2.kmn</Filename>
-      <Filepath>k_027___system_stores_2.kmn</Filepath>
+      <ID>id_k_0601___system_stores_2</ID>
+      <Filename>k_0601___system_stores_2.kmn</Filename>
+      <Filepath>k_0601___system_stores_2.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_028___smp</ID>
-      <Filename>k_028___smp.kmn</Filename>
-      <Filepath>k_028___smp.kmn</Filepath>
+      <ID>id_k_0106___smp</ID>
+      <Filename>k_0106___smp.kmn</Filename>
+      <Filepath>k_0106___smp.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_029___beep</ID>
-      <Filename>k_029___beep.kmn</Filename>
-      <Filepath>k_029___beep.kmn</Filepath>
+      <ID>id_k_0005___beep</ID>
+      <Filename>k_0005___beep.kmn</Filename>
+      <Filepath>k_0005___beep.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_030___multiple_groups</ID>
-      <Filename>k_030___multiple_groups.kmn</Filename>
-      <Filepath>k_030___multiple_groups.kmn</Filepath>
+      <ID>id_k_0401___multiple_groups</ID>
+      <Filename>k_0401___multiple_groups.kmn</Filename>
+      <Filepath>k_0401___multiple_groups.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_031___caps_lock</ID>
-      <Filename>k_031___caps_lock.kmn</Filename>
-      <Filepath>k_031___caps_lock.kmn</Filepath>
+      <ID>id_k_0700___caps_lock</ID>
+      <Filename>k_0700___caps_lock.kmn</Filename>
+      <Filepath>k_0700___caps_lock.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_032___caps_control</ID>
-      <Filename>k_032___caps_control.kmn</Filename>
-      <Filepath>k_032___caps_control.kmn</Filepath>
+      <ID>id_k_0701___caps_control</ID>
+      <Filename>k_0701___caps_control.kmn</Filename>
+      <Filepath>k_0701___caps_control.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_033___caps_always_off</ID>
-      <Filename>k_033___caps_always_off.kmn</Filename>
-      <Filepath>k_033___caps_always_off.kmn</Filepath>
+      <ID>id_k_0702___caps_always_off</ID>
+      <Filename>k_0702___caps_always_off.kmn</Filename>
+      <Filepath>k_0702___caps_always_off.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_034___options_double_set_reset</ID>
-      <Filename>k_034___options_double_set_reset.kmn</Filename>
-      <Filepath>k_034___options_double_set_reset.kmn</Filepath>
+      <ID>id_k_0505___options_double_set_reset</ID>
+      <Filename>k_0505___options_double_set_reset.kmn</Filename>
+      <Filepath>k_0505___options_double_set_reset.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_035___options_double_set_staged</ID>
-      <Filename>k_035___options_double_set_staged.kmn</Filename>
-      <Filepath>k_035___options_double_set_staged.kmn</Filepath>
+      <ID>id_k_0506___options_double_set_staged</ID>
+      <Filename>k_0506___options_double_set_staged.kmn</Filename>
+      <Filepath>k_0506___options_double_set_staged.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_036___options___double_reset_staged</ID>
-      <Filename>k_036___options___double_reset_staged.kmn</Filename>
-      <Filepath>k_036___options___double_reset_staged.kmn</Filepath>
+      <ID>id_k_0507___options___double_reset_staged</ID>
+      <Filename>k_0507___options___double_reset_staged.kmn</Filename>
+      <Filepath>k_0507___options___double_reset_staged.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_037___options___double_reset</ID>
-      <Filename>k_037___options___double_reset.kmn</Filename>
-      <Filepath>k_037___options___double_reset.kmn</Filepath>
+      <ID>id_k_0508___options___double_reset</ID>
+      <Filename>k_0508___options___double_reset.kmn</Filename>
+      <Filepath>k_0508___options___double_reset.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_038___punctkeys</ID>
-      <Filename>k_038___punctkeys.kmn</Filename>
-      <Filepath>k_038___punctkeys.kmn</Filepath>
+      <ID>id_k_0107___punctkeys</ID>
+      <Filename>k_0107___punctkeys.kmn</Filename>
+      <Filepath>k_0107___punctkeys.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_039___generic_ctrlalt</ID>
-      <Filename>k_039___generic_ctrlalt.kmn</Filename>
-      <Filepath>k_039___generic_ctrlalt.kmn</Filepath>
+      <ID>id_k_0203___generic_ctrlalt</ID>
+      <Filename>k_0203___generic_ctrlalt.kmn</Filename>
+      <Filepath>k_0203___generic_ctrlalt.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_040___long_context</ID>
-      <Filename>k_040___long_context.kmn</Filename>
-      <Filepath>k_040___long_context.kmn</Filepath>
+      <ID>id_k_0800___long_context</ID>
+      <Filename>k_0800___long_context.kmn</Filename>
+      <Filepath>k_0800___long_context.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_041___long_context_and_deadkeys</ID>
-      <Filename>k_041___long_context_and_deadkeys.kmn</Filename>
-      <Filepath>k_041___long_context_and_deadkeys.kmn</Filepath>
+      <ID>id_k_0801___long_context_and_deadkeys</ID>
+      <Filename>k_0801___long_context_and_deadkeys.kmn</Filename>
+      <Filepath>k_0801___long_context_and_deadkeys.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_042___long_context_and_split_deadkeys</ID>
-      <Filename>k_042___long_context_and_split_deadkeys.kmn</Filename>
-      <Filepath>k_042___long_context_and_split_deadkeys.kmn</Filepath>
+      <ID>id_k_0802___long_context_and_split_deadkeys</ID>
+      <Filename>k_0802___long_context_and_split_deadkeys.kmn</Filename>
+      <Filepath>k_0802___long_context_and_split_deadkeys.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_043___output_and_keystroke</ID>
-      <Filename>k_043___output_and_keystroke.kmn</Filename>
-      <Filepath>k_043___output_and_keystroke.kmn</Filepath>
+      <ID>id_k_0402___output_and_keystroke</ID>
+      <Filename>k_0402___output_and_keystroke.kmn</Filename>
+      <Filepath>k_0402___output_and_keystroke.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_044___if_and_context</ID>
-      <Filename>k_044___if_and_context.kmn</Filename>
-      <Filepath>k_044___if_and_context.kmn</Filepath>
+      <ID>id_k_0803___if_and_context</ID>
+      <Filename>k_0803___if_and_context.kmn</Filename>
+      <Filepath>k_0803___if_and_context.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_045___deadkey_and_context</ID>
-      <Filename>k_045___deadkey_and_context.kmn</Filename>
-      <Filepath>k_045___deadkey_and_context.kmn</Filepath>
+      <ID>id_k_0804___deadkey_and_context</ID>
+      <Filename>k_0804___deadkey_and_context.kmn</Filename>
+      <Filepath>k_0804___deadkey_and_context.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_046___deadkey_and_contextex</ID>
-      <Filename>k_046___deadkey_and_contextex.kmn</Filename>
-      <Filepath>k_046___deadkey_and_contextex.kmn</Filepath>
+      <ID>id_k_0805___deadkey_and_contextex</ID>
+      <Filename>k_0805___deadkey_and_contextex.kmn</Filename>
+      <Filepath>k_0805___deadkey_and_contextex.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_047___caps_always_off_initially_on</ID>
-      <Filename>k_047___caps_always_off_initially_on.kmn</Filename>
-      <Filepath>k_047___caps_always_off_initially_on.kmn</Filepath>
+      <ID>id_k_0703___caps_always_off_initially_on</ID>
+      <Filename>k_0703___caps_always_off_initially_on.kmn</Filename>
+      <Filepath>k_0703___caps_always_off_initially_on.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_048___modifier_keys_keep_context</ID>
-      <Filename>k_048___modifier_keys_keep_context.kmn</Filename>
-      <Filepath>k_048___modifier_keys_keep_context.kmn</Filepath>
+      <ID>id_k_0806___modifier_keys_keep_context</ID>
+      <Filename>k_0806___modifier_keys_keep_context.kmn</Filename>
+      <Filepath>k_0806___modifier_keys_keep_context.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
     <File>
-      <ID>id_k_049___enter_invalidates_context</ID>
-      <Filename>k_049___enter_invalidates_context.kmn</Filename>
-      <Filepath>k_049___enter_invalidates_context.kmn</Filepath>
+      <ID>id_k_0807___enter_invalidates_context</ID>
+      <Filename>k_0807___enter_invalidates_context.kmn</Filename>
+      <Filepath>k_0807___enter_invalidates_context.kmn</Filepath>
       <FileVersion>1.0</FileVersion>
       <FileType>.kmn</FileType>
     </File>
diff --git a/common/test/keyboards/baseline/build.sh b/common/test/keyboards/baseline/build.sh
index 1428b5e0c48..3a1e8d9f1ec 100755
--- a/common/test/keyboards/baseline/build.sh
+++ b/common/test/keyboards/baseline/build.sh
@@ -17,7 +17,7 @@ builder_parse "$@"
 
 builder_describe_outputs \
   configure   kmcomp/kmcomp.exe \
-  build       k_000___null_keyboard.kmx
+  build       k_0000___null_keyboard.kmx
 
 do_configure() {
   mkdir -p kmcomp
@@ -25,9 +25,15 @@ do_configure() {
 }
 
 do_build() {
-  local name
+  local name jsname
   for name in *.kmn; do
-    ./kmcomp/kmcomp.exe -no-compiler-version -d "$name"
+    jsname="$(basename "${name%.kmn}").js"
+    ./kmcomp/kmcomp.exe -no-compiler-version -d "${name}"
+    if [[ "${name}" != "k_0812___nul_and_contextex.kmn" ]]; then
+      # k_0812___nul_and_contextex.kmn fails to compile because contextex
+      # is not currently supported in context() match, so we skip it
+      ./kmcomp/kmcomp.exe -no-compiler-version -d "${name}" "${jsname}"
+    fi
   done
 }
 
diff --git a/common/test/keyboards/baseline/k_0000___null_keyboard.js b/common/test/keyboards/baseline/k_0000___null_keyboard.js
new file mode 100644
index 00000000000..076ec597c48
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0000___null_keyboard.js
@@ -0,0 +1,28 @@
+
+KeymanWeb.KR(new Keyboard_k_0000___null_keyboard());
+
+function Keyboard_k_0000___null_keyboard()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0000___null_keyboard";
+  this.KN="0000 - null keyboard";
+  this.KMINVER="6.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0000;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_000___null_keyboard.kmn b/common/test/keyboards/baseline/k_0000___null_keyboard.kmn
similarity index 84%
rename from common/test/keyboards/baseline/k_000___null_keyboard.kmn
rename to common/test/keyboards/baseline/k_0000___null_keyboard.kmn
index ecae49acde0..57321e6d63d 100644
--- a/common/test/keyboards/baseline/k_000___null_keyboard.kmn
+++ b/common/test/keyboards/baseline/k_0000___null_keyboard.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '000 - null keyboard'
+store(&NAME) '0000 - null keyboard'
 c Description: Tests null keyboard
 c keys: [K_A][RALT K_B][SHIFT K_C]
 c expected: aC
diff --git a/common/test/keyboards/baseline/k_0000___null_keyboard.kmx b/common/test/keyboards/baseline/k_0000___null_keyboard.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..dfc85b5e2a75c78953aab55f2e514ac73f4dc574
GIT binary patch
literal 318
zcmX|+u?_)26h*H@5S5BXq0*5hq7)>e5E>-gVig;#WQD{ZD8v_t|L_N*rSuIdJ!dDo
z-sH@@cXQvHnVvlwDk0gA`&C3N*a#$(H#zf&UxM@>jnJ4yIl=*QaE22k;RY8-!3&;{
zfe*aHJk6XqSkzKabM3X#M4qWF^k5ZK0#92lSp_YOZ>lv;Uk=`)25PCV4tZT=Gq0!}
rK3^NTID?55RoS~{VxL|&RD;{w8dJHN;dSVfYP>7@C#4A_Ziza7;Y}tP

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0001___nul.js b/common/test/keyboards/baseline/k_0001___nul.js
new file mode 100644
index 00000000000..d33ee337cf4
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0001___nul.js
@@ -0,0 +1,42 @@
+
+KeymanWeb.KR(new Keyboard_k_0001___nul());
+
+function Keyboard_k_0001___nul()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0001___nul";
+  this.KN="0001 - nul";
+  this.KMINVER="6.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0000;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4000, 0x41)) {
+      if(k.KN(0,t)){
+        r=m=1;   // Line 13
+        k.KO(0,t,"b");
+      }
+      else if(k.KCM(1,t,"b",1)){
+        r=m=1;   // Line 14
+        k.KO(1,t,"c");
+      }
+      else if(1){
+        r=m=1;   // Line 15
+        k.KO(0,t,"d");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_003___nul.kmn b/common/test/keyboards/baseline/k_0001___nul.kmn
similarity index 83%
rename from common/test/keyboards/baseline/k_003___nul.kmn
rename to common/test/keyboards/baseline/k_0001___nul.kmn
index 32f6e84839a..44d92b628c7 100644
--- a/common/test/keyboards/baseline/k_003___nul.kmn
+++ b/common/test/keyboards/baseline/k_0001___nul.kmn
@@ -1,8 +1,8 @@
-store(&NAME) '003 - nul'
+store(&NAME) '0001 - nul'
 c Description: Tests nul context
 c keys: [K_A][K_A][K_A]
 c expected: cd
-c context: 
+c context:
 
 store(&version) '6.0'
 
diff --git a/common/test/keyboards/baseline/k_0001___nul.kmx b/common/test/keyboards/baseline/k_0001___nul.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..6795c349f5ca88367cf28a43109f64125adae061
GIT binary patch
literal 380
zcmYL^JxT*n7)6gLn#P|>J4qF6B9lh2(|}k6ZA`#+%m@j@5h4bZEWkptg5WA_1D3AA
zLb8Mu_TzcO(|mB=yZ3(Y4ovI1eZ@LdX5TZMm2fylr9KJTuyB<BGmZ~;O<v_i_GBs(
z*^qa6lZt%GhwR8)zM}r|UPvO);+7}wNXbi|m?t!-QkR@Z2Ie&`Ipu;g^$~|<x5mis
zkO%tQm+gi<ICoq1ZE7CAc`Qvj>ONgxX0~A8zd4Y<SycqP?4`QRxXxVlBxGAL%k{&U
UZO3e+f0i44QLK4(CAduB7e%Zpu>b%7

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0002___nul_with_initial_context.js b/common/test/keyboards/baseline/k_0002___nul_with_initial_context.js
new file mode 100644
index 00000000000..ca42f2a1f3e
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0002___nul_with_initial_context.js
@@ -0,0 +1,42 @@
+
+KeymanWeb.KR(new Keyboard_k_0002___nul_with_initial_context());
+
+function Keyboard_k_0002___nul_with_initial_context()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0002___nul_with_initial_context";
+  this.KN="0002 - nul with initial context";
+  this.KMINVER="6.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0000;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4000, 0x41)) {
+      if(k.KN(0,t)){
+        r=m=1;   // Line 13
+        k.KO(0,t,"b");
+      }
+      else if(k.KCM(1,t,"b",1)){
+        r=m=1;   // Line 14
+        k.KO(1,t,"c");
+      }
+      else if(1){
+        r=m=1;   // Line 15
+        k.KO(0,t,"d");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_005___nul_with_initial_context.kmn b/common/test/keyboards/baseline/k_0002___nul_with_initial_context.kmn
similarity index 83%
rename from common/test/keyboards/baseline/k_005___nul_with_initial_context.kmn
rename to common/test/keyboards/baseline/k_0002___nul_with_initial_context.kmn
index f59016cbe18..4ae05e6ba4a 100644
--- a/common/test/keyboards/baseline/k_005___nul_with_initial_context.kmn
+++ b/common/test/keyboards/baseline/k_0002___nul_with_initial_context.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '005 - nul with initial context'
+store(&NAME) '0002 - nul with initial context'
 c Description: Tests nul context with an initial context supplied
 c keys: [K_A][K_A]
 c expected: xdd
diff --git a/common/test/keyboards/baseline/k_0002___nul_with_initial_context.kmx b/common/test/keyboards/baseline/k_0002___nul_with_initial_context.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..3d89b790f5c1efdd874bb9926f226f54a4851b42
GIT binary patch
literal 422
zcmYL?yGlbr6h&7ss04g8Dp*LWbjsBtV5fp81TB1k*j*FB3nqfb*B59ZDXc7lScsqH
z2Uz+8*EPeaXIL|P?=xqnb#$=LDAXQ~XRs<^vy7r%^UMrOOZitH>Ef)(lRV0t3}ql=
z@+q$}F5mJc(^7M`DnT!J&P%3-7N^|PC8rmCW}dM^oki(!&AI0-1%1v`g;~&r6QR@Q
z!ldsjcka+&mvwg7R5w|Qzcje9f60|o;WjM0V9RdZyLo&SR?Rjzj6Z~TJ5IrN1@`2(
pMijyR&*i#_)E?M+mXJ-R>_tCJ*;LBj^zU+_FUzWXTY~Ed`~X>QFe?B6

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0003___nul_testing.js b/common/test/keyboards/baseline/k_0003___nul_testing.js
new file mode 100644
index 00000000000..330a614dba6
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0003___nul_testing.js
@@ -0,0 +1,34 @@
+
+KeymanWeb.KR(new Keyboard_k_0003___nul_testing());
+
+function Keyboard_k_0003___nul_testing()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0003___nul_testing";
+  this.KN="0003 - nul testing";
+  this.KMINVER="9.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0000;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4000, 0x41)) {
+      if(k.KN(0,t)){
+        r=m=1;   // Line 12
+        k.KO(0,t,"OK");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_018___nul_testing.kmn b/common/test/keyboards/baseline/k_0003___nul_testing.kmn
similarity index 87%
rename from common/test/keyboards/baseline/k_018___nul_testing.kmn
rename to common/test/keyboards/baseline/k_0003___nul_testing.kmn
index 20da4d4af70..87fc78f86fe 100644
--- a/common/test/keyboards/baseline/k_018___nul_testing.kmn
+++ b/common/test/keyboards/baseline/k_0003___nul_testing.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '018 - nul testing'
+store(&NAME) '0003 - nul testing'
 c Description: Tests the processing of nul in LHS of rules
 c keys: [K_A][K_A]
 c expected: OKa
diff --git a/common/test/keyboards/baseline/k_0003___nul_testing.kmx b/common/test/keyboards/baseline/k_0003___nul_testing.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..e30ca2494d2e94423d3ad0931da3603ea299dc3d
GIT binary patch
literal 386
zcmYL_J4yp#6h==lr~wNLQLsvtB48LFO*$2VhF}6_lvs`rB%rbI0g9C?u&@wUAg;p&
zxByGnV5{f;M7+bf|99Uook8BG0(b9^Ia(>4HYK6g1I3S~Ox9(RhjHV)nP+*D1$mVh
ziTMwClWF;qPnnRiv){h6vZ$Vu&<)?ZWNPSe!Y$_%j8dGL&se3(l8m_K%=gN!Oa0Ky
zseLuNY_LO1-K3Fr)z~-QrB9olb==aF75!S8**2ehvBiP$vL9?YTXj>BcE>i@WY0T8
hj=131%P=Uxq5N6M;D4?#ni-dGEZs}bTk%iJ`d=jsEAs#V

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0004___space_mnemonic_kbd.js b/common/test/keyboards/baseline/k_0004___space_mnemonic_kbd.js
new file mode 100644
index 00000000000..a4ee094cb5c
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0004___space_mnemonic_kbd.js
@@ -0,0 +1,46 @@
+
+KeymanWeb.KR(new Keyboard_k_0004___space_mnemonic_kbd());
+
+function Keyboard_k_0004___space_mnemonic_kbd()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0004___space_mnemonic_kbd";
+  this.KN="0004 - space mnemonic kbd";
+  this.KMINVER="9.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=1;
+  this.KBVER="1.0";
+  this.KMBM=0x0000;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.g_main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4000, 0x20)) {
+      if(k.KCM(2,t,"ab",2)){
+        r=m=1;   // Line 14
+        k.KO(2,t,"X");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x64)) {
+      if(k.KCM(2,t,"c ",2)){
+        r=m=1;   // Line 15
+        k.KO(2,t,"Y");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x65)) {
+      if(k.KCM(2,t," d",2)){
+        r=m=1;   // Line 16
+        k.KO(2,t,"Z");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_017___space_mnemonic_kbd.kmn b/common/test/keyboards/baseline/k_0004___space_mnemonic_kbd.kmn
similarity index 90%
rename from common/test/keyboards/baseline/k_017___space_mnemonic_kbd.kmn
rename to common/test/keyboards/baseline/k_0004___space_mnemonic_kbd.kmn
index 07e37ee681b..2660d114d4e 100644
--- a/common/test/keyboards/baseline/k_017___space_mnemonic_kbd.kmn
+++ b/common/test/keyboards/baseline/k_0004___space_mnemonic_kbd.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '017 - space mnemonic kbd'
+store(&NAME) '0004 - space mnemonic kbd'
 c Description: Tests Space handling in mnemonic keyboards (failed with Win 98)
 c keys: [K_A][K_B][K_SPACE][K_C][K_SPACE][K_D][K_SPACE][K_D][K_E]
 c expected: XYZ
diff --git a/common/test/keyboards/baseline/k_0004___space_mnemonic_kbd.kmx b/common/test/keyboards/baseline/k_0004___space_mnemonic_kbd.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..b256ace5368ea0457911922440f569265136c804
GIT binary patch
literal 508
zcmZ9Ize)o^5Ql$3h}tCDXeV2xOSoJtw9*K{NKhe(a@w65P&5}oEn?+kSc*uVKzsvV
z!@^1=Rf<%iezTqk4tzU*cV>1QQM;vS>G^uFA|zu6G6iO@!VSh3g6XBItUl7hIU)~m
z2lMa<1DJ$&cmnJ731gUm1@6wkEOv-4nU5Wzo2i|kk0Br~HPlgGUBybg9}o|;D5oM^
z=$y<UHIAAD-Bk~LLd@w@2Rh<bL0hV7Q#I^mm3-%dcJZ5PX+zuOr3$%<LM^H6@6?I6
znP1Z${!i@xj5DV9nRum3UlVe!)8Dp<*}`@%`*~~HN%!ipQ-}C%M!JVzvHvmm@211c
nfyoQ0SFrcweMEZ0AA)tWUo;uvk0HX2dB6Pj_8ZbZIN#wLFrz%!

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0005___beep.js b/common/test/keyboards/baseline/k_0005___beep.js
new file mode 100644
index 00000000000..e0d19f0651e
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0005___beep.js
@@ -0,0 +1,40 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0005___beep());
+}
+function Keyboard_k_0005___beep()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0005___beep";
+  this.KN="0005 - beep";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 13
+        k.KDC(0,t);
+        k.KB(t);
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_029___beep.kmn b/common/test/keyboards/baseline/k_0005___beep.kmn
similarity index 79%
rename from common/test/keyboards/baseline/k_029___beep.kmn
rename to common/test/keyboards/baseline/k_0005___beep.kmn
index 65e650ee44b..b9b9fcab8cb 100644
--- a/common/test/keyboards/baseline/k_029___beep.kmn
+++ b/common/test/keyboards/baseline/k_0005___beep.kmn
@@ -1,8 +1,8 @@
-store(&NAME) '029 - beep'
+store(&NAME) '0005 - beep'
 c Description: Tests beep
 c keys: [K_1]
 c expected: \b
-c context: 
+c context:
 
 store(&version) '10.0'
 
diff --git a/common/test/keyboards/baseline/k_0005___beep.kmx b/common/test/keyboards/baseline/k_0005___beep.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..c491183f26c8add7d26113a810c1570de0b4c414
GIT binary patch
literal 328
zcmYL^ISRs16h*I%iXd2ND;8EN320%bf&&CC9KhBgMG6NL1YLoJxB_t*F2LF~Sh)lX
zyLf(Zxcrmc|L%JazBBCi6q9zvVpk|+J}3;vS0IM*5%#Cnr!h(80DDNm362nf3!EVe
zH@HFq9&rEo7yl<%AUSfi)l4JJgS$oDQb}p$VNB|3Ns?7ZRkc;e+jJCy`K&hNE3M^e
x5p1wYr6y^b?h$pfw+uB6@SY}gPMMN2yeJ1>8Eg2@nO$)cS2#os@O|@A=?%KLC4v9|

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_000___null_keyboard.js b/common/test/keyboards/baseline/k_000___null_keyboard.js
deleted file mode 100755
index d22b7f3287d..00000000000
--- a/common/test/keyboards/baseline/k_000___null_keyboard.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_000___null_keyboard());function Keyboard_k_000___null_keyboard(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_000___null_keyboard";this.KN="000 - null keyboard";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_000___null_keyboard.kmx b/common/test/keyboards/baseline/k_000___null_keyboard.kmx
deleted file mode 100644
index 2ac1a0f65f7eacb2c86137b5e428632f5695f5e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 316
zcmX|+u@1pt6on519Ze*rPTeYHFd2}DL0FJjQA2}DDkR>(AQHQH91mdh0tO~8z}G+J
zG~eHQPtLu6+Zhe|%1Ec@!xc)!2f{LSop%xQgDC&1CBZz-0rpUUGaMlcSGa%$cep_g
z-tbCli#=)Z=%tQk+G(k=LeqQro@}`gYNG{@t+`1}v?3SDC+VoChPrA|S5-3G9Bs)(
qS}PzK?<=dq*)|)y%m#@Y-`&)ZF3^;$&zw}@tA2k;YlOuuzsWCa8zr>>

diff --git a/common/test/keyboards/baseline/k_001___basic_input_unicodei.js b/common/test/keyboards/baseline/k_001___basic_input_unicodei.js
deleted file mode 100755
index 2c6ff5d98aa..00000000000
--- a/common/test/keyboards/baseline/k_001___basic_input_unicodei.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_001___basic_input_unicodei());function Keyboard_k_001___basic_input_unicodei(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_001___basic_input_unicodei";this.KN="001 - basic input UnicodeI";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0010;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,65)) {if(1){r=m=1;k.KO(0,t,"a");}}else if(k.KKM(e,16400,66)) {if(1){r=m=1;k.KO(0,t,"b");}}else if(k.KKM(e,16400,67)) {if(1){r=m=1;k.KO(0,t,"c");}}else if(k.KKM(e,16400,70)) {if(k.KCM(2,t,"DE",2)){r=m=1;k.KO(2,t,"def");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_001___basic_input_unicodei.kmx b/common/test/keyboards/baseline/k_001___basic_input_unicodei.kmx
deleted file mode 100644
index 82f60cd001d0ba9bf984253ea81e87a41d1a3df4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 440
zcmZ9HF-t;G7=~X#s>M<e8*{o_p-a*tYNdtLl0xg%5*+l3R?t6ah~@@y2#0WN>WBCP
z8vP9}_MDHCLLWTmzVG{;^TMs)Hg2>fr4OQln3y{lBGV<l0pW^4uIJld%#ggo3+%%f
z-e4Q%Fo7Ldzz-zB6)(L`qmz(xx$3&tvw8~EH=iTVE2~3jk&e_=8{K6;(4!vEO|(lR
z-SPU8cY&@|)|JlD$2zj^Ku>Ik)(}~Ho@S}WHp|`6I;9h`%D+yj7?UpGZ{i4NH}A^0
tgkQh28bbxY>$3^|15WXKKAYk{p^8uWY=-}W(0t3zww><pI;b=IuU|25FM0p~

diff --git a/common/test/keyboards/baseline/k_002___basic_input_unicode.js b/common/test/keyboards/baseline/k_002___basic_input_unicode.js
deleted file mode 100755
index 660dbc905e8..00000000000
--- a/common/test/keyboards/baseline/k_002___basic_input_unicode.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_002___basic_input_unicode());function Keyboard_k_002___basic_input_unicode(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_002___basic_input_unicode";this.KN="002 - basic input Unicode";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0010;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,65)) {if(1){r=m=1;k.KO(0,t,"ก");}}else if(k.KKM(e,16400,66)) {if(1){r=m=1;k.KO(0,t,"ข");}}else if(k.KKM(e,16400,67)) {if(1){r=m=1;k.KO(0,t,"ฃ");}}else if(k.KKM(e,16400,70)) {if(k.KCM(2,t,"DE",2)){r=m=1;k.KO(2,t,"คฅฆ");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_002___basic_input_unicode.kmx b/common/test/keyboards/baseline/k_002___basic_input_unicode.kmx
deleted file mode 100644
index 5f1497a29e0dd26ad493c5cf04d65c69f09cd7e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 438
zcmZXPKTAS!6o%iMrY+w747D1Fo1zXu(2!O(NG=w*G-x?Eq>>f%4I09+K_tXM8lC(K
z?S6npKZBF?+{3RLJn)?RzVG>+1GiMYtSBONuRr%ic|oIyOds=25Pnn0znZ#-yCkph
z0(&rk9z<aV@2~-L_<}81!oukt?)Z?wOC>e*tUJ}zGM^#ODXtXMNxN$52Hj-d(W4&F
zSLh&Z>y~XPsj~9A&>8wbX}g@%6SI5UZ`<vxvdqt!#(7(_i_#%kVddhHCl%qh!id2B
y@8xkZH-2N(hXUSr*#JL;6a1#jM))xl@!Kx@z)!%l#Wm|8>tTQ0kDyNNzkUEQ)Gq!2

diff --git a/common/test/keyboards/baseline/k_003___nul.js b/common/test/keyboards/baseline/k_003___nul.js
deleted file mode 100755
index 8adf3b1c69d..00000000000
--- a/common/test/keyboards/baseline/k_003___nul.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_003___nul());function Keyboard_k_003___nul(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_003___nul";this.KN="003 - nul";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(k.KN(0,t)){r=m=1;k.KO(0,t,"b");}else if(k.KCM(1,t,"b",1)){r=m=1;k.KO(1,t,"c");}else if(1){r=m=1;k.KO(0,t,"d");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_003___nul.kmx b/common/test/keyboards/baseline/k_003___nul.kmx
deleted file mode 100644
index 9a5e835e04af55f0c3f11b84877e9e2d3df8e107..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 378
zcmYL^u}%U(6h$wQfQ>>Wjm1{mL6(@9*r5rr*hqsWw7a0mCd+C-4DtmO#4j**{(v2g
zCEs90M{D5^jAu3jyyVQ>d*6GLOxU~aswA1s=TcO`9u!foTiiuLLm_uHbAu-&3z$O<
z-r)_(@C6@m2rKx8Dy-qh=|ApY2tW#TuU8EfDa(C8ekM<K$TU$(>Z_wm-KdQ|S0mr_
z^}^;zV<mdbcbjU`zozRk8<E==FW^dd=tO-c2W&~F{KbcD9U!dT??t#H*N$mDfX$9w
Ymg1jWR&m)gehM+(m?CE%tQ&yz4<x}WLjV8(

diff --git a/common/test/keyboards/baseline/k_004___basic_input__shift_2_.js b/common/test/keyboards/baseline/k_004___basic_input__shift_2_.js
deleted file mode 100755
index de9374fe920..00000000000
--- a/common/test/keyboards/baseline/k_004___basic_input__shift_2_.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_004___basic_input__shift_2_());function Keyboard_k_004___basic_input__shift_2_(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_004___basic_input__shift_2_";this.KN="004 - basic input (shift 2)";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0010;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,65)) {if(1){r=m=1;k.KO(0,t,"ก");}}else if(k.KKM(e,16400,66)) {if(1){r=m=1;k.KO(0,t,"ข");}}else if(k.KKM(e,16400,67)) {if(1){r=m=1;k.KO(0,t,"ฃ");}}else if(k.KKM(e,16400,70)) {if(k.KCM(2,t,"DE",2)){r=m=1;k.KO(2,t,"คฅฆ");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_004___basic_input__shift_2_.kmx b/common/test/keyboards/baseline/k_004___basic_input__shift_2_.kmx
deleted file mode 100644
index c465d596d5fc7f7f50881ad8b4377414a05458cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 442
zcmYL^%}PR16ouDSQzzZ5flVEW4GK*Onq4gwl$ul!G_pT*kVaO}8#D+XAVL~MgJ{^O
z2k`+KI0$-!K)<^=)`st#wbnj+UvBeoe@}7gr+73L<%I`DWIEu^5l$%NUwyiVX_5!H
zhh=zz0VH4qLrB6md_f8#%>Fu^MlV4gFEw?hJ6))yuK7H9Ng1ueF=<~NouE7PFLk49
zbdI!5a&B&2D@<m!tFm@fMQ>=$wr6$A_AA@bv;74X=-26Hc-ykA(k59&2fPTs)zc|c
zQs7Aqm{klB+W)ySZXQyB^hj$66}<1VXZ#Cn;TK%?ihqL|e$i#`_z&>HK}GD0+8Oib
K{5Wdc{%Z;dQ!p?9

diff --git a/common/test/keyboards/baseline/k_005___nul_with_initial_context.js b/common/test/keyboards/baseline/k_005___nul_with_initial_context.js
deleted file mode 100755
index 114018d2f4b..00000000000
--- a/common/test/keyboards/baseline/k_005___nul_with_initial_context.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_005___nul_with_initial_context());function Keyboard_k_005___nul_with_initial_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_005___nul_with_initial_context";this.KN="005 - nul with initial context";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(k.KN(0,t)){r=m=1;k.KO(0,t,"b");}else if(k.KCM(1,t,"b",1)){r=m=1;k.KO(1,t,"c");}else if(1){r=m=1;k.KO(0,t,"d");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_005___nul_with_initial_context.kmx b/common/test/keyboards/baseline/k_005___nul_with_initial_context.kmx
deleted file mode 100644
index 53f9889b32f3e3fa150a9bbfb94fe118d5f532c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 420
zcmYL?yDmgg6o$V+(70466jM!SG71uvOM+rTBuKQ!jKoP83FGz#iixNcB2$Rh;7Rn9
z-r)Gw&cQnQ_Wu8Wt+h|{U~iXUcw2t|#Hz$$86~~qT{kQ&<zKy)gHt9wxsz#mmU|hI
z59!OOe9M<ihIe;BLeF~7NJ9-xj=1HNj85_m^98ERNry{LysydWa;(bDLg&s$r^T5`
z*EeoFp~g0=Y_YChq@Mm!<I4Uy7jDHg%=^Kn-Kw)$dKH$;*4R&fh<Dp=!A1pk<hKSD
nVgL6s-B{V~*?N%3#>?zc|5RoZW!Bff$f3R{hCEvmt}XBbj07=#

diff --git a/common/test/keyboards/baseline/k_006___vkey_input__shift_ctrl_.js b/common/test/keyboards/baseline/k_006___vkey_input__shift_ctrl_.js
deleted file mode 100755
index 28e7b1525d3..00000000000
--- a/common/test/keyboards/baseline/k_006___vkey_input__shift_ctrl_.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_006___vkey_input__shift_ctrl_());function Keyboard_k_006___vkey_input__shift_ctrl_(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_006___vkey_input__shift_ctrl_";this.KN="006 - vkey input (shift ctrl)";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0030;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16432,65)) {if(1){r=m=1;k.KO(0,t,"ก");}}else if(k.KKM(e,16400,66)) {if(1){r=m=1;k.KO(0,t,"ข");}}else if(k.KKM(e,16432,67)) {if(1){r=m=1;k.KO(0,t,"ฃ");}}else if(k.KKM(e,16400,70)) {if(k.KCM(2,t,"DE",2)){r=m=1;k.KO(2,t,"คฅฆ");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_006___vkey_input__shift_ctrl_.kmx b/common/test/keyboards/baseline/k_006___vkey_input__shift_ctrl_.kmx
deleted file mode 100644
index 6651a91b1962a3a7737a59686c1eea304ba0abf1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 446
zcmYL^y-q?w5QWbbyxMTZ1`?}V5lMtx8WKDH)PhKZB(?-05Pu_T;u}~P8(KnPEQkd$
zv9aPocmPXZLBE|SPV&vpIWx1HtsfsX<xB6AQC@`S5`krPiE{_@o1k3A{C6;g^9T=+
zhA}+B8Z2M}>+l7ikObfDf~&VUQxH*0b#-;GbG3D0I>Ik1R1WTRYTZx+x>vf@4eqvv
z>f`iGb;#E`Q<m+F8Y=5hd(=hc?S%}tbeR~kacOT9RG@!AH)OVLcT2l?6}6ZcsKew5
zTT;!F8t@l!3Mc>f%BTcHC4Nrp87k-il6WuZDOAxL;O1V@GuTIOf}49oe}Lx}wPHDD
NIUcMAK2^>B^#dmNFt7js

diff --git a/common/test/keyboards/baseline/k_007___vkey_input__ctrl_alt_.js b/common/test/keyboards/baseline/k_007___vkey_input__ctrl_alt_.js
deleted file mode 100755
index e4b0e5f291c..00000000000
--- a/common/test/keyboards/baseline/k_007___vkey_input__ctrl_alt_.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_007___vkey_input__ctrl_alt_());function Keyboard_k_007___vkey_input__ctrl_alt_(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_007___vkey_input__ctrl_alt_";this.KN="007 - vkey input (ctrl alt)";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0060;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16480,65)) {if(1){r=m=1;k.KO(0,t,"ก");}}else if(k.KKM(e,16384,66)) {if(1){r=m=1;k.KO(0,t,"ข");}}else if(k.KKM(e,16480,67)) {if(1){r=m=1;k.KO(0,t,"ฃ");}}else if(k.KKM(e,16480,70)) {if(k.KCM(2,t,"de",2)){r=m=1;k.KO(2,t,"คฅฆ");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_007___vkey_input__ctrl_alt_.kmx b/common/test/keyboards/baseline/k_007___vkey_input__ctrl_alt_.kmx
deleted file mode 100644
index 3000af8a8025e65bbe785fd9b97119b138509c13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 442
zcmYL@y)Hv>9EP7(mBsOqsI^m518EmxJFOtmupkkW6FM|LDwM<>7{mpLGzKw<(PVZF
zF2Lv#M8b3aieK{l&-=c=kDSKl`Wkr{|JZuL%A}8F6m;yjZ1`m<|LVCnSTMPi3z?7`
zxsm~Sm97lRyS&MWWZnJj>4JJpDtc(p<eUQ%4uh|l&r)Pc&e#jxA}zZ|oYFBZv*Y)e
zeRbm7VbaYKtJGLwK|RBCxL)!?)5#O}+u?qds{JLqMQ4+67v{|BY&g;KcAH(dAkM(D
z{8mnp+W)<pZb-IcxVF`mx;_%jZuNIEuN{_j?q2^Oi~7-C_Naf7Ojyi@w=cZ8s6Wc9
He*WkiPKGgp

diff --git a/common/test/keyboards/baseline/k_008___vkey_input__ctrl_alt_2_.js b/common/test/keyboards/baseline/k_008___vkey_input__ctrl_alt_2_.js
deleted file mode 100755
index 11ca6ba19f4..00000000000
--- a/common/test/keyboards/baseline/k_008___vkey_input__ctrl_alt_2_.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_008___vkey_input__ctrl_alt_2_());function Keyboard_k_008___vkey_input__ctrl_alt_2_(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_008___vkey_input__ctrl_alt_2_";this.KN="008 - vkey input (ctrl alt 2)";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0060;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16480,65)) {if(1){r=m=1;k.KO(0,t,"ก");}}else if(k.KKM(e,16480,67)) {if(1){r=m=1;k.KO(0,t,"ฃ");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_008___vkey_input__ctrl_alt_2_.kmx b/common/test/keyboards/baseline/k_008___vkey_input__ctrl_alt_2_.kmx
deleted file mode 100644
index b12a0f15c85c201507c654b35744a967bf70d2f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 388
zcmYL?yGlbr6h+rH5UrwBY%FdSv`DzI5X(eSi=YTez|xDR2pS_kf`V9xg@yP9;)nSG
zmUdPaX3db818ZiVefF7Y9d+6iA^REpVkP0Qw4!c!*EIhu<$pa-f@Pgod68v#mp7T0
zPx+7q`IawPl497EpjW)hlBuCZk9!8>T*N-p-z23fBhKP9rSJ5TTW)k$Iq|;YT%CIc
zZ=E%_D;&^dpB?oEwfIBDS9+$eePbB^sGEj8r>WUIz76%5-lA)!?+-&x-Gki(4rN+%
fiqOtBn|38RZor+R2idk?oOqA+Pm+WXg?NqucQ`A9

diff --git a/common/test/keyboards/baseline/k_0100___basic_input_unicodei.js b/common/test/keyboards/baseline/k_0100___basic_input_unicodei.js
new file mode 100644
index 00000000000..86e960301a9
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0100___basic_input_unicodei.js
@@ -0,0 +1,52 @@
+
+KeymanWeb.KR(new Keyboard_k_0100___basic_input_unicodei());
+
+function Keyboard_k_0100___basic_input_unicodei()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0100___basic_input_unicodei";
+  this.KN="0100 - basic input UnicodeI";
+  this.KMINVER="6.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0010;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4010, 0x41)) {
+      if(1){
+        r=m=1;   // Line 13
+        k.KO(0,t,"a");
+      }
+    }
+    else if(k.KKM(e, 0x4010, 0x42)) {
+      if(1){
+        r=m=1;   // Line 14
+        k.KO(0,t,"b");
+      }
+    }
+    else if(k.KKM(e, 0x4010, 0x43)) {
+      if(1){
+        r=m=1;   // Line 15
+        k.KO(0,t,"c");
+      }
+    }
+    else if(k.KKM(e, 0x4010, 0x46)) {
+      if(k.KCM(2,t,"DE",2)){
+        r=m=1;   // Line 17
+        k.KO(2,t,"def");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_001___basic_input_unicodei.kmn b/common/test/keyboards/baseline/k_0100___basic_input_unicodei.kmn
similarity index 85%
rename from common/test/keyboards/baseline/k_001___basic_input_unicodei.kmn
rename to common/test/keyboards/baseline/k_0100___basic_input_unicodei.kmn
index 446c0e8f1d9..da80e98ca71 100644
--- a/common/test/keyboards/baseline/k_001___basic_input_unicodei.kmn
+++ b/common/test/keyboards/baseline/k_0100___basic_input_unicodei.kmn
@@ -1,8 +1,8 @@
-store(&NAME) '001 - basic input UnicodeI'
+store(&NAME) '0100 - basic input UnicodeI'
 c Description: Tests basic input with simple context rules, ANSI characters used only
 c keys: [SHIFT K_A][SHIFT K_B][SHIFT K_C][SHIFT K_SPACE][SHIFT K_D][SHIFT K_E][SHIFT K_F]
 c expected: abc def
-c context: 
+c context:
 
 store(&version) '6.0'
 
diff --git a/common/test/keyboards/baseline/k_0100___basic_input_unicodei.kmx b/common/test/keyboards/baseline/k_0100___basic_input_unicodei.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..b31daddd07fd5f21d1d4072a35c3d4462a1e667d
GIT binary patch
literal 442
zcmZ9HKTCp97{!kv)nfk!Tbrb%cwK@vHBC%xQK40>z#$F)LEpeZT-qX}L4w4w$q&*8
zaO?v#3HrMaw}c+}-S?dH+<V~7-;|2llzu+a&tgLEV2Dg7_#P838RXy0{KY8A0QztU
zuP}ry_<|8^!#B)f4>owa@H&b<fB-M$b*CpisG^4XKyfyKj&uT5^0w-#q3hguR978z
z8ST=hZh4>MWlYyfs-O(|OsCc!Q;%)S8k*K0r(Mcge}Qh-DV;;=U#FA^NmuYYVT7~m
wcS&5tuU}Y=Acf!Y*&BWg7x-PDz2hfviQo6x6#oeo^Hn=*cDld2N2Tq*R$>k@Z2$lO

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0101___basic_input_unicode.js b/common/test/keyboards/baseline/k_0101___basic_input_unicode.js
new file mode 100644
index 00000000000..74dc5e3ddb7
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0101___basic_input_unicode.js
@@ -0,0 +1,52 @@
+
+KeymanWeb.KR(new Keyboard_k_0101___basic_input_unicode());
+
+function Keyboard_k_0101___basic_input_unicode()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0101___basic_input_unicode";
+  this.KN="0101 - basic input Unicode";
+  this.KMINVER="6.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0010;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4010, 0x41)) {
+      if(1){
+        r=m=1;   // Line 13
+        k.KO(0,t,"ก");
+      }
+    }
+    else if(k.KKM(e, 0x4010, 0x42)) {
+      if(1){
+        r=m=1;   // Line 14
+        k.KO(0,t,"ข");
+      }
+    }
+    else if(k.KKM(e, 0x4010, 0x43)) {
+      if(1){
+        r=m=1;   // Line 15
+        k.KO(0,t,"ฃ");
+      }
+    }
+    else if(k.KKM(e, 0x4010, 0x46)) {
+      if(k.KCM(2,t,"DE",2)){
+        r=m=1;   // Line 17
+        k.KO(2,t,"คฅฆ");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_002___basic_input_unicode.kmn b/common/test/keyboards/baseline/k_0101___basic_input_unicode.kmn
similarity index 90%
rename from common/test/keyboards/baseline/k_002___basic_input_unicode.kmn
rename to common/test/keyboards/baseline/k_0101___basic_input_unicode.kmn
index 04c6df9f4a6..a14821c8b6e 100644
--- a/common/test/keyboards/baseline/k_002___basic_input_unicode.kmn
+++ b/common/test/keyboards/baseline/k_0101___basic_input_unicode.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '002 - basic input Unicode'
+store(&NAME) '0101 - basic input Unicode'
 c Description: Tests basic input with simple context rules (Unicode)
 c keys: [SHIFT K_A][SHIFT K_B][SHIFT K_C][SHIFT K_SPACE][SHIFT K_D][SHIFT K_E][SHIFT K_F]
 c expected: \u0E01\u0E02\u0E03\u0020\u0E04\u0E05\u0E06
diff --git a/common/test/keyboards/baseline/k_0101___basic_input_unicode.kmx b/common/test/keyboards/baseline/k_0101___basic_input_unicode.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..acf956d6b4b6256d70d368f2258c1f396a3e86d9
GIT binary patch
literal 440
zcmZXPy-q?w5QWc01RAfH5NWCCG~C9-#>kIKLa;#-TSN;A#rT)-1{Q>xf>0O=V`)O-
zgYW=!@(ecm?PP(1Nxt24&g@L?tzBI-l#r&~pNXiz9Tbu2W9~fRAB9}jw|}@x(t|h1
z!Vvn9gei<51#_4|8r<SvuQTX06kM*FZq?PDnz}b%P(&wEPJ3`o{-m~A=r%7N^rC0<
zCEBGO-7wGh>Rd(Db%H+7zU|KImENPxcWisaUg?Z(j<-$QC>@fO);1mmQWX{zM>xBh
xE8@0%dq8UlC4A_!5&j*@_-&t!@gH!C-|^We{tE&djM=$iXFS{t6R3*)*FR`tFNOdB

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0102___basic_input__shift_2_.js b/common/test/keyboards/baseline/k_0102___basic_input__shift_2_.js
new file mode 100644
index 00000000000..a7ce73ed872
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0102___basic_input__shift_2_.js
@@ -0,0 +1,52 @@
+
+KeymanWeb.KR(new Keyboard_k_0102___basic_input__shift_2_());
+
+function Keyboard_k_0102___basic_input__shift_2_()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0102___basic_input__shift_2_";
+  this.KN="0102 - basic input (shift 2)";
+  this.KMINVER="6.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0010;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4010, 0x41)) {
+      if(1){
+        r=m=1;   // Line 13
+        k.KO(0,t,"ก");
+      }
+    }
+    else if(k.KKM(e, 0x4010, 0x42)) {
+      if(1){
+        r=m=1;   // Line 14
+        k.KO(0,t,"ข");
+      }
+    }
+    else if(k.KKM(e, 0x4010, 0x43)) {
+      if(1){
+        r=m=1;   // Line 15
+        k.KO(0,t,"ฃ");
+      }
+    }
+    else if(k.KKM(e, 0x4010, 0x46)) {
+      if(k.KCM(2,t,"DE",2)){
+        r=m=1;   // Line 17
+        k.KO(2,t,"คฅฆ");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_004___basic_input__shift_2_.kmn b/common/test/keyboards/baseline/k_0102___basic_input__shift_2_.kmn
similarity index 85%
rename from common/test/keyboards/baseline/k_004___basic_input__shift_2_.kmn
rename to common/test/keyboards/baseline/k_0102___basic_input__shift_2_.kmn
index d8782144273..0b072799ac5 100644
--- a/common/test/keyboards/baseline/k_004___basic_input__shift_2_.kmn
+++ b/common/test/keyboards/baseline/k_0102___basic_input__shift_2_.kmn
@@ -1,13 +1,13 @@
-store(&NAME) '004 - basic input (shift 2)'
+store(&NAME) '0102 - basic input (shift 2)'
 c Description: Tests basic vkey input with shift only (Unicode)
 c keys: [SHIFT K_A][SHIFT K_B][SHIFT K_C][SHIFT K_SPACE][SHIFT K_D][SHIFT K_E][SHIFT K_F]
 c expected: \u0E01\u0E02\u0E03\u0020\u0E04\u0E05\u0E06
-c context: 
+c context:
 
 store(&version) '6.0'
 
 begin Unicode > use(Main)
-         
+
 group(Main) using keys
 
 + [SHIFT K_A] > U+0E01
diff --git a/common/test/keyboards/baseline/k_0102___basic_input__shift_2_.kmx b/common/test/keyboards/baseline/k_0102___basic_input__shift_2_.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..2e431a12ef940cdc1b25117d97da4df8b6b1a859
GIT binary patch
literal 444
zcmYL_y-osA5QWdmiZ-s07^I{kYJvd@6FYts3eZMPZ1IOkAs_;YZ(t!lficFySQzcB
ztbGO^fYN6WznxrllJD+0=g!P#w|2O{r>OLH@i`LZg$G4sy1;Xda7rQn>ccfANN(U7
zmf;R=VGhP{5A*N^6NrJ&?6=cN^b%z8Qcb72(zzOHo6jo8O<pNw;E4QEEghp<baXXP
zAH70)M$$Bw*DAAV?W(99ZKF4|Zu`?3vcG3LI`)Pf`=u(kDS8{WRoWyg>41*#T^*e;
zMdC?y_$?n1+W)yCZUJHi{sUJJP{Ic;d&ECM8NcYVXZ#CP@Nt*D;@`mw2Q_17#7;k$
K4Wg(m`>r3KA~2T#

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0103___vkey_input__shift_ctrl_.js b/common/test/keyboards/baseline/k_0103___vkey_input__shift_ctrl_.js
new file mode 100644
index 00000000000..0775346e75f
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0103___vkey_input__shift_ctrl_.js
@@ -0,0 +1,52 @@
+
+KeymanWeb.KR(new Keyboard_k_0103___vkey_input__shift_ctrl_());
+
+function Keyboard_k_0103___vkey_input__shift_ctrl_()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0103___vkey_input__shift_ctrl_";
+  this.KN="0103 - vkey input (shift ctrl)";
+  this.KMINVER="6.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0030;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4030, 0x41)) {
+      if(1){
+        r=m=1;   // Line 13
+        k.KO(0,t,"ก");
+      }
+    }
+    else if(k.KKM(e, 0x4010, 0x42)) {
+      if(1){
+        r=m=1;   // Line 14
+        k.KO(0,t,"ข");
+      }
+    }
+    else if(k.KKM(e, 0x4030, 0x43)) {
+      if(1){
+        r=m=1;   // Line 15
+        k.KO(0,t,"ฃ");
+      }
+    }
+    else if(k.KKM(e, 0x4010, 0x46)) {
+      if(k.KCM(2,t,"DE",2)){
+        r=m=1;   // Line 17
+        k.KO(2,t,"คฅฆ");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_006___vkey_input__shift_ctrl_.kmn b/common/test/keyboards/baseline/k_0103___vkey_input__shift_ctrl_.kmn
similarity index 86%
rename from common/test/keyboards/baseline/k_006___vkey_input__shift_ctrl_.kmn
rename to common/test/keyboards/baseline/k_0103___vkey_input__shift_ctrl_.kmn
index 9a966aa651d..c9947cfcc54 100644
--- a/common/test/keyboards/baseline/k_006___vkey_input__shift_ctrl_.kmn
+++ b/common/test/keyboards/baseline/k_0103___vkey_input__shift_ctrl_.kmn
@@ -1,13 +1,13 @@
-store(&NAME) '006 - vkey input (shift ctrl)'
+store(&NAME) '0103 - vkey input (shift ctrl)'
 c Description: Tests basic vkey input with shift and control (Unicode)
 c keys: [LCTRL SHIFT K_A][SHIFT K_B][RCTRL SHIFT K_C][K_SPACE][SHIFT K_D][SHIFT K_E][SHIFT K_F]
 c expected: \u0E01\u0E02\u0E03\u0020\u0E04\u0E05\u0E06
-c context: 
+c context:
 
 store(&version) '6.0'
 
 begin Unicode > use(Main)
-      
+
 group(Main) using keys
 
 + [SHIFT CTRL K_A] > U+0E01
diff --git a/common/test/keyboards/baseline/k_0103___vkey_input__shift_ctrl_.kmx b/common/test/keyboards/baseline/k_0103___vkey_input__shift_ctrl_.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..9a9747c33db60f10305debf25314c884bcbf59e3
GIT binary patch
literal 448
zcmYL^Jud@L6o#Kxl||J+4Teq)2~8V`#MTxyG(>{L+Ehj3GfETxz#x8sh(Qcu5TnTt
zF^kbZ;JG(GPV$_4-gDk_Z*F62W1Td-Pv=H45+ND3VqNhp+Ways|Kjz>IA-TkE+i+{
zawP-uCO0xDpYkEupxsSMs3$zfrDP2a+MIJhlf$S>l%33yXGVJL#d)5N^JC69wL3|d
zT{}Bbwah2%Gv$7PRjRD8WIabQzESX&wvMhFNAZ=iZ@{wCyxwNK8|LlR*woRXrE}XY
zs3%}eej{ZO<o{k(H6*19+&a3GnmQv{d-v)GSx^s4@I9)Zq^=&3;CoiTNFpqfjJYr7
NRHi?Zwpxt;`UWxqFfafB

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0104___vkey_input__ctrl_alt_.js b/common/test/keyboards/baseline/k_0104___vkey_input__ctrl_alt_.js
new file mode 100644
index 00000000000..ee6e25596f3
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0104___vkey_input__ctrl_alt_.js
@@ -0,0 +1,52 @@
+
+KeymanWeb.KR(new Keyboard_k_0104___vkey_input__ctrl_alt_());
+
+function Keyboard_k_0104___vkey_input__ctrl_alt_()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0104___vkey_input__ctrl_alt_";
+  this.KN="0104 - vkey input (ctrl alt)";
+  this.KMINVER="6.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0060;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4060, 0x41)) {
+      if(1){
+        r=m=1;   // Line 13
+        k.KO(0,t,"ก");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x42)) {
+      if(1){
+        r=m=1;   // Line 14
+        k.KO(0,t,"ข");
+      }
+    }
+    else if(k.KKM(e, 0x4060, 0x43)) {
+      if(1){
+        r=m=1;   // Line 15
+        k.KO(0,t,"ฃ");
+      }
+    }
+    else if(k.KKM(e, 0x4060, 0x46)) {
+      if(k.KCM(2,t,"de",2)){
+        r=m=1;   // Line 17
+        k.KO(2,t,"คฅฆ");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_007___vkey_input__ctrl_alt_.kmn b/common/test/keyboards/baseline/k_0104___vkey_input__ctrl_alt_.kmn
similarity index 85%
rename from common/test/keyboards/baseline/k_007___vkey_input__ctrl_alt_.kmn
rename to common/test/keyboards/baseline/k_0104___vkey_input__ctrl_alt_.kmn
index 3c2eb42bfe0..a7e7b608105 100644
--- a/common/test/keyboards/baseline/k_007___vkey_input__ctrl_alt_.kmn
+++ b/common/test/keyboards/baseline/k_0104___vkey_input__ctrl_alt_.kmn
@@ -1,15 +1,15 @@
-store(&NAME) '007 - vkey input (ctrl alt)'
+store(&NAME) '0104 - vkey input (ctrl alt)'
 c Description: Tests basic vkey input with control and alt (Unicode)
 c keys: [LCTRL LALT K_A][K_B][RCTRL RALT K_C][K_SPACE][K_D][K_E][LCTRL LALT K_F]
 c expected: \u0E01\u0E02\u0E03\u0020\u0E04\u0E05\u0E06
-c context: 
+c context:
 
 store(&version) '6.0'
 
 begin Unicode > use(Main)
 
 group(Main) using keys
-         
+
 + [CTRL ALT K_A] > U+0E01
 + [K_B] > U+0E02
 + [CTRL ALT K_C] > U+0E03
diff --git a/common/test/keyboards/baseline/k_0104___vkey_input__ctrl_alt_.kmx b/common/test/keyboards/baseline/k_0104___vkey_input__ctrl_alt_.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..ae53a86547b28dae18c5fc3658157af6b2b7698a
GIT binary patch
literal 444
zcmYL_KT84u7{;Hg%Urq=q8e|KG7N<f+D@YyOqU88JJdn?W26Org9hmnL_|Y0M5B|F
zpTech(a%u*?(NbSe(ycc`|pk`pB^76A#HvY1|pm&5tK{^JTnx32;?OC@!$%TE<C_0
zJi#N(!w{Y!31b++61ePs$9fID3^}}1Rzvr?RH!TSIpyhW%U2febZ&iLP5RfmRfp=j
zYCLarfey(XZLphGRYg^_hc0N#?x(rXV6x4A%ifUZzH~s>XEwCE(hjwfPMBzNyQMl?
zR2=CL{=-E?cDh%@Ex=j8f1vdOCA<fs_KJUlUF;%6bMN>M*vF^h+9$pTjxEkup0(_H
Kb6x`V_eH;W{V}Nk

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0105___vkey_input__ctrl_alt_2_.js b/common/test/keyboards/baseline/k_0105___vkey_input__ctrl_alt_2_.js
new file mode 100644
index 00000000000..2a6c8c0d029
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0105___vkey_input__ctrl_alt_2_.js
@@ -0,0 +1,40 @@
+
+KeymanWeb.KR(new Keyboard_k_0105___vkey_input__ctrl_alt_2_());
+
+function Keyboard_k_0105___vkey_input__ctrl_alt_2_()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0105___vkey_input__ctrl_alt_2_";
+  this.KN="0105 - vkey input (ctrl alt 2)";
+  this.KMINVER="6.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0060;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4060, 0x41)) {
+      if(1){
+        r=m=1;   // Line 14
+        k.KO(0,t,"ก");
+      }
+    }
+    else if(k.KKM(e, 0x4060, 0x43)) {
+      if(1){
+        r=m=1;   // Line 15
+        k.KO(0,t,"ฃ");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_008___vkey_input__ctrl_alt_2_.kmn b/common/test/keyboards/baseline/k_0105___vkey_input__ctrl_alt_2_.kmn
similarity index 87%
rename from common/test/keyboards/baseline/k_008___vkey_input__ctrl_alt_2_.kmn
rename to common/test/keyboards/baseline/k_0105___vkey_input__ctrl_alt_2_.kmn
index d1660c40f26..6baa092327a 100644
--- a/common/test/keyboards/baseline/k_008___vkey_input__ctrl_alt_2_.kmn
+++ b/common/test/keyboards/baseline/k_0105___vkey_input__ctrl_alt_2_.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '008 - vkey input (ctrl alt 2)'
+store(&NAME) '0105 - vkey input (ctrl alt 2)'
 c Description: Tests basic vkey input with control and alt (Unicode)
 c keys: [LCTRL LALT K_A][LCTRL LALT K_B][LCTRL LALT K_C]
 c expected: \u0E01\u0E03
diff --git a/common/test/keyboards/baseline/k_0105___vkey_input__ctrl_alt_2_.kmx b/common/test/keyboards/baseline/k_0105___vkey_input__ctrl_alt_2_.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..6f88e253897eaa40c89bd83c0ed64aff33db9903
GIT binary patch
literal 390
zcmYL?yGjFL5Jt~NP%E`ktFYCgg|ZQ1oft%6(ZUN@x@d~vC1RqWg;<DK1UnlEc`_fs
z(l^la|3n=)GvC~cql0}W;VmoP(URaaOHntBxy5fy`Df4L!FekKd65Mf%BxJthm2%e
zzT{KpLhf!wg031DC09d1n>#Kjxr}*E%}$+^6}jas_ES3cuehOab%_(>HRtM5A8KnX
zyPvU3lN~nI>#W8fnOE9Q_q@@KUusUnmfh6ZGTtWsg$)j!>G+|`se7=Uz@GeCMG?~f
c&8FFm95>+J)`PUnXUDZi^CwBd5EIe=0DCto;s5{u

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0106___smp.js b/common/test/keyboards/baseline/k_0106___smp.js
new file mode 100644
index 00000000000..e7c75e32d7d
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0106___smp.js
@@ -0,0 +1,80 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0106___smp());
+}
+function Keyboard_k_0106___smp()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0106___smp";
+  this.KN="0106 - smp";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.KS=1;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 15
+        k.KDC(0,t);
+        k.KO(-1,t,"🙂");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_2 /* 0x32 */)) {
+      if(k.KFCM(1,t,['🙂'])){
+        r=m=1;   // Line 16
+        k.KDC(1,t);
+        k.KO(-1,t,"🙂hi😀");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_3 /* 0x33 */)) {
+      if(k.KFCM(1,t,['😀'])){
+        r=m=1;   // Line 17
+        k.KDC(1,t);
+        k.KO(-1,t,"x");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_4 /* 0x34 */)) {
+      if(k.KFCM(4,t,['🙂','h','i','x'])){
+        r=m=1;   // Line 18
+        k.KDC(4,t);
+        k.KO(-1,t,"😁y");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_5 /* 0x35 */)) {
+      if(1){
+        r=m=1;   // Line 22
+        k.KDC(0,t);
+        k.KO(-1,t,"𐌳");
+        r=this.g_second_1(t,e);
+        m=2;
+      }
+    }
+    return r;
+  };
+  this.g_second_1=function(t,e) {
+    var k=KeymanWeb,r=1,m=0;
+      if(k.KFCM(1,t,['𐌳'])){
+        m=1;   // Line 26
+        k.KDC(1,t);
+        k.KO(-1,t,"x");
+      }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_028___smp.kmn b/common/test/keyboards/baseline/k_0106___smp.kmn
similarity index 94%
rename from common/test/keyboards/baseline/k_028___smp.kmn
rename to common/test/keyboards/baseline/k_0106___smp.kmn
index 7c1eaaba960..3ce026ca4c7 100644
--- a/common/test/keyboards/baseline/k_028___smp.kmn
+++ b/common/test/keyboards/baseline/k_0106___smp.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '028 - smp'
+store(&NAME) '0106 - smp'
 c Description: Tests SMP characters; see #4361 [1-4], #5561 [5]
 c keys: [K_1][K_2][K_3][K_4][K_5]
 c expected: \U0001F601yx
diff --git a/common/test/keyboards/baseline/k_0106___smp.kmx b/common/test/keyboards/baseline/k_0106___smp.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..cfbb429d0b77716c4943aa91589a3007bfec4807
GIT binary patch
literal 576
zcmYL_y-EX75QWdGQL#~jsE9?dNN3281{4BuK`eqcDx?yE2_}U<7!dOwDa0obpTY-7
zB_dm`V3k5FEG=BWx$c^QZ<%vu=H9zgs~;U|Mj8&z>LNV*5K}M)RmfpR1nGZNtw=1w
z9rR%d9^f8q{s|so8eU-lbMOhnIG^C`pEzG7Uxqwds;Q-(&ehO`(|HxBl$Fssbg5k7
zXLX<*?Q56Z>Nz)^)eY0vbaiy;<_lD%J*pYH8~Ao=Q5()JxD#7Cb=^(8E%0?rSI4<c
z&XZ0&sSQb_NK7uUjkS0qR!dq&H`(p8R;scG%Fj?l+CI#CLBB%@IUjpN^at1*)3Nu3
z{)SDo?cQc5xj7A$zz@xeqH(o(cO?+|&%MP@v={cA@<Z#gih|Nx6s5!=M3;XZZNi)t
N`w(Rswjr63egU-#Of~=j

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0107___punctkeys.js b/common/test/keyboards/baseline/k_0107___punctkeys.js
new file mode 100644
index 00000000000..a5455156e99
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0107___punctkeys.js
@@ -0,0 +1,100 @@
+
+KeymanWeb.KR(new Keyboard_k_0107___punctkeys());
+
+function Keyboard_k_0107___punctkeys()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0107___punctkeys";
+  this.KN="0107 - punctkeys";
+  this.KMINVER="6.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0000;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4000, 0xE2)) {
+      if(k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 24
+        k.KO(1,t,"p");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0xDE)) {
+      if(k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 23
+        k.KO(1,t,"o");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0xBC)) {
+      if(k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 15
+        k.KO(1,t,"g");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0xBD)) {
+      if(k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 16
+        k.KO(1,t,"h");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0xBE)) {
+      if(k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 17
+        k.KO(1,t,"i");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0xBF)) {
+      if(k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 18
+        k.KO(1,t,"j");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0xBA)) {
+      if(k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 13
+        k.KO(1,t,"e");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0xBB)) {
+      if(k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 14
+        k.KO(1,t,"f");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0xDB)) {
+      if(k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 20
+        k.KO(1,t,"l");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0xDC)) {
+      if(k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 21
+        k.KO(1,t,"m");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0xDD)) {
+      if(k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 22
+        k.KO(1,t,"n");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0xC0)) {
+      if(k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 19
+        k.KO(1,t,"k");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_038___punctkeys.kmn b/common/test/keyboards/baseline/k_0107___punctkeys.kmn
similarity index 92%
rename from common/test/keyboards/baseline/k_038___punctkeys.kmn
rename to common/test/keyboards/baseline/k_0107___punctkeys.kmn
index 33f9c052973..86edfb9dc65 100644
--- a/common/test/keyboards/baseline/k_038___punctkeys.kmn
+++ b/common/test/keyboards/baseline/k_0107___punctkeys.kmn
@@ -1,13 +1,13 @@
-store(&NAME) '038 - punctkeys'
+store(&NAME) '0107 - punctkeys'
 c Description: Tests punctuation keys (Unicode)
 c keys: [K_A][K_COLON][K_A][K_EQUAL][K_A][K_COMMA][K_A][K_HYPHEN][K_A][K_PERIOD][K_A][K_SLASH][K_A][K_BKQUOTE][K_A][K_LBRKT][K_A][K_BKSLASH][K_A][K_RBRKT][K_A][K_QUOTE][K_A][K_oE2]
 c expected: efghijklmnop
-c context: 
+c context:
 
 store(&version) '6.0'
 
 begin Unicode > use(Main)
-      
+
 group(Main) using keys
 
 'a' + [K_COLON] > 'e'
diff --git a/common/test/keyboards/baseline/k_0107___punctkeys.kmx b/common/test/keyboards/baseline/k_0107___punctkeys.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..d55d4d2c972c6a5b2156cc5cc2eb1be2d92deae8
GIT binary patch
literal 644
zcmYL`J1>J_7=~{K432e7EFGi~LE1zd!tfD7QbeMX4hD^))m9rVAu$*X2Js8T;$Jv+
zG8t_SgTdq{NVwk5gEzVQJlFla-`n>6qVd?Gs-%n2&U>*c+y{%u?>%aO@QX$Jw~i`*
z+BV7w978*t!6{Tj8P1^w9^nBR;RD{ScVF^J9|kF^HSH^>gtmMSE5c+*LG?jFJLIb>
zDdX=evL~c@jcZO*^n>d6&k1Rl`L>EmEAO8a;T&n2X^_1Ma(Dg+OlXNd&8c}Mc}nWx
z7Y)Ggs-<!I|J)na;l`fS#XWSxE9(Bg%X;xJT%!$^4dBCYgS$JBCyn7A+@ejEP2w|f
zhX*X1#TVcbud^(M$KeXEw`>_-fhWAhvLv2@XS~(2EM9;Y+`T_}QVHLKGTIC-JHQX2
hfF>Ysb;D}PYTD|iRd<VS|GL$z)tps#_imoC`VEDeLxcbT

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_012___ralt.js b/common/test/keyboards/baseline/k_012___ralt.js
deleted file mode 100755
index 5df180316b2..00000000000
--- a/common/test/keyboards/baseline/k_012___ralt.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_012___ralt());function Keyboard_k_012___ralt(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_012___ralt";this.KN="012 - ralt";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0060;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(1){r=m=1;k.KO(0,t,"ז");}}else if(k.KKM(e,16384,79)) {if(1){r=m=1;k.KO(0,t,"ר");}}else if(k.KKM(e,16480,65)) {if(1){r=m=1;k.KO(0,t,"b");}}else if(k.KKM(e,16480,79)) {if(1){r=m=1;k.KO(0,t,"c");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_012___ralt.kmx b/common/test/keyboards/baseline/k_012___ralt.kmx
deleted file mode 100644
index 3ac57c165b517b5a530db05d20d0d257e07f8d9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 402
zcmX|+J4*vW7)4LO$J+R4wB0I&U`Xujc0~~hF<>;LjISc#1H?uPu@DgnB32e+=RfcV
zSo#YrtSl|9Z1v2z`oWpK_kQ2Z&eS_=Ek>YpxA2Hn3X3%)L1&UEzAfc{-4=tBCVjb-
zDY=(x8I~t`kVIbOS;pmE-U|KY_fx6@b#^#rj}7*tuTo={lo>fR-Q~!<%nCUT7S(f9
z;@&cC{VFY%Y1$|5geALaJh2zgti|bh)^$C$IAGg<Lh5^_<*x=5!G^p1?#y+gl4NjV
p>r|Thu_8OupG&R}uk2=Up}&$aH&JAL{f)d18t@U<%^<x^s2{$AEG7T|

diff --git a/common/test/keyboards/baseline/k_013___deadkeys.js b/common/test/keyboards/baseline/k_013___deadkeys.js
deleted file mode 100755
index 377100493fe..00000000000
--- a/common/test/keyboards/baseline/k_013___deadkeys.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_013___deadkeys());function Keyboard_k_013___deadkeys(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_013___deadkeys";this.KN="013 - deadkeys";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0010;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,54)) {if(1){r=m=1;k.KDO(0,t,0);}}else if(k.KKM(e,16384,65)) {if(k.KDM(0,t,0)){r=m=1;k.KO(0,t,"â");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_013___deadkeys.kmx b/common/test/keyboards/baseline/k_013___deadkeys.kmx
deleted file mode 100644
index 7f93d7d9ae9f2ed3743e3ca997647b328c37481f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 394
zcmX|*F-t;W6o%g-=sHME1x<Hy2n;0}-14G`XbM>(1i_^mB+Nk<LA>DT>>&Pv@R#%h
z9Gm<BPVTqod|o^7eBXP{d%l;i)_H0vB}LK8Qq++h)G3(0higPkA^&TZEM72Kz#J~&
z8!X7)|G)}7_=Po`!w$BI_Q*K_oBP~XkV8u~eQ2bfLVdYDr@U_ED+}*<A?K&t8Q^Es
zP*D#mqYJum85y<dAJtM-O?;7%=d9rRF1hQn3(NvNqq}-j-=*8`9rKdgwO0W@tHYs=
i5!Tud_c^b0>BJsljUl8zOJ)=LDa5hoUP>FBL-z;W+bnhf

diff --git a/common/test/keyboards/baseline/k_014___groups_and_virtual_keys.js b/common/test/keyboards/baseline/k_014___groups_and_virtual_keys.js
deleted file mode 100755
index 65d043fda04..00000000000
--- a/common/test/keyboards/baseline/k_014___groups_and_virtual_keys.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_014___groups_and_virtual_keys());function Keyboard_k_014___groups_and_virtual_keys(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_014___groups_and_virtual_keys";this.KN="014 - groups and virtual keys";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0070;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16416,50)) {if(1){r=m=1;k.KDO(0,t,0);}}else if(k.KKM(e,16448,50)) {if(1){r=m=1;k.KDO(0,t,0);}}else if(k.KKM(e,16400,50)) {if(1){r=m=1;k.KDO(0,t,1);}}else if(k.KKM(e,16384,65)) {if(1){r=m=1;k.KO(0,t,"α");}}if(m==1) {r=this.g1(t,e);m=2;}return r;};this.g1=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KDM(1,t,0)&&k.KCM(1,t,"α",1)){m=1;k.KO(1,t,"ᾱ");}else if(k.KDM(1,t,1)&&k.KCM(1,t,"α",1)){m=1;k.KO(1,t,"ᾰ");}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_014___groups_and_virtual_keys.kmx b/common/test/keyboards/baseline/k_014___groups_and_virtual_keys.kmx
deleted file mode 100644
index 03bb1508a55ebf46c59d21379908465c37eba734..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 764
zcmZvay)T1N6vm(W2x3qM!lE%WA|b7akaTF9ib#DVzGBo+B4|ZRbnzD$3}O^9i9y&J
zlffYV0x@+k8!QZx*YDo<RzjTQdC&7a=iGDe?QME#eojqN|HoNbM8JHAW>5p-;1km$
zpg-|tibOkj1P`DCJcB3D0NPpiLT&_o@E*_#kCS5{2wx*FJAOz$aQv8j<oG4|!ts0Z
zo#Peq3y3gBN-L|9wv|!N>WHEmQb_$^UAxL_Pdh50OvfsDUmN&E{EW8Hn|4Bh)nQF5
zp(%~QM>Sw~2x}2Nt2s?*hPuCRn64b_wwa$}-ijufR<gSl=`m-J#+eY(0=*e}%=reL
zAH`2`_9)&6NYdrc$#cf6?KJnB`e(v0e#-i0?uxx*jtP6**X-ce%??RwS?-(tsYZCe
z80dBHSjUP0xIvelhqV6zlRdBA^51vx-!K&Ctypsc2I;kLjCYDYb6y*M5bqp)2@>cQ
zAiOK|HSoMfdxpP^5^-B=zSZB#@J{m~Dm1+MP3rP3y`kU1ZFhB=S%2eHjh*%lw@zUB

diff --git a/common/test/keyboards/baseline/k_015___ralt_2.js b/common/test/keyboards/baseline/k_015___ralt_2.js
deleted file mode 100755
index 741a0871845..00000000000
--- a/common/test/keyboards/baseline/k_015___ralt_2.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_015___ralt_2());function Keyboard_k_015___ralt_2(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_015___ralt_2";this.KN="015 - ralt 2";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(k.KCM(1,t,"c",1)){r=m=1;k.KO(1,t,"cd");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_015___ralt_2.kmx b/common/test/keyboards/baseline/k_015___ralt_2.kmx
deleted file mode 100644
index 0a5e1bbf434b09618983f22e84b6f9fdc7c89d0f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 330
zcmX|-!Ae3=5QaZDrqQBRZKZ`Pm1_{#P6Z2<6jGyYsF08b;iflmAwEI$96f-$dWJUj
z2rk^&cdq6S-<*GD&dj;o=6$zA8XkX2pQuC#Dk;I2<xsOx+PxaPizim*GLutzlZ70}
zhrCNlzGNxK@+;pvzxG^7B+z8YD`Os*#Cb%K3o_*8#p)AN-MPIiEh^kl(_d1E=d;|I
z-_oH@+dfW*z1PM}ymb`sEm^D5(~s!$%)nRSECD(BSFnNbHQTw0*^#8m{uf(U(sw#U
F_yZUOB~1VT

diff --git a/common/test/keyboards/baseline/k_017___space_mnemonic_kbd.js b/common/test/keyboards/baseline/k_017___space_mnemonic_kbd.js
deleted file mode 100755
index 489675682d0..00000000000
--- a/common/test/keyboards/baseline/k_017___space_mnemonic_kbd.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_017___space_mnemonic_kbd());function Keyboard_k_017___space_mnemonic_kbd(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_017___space_mnemonic_kbd";this.KN="017 - space mnemonic kbd";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=1;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,32)) {if(k.KCM(2,t,"ab",2)){r=m=1;k.KO(2,t,"X");}}else if(k.KKM(e,16384,100)) {if(k.KCM(2,t,"c ",2)){r=m=1;k.KO(2,t,"Y");}}else if(k.KKM(e,16384,101)) {if(k.KCM(2,t," d",2)){r=m=1;k.KO(2,t,"Z");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_017___space_mnemonic_kbd.kmx b/common/test/keyboards/baseline/k_017___space_mnemonic_kbd.kmx
deleted file mode 100644
index ffb5e1ac098451ffb07900c29a26fa80eaf8dd89..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 506
zcmZ9Ixk^Jp6o&sGxHM54Z7ilr73JQfP&*?8BOwb(4AJhY5yUKlTBONiSX+osAm(K(
ztb$lsq!K~DGhPYgz&B@^v&|G+jk=bk!gv%4N!Wobg4ug8#P~rlz2r2nuQ+jy$Rj+!
zIy}P@EWkUwfc5%@3CzI;wMkgT4$x^>!EU0fvE4ymKtNn7s;z;#iq!LdpitX#+JqZj
z6F(!vk<mkU)kj|vbGp*0&Z$YMtei^9WAAFq_f4sZUsGL&s&Fr5xyve}9r{~Mfp~-I
zc^%{b#b#%8m_A_Qoo;<jhVy{_woSwqwsGj^?dvGstItkt;`a%D4*tb{$J}Y9!%Kq6
mD_3t|?^*T{X^j5?*3JIV<P(1aE$oQ*%WrSLA)SEp9ex3Z;yiQ!

diff --git a/common/test/keyboards/baseline/k_018___nul_testing.js b/common/test/keyboards/baseline/k_018___nul_testing.js
deleted file mode 100755
index 09e69468dbf..00000000000
--- a/common/test/keyboards/baseline/k_018___nul_testing.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_018___nul_testing());function Keyboard_k_018___nul_testing(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_018___nul_testing";this.KN="018 - nul testing";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(k.KN(0,t)){r=m=1;k.KO(0,t,"OK");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_018___nul_testing.kmx b/common/test/keyboards/baseline/k_018___nul_testing.kmx
deleted file mode 100644
index 7c54781918fad4a1c026e8e48f8657e55e2efbd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmYL_ze+-37>6G-%Ag?{s?kXbEHoQzi3&tR^gx=_)}bPV(jgma>LMDVD~K+}3utWV
z2HNxaK9t_W^M1egKb+=yx5E+?f08Y<OmNzw1brw6ia$*mt<3^2)5bM3Z}KYZ@*(dM
z=Ew3WIr)|^$;zCwzrHK7p<b1si@uvuQbUs)p13Dv5aSYMs^r<00gv4Ij_i5R_s!he
zRiMogEo$n0cH*W2J>ye4oRC<DinR*6`n@>QFyHlFjSJ(lAJm=AyD5#k!!|hP%sYLq
g7;^1p=w;wiW)@`Ne=apzo|Z?Jo+a^C_@nds3FUMv6aWAK

diff --git a/common/test/keyboards/baseline/k_019___multiple_deadkeys.js b/common/test/keyboards/baseline/k_019___multiple_deadkeys.js
deleted file mode 100755
index 4e928ab0a58..00000000000
--- a/common/test/keyboards/baseline/k_019___multiple_deadkeys.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_019___multiple_deadkeys());function Keyboard_k_019___multiple_deadkeys(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_019___multiple_deadkeys";this.KN="019 - multiple deadkeys";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDO(0,t,0);}}else if(k.KKM(e,16384,50)) {if(1){r=m=1;k.KO(0,t,"a");k.KDO(-1,t,1);}}else if(k.KKM(e,16384,51)) {if(1){r=m=1;k.KDO(0,t,2);k.KO(-1,t,"a");}}else if(k.KKM(e,16384,52)) {if(1){r=m=1;k.KDO(0,t,3);k.KDO(-1,t,4);}}else if(k.KKM(e,16384,53)) {if(1){r=m=1;k.KO(0,t,"a");k.KDO(-1,t,5);k.KDO(-1,t,6);}}else if(k.KKM(e,16384,54)) {if(1){r=m=1;k.KO(0,t,"a");k.KDO(-1,t,7);k.KDO(-1,t,8);k.KO(-1,t,"b");}}else if(k.KKM(e,16384,55)) {if(1){r=m=1;k.KDO(0,t,9);k.KDO(-1,t,10);k.KO(-1,t,"a");}}else if(k.KKM(e,16384,56)) {if(1){r=m=1;k.KDO(0,t,11);k.KDO(-1,t,12);k.KDO(-1,t,13);}}else if(k.KKM(e,16384,57)) {if(1){r=m=1;k.KO(0,t,"{");k.KDO(-1,t,14);k.KDO(-1,t,15);k.KO(-1,t,"}");k.KDO(-1,t,16);k.KDO(-1,t,17);}}else if(k.KKM(e,16384,88)) {if(k.KCM(2,t,"{",1)&&k.KDM(1,t,14)&&k.KDM(1,t,18)&&k.KCM(1,t,"}",1)&&k.KDM(0,t,19)&&k.KDM(0,t,20)){r=m=1;k.KO(2,t,"9=OK");}else if(k.KCM(2,t,"a",1)&&k.KDM(1,t,7)&&k.KDM(1,t,8)&&k.KCM(1,t,"b",1)){r=m=1;k.KO(2,t,"6=OK ");}else if(k.KDM(1,t,15)&&k.KCM(1,t,"}",1)&&k.KDM(0,t,16)&&k.KDM(0,t,17)){r=m=1;k.KDO(1,t,18);k.KO(-1,t,"}");k.KDO(-1,t,19);k.KDO(-1,t,20);}else if(k.KCM(1,t,"a",1)&&k.KDM(0,t,5)&&k.KDM(0,t,6)){r=m=1;k.KO(1,t,"5=OK ");}else if(k.KDM(1,t,9)&&k.KDM(1,t,10)&&k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"7=OK ");}else if(k.KDM(0,t,11)&&k.KDM(0,t,12)&&k.KDM(0,t,13)){r=m=1;k.KO(0,t,"8=OK ");}else if(k.KCM(1,t,"a",1)&&k.KDM(0,t,1)){r=m=1;k.KO(1,t,"2=OK ");}else if(k.KDM(1,t,2)&&k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"3=OK ");}else if(k.KDM(0,t,3)&&k.KDM(0,t,4)){r=m=1;k.KO(0,t,"4=OK ");}else if(k.KDM(1,t,9)&&k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"7=Fail1 ");}else if(k.KDM(1,t,10)&&k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"7=Fail2 ");}else if(k.KDM(0,t,11)&&k.KDM(0,t,12)){r=m=1;k.KO(0,t,"8=Fail4 ");}else if(k.KDM(0,t,11)&&k.KDM(0,t,13)){r=m=1;k.KO(0,t,"8=Fail5 ");}else if(k.KDM(0,t,12)&&k.KDM(0,t,13)){r=m=1;k.KO(0,t,"8=Fail6 ");}else if(k.KDM(0,t,0)){r=m=1;k.KO(0,t,"1=OK ");}else if(k.KDM(0,t,11)){r=m=1;k.KO(0,t,"8=Fail1 ");}else if(k.KDM(0,t,12)){r=m=1;k.KO(0,t,"8=Fail2 ");}else if(k.KDM(0,t,13)){r=m=1;k.KO(0,t,"8=Fail3 ");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_019___multiple_deadkeys.kmx b/common/test/keyboards/baseline/k_019___multiple_deadkeys.kmx
deleted file mode 100644
index fe22a2819a535a56b6c8a43dd1239726e9575383..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2192
zcmZXU%S%;J6vmg2>{@Csvv*yr#0t%$-g~`fQqhBwEYiY3MAy`i)WRMV88i?PM-D<F
z`U4y_Xz0j6BZ&qL8b&l|5=4WDkidRxpLIL?9yhGLzVBOW@3YoE=j^V&-X19znfTs6
zA&erO7`rgVC$RYvkrf8;|CmjLum(3x;v}{W{1QKdtpzXPUtya18UG2}2>y-#X}F?T
zqzqI20DiCGR(zx3)A&xqz4&g!L-?D9ALGXj&)_EwzsAoQeuJMkyog^g{1N}&@HhMy
z!^`+zhO0P(1g3S?;&&TP<C_d$z@IjJ1K($O96w@s3jf^jEBp(ri9JQSWKf>SsN`hK
z@g@l*D@kd<M&+T5$O9Rcd-y?=0p=X@9k=Q}E9#_MPRd0&1I|jL+qF)v!LLY<oR>?)
zMVg&{j#+ojv7<gMkT&L1auqf#x8$zdUnIp&^yIPwP@V^@ZuWRHyv5@!@K$z@R<t^$
z-&0a3se+ueQ~aC^O1dDY%_)A4o>8VCCvf#<#Lo)oF-ey>uY!OcR4dHW+S@pTsP=$f
zlAJ{0TCG1DTdN&pV{5gCEa&O(r(I-ubH1j1WM#<H^j)cT8*P#AWC_cU{Qv2{LlONO
zb$nYR@&nU%w8JU<aqwkK-_vf>{=&=3g#JYKnU;XpU@3U5Y1`rTSQ>uNw8QWYECa7M
ztrOmj>DSa?+GY3vreBikI)>nr*kkZ9r-)3!XHBa!?G1dvw06_p!@rug-?TsQQm!1`
z?~rNL@T6&trZvGkOxtPNW%zZ|_Lw#VA2%&&+5~*sw8N&&!RJjoV%l5yJJa<1b$oz-
zF-^~3#}Bw(jasvwzm6(+(lotIbu_};O*<M&athvST6lZV1ANRh{a1B7f=^>BD+#;V
za}F1~sH!FIs}3_tU5rnH5$2USMGMU<38$31?>=0$&ME7?eJY$%>E<f8_Nl`g+`Lhq
zIlsxxn_WCB$GM-nz<%Zy%dB>pTZyJEF9{AS^y|@nR<BWY^)pkec8Yq<crjh=ci0w-
z#d~e`;?Y^RcxrU&tuZw^f34sw9S(Eb>%Emf=^V(9>HQVP!t>Ya^6T`@3S;>i_5X|F
odVl$GeN%p1@3Jr+y~!X}aZzkdRBJ^n5>;9mi|BnDK1VC~2i<EM9RL6T

diff --git a/common/test/keyboards/baseline/k_0200___ralt.js b/common/test/keyboards/baseline/k_0200___ralt.js
new file mode 100644
index 00000000000..1e4672f5685
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0200___ralt.js
@@ -0,0 +1,52 @@
+
+KeymanWeb.KR(new Keyboard_k_0200___ralt());
+
+function Keyboard_k_0200___ralt()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0200___ralt";
+  this.KN="0200 - ralt";
+  this.KMINVER="9.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0060;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.g_main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4000, 0x41)) {
+      if(1){
+        r=m=1;   // Line 14
+        k.KO(0,t,"ז");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x4F)) {
+      if(1){
+        r=m=1;   // Line 15
+        k.KO(0,t,"ר");
+      }
+    }
+    else if(k.KKM(e, 0x4060, 0x41)) {
+      if(1){
+        r=m=1;   // Line 16
+        k.KO(0,t,"b");
+      }
+    }
+    else if(k.KKM(e, 0x4060, 0x4F)) {
+      if(1){
+        r=m=1;   // Line 17
+        k.KO(0,t,"c");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_012___ralt.kmn b/common/test/keyboards/baseline/k_0200___ralt.kmn
similarity index 78%
rename from common/test/keyboards/baseline/k_012___ralt.kmn
rename to common/test/keyboards/baseline/k_0200___ralt.kmn
index 8e041ad99e0..5dd8e09ab1a 100644
--- a/common/test/keyboards/baseline/k_012___ralt.kmn
+++ b/common/test/keyboards/baseline/k_0200___ralt.kmn
@@ -1,9 +1,9 @@
-store(&NAME) '012 - ralt'
+store(&NAME) '0200 - ralt'
 c Description: Tests Right Alt processing: requires Ctrl+Alt simulation off.
 c env.simulate_altgr: 0
 c keys: [RALT K_A][RALT K_O][LCTRL LALT K_A][LCTRL LALT K_O]
 c expected: \u05d6\u05e8\u0062\u0063
-c context: 
+c context:
 
 store(&VERSION) '9.0'
 
@@ -11,7 +11,7 @@ begin Unicode > use(main)
 
 group(main) using keys
 
-+ [RAlt K_A] > U+05D6 
++ [RAlt K_A] > U+05D6
 + [RAlt K_O] > U+05E8
-+ [Ctrl Alt K_A] > "b" 
++ [Ctrl Alt K_A] > "b"
 + [Ctrl Alt K_O] > "c"
diff --git a/common/test/keyboards/baseline/k_0200___ralt.kmx b/common/test/keyboards/baseline/k_0200___ralt.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..6fd03a1b6cbc31e982a48061eed0fd82f04df5ec
GIT binary patch
literal 404
zcmYL_yGjF56h)U{G*R%;Xd5h2sZ8wbW&{xlF<^{X`YZxIKx_mHu@H-pLM+8^u<`>e
z{Q#>}R@PQ_y6)wo2iBdv&*RRVY3yvZsla%(`HV3X4r4@u&SgyTV<`XPAvMmJ>B*hU
z%A@pUR9@ss%JL?!G9@1}Nc!97mt+DBj=1E6Jx-&~ShA8)WkJr(A9G=)#s&pVR@KWa
z#_1Z{`c2xb)3OeAr(rG5hdaCR)_Uw-p`+_^z!`_W73SP%K5eCCSc3hZEOZl6&f&_^
pwY2n;DR-m4l|mo(+|B(j`ksWo>6Gj1@8!K@g3oyF2kF;@_ywZWEFk~@

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0201___ralt_2.js b/common/test/keyboards/baseline/k_0201___ralt_2.js
new file mode 100644
index 00000000000..b4504c909d0
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0201___ralt_2.js
@@ -0,0 +1,34 @@
+
+KeymanWeb.KR(new Keyboard_k_0201___ralt_2());
+
+function Keyboard_k_0201___ralt_2()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0201___ralt_2";
+  this.KN="0201 - ralt 2";
+  this.KMINVER="9.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0000;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.g_main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4000, 0x41)) {
+      if(k.KCM(1,t,"c",1)){
+        r=m=1;   // Line 13
+        k.KO(1,t,"cd");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_015___ralt_2.kmn b/common/test/keyboards/baseline/k_0201___ralt_2.kmn
similarity index 71%
rename from common/test/keyboards/baseline/k_015___ralt_2.kmn
rename to common/test/keyboards/baseline/k_0201___ralt_2.kmn
index 631bea8d8d8..6606a5d96d5 100644
--- a/common/test/keyboards/baseline/k_015___ralt_2.kmn
+++ b/common/test/keyboards/baseline/k_0201___ralt_2.kmn
@@ -1,9 +1,10 @@
-store(&NAME) '015 - ralt 2'
+store(&VERSION) '9.0'
+store(&NAME) '0201 - ralt 2'
 c Description: Tests Right Alt processing with non-US kbds.
 c keys: [K_A][K_B][K_C][RALT K_A]
 c expected: abcd
 
-store(&VERSION) '9.0'
+store(&TARGETS) 'any'
 
 begin Unicode > use(main)
 
diff --git a/common/test/keyboards/baseline/k_0201___ralt_2.kmx b/common/test/keyboards/baseline/k_0201___ralt_2.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..79ead9aea3c068f3534e7d3f82f0906876a2df47
GIT binary patch
literal 370
zcmX|*KTASU7>6I1Qb=g3rQuF@EA(z|-XKJ!1ieOUSdfqk5`oaiXb?YvIJUR-LHYoV
z?e?6L^@Ha<zw`b(r+ZTjsKCqfdyXoFp!OyBrevC}(*A3{YdkWulvg>HwXCEpZ?ciF
z>r*}?m2dfyLpgBIo&=wGo=8m(UG7;h;g)H<H#m!xlxr^NGoVe6D{D0}sgrOjb0;2o
z(q-0CJ8~|aAZ}X3Tw$(H%WUBuoUI#MZb{;c<M?L7+&M%2m=QDX{1J3YP{^Nx4TPWm
T&gI^!Qf|V7rKyaZ4iSC;w+$$a

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0203___generic_ctrlalt.js b/common/test/keyboards/baseline/k_0203___generic_ctrlalt.js
new file mode 100644
index 00000000000..de496127b2d
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0203___generic_ctrlalt.js
@@ -0,0 +1,40 @@
+
+KeymanWeb.KR(new Keyboard_k_0203___generic_ctrlalt());
+
+function Keyboard_k_0203___generic_ctrlalt()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0203___generic_ctrlalt";
+  this.KN="0203 - generic ctrlalt";
+  this.KMINVER="6.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0060;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4020, 0x42)) {
+      if(k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 13
+        k.KO(1,t,"b");
+      }
+    }
+    else if(k.KKM(e, 0x4040, 0x43)) {
+      if(k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 14
+        k.KO(1,t,"c");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_039___generic_ctrlalt.kmn b/common/test/keyboards/baseline/k_0203___generic_ctrlalt.kmn
similarity index 84%
rename from common/test/keyboards/baseline/k_039___generic_ctrlalt.kmn
rename to common/test/keyboards/baseline/k_0203___generic_ctrlalt.kmn
index 1bbb1de6611..8221e7d62c0 100644
--- a/common/test/keyboards/baseline/k_039___generic_ctrlalt.kmn
+++ b/common/test/keyboards/baseline/k_0203___generic_ctrlalt.kmn
@@ -1,8 +1,8 @@
-store(&NAME) '039 - generic ctrlalt'
+store(&NAME) '0203 - generic ctrlalt'
 c Description: Tests generic alt and control (Unicode)
 c keys: [K_A][K_A][LCTRL K_B][K_A][LALT K_C][K_A][RCTRL K_B][K_A][RALT K_C]
 c expected: abcbc
-c context: 
+c context:
 
 store(&version) '6.0'
 
diff --git a/common/test/keyboards/baseline/k_0203___generic_ctrlalt.kmx b/common/test/keyboards/baseline/k_0203___generic_ctrlalt.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..c2ac5c2f2f2c234a42d46ecd1afcdb8640564d38
GIT binary patch
literal 376
zcmYL?u};EZ6opS6u!9mN-AE@kO)CkBTdg4s4J>NHS_%=8(i&(Cz5xSqb0a>H55VX%
zI2jiG{y$Z2^7TLGo_lZO;r*RzQt&q1i*n3|qGff++obtJA^&St4W7~2z#7hB3$Jht
zAMg$?e8LVI@C{#;KH-iFK3<A7(TnCvlw0rXili-17w|}$!$LEq_*5l2V>&}gEe&*|
zzPjj+F73^hp6$kxox)xX6p;5wJ!TX7=3mzk=>ctS7aFt06-Nr;uZ|GL9`+*KDR`kY
VCCcCyUx$$16TXBIK7q7)e*x!tD@6bR

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.js b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.js
deleted file mode 100755
index 85742c0edd8..00000000000
--- a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_020___deadkeys_and_backspace());function Keyboard_k_020___deadkeys_and_backspace(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_020___deadkeys_and_backspace";this.KN="020 - deadkeys and backspace";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,8)) {if(k.KCM(2,t,"c",1)&&k.KDM(1,t,11)&&k.KCM(1,t,"d",1)){r=m=1;k.KO(2,t," ok");}else if(k.KCM(2,t,"cd",2)){r=m=1;k.KO(2,t," fail");}}else if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDO(0,t,0);}}else if(k.KKM(e,16384,50)) {if(1){r=m=1;k.KO(0,t,"a");k.KDO(-1,t,1);}}else if(k.KKM(e,16384,51)) {if(1){r=m=1;k.KDO(0,t,2);k.KO(-1,t,"a");}}else if(k.KKM(e,16384,52)) {if(1){r=m=1;k.KDO(0,t,3);k.KDO(-1,t,4);}}else if(k.KKM(e,16384,53)) {if(1){r=m=1;k.KO(0,t,"a");k.KDO(-1,t,5);k.KDO(-1,t,6);k.KO(-1,t,"b");}}else if(k.KKM(e,16384,54)) {if(1){r=m=1;k.KO(0,t,"a");k.KDO(-1,t,7);k.KDO(-1,t,8);k.KO(-1,t,"b");k.KDO(-1,t,9);k.KDO(-1,t,10);}}else if(k.KKM(e,16384,55)) {if(1){r=m=1;k.KO(0,t,"c");k.KDO(-1,t,11);k.KO(-1,t,"de");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_021___options.js b/common/test/keyboards/baseline/k_021___options.js
deleted file mode 100755
index 8d0463e8219..00000000000
--- a/common/test/keyboards/baseline/k_021___options.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_021___options());}function Keyboard_k_021___options(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_021___options";this.KN="021 - options";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="0";this.s10="1";this.s11="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,48)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s11;}}else if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s10;}}else if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");}else if(this.s5===this.s9){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_021___options.kmx b/common/test/keyboards/baseline/k_021___options.kmx
deleted file mode 100644
index f35da34878adc50c677ebe1bc952d99bc916fc91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 556
zcmZvZ&n^Q|6vjW33Pqy+gk3YS=t5{Zyg*6Rq9GAP7a|!-RG2o1#2Z+9CJXTdVreaw
zA~x6W+_}ZVX@2v4=iGBo@62tscD6MlZJqDcL=4!27zOin=wTdz{fUJrw=>8iJishG
z!xId_2fV;Aj4>k$!{^X4l&IIx`QRI99m>@A(N^$>=t1zOXgl}}Jp+GmHFd08T_{z?
zeyc7iQLIJis;6sp&`ejXRkW!UZD<Xj&{_2}D!O6DB^`NZKKX=QUEjCNbDhqZohd!`
zKM6l+Rl8&z9nsllhSe?dll}E~ocA93QNURGJJI$`hUHh5-oPeIgxWj#C#2-#q4q^y
q;6|)wU)7>S9)ojJ8ua(s_gpuTzgHFK+%z4Lzo(2hi2qqD()SIB_&WLk

diff --git a/common/test/keyboards/baseline/k_022___options_with_preset.js b/common/test/keyboards/baseline/k_022___options_with_preset.js
deleted file mode 100755
index 2e85641ef38..00000000000
--- a/common/test/keyboards/baseline/k_022___options_with_preset.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_022___options_with_preset());}function Keyboard_k_022___options_with_preset(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_022___options_with_preset";this.KN="022 - options with preset";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="0";this.s10="1";this.s11="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,48)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s11;k.KSAVE("foo",this.s5);}}else if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s10;k.KSAVE("foo",this.s5);}}else if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");}else if(this.s5===this.s9){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_022___options_with_preset.kmx b/common/test/keyboards/baseline/k_022___options_with_preset.kmx
deleted file mode 100644
index e681df83394f04ad7be451a4d82051d74924c8d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 592
zcmZXRJxjw-7==%ZqDB$1t%69&AjLsTTS^5dEs8=>1Qj|7!4K?U8`@A&9K=CfoL!y$
z9S-6z5PynGd~WVl3%=ppbKb9$gxhEy?8}pu9#@`3q|8B#1Ebf#10p7nzp<CLat3+>
zuV5B@fOjwgCfWOhN5KMm&KMG_a1BhMx8b_eM{pD5sYh_=^flaf`WC)%`X0UmC1a|F
zPIaXV1!^aGNfjPn%b=rBky>zDJ@QL*q;piLE_*!?u~pEn*0rNebQ#}b;$2XmewQih
zVBdI#TPK;Tac(i`vl%dB-d|Rgv#vw3mX4V`!Nb%|*e@Q`&nf8z{KOE#q<@ZPC+FH<
zv^;LWIAmRIf_xqX<kPN}Ctq~6jH^}2H$WU`G|WB6aSk?NE8alG{$nxeWtmDRciHA|
KeEsi@G4~D6e?lMt

diff --git a/common/test/keyboards/baseline/k_023___options_with_save.js b/common/test/keyboards/baseline/k_023___options_with_save.js
deleted file mode 100755
index 39fc6dba75a..00000000000
--- a/common/test/keyboards/baseline/k_023___options_with_save.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_023___options_with_save());}function Keyboard_k_023___options_with_save(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_023___options_with_save";this.KN="023 - options with save";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="0";this.s10="1";this.s11="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,48)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s11;}}else if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s10;}}else if(k.KKM(e,16384,50)) {if(1){r=m=1;k.KDC(0,t);k.KSAVE("foo",this.s5);}}else if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");}else if(this.s5===this.s9){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_023___options_with_save.kmx b/common/test/keyboards/baseline/k_023___options_with_save.kmx
deleted file mode 100644
index 3668b7a066ef37d8ecd0334c9e3fdbd2eca1f944..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 606
zcmZva%}T>S6opR<MU5M^Kkg*B=t8tK5xW#Eii@J4RuC6L@COT;mbO#{aUnj2;Lf*j
z=R$k}@nzySlZm?U!pS-3&b@asnY0eu`|_mc*WIFsoOuwF!00vbh)4+JPaNk{S%Kcc
z8<+*3-~)^SkG?N>9Qf#p8AvqX5KN&r;8mxO;5L{e--9om9>IO5@8BD!AK-gXH$&CZ
znQnEZNU`;Gg<6)cCD2t*Lv`R-1N=35s0-A9`VpN{RXbYOwl>iLGi!Ek)vorbOS{wE
z&Y9G;bt^o#sPyTKs4;s7>?<{Ofa~al%2T^TKsI~ZzxpXBy?`tV2xEUIniH1Xvd5P%
z0W-l~8C=2pAVim4-8_B)MEGf!Tf{e9ZpP)B_&ty$MHTG5XPV!FNRl#n6X~gIHdi8-
Pw>KMeKL4M!3F^K9(8fOx

diff --git a/common/test/keyboards/baseline/k_024___options_with_save_and_preset.js b/common/test/keyboards/baseline/k_024___options_with_save_and_preset.js
deleted file mode 100755
index 81152ece466..00000000000
--- a/common/test/keyboards/baseline/k_024___options_with_save_and_preset.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_024___options_with_save_and_preset());}function Keyboard_k_024___options_with_save_and_preset(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_024___options_with_save_and_preset";this.KN="024 - options with save and preset";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="0";this.s10="1";this.s11="0";this.s12="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,48)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s11;}}else if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s10;}}else if(k.KKM(e,16384,50)) {if(this.s5===this.s12){r=m=1;k.KDC(0,t);k.KSAVE("foo",this.s5);}}else if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");}else if(this.s5===this.s9){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_024___options_with_save_and_preset.kmx b/common/test/keyboards/baseline/k_024___options_with_save_and_preset.kmx
deleted file mode 100644
index 1fecdfac2131f0ebb90d36134ae99c5f0d5e1342..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 656
zcmZXSy-EW?6opR$!QVnmVmjF>RSZcGu@F%~6oVETA(a@6At_8kvLpz0T8oH<ScrvK
zh;LwPEf(Svh_A7JGdpU)3un){XYRc-yF0~lX-A_{CiQ$OB4QrII52t%JRt%C`5PC}
zP)<Sb;0>g}C-?wEAVc35JPcOQ^JXAXhD%@qU4!?XK7o5+8vhbLclsK>a{3m&arz#<
zbNUf}06DXPiaOM>j#N?8<~bEKD^D|^rM7%E;HJ9deYCGSs!M&3PS5sL;kG*DUEnh(
ztt~BUQ>*AaJ7w)|Y1`AGDx4Xfp~n1{t()VyMx{q*g&K3BJg4ECXqT*^11hWRVSE$e
zI}Ga3d5K7`;3r}Tlm5*$bxF5e;14YTGbiD^Me=n}AUA)`#0L2`sGujUBkhsbofmhW
rPksi1Ag-9ktQ%^s4-o`Oe8UMiYHv{Z6|w`axeHC+*VF&C5!Su|**i;w

diff --git a/common/test/keyboards/baseline/k_025___options_with_reset.js b/common/test/keyboards/baseline/k_025___options_with_reset.js
deleted file mode 100755
index e8a48164b00..00000000000
--- a/common/test/keyboards/baseline/k_025___options_with_reset.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_025___options_with_reset());}function Keyboard_k_025___options_with_reset(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_025___options_with_reset";this.KN="025 - options with reset";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="0";this.s10="1";this.s11="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,48)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s11;}}else if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s10;}}else if(k.KKM(e,16384,51)) {if(1){r=m=1;k.KDC(0,t);this.s5=k.KLOAD(this.KI,"foo","0");}}else if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");}else if(this.s5===this.s9){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_025___options_with_reset.kmx b/common/test/keyboards/baseline/k_025___options_with_reset.kmx
deleted file mode 100644
index 028f81cb5feb143b688f8ea96ef43bcce6d86368..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 608
zcmZvayH3ME5JhhyMZ8h~2__Y?B1i>RLWq<yARa{o4FOS5VDS(saFAp1Di8(YGbpI2
z`34Ha7a%@?pD<_b4Nx%B-FxTm%&hHod#|&tQEBe$<w-=wEW{Wvx&<B(F@gMvgKR1t
z=ncGrY48Ew!4SyP_X!V!GP-025>0psjHB1#meu?4E||d&;lS!EII{W{zOniqz5`V=
zRBavWT4(YVBzaYfYRJ_B=;>UMx^SRA`6W8iDJrC^4<dRh+S0N%wT7-S)k`K<bisZ|
zRob7Pcfzb*QrBSJpwgw&r^cLKQ=N51J7irQQhCG-<C{pI_pg4;NY7vpIfO}nCz_t3
z-Olsv9bhIDtXCp019R?_^=8TEfloeRJ&(L;y-Dk>l6OEH7nDnGexUg=h&XoeO{8z_
TC0-FPo7`={`?>$@jZpUudIdme

diff --git a/common/test/keyboards/baseline/k_026___system_stores.js b/common/test/keyboards/baseline/k_026___system_stores.js
deleted file mode 100755
index b49711fb248..00000000000
--- a/common/test/keyboards/baseline/k_026___system_stores.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_026___system_stores());}function Keyboard_k_026___system_stores(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_026___system_stores";this.KN="026 - system stores";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5="1234567890";this.s6="abcdefghij";this.s9="windows";this.s10="desktop";this.s11="hardware";this.s12="native";this.s13="en-US";this.s14="kbdus.dll";this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,48)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,49)) {if(k.KIFS(31,this.s9,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"windows.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,50)) {if(k.KIFS(31,this.s10,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"desktop.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,51)) {if(k.KIFS(31,this.s11,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"hardware.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,52)) {if(k.KIFS(31,this.s12,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"native.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,53)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,54)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,55)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,56)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,57)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,65)) {if(k.KIFS(32,this.s13,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"en-US.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,66)) {if(k.KIFS(32,this.s14,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"kbdus.dll.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,67)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,68)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,69)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,70)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,71)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,72)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,73)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,74)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_026___system_stores.kmx b/common/test/keyboards/baseline/k_026___system_stores.kmx
deleted file mode 100644
index bb918cf1429b4e57b68ea4d8bd08e226d558426d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1972
zcmd^<%}bO~6viK=53>>>(>_2f!bPO$_zf*8$^uIS4cyN7j-TT=%#51<K#LY4Auak7
zT7-m1>sGBI!d0{kX%Q09A|kZkxpUvV*}~bi=nT)C^E~&Q^WOJ<yaS^n!>X3DBU?X(
zRoEX^11!D<S}UbpjPSRuA1#ITxX<7dXaLq^8`y9&4R-KV;3{##H;?dxK7NSLfm(8&
z;#YmVhJOYc(cj@;`S>G#)5qWOTRyI0jz4@{Ph1VG_6q(CXd{*el-81Fl~mU8HYL=p
zCbfV9BLx-7n02hEIptvmGMhE1>$;~~#O?HIb^V&Pz<8dFDRQl2JN-J;sV=(qs8@Y1
zFJgQG6v;>`r7=a+jiXJXPNQbvMfdEy>(ayjZEBl%W|Evz?=I9Ex(}P8$DHdTExPdt
zzUbyErx!Fszd7Zo5zk37&xj23X{Tk0i`3dXn5F64Lib_EW|(KBc{;Y@GyKf@S;-*~
z+c|;?us2IvXFCUGqlcsg&`x~HDbfS@Bd^7IPvGkyK~9~|+kn6JTAa5D{|Y+DIqmbl
z!K)6Jv^cL0o&cTX*!eW;gx~a9oHqo|0$bNu%fXjHcc87npM#!2TZ6v=y@B=?z76^U
z?F+o-i0!*{7MRt-8@+bEB<V8zE=a*`Rm}$Bk=Nq99Q-jDV?5SY;Ts?dw3qPrARTBQ
z;5%SE(CngK1QUUF3EmGT1MLoc8cYRR2EJ^1psm1PfE*{r&eu3+Fwc!@A+nR4;XIlB
zd1_7D-EH8!SLzt?LDhDD_D*<M&8O_Z>ixGNtUq2xeRy-i+7o5e9`t7adVKFI5Wm?4
m_T(gQmSX=3th?>&61zIj?(W~!zrPw`mzpxWl=GzjIp-IYEd-wc

diff --git a/common/test/keyboards/baseline/k_027___system_stores_2.js b/common/test/keyboards/baseline/k_027___system_stores_2.js
deleted file mode 100755
index 47da49cf681..00000000000
--- a/common/test/keyboards/baseline/k_027___system_stores_2.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_027___system_stores_2());}function Keyboard_k_027___system_stores_2(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_027___system_stores_2";this.KN="027 - system stores 2";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5="1234567890";this.s6="abcdefghij";this.s9="linux";this.s10="desktop";this.s11="hardware";this.s12="native";this.s13="fr-FR";this.s14="kbdfr.dll";this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,48)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,49)) {if(k.KIFS(31,this.s9,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"linux.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,50)) {if(k.KIFS(31,this.s10,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"desktop.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,51)) {if(k.KIFS(31,this.s11,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"hardware.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,52)) {if(k.KIFS(31,this.s12,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"native.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,53)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,54)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,55)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,56)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,57)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"platform-fail.");}}else if(k.KKM(e,16384,65)) {if(k.KIFS(32,this.s13,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"fr-FR.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,66)) {if(k.KIFS(32,this.s14,t)){r=m=1;k.KDC(0,t);k.KO(-1,t,"kbdfr.dll.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,67)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,68)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,69)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,70)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,71)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,72)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,73)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}else if(k.KKM(e,16384,74)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"baselayout-fail.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_027___system_stores_2.kmx b/common/test/keyboards/baseline/k_027___system_stores_2.kmx
deleted file mode 100644
index dac90ab985bd96e1b54a14967406fb4236e80d09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1968
zcmd^<&uUXa6vj_W)f#IlsI68gag&AEkn~T|?qbm@)_+umE=`);CT-G`B(3cWxCm9m
zl`9`Wq?FP}5EtS?M8pRW5h=x$NGZnOnanjqT_igfPWW=p_sw_Cy?18rotn9OM*<>`
zeq?V6qfP%9-9YmM2)B#W7^Hv3=8<~ZOV|NlK_A!$yFjPU)8H4e6C}uEwt1E~ZSyLz
z0($T~CqA?JHgN+CpuZ=+w)tn`2b=#SezAEc_qb>CUh)9Y+6%<fAVMxOB^g<hf+S_p
z@Q4gaT!JzP%FL9df}>zqMT$~_m0?4;Lvm9t$_=?p9;IK{^bE-go)WGce(f5?JuD+K
zDlvMG$++>QnV$m{97##ZtfZ;)(6XrWsCjtBT)$+x#QDEMZIEjw@zi^dqE5&?SdJb=
z(?x4_epyzT6{D49fnG&fGD?;XCG-a-W{kE-UZGC!Ux$ZdP$p&Cum$chZL}~k&rioB
zD|s9Eqo1S=H11H>S<iuvnGTT^5G6lh6p>Z<L#z3|r|?ant9;V>w&1U<=KJ2kcfl~8
zQ`Yw#-f^g|`Mw@_7>wZ2^Qj{OPgu?OU5C#DT~lAn!>b_XXzTD7Ans@{;cvj0qrHWH
z1LKai0}mY5Jr_9xbacV{t#-C9NeF%wq~N-$I<CR*Tg~_7;g7*A^S<^3z6H{bwhjLX
zGLH5Mz6U%<+lLSEvd%eL5IzC2j&=#|ft;gd;Z>lg*T0u__y$<w#OV3*%v)68WO?u$
zY8bbBVwKlweVp@lIZEEFQs0}#>2|C6j5V!3_$IjZ$6Ba&-x{~JtA*NTPxi0p8(#qb
o$<DDS$9b|8dsk-Nbx+sW(Peh_;Ew+N#c;cHx7ekXEB()&-(n8~0{{R3

diff --git a/common/test/keyboards/baseline/k_028___smp.js b/common/test/keyboards/baseline/k_028___smp.js
deleted file mode 100755
index 236cd0e638e..00000000000
--- a/common/test/keyboards/baseline/k_028___smp.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_028___smp());}function Keyboard_k_028___smp(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_028___smp";this.KN="028 - smp";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KS=1;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"🙂");}}else if(k.KKM(e,16384,50)) {if(k.KFCM(1,t,['🙂'])){r=m=1;k.KDC(1,t);k.KO(-1,t,"🙂hi😀");}}else if(k.KKM(e,16384,51)) {if(k.KFCM(1,t,['😀'])){r=m=1;k.KDC(1,t);k.KO(-1,t,"x");}}else if(k.KKM(e,16384,52)) {if(k.KFCM(4,t,['🙂','h','i','x'])){r=m=1;k.KDC(4,t);k.KO(-1,t,"😁y");}}else if(k.KKM(e,16384,53)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"𐌳");r=this.g1(t,e);m=2;}}return r;};this.g1=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KFCM(1,t,['𐌳'])){m=1;k.KDC(1,t);k.KO(-1,t,"x");}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_028___smp.kmx b/common/test/keyboards/baseline/k_028___smp.kmx
deleted file mode 100644
index f343f969e9bde1431c12375cf7a6c7c68dad0b26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 574
zcmYL_Jxc>o5Jm4sgJNS$5g}EoR4Um`gjhu4f>;CvQNh9{n20I-z<`+lVIlT{_!k82
ztwbzRMXMBIVQC?(XP&!e;4E|R%)Iw@8oS$Dnvyo}A8$l>_8}%91$CIij0n>IShgaO
zgDbd%S-6F3u=xkLgGqRWC&<7j4C6e-**|ffC(l6%Ej83uPe*F%*y)l2RaMYDbn#Dd
zi`vkN*0oCRGq>Poi#liajINGO+_X<sTBBN^yNPdS2C6vMcPF;B@48!fOAu;@u8wnC
zoG0yh(g7rqCNY_17ln8qR!dq&H`(peR;sfF%FhrWZ5!sjpx>d4oQb_5`UC8Z+1UF+
zf5Rf$HgB`z+?;`0KOC49MPoYT-L<~Zf9?f-qP;=Ssc>LjR#CtF7DZ`s2+`$VN1HGw
NZy%yULlu%4=@$SrOV9uS

diff --git a/common/test/keyboards/baseline/k_029___beep.js b/common/test/keyboards/baseline/k_029___beep.js
deleted file mode 100755
index 7862cedc629..00000000000
--- a/common/test/keyboards/baseline/k_029___beep.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_029___beep());}function Keyboard_k_029___beep(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_029___beep";this.KN="029 - beep";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);k.KB(t);}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_029___beep.kmx b/common/test/keyboards/baseline/k_029___beep.kmx
deleted file mode 100644
index abf8b899836172c2802a5c5f3972aa85ee03ab52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 326
zcmYL^u}VT=7=|C0lt6IO^-K;z;b}XIn3N4tOA4-5XK=8jNbn9CqALimq6=tt@&baO
zOK50tIX?eE?S<$3@A=;E{o(Ho`_~-8diDH`Duj<Zkl@==(qu}zS9iNub@D1NQj>Ri
zlcIdcLQ1lfPpQa{d~N-o=dUycdZf&mFycP{Z*oFH#F5;XrA(dIx#E;d&h@d)<GfvG
zX8y<%V;=H;Yzh~qk=rBZ;nqYt4D@4e-Mq5}k?(29PQeELd*QBfh}+OII+H95?}QD-
C-6tpj

diff --git a/common/test/keyboards/baseline/k_0300___deadkeys.js b/common/test/keyboards/baseline/k_0300___deadkeys.js
new file mode 100644
index 00000000000..0ceda698246
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0300___deadkeys.js
@@ -0,0 +1,40 @@
+
+KeymanWeb.KR(new Keyboard_k_0300___deadkeys());
+
+function Keyboard_k_0300___deadkeys()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0300___deadkeys";
+  this.KN="0300 - deadkeys";
+  this.KMINVER="9.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0010;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.g_main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4010, 0x36)) {
+      if(1){
+        r=m=1;   // Line 13
+        k.KDO(0,t,0);
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x41)) {
+      if(k.KDM(0,t,0)){
+        r=m=1;   // Line 15
+        k.KO(0,t,"â");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_013___deadkeys.kmn b/common/test/keyboards/baseline/k_0300___deadkeys.kmn
similarity index 87%
rename from common/test/keyboards/baseline/k_013___deadkeys.kmn
rename to common/test/keyboards/baseline/k_0300___deadkeys.kmn
index d0f4876455e..528a0929a01 100644
--- a/common/test/keyboards/baseline/k_013___deadkeys.kmn
+++ b/common/test/keyboards/baseline/k_0300___deadkeys.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '013 - deadkeys'
+store(&NAME) '0300 - deadkeys'
 c Description: Tests a simple deadkey rule in Unicode
 c keys: [SHIFT K_6][K_A]
 c expected: \u00E2
diff --git a/common/test/keyboards/baseline/k_0300___deadkeys.kmx b/common/test/keyboards/baseline/k_0300___deadkeys.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..a575f19954bd5fb7b00324488bf11fafec1bc443
GIT binary patch
literal 396
zcmYL_F-t;W6o%g#N`<JY76)l?vbYirZW=d4Bn7o_5-#Z=VGe=d5_fQPbO?We^i%o)
zLW@Jcpvm?2e1}gvm*;-(d(OEpm#^OKw3U|P!S|`C1NWki!Ray-5DA6c*W53j)A@h}
zT)+yJ;J*KYPe{QA)^G+}`1LwN&Jno&C1(}_v{ctXQ;ihq)qJ2ECV_Igf<DuT_ls@4
zv5{9p6+P%4UDCCs<n@GasjZrt%%viaRJ9zJJ+$-^y*oXkhkDl7(%tSY{m^#ZS0Vq_
jfL$FToc+(~;ZFQ`!ss0$yj?A4jGsZ0r2I|)(A~K|5FIR`

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0301___multiple_deadkeys.js b/common/test/keyboards/baseline/k_0301___multiple_deadkeys.js
new file mode 100644
index 00000000000..67b3f4987c4
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0301___multiple_deadkeys.js
@@ -0,0 +1,176 @@
+
+KeymanWeb.KR(new Keyboard_k_0301___multiple_deadkeys());
+
+function Keyboard_k_0301___multiple_deadkeys()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0301___multiple_deadkeys";
+  this.KN="0301 - multiple deadkeys";
+  this.KMINVER="9.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0000;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.g_main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4000, 0x31)) {
+      if(1){
+        r=m=1;   // Line 22
+        k.KDO(0,t,0);
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x32)) {
+      if(1){
+        r=m=1;   // Line 25
+        k.KO(0,t,"a");
+        k.KDO(-1,t,1);
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x33)) {
+      if(1){
+        r=m=1;   // Line 28
+        k.KDO(0,t,2);
+        k.KO(-1,t,"a");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x34)) {
+      if(1){
+        r=m=1;   // Line 31
+        k.KDO(0,t,3);
+        k.KDO(-1,t,4);
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x35)) {
+      if(1){
+        r=m=1;   // Line 34
+        k.KO(0,t,"a");
+        k.KDO(-1,t,5);
+        k.KDO(-1,t,6);
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x36)) {
+      if(1){
+        r=m=1;   // Line 37
+        k.KO(0,t,"a");
+        k.KDO(-1,t,7);
+        k.KDO(-1,t,8);
+        k.KO(-1,t,"b");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x37)) {
+      if(1){
+        r=m=1;   // Line 40
+        k.KDO(0,t,9);
+        k.KDO(-1,t,10);
+        k.KO(-1,t,"a");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x38)) {
+      if(1){
+        r=m=1;   // Line 45
+        k.KDO(0,t,11);
+        k.KDO(-1,t,12);
+        k.KDO(-1,t,13);
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x39)) {
+      if(1){
+        r=m=1;   // Line 56
+        k.KO(0,t,"{");
+        k.KDO(-1,t,14);
+        k.KDO(-1,t,15);
+        k.KO(-1,t,"}");
+        k.KDO(-1,t,16);
+        k.KDO(-1,t,17);
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x58)) {
+      if(k.KCM(2,t,"{",1)&&k.KDM(1,t,14)&&k.KDM(1,t,18)&&k.KCM(1,t,"}",1)&&k.KDM(0,t,19)&&k.KDM(0,t,20)){
+        r=m=1;   // Line 59
+        k.KO(2,t,"9=OK");
+      }
+      else if(k.KCM(2,t,"a",1)&&k.KDM(1,t,7)&&k.KDM(1,t,8)&&k.KCM(1,t,"b",1)){
+        r=m=1;   // Line 38
+        k.KO(2,t,"6=OK ");
+      }
+      else if(k.KDM(1,t,15)&&k.KCM(1,t,"}",1)&&k.KDM(0,t,16)&&k.KDM(0,t,17)){
+        r=m=1;   // Line 58
+        k.KDO(1,t,18);
+        k.KO(-1,t,"}");
+        k.KDO(-1,t,19);
+        k.KDO(-1,t,20);
+      }
+      else if(k.KCM(1,t,"a",1)&&k.KDM(0,t,5)&&k.KDM(0,t,6)){
+        r=m=1;   // Line 35
+        k.KO(1,t,"5=OK ");
+      }
+      else if(k.KDM(1,t,9)&&k.KDM(1,t,10)&&k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 41
+        k.KO(1,t,"7=OK ");
+      }
+      else if(k.KDM(0,t,11)&&k.KDM(0,t,12)&&k.KDM(0,t,13)){
+        r=m=1;   // Line 46
+        k.KO(0,t,"8=OK ");
+      }
+      else if(k.KCM(1,t,"a",1)&&k.KDM(0,t,1)){
+        r=m=1;   // Line 26
+        k.KO(1,t,"2=OK ");
+      }
+      else if(k.KDM(1,t,2)&&k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 29
+        k.KO(1,t,"3=OK ");
+      }
+      else if(k.KDM(0,t,3)&&k.KDM(0,t,4)){
+        r=m=1;   // Line 32
+        k.KO(0,t,"4=OK ");
+      }
+      else if(k.KDM(1,t,9)&&k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 42
+        k.KO(1,t,"7=Fail1 ");
+      }
+      else if(k.KDM(1,t,10)&&k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 43
+        k.KO(1,t,"7=Fail2 ");
+      }
+      else if(k.KDM(0,t,11)&&k.KDM(0,t,12)){
+        r=m=1;   // Line 50
+        k.KO(0,t,"8=Fail4 ");
+      }
+      else if(k.KDM(0,t,11)&&k.KDM(0,t,13)){
+        r=m=1;   // Line 51
+        k.KO(0,t,"8=Fail5 ");
+      }
+      else if(k.KDM(0,t,12)&&k.KDM(0,t,13)){
+        r=m=1;   // Line 52
+        k.KO(0,t,"8=Fail6 ");
+      }
+      else if(k.KDM(0,t,0)){
+        r=m=1;   // Line 23
+        k.KO(0,t,"1=OK ");
+      }
+      else if(k.KDM(0,t,11)){
+        r=m=1;   // Line 47
+        k.KO(0,t,"8=Fail1 ");
+      }
+      else if(k.KDM(0,t,12)){
+        r=m=1;   // Line 48
+        k.KO(0,t,"8=Fail2 ");
+      }
+      else if(k.KDM(0,t,13)){
+        r=m=1;   // Line 49
+        k.KO(0,t,"8=Fail3 ");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_019___multiple_deadkeys.kmn b/common/test/keyboards/baseline/k_0301___multiple_deadkeys.kmn
similarity index 97%
rename from common/test/keyboards/baseline/k_019___multiple_deadkeys.kmn
rename to common/test/keyboards/baseline/k_0301___multiple_deadkeys.kmn
index e70b30f08c5..ea7b8535816 100644
--- a/common/test/keyboards/baseline/k_019___multiple_deadkeys.kmn
+++ b/common/test/keyboards/baseline/k_0301___multiple_deadkeys.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '019 - multiple deadkeys'
+store(&NAME) '0301 - multiple deadkeys'
 c Description: Tests deadkey scenarios
 c 1. One deadkey in context                   dk(1) + '1'
 c 2. One char and one deadkey in context      'a' dk(2) + '2'
diff --git a/common/test/keyboards/baseline/k_0301___multiple_deadkeys.kmx b/common/test/keyboards/baseline/k_0301___multiple_deadkeys.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..68804c91dd92a36e274aed421c0cbb7ad513c2a5
GIT binary patch
literal 2194
zcmZXU%S%;J6vmfYW|npBVP&t2m6WA<uinS$g@qYm57Cln5Z#_iSwRL?)F47c8aW7w
z=nrtzph1I14H`)_XwWdCfkSZ+5t04YKI?k+J#JWgec!j%-e>K7&RN|T&h^Q1k=p0)
ztAtUe6Js-`xC5K25SeEH7siCk7O6uSBk?)50X&Hx$CiPo@vksV{f_^JCBVP&bB0%y
z6US6<#3v1B@vVlt@EwNx@jZqI@K+2!!VepMfgd&e20v-|Eq==INBjrFU-6#}&)|O;
z{)_)*IKdrMV_N4<{5HdReA@6Se3#+N_=|>z@plZ5;h!0Pjem)?vZqM5T$hJ3Bn7$S
zc&oG#Nl8+gu_1XNw`Euc<sSYz$~EQ!^DVdTK5H7~j2xBIavU5;i`%zR`r*COCnx1B
zajJFt31;23z>fO7l;oL@$$8kIT$Q_Se~}D3iFCT`6sX9xuC&L~@HUUP!Q0tATG8&5
zE1r@;$&}<|o#N-@P_iXCd8ha}0ZOhUC*|tRiJz5ncbSjnY2Eo)p4Oh{4x-vqoF&Ok
z6iPI$KZvc>69lofdWL}e^!L+K1iU$4({luJ!_)L#sdf|XBVWoiRvg7Y)PINJ|EL)=
zOGRceeMg&Y$sGJIrtfKsY5(9=mBRT%wwqQB--u=44W`w@o3Jc=mudUpN3a}xw`m>l
z9!$TcX487%H!%H@RM#;8AH_z%2c1G6flrv$Xxdx&2h$Fi_8I=uv>m4XfmhOWbiX~O
z)xjG~YcVYiKVn+FX}$1ErfoHC06uJ5(zK`WanqVin}ko9w%4?G@K2`c{p<Jw|6!Wm
zzm8dWIn7aP*8A6yfH#<?{ZvOQ{E%t;LrFT}{icQegEPSInWq1$juH4cHa}lwy}jUY
zxr?e=;lAoHV~LCLNif2^N~cihf>Py_<?g!=S5-S@g}2X2r_{K4m0SDR;ni+V$P?#l
z-Mq%d13658>IVCnYb|q~%Un-1Yk5g<SfO8!o@enIRTn=qvuLO2tT`{HtNjz^W3l*I
z(_TEf>o!k~ZoNIGM)$83baBE#y1n+=;!PJoeoXsU7z^)Tt1GV4o)yN5HR}Ht#kGI=
laeY&MTzgp<kKSY|R&iNuO;qd3SR|^nCKl0t8$L%X_zwcr8!Z3;

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0302___deadkeys_and_backspace.js b/common/test/keyboards/baseline/k_0302___deadkeys_and_backspace.js
new file mode 100644
index 00000000000..2322275bdde
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0302___deadkeys_and_backspace.js
@@ -0,0 +1,93 @@
+
+KeymanWeb.KR(new Keyboard_k_0302___deadkeys_and_backspace());
+
+function Keyboard_k_0302___deadkeys_and_backspace()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0302___deadkeys_and_backspace";
+  this.KN="0302- deadkeys and backspace";
+  this.KMINVER="9.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0000;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.g_main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4000, 0x08)) {
+      if(k.KCM(2,t,"c",1)&&k.KDM(1,t,11)&&k.KCM(1,t,"d",1)){
+        r=m=1;   // Line 32
+        k.KO(2,t," ok");
+      }
+      else if(k.KCM(2,t,"cd",2)){
+        r=m=1;   // Line 31
+        k.KO(2,t," fail");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x31)) {
+      if(1){
+        r=m=1;   // Line 24
+        k.KDO(0,t,0);
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x32)) {
+      if(1){
+        r=m=1;   // Line 25
+        k.KO(0,t,"a");
+        k.KDO(-1,t,1);
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x33)) {
+      if(1){
+        r=m=1;   // Line 26
+        k.KDO(0,t,2);
+        k.KO(-1,t,"a");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x34)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDO(0,t,3);
+        k.KDO(-1,t,4);
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x35)) {
+      if(1){
+        r=m=1;   // Line 28
+        k.KO(0,t,"a");
+        k.KDO(-1,t,5);
+        k.KDO(-1,t,6);
+        k.KO(-1,t,"b");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x36)) {
+      if(1){
+        r=m=1;   // Line 29
+        k.KO(0,t,"a");
+        k.KDO(-1,t,7);
+        k.KDO(-1,t,8);
+        k.KO(-1,t,"b");
+        k.KDO(-1,t,9);
+        k.KDO(-1,t,10);
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x37)) {
+      if(1){
+        r=m=1;   // Line 30
+        k.KO(0,t,"c");
+        k.KDO(-1,t,11);
+        k.KO(-1,t,"de");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn b/common/test/keyboards/baseline/k_0302___deadkeys_and_backspace.kmn
similarity index 96%
rename from common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
rename to common/test/keyboards/baseline/k_0302___deadkeys_and_backspace.kmn
index af7c80f21d9..8049e44a86c 100644
--- a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
+++ b/common/test/keyboards/baseline/k_0302___deadkeys_and_backspace.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '020 - deadkeys and backspace'
+store(&NAME) '0302- deadkeys and backspace'
 c Description: Tests deadkey backspacing
 c 1. One deadkey in context                   dk(1) + BKSP = nul
 c 2. One char and one deadkey in context      'a' dk(2) + BKSP = nul
diff --git a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmx b/common/test/keyboards/baseline/k_0302___deadkeys_and_backspace.kmx
similarity index 87%
rename from common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmx
rename to common/test/keyboards/baseline/k_0302___deadkeys_and_backspace.kmx
index 68271160736d730fec3a93720e79a8442ccf8803..71e4f50f3ed9d9017231960380b326faa45ed941 100644
GIT binary patch
delta 32
ncmZqTXyV}UjtB{6;ACK!dx2kMBaaFrt1*KCgVAPF#<NTSc&7(A

delta 32
ncmZqTXyV}UjtB{6;ACLf%=A@oBaaFrs}X|%gTiK0#<NTSdTj?#

diff --git a/common/test/keyboards/baseline/k_030___multiple_groups.js b/common/test/keyboards/baseline/k_030___multiple_groups.js
deleted file mode 100755
index 4eeb812c493..00000000000
--- a/common/test/keyboards/baseline/k_030___multiple_groups.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_030___multiple_groups());}function Keyboard_k_030___multiple_groups(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_030___multiple_groups";this.KN="030 - multiple groups";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"a");}}else if(k.KKM(e,16384,50)) {if(k.KFCM(1,t,['b'])){r=m=1;k.KDC(1,t);k.KO(-1,t,"b");r=this.g2(t,e);m=2;}}if(m==1) {k.KDC(-1,t);r=this.g1(t,e);m=2;}return r;};this.g1=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KFCM(1,t,['a'])){m=1;k.KDC(1,t);k.KO(-1,t,"b");}return r;};this.g2=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KFCM(1,t,['b'])){m=1;k.KDC(1,t);k.KO(-1,t,"abc");}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_031___caps_lock.js b/common/test/keyboards/baseline/k_031___caps_lock.js
deleted file mode 100755
index d3147ae65e0..00000000000
--- a/common/test/keyboards/baseline/k_031___caps_lock.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_031___caps_lock());}function Keyboard_k_031___caps_lock(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_031___caps_lock";this.KN="031 - caps lock";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0310;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16896,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16640,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16384,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16912,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16656,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16400,65)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16400,66)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16384,65)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16384,66)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_031___caps_lock.kmx b/common/test/keyboards/baseline/k_031___caps_lock.kmx
deleted file mode 100644
index 5fe3e4fbd74b8e928a0acf7e052369c0de919bae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 650
zcmbV}O-jR16opSaP${BSs+Kw_2%!TljTOiCp*Sdt_ydl_)E_9uwpb7p7f?i8fpjS@
zz_Dv^<Pt>v?rYRp2j1`{=bU%nO?asv?(Zohh5b@PRLXAD2$)`j9O8>Y{?>hZAZK|z
zKo92N2_9h-o}mw8@Cq-Gg?D&Mbeh>8=n6=6o#{rGiq!JHqN+j_wFD=m9d%K$+PDik
z0&T0NEp4DfW|aM$K-bK<qPIz>O$xQleUsH9-4Xd9wYNGQ;F?Tq>y&-cVoF+tpW=A@
zS^Vu>Aju`mpLAw8jSxR!nUlux`6QdPtR@xk0aURwmQf}A3fR|8LDunRyi2la%h<b)
z-vOlZV6}@s0*9XWiFAyQA;R0=uxjCNp@A;=M7qQGphIVutL*c0e=>36hOG_j{O`VR
DUGYIM

diff --git a/common/test/keyboards/baseline/k_032___caps_control.js b/common/test/keyboards/baseline/k_032___caps_control.js
deleted file mode 100755
index d8afdda31d8..00000000000
--- a/common/test/keyboards/baseline/k_032___caps_control.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_032___caps_control());}function Keyboard_k_032___caps_control(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_032___caps_control";this.KN="032 - caps control";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0310;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16912,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16656,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16640,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16896,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16640,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16640,52)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,52)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16896,53)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16640,53)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16896,54)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16640,54)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16640,55)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,55)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_032___caps_control.kmx b/common/test/keyboards/baseline/k_032___caps_control.kmx
deleted file mode 100644
index 1914d1954bb7186f7edb96a9a28e64df0ce182d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 880
zcmdUs%Pxaa6oprjxJF9cHIzgnf@teD)W#(t45&nm+}dbT+O#6^3MM8Vz(9-)MZ^P$
z2M{A8F)$JlV|@GXDbL{i`OevEowL_}TUbl1s7CrcdCQ66vx!j!R!>2m;+sLKa+?@A
zSF}){!x^-~6<k0iJi#?s)(5;ot!eTqpqhG+wIBS{^Q_aZ-e6sa5qxPuNgZiVo7(sE
zh@y%ps3F+K&8gs3S@sW<S5_I$g|wuY7Bxd1CTZA93+a%wJRNDySzg#XThJ~}ivAS4
zNv^_gcIiy%Ue;%1cq-c)W1b^D$lW$cDW*no<61?fNy=)6OzGGsokD5UQ<(hgw7xd*
z$EC|M=?2VeH!mjLqVK?-y8(Df-J>6z*Jxf`dPF}%1li=g7xcUHn$4s41N{Y~$WG_k
zkFEpr0_Me~dUOZa+jcoGfbMr*w|V3ZpvMhlk2^Pso_1cZJ2#77h6!|^^AhL{=Y?GF
W7J462-nY&0A8q7N1+Jp{FMB^|wPG3o

diff --git a/common/test/keyboards/baseline/k_033___caps_always_off.js b/common/test/keyboards/baseline/k_033___caps_always_off.js
deleted file mode 100755
index da223fb088e..00000000000
--- a/common/test/keyboards/baseline/k_033___caps_always_off.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_033___caps_always_off());}function Keyboard_k_033___caps_always_off(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_033___caps_always_off";this.KN="033 - caps always off";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0300;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16640,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16640,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16640,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_033___caps_always_off.kmx b/common/test/keyboards/baseline/k_033___caps_always_off.kmx
deleted file mode 100644
index cb9a71a0460da245d17985bf76235ebdf6c93080..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 572
zcmbV}!Ab&A6o!8Xv8at!<Su6A%EZZN5iU{?7m}M2+78u#V9k(F_#Q2y7btunAE1>)
zOL19!=Z*ueJ(us^^WQn=_c+tLxxUhl^fCC}6_K-z*aFKhpilBgkScE*(e%>ukmC(r
zp$wn!4%R<|DQv?Jd;vct55Hf|B2>tIu)N8626b|&r+ZEGpiqxa*VSP8I)+<r6OGA2
zjr77kaVl2C!c~2>bg2$`fM3mdR`iVL6O}{7&NXngncKQo<`n3ZnlAl5ej%MUO`sF@
zwg#vn)5N;NS&DK}0$CJDOs;pP|CRAH=g|UeijuXor6t<q-J1Wt-BFiE7gu)&c1PVF
l`Uo0G`vz9$qpPbs`xaJLL!U$BW*_k;EE3e1m8wmj{R8P3KC1u#

diff --git a/common/test/keyboards/baseline/k_034___options_double_set_reset.js b/common/test/keyboards/baseline/k_034___options_double_set_reset.js
deleted file mode 100755
index b8e2dba019d..00000000000
--- a/common/test/keyboards/baseline/k_034___options_double_set_reset.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_034___options_double_set_reset());}function Keyboard_k_034___options_double_set_reset(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_034___options_double_set_reset";this.KN="034 - options double set reset";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="2";this.s10="3";this.s11="2";this.s12="3";this.s13="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");this.s5=this.s9;this.s5=k.KLOAD(this.KI,"foo","0");this.s5=this.s10;this.s5=k.KLOAD(this.KI,"foo","0");}else if(this.s5===this.s11){r=m=1;k.KDC(0,t);k.KO(-1,t,"bar.");}else if(this.s5===this.s12){r=m=1;k.KDC(0,t);k.KO(-1,t,"baz.");}else if(this.s5===this.s13){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_034___options_double_set_reset.kmx b/common/test/keyboards/baseline/k_034___options_double_set_reset.kmx
deleted file mode 100644
index df8eb8062a535df0881c3e960f8b5232fdf6bc94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 674
zcmY+Cy-EW?6opTMqDBQZA$GD=urVb5bQUV8MKFyDL2ME?LPV3W{(z~hd;p7JAr`?x
zEyO~6jFe(wAwGfl0{YF)n2-x+&$(ys+`F?gxx&__V$$0~J1!z(9>gdxdI`KDehFkJ
zT2U*L&?oo+li(YCfdP<V-48qn*3gTlA+ZY=z!>@f_MN_f8(<2*312yV17ADcf^VI^
zhwq$zf*+lJfuBLf3{y^Jo$E+NRl_`^InB${45+ED6II}<j>&!0sY*IzjfYd_t)~FC
zT1qLeWo>AcURfrj!zn49Q4>&Qd)e9hbgPAR3q04U^jKM>#(YVZ?~qosO;*t!l|DU;
zZ(=rlnu=a+_tcI^@8CcB5GL(*FOrSB*VCL;9vE-Jc{}93^TLD2uah^NmvD8L<V|4r
wlI9-7)vqBq3EM2@GIL83xY6*$OUw)SKV5eiZQMqWJAzwf_g-g4cZIoyf7L`(djJ3c

diff --git a/common/test/keyboards/baseline/k_035___options_double_set_staged.js b/common/test/keyboards/baseline/k_035___options_double_set_staged.js
deleted file mode 100755
index 8d7f0a57a6c..00000000000
--- a/common/test/keyboards/baseline/k_035___options_double_set_staged.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_035___options_double_set_staged());}function Keyboard_k_035___options_double_set_staged(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_035___options_double_set_staged";this.KN="035 - options double set staged";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="2";this.s10="3";this.s11="2";this.s12="3";this.s13="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");this.s5=this.s9;}else if(this.s5===this.s11){r=m=1;k.KDC(0,t);k.KO(-1,t,"bar.");}else if(this.s5===this.s12){r=m=1;k.KDC(0,t);k.KO(-1,t,"baz.");}else if(this.s5===this.s13){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}else if(k.KKM(e,16384,66)) {if(1){r=m=1;k.KDC(0,t);this.s5=k.KLOAD(this.KI,"foo","0");}}else if(k.KKM(e,16384,67)) {if(1){r=m=1;k.KDC(0,t);this.s5=this.s10;}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_035___options_double_set_staged.kmx b/common/test/keyboards/baseline/k_035___options_double_set_staged.kmx
deleted file mode 100644
index e112a0740f57c46c61d5d72a322bfb0922edaf06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 718
zcmY+CJ4*vW6opR&-wJAC>}0ESh9r_wQ9%@f7Ct~Mgghk>qr@l}tOTtsEJQ>s)Iw57
z3b7Px5o@s!e}VW1)^B!4gBQ-8$IRTB-JR6R(xSSg>%+#FsDOD;y};-R@PKeB<X^qC
z_%aNAfOjwizQ8AF2MN}F!yRB2J#HFOYw#-QLzm!!)d%oC7$!f3PprOx&#b<JFRi|X
zZ>+w9>sH^x4G=S%DW$yjw4t=ho{wo%NjVw;o7z%UMYybOd=9mvj7qF=Nb-ytuCjU^
zm!m^O^P1G0rqOZsh<f`(w99yfxqdf)_X7Pky?IHVGt6{YnP!eTOPrHPQ(DFqm1Sm*
z9ws-H@SbMIf9=23Ye0Gfztx5?w%I+6>$k%T{H+`?S;%Hv_?pcIZFYn|wwd{}rq1zo
zkU<Z42{!`&2(tK~&7Sbjz<=i`Hzuf7bu#L@AykWZ4>Fvg!Z&NC-Ds26{-r&nWxj~>
U*RQ$4+)dXF)6<l{4_BD_0iY^ZkpKVy

diff --git a/common/test/keyboards/baseline/k_036___options___double_reset_staged.js b/common/test/keyboards/baseline/k_036___options___double_reset_staged.js
deleted file mode 100755
index 9427fcf1683..00000000000
--- a/common/test/keyboards/baseline/k_036___options___double_reset_staged.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_036___options___double_reset_staged());}function Keyboard_k_036___options___double_reset_staged(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_036___options___double_reset_staged";this.KN="036 - options - double reset staged";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="2";this.s10="2";this.s11="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");this.s5=this.s9;}else if(this.s5===this.s10){r=m=1;k.KDC(0,t);k.KO(-1,t,"bar.");}else if(this.s5===this.s11){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}else if(k.KKM(e,16384,66)) {if(1){r=m=1;k.KDC(0,t);this.s5=k.KLOAD(this.KI,"foo","0");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_037___options___double_reset.js b/common/test/keyboards/baseline/k_037___options___double_reset.js
deleted file mode 100755
index a4e26a633f5..00000000000
--- a/common/test/keyboards/baseline/k_037___options___double_reset.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_037___options___double_reset());}function Keyboard_k_037___options___double_reset(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_037___options___double_reset";this.KN="037 - options - double reset";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5=KeymanWeb.KLOAD(this.KI,"foo","0");this.s8="1";this.s9="2";this.s10="2";this.s11="0";this.KVER="16.0.138.0";this.KVS=['s5'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(this.s5===this.s8){r=m=1;k.KDC(0,t);k.KO(-1,t,"foo.");this.s5=this.s9;this.s5=k.KLOAD(this.KI,"foo","0");this.s5=k.KLOAD(this.KI,"foo","0");}else if(this.s5===this.s10){r=m=1;k.KDC(0,t);k.KO(-1,t,"bar.");}else if(this.s5===this.s11){r=m=1;k.KDC(0,t);k.KO(-1,t,"no foo.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_037___options___double_reset.kmx b/common/test/keyboards/baseline/k_037___options___double_reset.kmx
deleted file mode 100644
index eed688349c9217c488bedcd573382d937efc8fe4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 584
zcmYk4u}T9$6h&_$qQ*u|SUZ_2g=k0=(IQ0@#6U2O3Rc3#RS0Mzn;1|m#6m2@&#?9z
z#6tW6@f+;LO3&<!Ss&bY?|bv+?hLby{oNhqr0?giH4zz`h)G~|4Ll%z2;?y8StkSN
z6}*61@DAR<7$~ss10DzSXk!hD8e9ca=q6nEI)V?t9Q{jp;Po|p<@GIm<Mlm!2g=q|
z4ISx1rwY|c>av!#Dx*cv)tUNg!yWZ}FQPhEODF6zipf3DXKztWt!rDG=nC$o<O@X&
zSdW=<KJL56xO9`b74jC7hMgfZ_7oM)AZ=)ms;xsNBRp*1#?rs+?(mqAp1@y>AZ(dB
zhE&sj`IDs_?_hf~z86p%-^=^n0(BL*vzB<vyhb$v2e8Zbg$q>K<h5FO#@svY@{4eX
MuFTLSU9<nnFUgukivR!s

diff --git a/common/test/keyboards/baseline/k_038___punctkeys.js b/common/test/keyboards/baseline/k_038___punctkeys.js
deleted file mode 100755
index 8992c4c2945..00000000000
--- a/common/test/keyboards/baseline/k_038___punctkeys.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_038___punctkeys());function Keyboard_k_038___punctkeys(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_038___punctkeys";this.KN="038 - punctkeys";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,226)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"p");}}else if(k.KKM(e,16384,222)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"o");}}else if(k.KKM(e,16384,188)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"g");}}else if(k.KKM(e,16384,189)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"h");}}else if(k.KKM(e,16384,190)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"i");}}else if(k.KKM(e,16384,191)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"j");}}else if(k.KKM(e,16384,186)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"e");}}else if(k.KKM(e,16384,187)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"f");}}else if(k.KKM(e,16384,219)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"l");}}else if(k.KKM(e,16384,220)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"m");}}else if(k.KKM(e,16384,221)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"n");}}else if(k.KKM(e,16384,192)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"k");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_038___punctkeys.kmx b/common/test/keyboards/baseline/k_038___punctkeys.kmx
deleted file mode 100644
index 8166409f5f32d1c631f1cdaaeabb6f0a4d19a7d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 642
zcmYL{J1>J_7=~{K3=VZRHikwdnzoV#gH#hF8XcS>21y-CTRo(u34_7ZLHq*oL!4)$
z6&=LnCm3+Op9gPp^?9!QdA~RL-mi((rA0MKwR*fHR)hOt5qW)#>LdJO(f+NI#-Fy2
zatbx*hjTcCX1Ik5Xn{v~03W==oAsa64+w#j(6$bhS4suXLmJhX{2GCh4oEk(ubj85
z!j6EFn$o<c>7xpIrvy}GURFgJ6}@x93NxQ&>Su3?+?_rSaV^tlIJKxPo|1-m*9iQs
zRvM@O&%I&;ZXA;axrG4KQTO&P8^(ihjdoZT!J}}4yBknUn!qQ)-BPDzaeM~u@Gi^d
z@FZN~ZI&(ID{zIkTegO;!xP?P*#@45XS~<4EM9;Y+<iU8q%vNGd$b!|c7z{;`&*=-
eXm!WxuGNgytW|f5ZhzY9p4GfnclU0dv-%B_HbiLv

diff --git a/common/test/keyboards/baseline/k_039___generic_ctrlalt.js b/common/test/keyboards/baseline/k_039___generic_ctrlalt.js
deleted file mode 100755
index 014fc69a24c..00000000000
--- a/common/test/keyboards/baseline/k_039___generic_ctrlalt.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_039___generic_ctrlalt());function Keyboard_k_039___generic_ctrlalt(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_039___generic_ctrlalt";this.KN="039 - generic ctrlalt";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0060;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16416,66)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"b");}}else if(k.KKM(e,16448,67)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"c");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_039___generic_ctrlalt.kmx b/common/test/keyboards/baseline/k_039___generic_ctrlalt.kmx
deleted file mode 100644
index 1bf180a31c8c53250e335c5cd034092f41c99438..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 374
zcmYL?J4yp#7)4Jkq6mgm+E`3A*eD4JLK>Mw#3E>;g6(8{5Q!6r5^x78f-4Bwk1oK{
zHKelDGe4tVIP>58y{3PCc|jH4;(QNPDL%?l@QLrP#c!qk)3hAiwlbHQ?8ri1WnJE7
zDI4-BA5xbuS(Sd%J5_0zq0cQZJd%=!+@M8=h<&-Ym&=49nK|QGKXP`YgP3!=oN=N*
z<RDy(nTCxgcgEpnlcxPsyOFc0_2N$*>2akmZjZTf3)&Spl3%T9iuk|RGi^zfz@4oJ
SIX2fMv6h=BGBBr-mG2L_11f6(

diff --git a/common/test/keyboards/baseline/k_0400___groups_and_virtual_keys.js b/common/test/keyboards/baseline/k_0400___groups_and_virtual_keys.js
new file mode 100644
index 00000000000..32aebaea242
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0400___groups_and_virtual_keys.js
@@ -0,0 +1,69 @@
+
+KeymanWeb.KR(new Keyboard_k_0400___groups_and_virtual_keys());
+
+function Keyboard_k_0400___groups_and_virtual_keys()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0400___groups_and_virtual_keys";
+  this.KN="0400 - groups and virtual keys";
+  this.KMINVER="9.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0070;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_UMain_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_UMain_0(t,e);
+  };
+  this.g_UMain_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4020, 0x32)) {
+      if(1){
+        r=m=1;   // Line 16
+        k.KDO(0,t,0);
+      }
+    }
+    else if(k.KKM(e, 0x4040, 0x32)) {
+      if(1){
+        r=m=1;   // Line 17
+        k.KDO(0,t,0);
+      }
+    }
+    else if(k.KKM(e, 0x4010, 0x32)) {
+      if(1){
+        r=m=1;   // Line 18
+        k.KDO(0,t,1);
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x41)) {
+      if(1){
+        r=m=1;   // Line 15
+        k.KO(0,t,"α");
+      }
+    }
+    if(m==1) {
+    
+      r=this.g_DK1_1(t,e);
+      m=2;
+    }
+    return r;
+  };
+  this.g_DK1_1=function(t,e) {
+    var k=KeymanWeb,r=1,m=0;
+      if(k.KDM(1,t,0)&&k.KCM(1,t,"α",1)){
+        m=1;   // Line 25
+        k.KO(1,t,"ᾱ");
+      }
+      else if(k.KDM(1,t,1)&&k.KCM(1,t,"α",1)){
+        m=1;   // Line 26
+        k.KO(1,t,"ᾰ");
+      }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_014___groups_and_virtual_keys.kmn b/common/test/keyboards/baseline/k_0400___groups_and_virtual_keys.kmn
similarity index 92%
rename from common/test/keyboards/baseline/k_014___groups_and_virtual_keys.kmn
rename to common/test/keyboards/baseline/k_0400___groups_and_virtual_keys.kmn
index 0e32c432eb6..67e63340a1c 100644
--- a/common/test/keyboards/baseline/k_014___groups_and_virtual_keys.kmn
+++ b/common/test/keyboards/baseline/k_0400___groups_and_virtual_keys.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '014 - groups and virtual keys'
+store(&NAME) '0400 - groups and virtual keys'
 c Description: Tests multiple groups and virtual keys with mnemonic layout
 c keys: [K_A][SHIFT K_2][K_A][LCTRL K_2][K_A]
 c expected: \u03B1\u1FB0\u1FB1
diff --git a/common/test/keyboards/baseline/k_0400___groups_and_virtual_keys.kmx b/common/test/keyboards/baseline/k_0400___groups_and_virtual_keys.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..c0ab17f657754e43c5da65328588b52beb5e9107
GIT binary patch
literal 766
zcmZvayDx)L7{;HvM8%*CZVQ8S5Tq3m7O94axFw2Mi^jFBs7h+`7Z?m;6tNHkMlp#&
z`~@PW4rT+3!RL3*cMyp;dCvR1&wDxNeCHdTn@*@w%AT&i3k#S9s{$n;20joy4EkfA
zCW+O7dvFKp!6SG86`+B>CwvgJ!&^ZOJdW=NA^0+W-tk@hj^q3IJ;%@RCyw9ZZyYb;
zpFxB<(x_4@D6OP2Hjb#9Ohhf}0883bR(WkGM`UUi@!MKK-$GAnop{a8$k89xga$OO
zA$XrU?H*yx5>F|i5lxc!cMemPp)bw+4D%K=#<YUnZHt;H=a7c&NoJ@`Qe#fo<@6}~
z4s!Y^S}%xe#?8rc#+0ozHyr<GLJ#_&)y>=md&dkD^4!<#;OET_adIi{oBGZ2g8iV)
zy<{030dPfp?KDFB7Z~q(<(B`wga3*xF<y(F1JFgSdF2?|A@PyZYSBVy$HZq~fVdh6
y?VR`mcwW%`fqxk(?6TCX-`~pcMzdf=3SRsoHTjZWiQm9w^Y>iSf8nAMJM9a&a$#)%

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0401___multiple_groups.js b/common/test/keyboards/baseline/k_0401___multiple_groups.js
new file mode 100644
index 00000000000..12bc00f9e61
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0401___multiple_groups.js
@@ -0,0 +1,73 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0401___multiple_groups());
+}
+function Keyboard_k_0401___multiple_groups()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0401___multiple_groups";
+  this.KN="401 - multiple groups";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 13
+        k.KDC(0,t);
+        k.KO(-1,t,"a");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_2 /* 0x32 */)) {
+      if(k.KFCM(1,t,['b'])){
+        r=m=1;   // Line 14
+        k.KDC(1,t);
+        k.KO(-1,t,"b");
+        r=this.g_b_2(t,e);
+        m=2;
+      }
+    }
+    if(m==1) {
+    
+      k.KDC(-1,t);
+      r=this.g_a_1(t,e);
+      m=2;
+    }
+    return r;
+  };
+  this.g_a_1=function(t,e) {
+    var k=KeymanWeb,r=1,m=0;
+      if(k.KFCM(1,t,['a'])){
+        m=1;   // Line 20
+        k.KDC(1,t);
+        k.KO(-1,t,"b");
+      }
+    return r;
+  };
+  this.g_b_2=function(t,e) {
+    var k=KeymanWeb,r=1,m=0;
+      if(k.KFCM(1,t,['b'])){
+        m=1;   // Line 24
+        k.KDC(1,t);
+        k.KO(-1,t,"abc");
+      }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_030___multiple_groups.kmn b/common/test/keyboards/baseline/k_0401___multiple_groups.kmn
similarity index 90%
rename from common/test/keyboards/baseline/k_030___multiple_groups.kmn
rename to common/test/keyboards/baseline/k_0401___multiple_groups.kmn
index b9148827bc8..87097387aa2 100644
--- a/common/test/keyboards/baseline/k_030___multiple_groups.kmn
+++ b/common/test/keyboards/baseline/k_0401___multiple_groups.kmn
@@ -1,4 +1,4 @@
-store(&NAME) "030 - multiple groups"
+store(&NAME) "401 - multiple groups"
 c Description: Tests multiple groups. Purpose here is to interleave output and backspaces from kmx processor to consumer
 c keys: [K_1][K_2]
 c expected: abc
diff --git a/common/test/keyboards/baseline/k_030___multiple_groups.kmx b/common/test/keyboards/baseline/k_0401___multiple_groups.kmx
similarity index 67%
rename from common/test/keyboards/baseline/k_030___multiple_groups.kmx
rename to common/test/keyboards/baseline/k_0401___multiple_groups.kmx
index e27ee4dd08c08fc1f45267c54dbfb6dd1bfe5109..415a932ccb7e862990a7eddee4d676b3766d6c1b 100644
GIT binary patch
delta 30
mcmcb@a)pJ*J0c{Qfs29RPMm(~M4oM|CJY7)h8vIfG6DdINC?sZ

delta 30
mcmcb@a)pJ*J0c{Qfs27*j?LcCi9Fj_4H%3W3^pF`Wds0;MhNTx

diff --git a/common/test/keyboards/baseline/k_0402___output_and_keystroke.js b/common/test/keyboards/baseline/k_0402___output_and_keystroke.js
new file mode 100644
index 00000000000..aa1e8903298
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0402___output_and_keystroke.js
@@ -0,0 +1,87 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0402___output_and_keystroke());
+}
+function Keyboard_k_0402___output_and_keystroke()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0402___output_and_keystroke";
+  this.KN="0402 - output and keystroke";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 13
+        k.KDC(0,t);
+        k.KO(-1,t,"a");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_2 /* 0x32 */)) {
+      if(k.KFCM(1,t,['b'])){
+        r=m=1;   // Line 14
+        k.KDC(1,t);
+        k.KO(-1,t,"b");
+        r=this.g_b_2(t,e);
+        m=2;
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_3 /* 0x33 */)) {
+      if(k.KFCM(3,t,['a','b','c'])){
+        r=m=1;   // Line 15
+        k.KDC(3,t);
+        k.KO(-1,t,"a");
+        k.KO(-1,t,"bd");
+        r=this.g_emit_3(t,e);
+        m=2;
+      }
+    }
+    if(m==1) {
+    
+      k.KDC(-1,t);
+      r=this.g_a_1(t,e);
+      m=2;
+    }
+    return r;
+  };
+  this.g_a_1=function(t,e) {
+    var k=KeymanWeb,r=1,m=0;
+      if(k.KFCM(1,t,['a'])){
+        m=1;   // Line 21
+        k.KDC(1,t);
+        k.KO(-1,t,"b");
+      }
+    return r;
+  };
+  this.g_b_2=function(t,e) {
+    var k=KeymanWeb,r=1,m=0;
+      if(k.KFCM(1,t,['b'])){
+        m=1;   // Line 25
+        k.KDC(1,t);
+        k.KO(-1,t,"abc");
+      }
+    return r;
+  };
+  this.g_emit_3=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_043___output_and_keystroke.kmn b/common/test/keyboards/baseline/k_0402___output_and_keystroke.kmn
similarity index 90%
rename from common/test/keyboards/baseline/k_043___output_and_keystroke.kmn
rename to common/test/keyboards/baseline/k_0402___output_and_keystroke.kmn
index 4c6409c1c71..dd8df421841 100644
--- a/common/test/keyboards/baseline/k_043___output_and_keystroke.kmn
+++ b/common/test/keyboards/baseline/k_0402___output_and_keystroke.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '043 - output and keystroke'
+store(&NAME) '0402 - output and keystroke'
 c Description: Tests the 'emit default key' function by having an empty 'using keys' final group
 c keys: [K_1][K_2][K_3]
 c expected: abd3
diff --git a/common/test/keyboards/baseline/k_0402___output_and_keystroke.kmx b/common/test/keyboards/baseline/k_0402___output_and_keystroke.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..a6a883d2fd232490492a2c257e2b7bf08e1fce33
GIT binary patch
literal 726
zcmZvazb`{k6vw}m5{XiYUx}fUP17F|v6T>srWPb(du>TtQPLt|5Tk*_WHyKx`~e0L
zqd{!^JJ09bca@0KeBbwczvtX@@4K(XjkQ(vNsYwihlmb)5LoI01#pKM5~S_;?2OV8
z=m|W6QSb(yK@W(t?j7z06XZi+kbD|W`+ON*@cAaZ=JPsS_4z4$;`3|x3S^ig6}6>f
z?J7{i>5QhS<do7B*wdj7wC|oN*Hgvaacf#snsk_wCbgnDm9$8nWkTA`pVSf6rdq1e
zX**>3NlR2ybO-p6JL}vmZa|h(-f25W+36Xl^XM&3TVrp@*34_22{l!iUv($R%6dzG
zc1UpBV<7HtJw{IlI7eT2583{D_jnKg_-}aMU(Wh1Y)%+<%i4dxlhkkJ0^fwv2FM{3
z-rGcP1AEf}@72*~ATZ6$n44>7EjyiLuP{uqQ`J@M{}oWHIOahNN2D9(+yYx^^NcOV
QBhm}CSMa^w>OXh;1y)H=<^TWy

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_040___long_context.js b/common/test/keyboards/baseline/k_040___long_context.js
deleted file mode 100755
index 39d43abebc5..00000000000
--- a/common/test/keyboards/baseline/k_040___long_context.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_040___long_context());function Keyboard_k_040___long_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_040___long_context";this.KN="040 - long context";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,32)) {if(1){r=m=1;k.KO(0,t," ");}}else if(k.KKM(e,16384,70)) {if(k.KCM(1,t," ",1)){r=m=1;k.KO(1,t," ");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_040___long_context.kmx b/common/test/keyboards/baseline/k_040___long_context.kmx
deleted file mode 100644
index 55a88a77abb2acf83872b6a12dc061dce250738f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 366
zcmYL^!Ae3=5Qe`ZvW?)%ws++&Q3$D>1<^umlS0cPGj60pN#q;2koH3KG(AAjMtX!+
zzCnFw(3-<{&i~KMnR9RJqI1qRe0IL(7#nFbOoeWGmQDT`%D)({8p~#8GL>C<l@}?<
zyS&McEaXE<vXt+Y-b!<%<^e5km@wdqVfY&RRx<YFo{`yG)pe+`z0Zv8t8m5<ZBEn;
zsxhm=ll2E4$)g+UE;x;OZC}XajYD(Cbk%vx?Rg8Te$j!fV^fjr|Gi9C6q;~psV9AH
P`o9!?{hegt(w_JQEf^>^

diff --git a/common/test/keyboards/baseline/k_041___long_context_and_deadkeys.js b/common/test/keyboards/baseline/k_041___long_context_and_deadkeys.js
deleted file mode 100755
index 86542bbac7b..00000000000
--- a/common/test/keyboards/baseline/k_041___long_context_and_deadkeys.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_041___long_context_and_deadkeys());function Keyboard_k_041___long_context_and_deadkeys(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_041___long_context_and_deadkeys";this.KN="041 - long context and deadkeys";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,49)) {if(k.KDM(60,t,0)&&k.KCM(60,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh",60)){r=m=1;k.KO(-1,t,"1");}}else if(k.KKM(e,16384,50)) {if(k.KCM(63,t,"\x08\x01abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh1",63)){r=m=1;k.KO(63,t,"FAIL TEST 2");}else if(k.KCM(62,t,"\x01abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh1",62)){r=m=1;k.KO(62,t,"FAIL TEST 2");}else if(k.KCM(61,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh1",61)){r=m=1;k.KO(-1,t,"2");}}else if(k.KKM(e,16384,51)) {if(k.KCM(64,t,"\x08\x01abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh12",64)){r=m=1;k.KO(64,t,"FAIL TEST 3");}else if(k.KCM(63,t,"\x01abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh12",63)){r=m=1;k.KO(63,t,"FAIL TEST 3");}else if(k.KCM(62,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh12",62)){r=m=1;k.KO(62,t,"abcdefghijklmnopqrstuvwxyz123");}}else if(k.KKM(e,16384,52)) {if(k.KDM(29,t,0)&&k.KCM(29,t,"abcdefghijklmnopqrstuvwxyz123",29)){r=m=1;k.KO(29,t,"PASS");}}else if(k.KKM(e,16384,90)) {if(1){r=m=1;k.KDO(0,t,0);k.KO(-1,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_041___long_context_and_deadkeys.kmx b/common/test/keyboards/baseline/k_041___long_context_and_deadkeys.kmx
deleted file mode 100644
index de2b1d5020c9941e3a57d1734085ca1dd0abe11d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1816
zcmc(f%PvDv6o!B5QX`E)86cHNM~EVZf)t@Nl2#%jlDc2&UY8nq1OpNA1R@^8j3+QO
z6p5J_sc-EbV!#B+SttMAYyEqjefifpJ29C~sY1GadOj9bVhvUa%<lzBoC1dXX?2!>
zg~2&E1-0N3TmTz>1Xmyk-oOh8fiUxh4EQbdQO}Rl_kebIDWL`BwXTddT->fM#S~F1
z$Z8XI32)AMIdTt`Bev{$`gxcP?V6iqml>i;s!wAY!0%R@TP3P}#&@)<6*rGqp@Z=u
zMkC~A;BEDo%kI|%(TZEs=9fBoq`1qD;VqU(Tj0a0a4h^flT_mkH<xmLU@MxAX4k|w
z9%p)*#RJkbu)I3QNcY4Kz}Bz#xS29(9~jr*aj(Ro@*>yhaVNxgpo_T4<3{)f(qM|X
z+PGfnj5tgo3xxm*SRdpx8O@@Aoqv%EEThLNDrc$G1{!W@+v%Cp9@-vImAsDr<sE5|
z`VDJT5v8eOiZ<dj@pD(E%TN3APpe|J0!|&j>h+T{_I3JOG5e3ctC{W0&zjl3ep4;G
evuy9bdG|lwDc+gm{GBPDzuXfaC-M8Hk=_Ayq%&;*

diff --git a/common/test/keyboards/baseline/k_042___long_context_and_split_deadkeys.js b/common/test/keyboards/baseline/k_042___long_context_and_split_deadkeys.js
deleted file mode 100755
index da7e2138ff2..00000000000
--- a/common/test/keyboards/baseline/k_042___long_context_and_split_deadkeys.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_042___long_context_and_split_deadkeys());function Keyboard_k_042___long_context_and_split_deadkeys(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_042___long_context_and_split_deadkeys";this.KN="042 - long context and split deadkeys";this.KMINVER="6.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,32)) {if(k.KCM(64,t,"\x01abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk",64)){r=m=1;k.KO(64,t,"FAIL");}else if(k.KDM(63,t,0)&&k.KCM(63,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk",63)){r=m=1;k.KO(63,t,"UNEXPECTED");}}else if(k.KKM(e,16384,49)) {if(k.KCM(61,t,"defghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk ",61)){r=m=1;k.KO(61,t,"def");}}else if(k.KKM(e,16384,50)) {if(k.KDM(6,t,0)&&k.KCM(6,t,"abcdef",6)){r=m=1;k.KO(6,t,"PASS");}}else if(k.KKM(e,16384,90)) {if(1){r=m=1;k.KDO(0,t,0);k.KO(-1,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_042___long_context_and_split_deadkeys.kmx b/common/test/keyboards/baseline/k_042___long_context_and_split_deadkeys.kmx
deleted file mode 100644
index fbe552d53b0f731852fd07a3aa5831d25cda51f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1072
zcmd6kyH0{Z5QPt@NGOQWL>r4gn$SrQ4T&8p-hvVmFd=p*UO+??yg+4bO`$%4@u94J
z0$coML2W2aaQ>W~Gqbbv&z?;e@;L>h`R7nXn9mk$92if60;G#Ue=IiIqtm!2&;c{x
z6}$jD{|Vke5QOOA2NUo){A`~m@bNy+;I~1H8Y!(~wREAPYA%jxS#fz<099R*J%t@P
z)};1cO=7Dq;Tx(`Rd%@&yG63+u49945oNThJ#D}fin>2Wbj$uVC(Ev<w8$rIvFlM=
zByW?ffHm#I%kJ;iojYiWHRWpURNW`F!MBY;Ed1@`5lsTKceXx&2cNP8R`E*@z`B{r
zW`PkY4B~K8+w76J0}kL}OC)&(;wUe)$t`!ZOVY>uhs<l!o}k<r(^pWWio!MSTi2Dl
zds8>)aEF>Lwg2#pP%MMq1!Y;+m1j*cSGODd2eb85(a_ZKP$J7)<@g3^GAK8UH<Z2r
D&i<)^

diff --git a/common/test/keyboards/baseline/k_043___output_and_keystroke.js b/common/test/keyboards/baseline/k_043___output_and_keystroke.js
deleted file mode 100755
index 3e6941c7db0..00000000000
--- a/common/test/keyboards/baseline/k_043___output_and_keystroke.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_043___output_and_keystroke());}function Keyboard_k_043___output_and_keystroke(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_043___output_and_keystroke";this.KN="043 - output and keystroke";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"a");}}else if(k.KKM(e,16384,50)) {if(k.KFCM(1,t,['b'])){r=m=1;k.KDC(1,t);k.KO(-1,t,"b");r=this.g2(t,e);m=2;}}else if(k.KKM(e,16384,51)) {if(k.KFCM(3,t,['a','b','c'])){r=m=1;k.KDC(3,t);k.KO(-1,t,"a");k.KO(-1,t,"bd");r=this.g3(t,e);m=2;}}if(m==1) {k.KDC(-1,t);r=this.g1(t,e);m=2;}return r;};this.g1=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KFCM(1,t,['a'])){m=1;k.KDC(1,t);k.KO(-1,t,"b");}return r;};this.g2=function(t,e) {var k=KeymanWeb,r=1,m=0;if(k.KFCM(1,t,['b'])){m=1;k.KDC(1,t);k.KO(-1,t,"abc");}return r;};this.g3=function(t,e) {var k=KeymanWeb,r=0,m=0;return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_043___output_and_keystroke.kmx b/common/test/keyboards/baseline/k_043___output_and_keystroke.kmx
deleted file mode 100644
index a25aae26a641719fa2715c7c81d3bb9b575b42ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 724
zcmZvaJ4-`B5QR@nL=m5b5v@|CQc0p9b}=9dAr`(!CEPq9L41&?D2Szng_X6Sh=sL<
zg`~6)vGV_1zu9b}h!f5|bI#1p?%kVwadSfhQg!F<SwzGh1eRhT3mz~-g0vf7J?%6O
zy@D4o0X{$r^nn=bKH+{aMLudE&%o0@Uxjl%FT(3SufZjspTnm<zk#noiaAnVRh?;1
zf%ctFX<l<mXa*eUSVuZ^&xGr!;O@E=O)3pKOi4+tX-Newlc$+H>!v4lLbai$>U7%t
zG(TyDYJ%<nzwItMH;o&RWjKL#WzZ$37o4_pRXJ;&y(L?d(-srzDl@<0PLh`O7XIuo
z$X&-l%-?yGo(Q-^UwIGN{dSLdPyhJuc%AQN{T4PS40~nmzu!q3vT~L$LTMXhki*_9
zqAS4Obi{i#^aTh^Gc)Su+F46ZkFi%6j<Hk4RqWptP%As;L5#Oax6HW*w$kPqTTHe|
OEoyI|v)<}Icl!+lh)}5j

diff --git a/common/test/keyboards/baseline/k_044___if_and_context.js b/common/test/keyboards/baseline/k_044___if_and_context.js
deleted file mode 100755
index c08dc3c67c4..00000000000
--- a/common/test/keyboards/baseline/k_044___if_and_context.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_044___if_and_context());}function Keyboard_k_044___if_and_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_044___if_and_context";this.KN="044 - if and context";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s6=KeymanWeb.KLOAD(this.KI,"nfc","0");this.s7="ae";this.s9="0";this.KVER="16.0.138.0";this.KVS=['s6'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"exay");}}else if(k.KKM(e,16384,66)) {if(k.KFCM(4,t,[{t:'a',a:this.s7},'x',{t:'a',a:this.s7},'y'])&&this.s6===this.s9){r=m=1;k.KDC(4,t);k.KIO(-1,this.s7,1,t);k.KO(-1,t,"x");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_044___if_and_context.kmx b/common/test/keyboards/baseline/k_044___if_and_context.kmx
deleted file mode 100644
index 60c0c6300a6b6337cf3f02886ffdcaffb26c0183..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 500
zcmYL`y-LGi6o%hKQ0rtNC^$%`4uYix5d;S<NQa_}3LRWNTZIfpNQ%@OaB>!JL2wW+
zK*UMB0x!bR!7V=L81<CrocH{FUz79)2m6|nZtv<>!Xk564NPyr7*S%#Kl`i(7pOeI
zJuJdAJi-iozzfVm%={N|9+uEawcjGHRC<%R4mNW{9KbR<CuYz_OMRW_QfCUvJa21_
zUqh>q>J)FC5pk$<)R_4RUTSJj+uGF*y2EKLKe4F`CUO;Q+r0HU_#WK`(}B8G?e>iG
zhs3~!xFdCyli7BmE_va-4f<UjvXT1#7<u*Q39cjQ27WC@So(igAhWk%_C)Iyj?sx%
hq&M<+uqO+=4YRVWD|SESS)yt38kLBzF{z@>egkApK!N}O

diff --git a/common/test/keyboards/baseline/k_045___deadkey_and_context.js b/common/test/keyboards/baseline/k_045___deadkey_and_context.js
deleted file mode 100755
index 750277ccbe6..00000000000
--- a/common/test/keyboards/baseline/k_045___deadkey_and_context.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_045___deadkey_and_context());}function Keyboard_k_045___deadkey_and_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_045___deadkey_and_context";this.KN="045 - deadkey and context";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0010;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,191)) {if(k.KFCM(7,t,['<',{t:'d',d:0},'a',{t:'d',d:1},'b',{t:'d',d:2},'>'])){r=m=1;k.KDC(7,t);k.KO(-1,t,"correct");}}else if(k.KKM(e,16384,89)) {if(1){r=m=1;k.KDC(0,t);k.KDO(-1,t,0);k.KO(-1,t,"a");k.KDO(-1,t,1);k.KO(-1,t,"b");k.KDO(-1,t,2);}}else if(k.KKM(e,16384,90)) {if(k.KFCM(5,t,[{t:'d',d:0},'a',{t:'d',d:1},'b',{t:'d',d:2}])){r=m=1;k.KDC(5,t);k.KO(-1,t,"<");k.KDO(-1,t,0);k.KO(-1,t,"a");k.KDO(-1,t,1);k.KO(-1,t,"b");k.KDO(-1,t,2);k.KO(-1,t,">");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_045___deadkey_and_context.kmx b/common/test/keyboards/baseline/k_045___deadkey_and_context.kmx
deleted file mode 100644
index 4b1e3bfb2aa31a9c5885a151a395d08e36c9a9fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 576
zcmaKpO-chn5QSeRf>9LIg>FKaMF?(`nHV8L&={0}K@n6CSB@r&DE<&dk{rXeM{psY
zKs<#<$O+u)S8YdKh&8;b_o`l3(@f)Ve^295R2gJNq%09*z<3q(As+<vJF3AKouxd1
zM=%Foz%v*H@8A_=zyv!2Fa^(3bDo!}CC_)MTb>_Nk37Goo`Hz7QbR5EbfH9-PDd(f
zS)mp{lUYJOcb?FBn)FX~h5MFnmn;>uqjha-6CSg7(d{ni4o62fYCFHpVjOj*A?}2}
z-MIp4I)Jy`X1mqAW%7pe+Nq(AIa~ati|8fveM))&!$?C+{@k;Mn(^Z|Mg!18Px{^n
s{~!zc=xN`}q340UxWm_i*^4Xu!3_HoR|B26n${|_zbCfPPW|us1di2800000

diff --git a/common/test/keyboards/baseline/k_046___deadkey_and_contextex.js b/common/test/keyboards/baseline/k_046___deadkey_and_contextex.js
deleted file mode 100755
index 45dc72f186d..00000000000
--- a/common/test/keyboards/baseline/k_046___deadkey_and_contextex.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_046___deadkey_and_contextex());}function Keyboard_k_046___deadkey_and_contextex(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_046___deadkey_and_contextex";this.KN="046 - deadkey and contextex";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0010;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,191)) {if(k.KFCM(3,t,['<',{t:'d',d:0},'>'])){r=m=1;k.KDC(3,t);k.KO(-1,t,"correct");}}else if(k.KKM(e,16400,77)) {if(k.KFCM(5,t,[{t:'d',d:0},'a',{t:'d',d:1},'b',{t:'d',d:2}])){r=m=1;k.KDC(5,t);k.KO(-1,t,"<");k.KDO(-1,t,0);k.KO(-1,t,">");}}else if(k.KKM(e,16384,89)) {if(1){r=m=1;k.KDC(0,t);k.KDO(-1,t,0);k.KO(-1,t,"a");k.KDO(-1,t,1);k.KO(-1,t,"b");k.KDO(-1,t,2);}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_046___deadkey_and_contextex.kmx b/common/test/keyboards/baseline/k_046___deadkey_and_contextex.kmx
deleted file mode 100644
index 618eefbf27fa97b51828277312f179cc1a9aecfd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmZ{h%}PR16or=-WkH|~YSQ4+K$;X@6EUzKqi7&H$)Hhi>q<yuV3$Y&AH#7E&>(t(
z@Hu*f9w3_3w~xna(!Q*{*V=oXeUwu_Z5?Y~x_sEqiAY%@=78}%Fo1j!(4Q!$$8?GE
z44%L;cm*$D7JPyc$bc+6W<VCcMqTy1O09U_qBcE`sb`)i)GjD+R;sJ5zOEIi>vTaS
zl@(|m#LOb{mGcD76Vt!Y4eo^Qz0Xo!P1V%UAzMOrZ@B$=-Qnu#RvmZ7W+9FvrUCAV
zzTLY8_H_d9xb1ecc`M`t=e1K49dfq#M;FnX=wV8F1e2J8nEbtG7q#feZ;akS1MMD*
v`hlM2E&A{U?^{8afc@(pUmKP%tMZB&_V0L}^L*Tm+%&CoSM8Vl*O$Hl`LRaN

diff --git a/common/test/keyboards/baseline/k_047___caps_always_off_initially_on.js b/common/test/keyboards/baseline/k_047___caps_always_off_initially_on.js
deleted file mode 100755
index 3775e99174d..00000000000
--- a/common/test/keyboards/baseline/k_047___caps_always_off_initially_on.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_047___caps_always_off_initially_on());}function Keyboard_k_047___caps_always_off_initially_on(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_047___caps_always_off_initially_on";this.KN="047 - caps always off initially on";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0300;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16640,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,49)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16640,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,50)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}else if(k.KKM(e,16640,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"fail.");}}else if(k.KKM(e,16896,51)) {if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"pass.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_047___caps_always_off_initially_on.kmx b/common/test/keyboards/baseline/k_047___caps_always_off_initially_on.kmx
deleted file mode 100644
index 301fcddc0469177249bea6a3887abb6daae0cf5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 598
zcmbV}J4*vm5QR^IM6r-We544n)fS>5@qv;mS?~cNA{c{(%@PeRtR@&y(pg(uh`&Jm
z1O6?`6oP(pca_x6a_-DI^Saz^p0!UjD}9`o$HFppVAH_jI=CYE#t1cK2iD0ZehK#i
zp20GB1FyjPKfybg0Xb%T;aQ~;aS`N+>-bt4cksucf-W_6sgbS~>c;VkwzMNp>!6D|
z(2yuptOw4KV}14bJVo?Gx&xMv$$IL$Ilhk6P)mEvtg@->w)whe+buJqw603t|JyUU
zCD~!!+teJ;?=dfQJ5Ak04Rq>m&}G^MlcmRu^aOq_M__caQz}@xA!T{pIbgS#H!a|`
z;3cpDT`-Nh75HkZEt(ccYw%rQ_pm==bv5{YsufKOq(gWc^xWNJUczhu8}cRWzquc6
CV?lcW

diff --git a/common/test/keyboards/baseline/k_048___modifier_keys_keep_context.js b/common/test/keyboards/baseline/k_048___modifier_keys_keep_context.js
deleted file mode 100755
index 5b171674cfe..00000000000
--- a/common/test/keyboards/baseline/k_048___modifier_keys_keep_context.js
+++ /dev/null
@@ -1 +0,0 @@
-KeymanWeb.KR(new Keyboard_k_048___modifier_keys_keep_context());function Keyboard_k_048___modifier_keys_keep_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_048___modifier_keys_keep_context";this.KN="048 - modifier keys keep context";this.KMINVER="9.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,65)) {if(1){r=m=1;k.KO(0,t,"a");}}else if(k.KKM(e,16384,66)) {if(k.KCM(1,t,"a",1)){r=m=1;k.KO(1,t,"pass.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_048___modifier_keys_keep_context.kmx b/common/test/keyboards/baseline/k_048___modifier_keys_keep_context.kmx
deleted file mode 100644
index 98ca5a6dbe39d8e012c3f744a706235d18dbc689..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 402
zcmYL^F-rqM5Jq28M1_b}+E}Ez&Je}IbV)!&g9=F$+ryj?BvFiof`wRFND6E5xA_As
z)9ah#)LGu{_sz`i+;z_feU@NePWCWLu^AN!-I8s^x1s!tx1w>)%&WY}y1dIw7UWYt
zWKrhwC96{PZbd@ZJU67FhAtToj7gc~zQGQ=)Yz0U*9;kPDH*qBuJZ0_p)zh%7j{j!
zvvTha3CFZKB7Uw(J)e_srti_`fD`Mm<$`^yF(-9G%x_AEQ}rl+cj&8dSb~B4Mp+T|
g|6W_S9OV`~T6&U>cBRNY>t~XN_p4K;uDUuhKPy}<<NyEw

diff --git a/common/test/keyboards/baseline/k_049___enter_invalidates_context.js b/common/test/keyboards/baseline/k_049___enter_invalidates_context.js
deleted file mode 100755
index fdc476f8918..00000000000
--- a/common/test/keyboards/baseline/k_049___enter_invalidates_context.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_049___enter_invalidates_context());}function Keyboard_k_049___enter_invalidates_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_049___enter_invalidates_context";this.KN="049 - enter_invalidates_context";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,67)) {if(k.KFCM(2,t,['a','b'])){r=m=1;k.KDC(2,t);k.KO(-1,t,"abd");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_049___enter_invalidates_context.kmx b/common/test/keyboards/baseline/k_049___enter_invalidates_context.kmx
deleted file mode 100644
index 916a4a46625113bebba4aba17872cab7223f6235..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 376
zcmYL@y-or_6on7XN{odx(pV5lwv+5e8oO0OC>Ch^2?>Q+Sc)~M$zsU*1{B27itrM?
zj}Kr?uiqU3Z}QDObMDVfJh;8lq4Zh*7>X#_L3m&~f+pgJK<=a1HlE-tVF6WG!8;tl
z7p$QS8~BD}IAYcV(`V#U2+&fjiQe?2M9=OXsHscUbPf}|SI%4y%FuJVrl^!`{tSPt
zmu**pC;95@N<FpFA#XI?J3h0vXU4SkTkV3gL$yYC;`W;x;$G{Hp3Ln|nUlKw_a1g(
X()gcjajRH4k{&7LkZ8nT|FZN8<D@MP

diff --git a/common/test/keyboards/baseline/k_0500___options.js b/common/test/keyboards/baseline/k_0500___options.js
new file mode 100644
index 00000000000..a9eb29cc71d
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0500___options.js
@@ -0,0 +1,64 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0500___options());
+}
+function Keyboard_k_0500___options()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0500___options";
+  this.KN="0500 - options";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_foo_4=KeymanWeb.KLOAD(this.KI,"foo","0");
+  this.s7="1";
+  this.s8="0";
+  this.s9="1";
+  this.s10="0";
+  this.KVS=['s_foo_4'];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_0 /* 0x30 */)) {
+      if(1){
+        r=m=1;   // Line 18
+        k.KDC(0,t);
+        this.s_foo_4=this.s10;
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 17
+        k.KDC(0,t);
+        this.s_foo_4=this.s9;
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_A /* 0x41 */)) {
+      if(this.s_foo_4===this.s7){
+        r=m=1;   // Line 15
+        k.KDC(0,t);
+        k.KO(-1,t,"foo.");
+      }
+      else if(this.s_foo_4===this.s8){
+        r=m=1;   // Line 16
+        k.KDC(0,t);
+        k.KO(-1,t,"no foo.");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_021___options.kmn b/common/test/keyboards/baseline/k_0500___options.kmn
similarity index 88%
rename from common/test/keyboards/baseline/k_021___options.kmn
rename to common/test/keyboards/baseline/k_0500___options.kmn
index 3851896b84e..428168cadbc 100644
--- a/common/test/keyboards/baseline/k_021___options.kmn
+++ b/common/test/keyboards/baseline/k_0500___options.kmn
@@ -1,8 +1,8 @@
-store(&NAME) '021 - options'
+store(&NAME) '0500 - options'
 c Description: Tests basic option rules
 c keys: [K_A][K_1][K_A][K_0][K_A]
 c expected: no foo.foo.no foo.
-c context: 
+c context:
 
 store(&version) '10.0'
 
diff --git a/common/test/keyboards/baseline/k_0500___options.kmx b/common/test/keyboards/baseline/k_0500___options.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..df17de841b1102f766ded81bdd033cc21002fecb
GIT binary patch
literal 558
zcmZvZO)ErE7{~vni$QrAVyBxlS#Z1KWj~atX>3rkkja?3;?6Xrd;?kgNEY%5WNj@=
zNgcoQGFW)(cc1@rp6C4Ux%bo#_I5Qat=>ipBKquu7y+xR&_x&m`4dUO%W2XhJirV*
z!xId`2fRQLM)8P(`8+v>an_f~i$QObH(-|aBl2O;P4aQjXXIAU9r8J(%u6+$>P8o8
zD0g+LH9DzcEkRoyT`42yx};y$j@DJzCc45@;#|tQ#-+=IpY+}>cD3Ey3ePR)S?4{O
zdsBt|oLl=;nNFB&;$dBF__O`hcbxbhdJ!RP`Ri!+ltTNJ)*D!diLmxg{Rs`~v9R_<
sJ;0sVHTz#}l&I&xm`U}!8|`T>obcb3pp2PfqTp^S=L_P0dPB^819yfy3IG5A

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0501___options_with_preset.js b/common/test/keyboards/baseline/k_0501___options_with_preset.js
new file mode 100644
index 00000000000..bf48622b987
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0501___options_with_preset.js
@@ -0,0 +1,66 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0501___options_with_preset());
+}
+function Keyboard_k_0501___options_with_preset()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0501___options_with_preset";
+  this.KN="0501 - options with preset";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_foo_4=KeymanWeb.KLOAD(this.KI,"foo","0");
+  this.s7="1";
+  this.s8="0";
+  this.s9="1";
+  this.s10="0";
+  this.KVS=['s_foo_4'];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_0 /* 0x30 */)) {
+      if(1){
+        r=m=1;   // Line 21
+        k.KDC(0,t);
+        this.s_foo_4=this.s10;
+        k.KSAVE("foo",this.s_foo_4);
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 20
+        k.KDC(0,t);
+        this.s_foo_4=this.s9;
+        k.KSAVE("foo",this.s_foo_4);
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_A /* 0x41 */)) {
+      if(this.s_foo_4===this.s7){
+        r=m=1;   // Line 18
+        k.KDC(0,t);
+        k.KO(-1,t,"foo.");
+      }
+      else if(this.s_foo_4===this.s8){
+        r=m=1;   // Line 19
+        k.KDC(0,t);
+        k.KO(-1,t,"no foo.");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_022___options_with_preset.kmn b/common/test/keyboards/baseline/k_0501___options_with_preset.kmn
similarity index 88%
rename from common/test/keyboards/baseline/k_022___options_with_preset.kmn
rename to common/test/keyboards/baseline/k_0501___options_with_preset.kmn
index dbaad6e63c8..98184fca342 100644
--- a/common/test/keyboards/baseline/k_022___options_with_preset.kmn
+++ b/common/test/keyboards/baseline/k_0501___options_with_preset.kmn
@@ -1,8 +1,8 @@
-store(&NAME) '022 - options with preset'
+store(&NAME) '0501 - options with preset'
 c Description: Tests basic option rules with a preset supplied
 c keys: [K_A][K_1][K_A][K_0][K_A]
 c expected: foo.foo.no foo.
-c context: 
+c context:
 c option: foo=1
 c expected option: foo=0
 c saved option: foo=0
diff --git a/common/test/keyboards/baseline/k_0501___options_with_preset.kmx b/common/test/keyboards/baseline/k_0501___options_with_preset.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..0ed8c43f5e518305a791b391b3cab3607fd07bf2
GIT binary patch
literal 594
zcmZXRyGjE=7==%QqDGNm5^W?b7F!60ENDn!q2dJ$T6jaOT)bckH(|3x1+fqdvGN(L
zeGCin3B=C#5Y}&YM-BMHnRCv6+gYZuzq75JG`08mDI#MIVi*{`03HxAf&7iFY%0g0
zSMUNRz&m&Y10c`b2RsN|^rTrx%)@n%N3X-nRv*F#piI6ChgM(1msa1xH&)-ncc5yP
zs-Y8I>0G{o#8)*(#gn5M&{A8GnsA^F{sJB84AoZ1WCujdx!TmCHnf8Fn6D(;U3IC4
zbfp{8Z=SNPmGsp(*XVSZ^yx7-@HET0q+MK7M|2*u!{kk*ckb0s8R;4PL?6P~zl~<5
zWXoTaMtB3Wp=fiX_%iVEV>ajDr){oab2a=bh~t9#dFePV!6wp7t|ycJV<o8->B=Ur
N8Spob{?~@+`v!5WLhb+n

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0502___options_with_save.js b/common/test/keyboards/baseline/k_0502___options_with_save.js
new file mode 100644
index 00000000000..26c4fa041bd
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0502___options_with_save.js
@@ -0,0 +1,71 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0502___options_with_save());
+}
+function Keyboard_k_0502___options_with_save()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0502___options_with_save";
+  this.KN="0502 - options with save";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_foo_4=KeymanWeb.KLOAD(this.KI,"foo","0");
+  this.s7="1";
+  this.s8="0";
+  this.s9="1";
+  this.s10="0";
+  this.KVS=['s_foo_4'];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_0 /* 0x30 */)) {
+      if(1){
+        r=m=1;   // Line 20
+        k.KDC(0,t);
+        this.s_foo_4=this.s10;
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 19
+        k.KDC(0,t);
+        this.s_foo_4=this.s9;
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_2 /* 0x32 */)) {
+      if(1){
+        r=m=1;   // Line 21
+        k.KDC(0,t);
+        k.KSAVE("foo",this.s_foo_4);
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_A /* 0x41 */)) {
+      if(this.s_foo_4===this.s7){
+        r=m=1;   // Line 17
+        k.KDC(0,t);
+        k.KO(-1,t,"foo.");
+      }
+      else if(this.s_foo_4===this.s8){
+        r=m=1;   // Line 18
+        k.KDC(0,t);
+        k.KO(-1,t,"no foo.");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_023___options_with_save.kmn b/common/test/keyboards/baseline/k_0502___options_with_save.kmn
similarity index 88%
rename from common/test/keyboards/baseline/k_023___options_with_save.kmn
rename to common/test/keyboards/baseline/k_0502___options_with_save.kmn
index 913bea076f3..987b30055c0 100644
--- a/common/test/keyboards/baseline/k_023___options_with_save.kmn
+++ b/common/test/keyboards/baseline/k_0502___options_with_save.kmn
@@ -1,8 +1,8 @@
-store(&NAME) '023 - options with save'
+store(&NAME) '0502 - options with save'
 c Description: Tests basic option rules with save
 c keys: [K_A][K_1][K_A][K_0][K_A][K_2]
 c expected: no foo.foo.no foo.
-c context: 
+c context:
 c expected option: foo=0
 c saved option: foo=0
 
diff --git a/common/test/keyboards/baseline/k_0502___options_with_save.kmx b/common/test/keyboards/baseline/k_0502___options_with_save.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..5277a9c6e313a5dfd41466e86691ae2d36d1b3bd
GIT binary patch
literal 608
zcmZvaJ5K^Z6on5Y#21CiLn=dvq0$YDkWixWQ4nneV`1UON2G8uKztR(!uT_+{UH{{
z&d&H})^BEK)xw*cIp^HD_s-7lb`H9GnwCZ%y*Cjlvk)`D=r(vlL<I6Dj?%F#LZ<N*
zEPzk&4kkdBzAtzZRL~_ekZ8dTFpJ)T+fE<C`(Tm$5DuNbfyYkY!*@<U!VjQkhN`1e
z-ReStLhEa4vQt-CD`22Yjn#)kjqum#vCdH=I<DxIs@m0>cC?B1>Gka7s@)w@7k9_!
zoiS-(>zb_FRF>%ss4=JeT4h~V57*Z*l_&NDpKS8HfAw=pdI3pf5XSyaG<VFq?JV!U
z2+V|>%a!mIP{$WsZVA5(0{ooIdH9yg&AZ$Nz6+u#r;PpbiRQ;3qNqULM0{({=JMpy
O_S=Tsul&#66m{Pc!ayJZ

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0503___options_with_save_and_preset.js b/common/test/keyboards/baseline/k_0503___options_with_save_and_preset.js
new file mode 100644
index 00000000000..0ce89bd875a
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0503___options_with_save_and_preset.js
@@ -0,0 +1,72 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0503___options_with_save_and_preset());
+}
+function Keyboard_k_0503___options_with_save_and_preset()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0503___options_with_save_and_preset";
+  this.KN="0503 - options with save and preset";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_foo_4=KeymanWeb.KLOAD(this.KI,"foo","0");
+  this.s7="1";
+  this.s8="0";
+  this.s9="1";
+  this.s10="0";
+  this.s11="0";
+  this.KVS=['s_foo_4'];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_0 /* 0x30 */)) {
+      if(1){
+        r=m=1;   // Line 21
+        k.KDC(0,t);
+        this.s_foo_4=this.s10;
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 20
+        k.KDC(0,t);
+        this.s_foo_4=this.s9;
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_2 /* 0x32 */)) {
+      if(this.s_foo_4===this.s11){
+        r=m=1;   // Line 22
+        k.KDC(0,t);
+        k.KSAVE("foo",this.s_foo_4);
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_A /* 0x41 */)) {
+      if(this.s_foo_4===this.s7){
+        r=m=1;   // Line 18
+        k.KDC(0,t);
+        k.KO(-1,t,"foo.");
+      }
+      else if(this.s_foo_4===this.s8){
+        r=m=1;   // Line 19
+        k.KDC(0,t);
+        k.KO(-1,t,"no foo.");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_024___options_with_save_and_preset.kmn b/common/test/keyboards/baseline/k_0503___options_with_save_and_preset.kmn
similarity index 86%
rename from common/test/keyboards/baseline/k_024___options_with_save_and_preset.kmn
rename to common/test/keyboards/baseline/k_0503___options_with_save_and_preset.kmn
index 0c3004c3e32..9688ed8e616 100644
--- a/common/test/keyboards/baseline/k_024___options_with_save_and_preset.kmn
+++ b/common/test/keyboards/baseline/k_0503___options_with_save_and_preset.kmn
@@ -1,8 +1,8 @@
-store(&NAME) '024 - options with save and preset'
+store(&NAME) '0503 - options with save and preset'
 c Description: Tests basic option rules with save
 c keys: [K_A][K_1][K_A][K_0][K_A][K_2]
 c expected: foo.foo.no foo.
-c context: 
+c context:
 c option: foo=1
 c expected option: foo=0
 c saved option: foo=0
diff --git a/common/test/keyboards/baseline/k_0503___options_with_save_and_preset.kmx b/common/test/keyboards/baseline/k_0503___options_with_save_and_preset.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..49b55208b61eb58cb876320210f253ea9dd092fb
GIT binary patch
literal 658
zcmZXSy)T1N6vm%6X?zZ%Et|YkH%&_!3{pZQibY9dQc7BhwrQJ|#b_20gBZjh2JvUu
zBnIpf@o&6-_r4cRoaDLBbDn$7x$no#74qxqmp<MK&mux*AqIibS@4MP3FL2_hXXkR
zy@D4o3O>O*=mAOkzTjT4fSxe}i7j{&457>Lj?*Xb5g5b2fX|%1f-jxEfv=sugKwRF
zfbT)d9H5-`bgV-aRke9aQ|wI2(>SQ9u9hlrRZa2^x}`FzNk^Mr&vusJx*Ft7&|*?T
zYns!l7SU-YChd6%+tZ*bm>E39KJ#m~Zklz8N{`MWHRhSp%COFBgRG)mDodPUd=tT2
zbnC!*3h|}EPec$V{hMp*;%+;`Kbi$*PRw~(@?|hVZvLH#74keNqKB;`ZId53FY3HD
q`6=-Is3ID$ZlJk9gzv}k4aeZHy+grQNOrmAHdJ|EPyhG&*!u=B;!RQj

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0504___options_with_reset.js b/common/test/keyboards/baseline/k_0504___options_with_reset.js
new file mode 100644
index 00000000000..5cb7dc19aeb
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0504___options_with_reset.js
@@ -0,0 +1,71 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0504___options_with_reset());
+}
+function Keyboard_k_0504___options_with_reset()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0504___options_with_reset";
+  this.KN="0504 - options with reset";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_foo_4=KeymanWeb.KLOAD(this.KI,"foo","0");
+  this.s7="1";
+  this.s8="0";
+  this.s9="1";
+  this.s10="0";
+  this.KVS=['s_foo_4'];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_0 /* 0x30 */)) {
+      if(1){
+        r=m=1;   // Line 20
+        k.KDC(0,t);
+        this.s_foo_4=this.s10;
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 19
+        k.KDC(0,t);
+        this.s_foo_4=this.s9;
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_3 /* 0x33 */)) {
+      if(1){
+        r=m=1;   // Line 21
+        k.KDC(0,t);
+        this.s_foo_4=k.KLOAD(this.KI,"foo","0");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_A /* 0x41 */)) {
+      if(this.s_foo_4===this.s7){
+        r=m=1;   // Line 17
+        k.KDC(0,t);
+        k.KO(-1,t,"foo.");
+      }
+      else if(this.s_foo_4===this.s8){
+        r=m=1;   // Line 18
+        k.KDC(0,t);
+        k.KO(-1,t,"no foo.");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_025___options_with_reset.kmn b/common/test/keyboards/baseline/k_0504___options_with_reset.kmn
similarity index 87%
rename from common/test/keyboards/baseline/k_025___options_with_reset.kmn
rename to common/test/keyboards/baseline/k_0504___options_with_reset.kmn
index 13a0d692837..caeb29c25d0 100644
--- a/common/test/keyboards/baseline/k_025___options_with_reset.kmn
+++ b/common/test/keyboards/baseline/k_0504___options_with_reset.kmn
@@ -1,8 +1,8 @@
-store(&NAME) '025 - options with reset'
+store(&NAME) '0504 - options with reset'
 c Description: Tests basic option rules with reset
 c keys: [K_A][K_1][K_A][K_0][K_A][K_3]
 c expected: foo.foo.no foo.
-c context: 
+c context:
 c option: foo=1
 c expected option: foo=1
 
diff --git a/common/test/keyboards/baseline/k_0504___options_with_reset.kmx b/common/test/keyboards/baseline/k_0504___options_with_reset.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..413060deca897aa94429ce8dc61d06902581fb0e
GIT binary patch
literal 610
zcmZvaOH0E*6opR<#TOK{wMrL~Maj;PqV1w9E%<<<8y|Ef#20p9TH4T}xDXfO)_>sI
z-{C_11)@JDev?eqg%{48bI;s+C&{GMKG@f^RDW{5L}biD%mAa;!6PCjkUw#fO=Sss
z1Fv8ae1LZ_0rK>H!jqtaE}MZw1FnNv^bXv#`WSA5W&8;4S$zW!t-gbAt$u*-fp3PY
zrE^{DN`b;8_f=zOO^#MTS3O1Qz@Y}@BXp!oRG+>9i0E>)rw#3D6J4d-OJ=(ovfrmF
z?N3j<U{*J&tFdlV>ChQaW6rN?m9?ouvW`xvJY$COO{7o!S3hT@7ch<-!lb_wO;6Eo
z=lS|ez)UDuuS{M6=G+DAx#S)Q$mgu*lQ*n4Z@n$@BM`?0<&wJ}YkmzPj!XC^(zo^!
SuZWjTZa3upoPYMFsQU)ZB0x6)

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0505___options_double_set_reset.js b/common/test/keyboards/baseline/k_0505___options_double_set_reset.js
new file mode 100644
index 00000000000..7e89315cdaa
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0505___options_double_set_reset.js
@@ -0,0 +1,66 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0505___options_double_set_reset());
+}
+function Keyboard_k_0505___options_double_set_reset()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0505___options_double_set_reset";
+  this.KN="0505 - options double set reset";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_foo_4=KeymanWeb.KLOAD(this.KI,"foo","0");
+  this.s7="1";
+  this.s8="2";
+  this.s9="3";
+  this.s10="2";
+  this.s11="3";
+  this.s12="0";
+  this.KVS=['s_foo_4'];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_A /* 0x41 */)) {
+      if(this.s_foo_4===this.s7){
+        r=m=1;   // Line 17
+        k.KDC(0,t);
+        k.KO(-1,t,"foo.");
+        this.s_foo_4=this.s8;
+        this.s_foo_4=k.KLOAD(this.KI,"foo","0");
+        this.s_foo_4=this.s9;
+        this.s_foo_4=k.KLOAD(this.KI,"foo","0");
+      }
+      else if(this.s_foo_4===this.s10){
+        r=m=1;   // Line 18
+        k.KDC(0,t);
+        k.KO(-1,t,"bar.");
+      }
+      else if(this.s_foo_4===this.s11){
+        r=m=1;   // Line 19
+        k.KDC(0,t);
+        k.KO(-1,t,"baz.");
+      }
+      else if(this.s_foo_4===this.s12){
+        r=m=1;   // Line 20
+        k.KDC(0,t);
+        k.KO(-1,t,"no foo.");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_034___options_double_set_reset.kmn b/common/test/keyboards/baseline/k_0505___options_double_set_reset.kmn
similarity index 87%
rename from common/test/keyboards/baseline/k_034___options_double_set_reset.kmn
rename to common/test/keyboards/baseline/k_0505___options_double_set_reset.kmn
index 3fe9225ecad..e91f95e26b7 100644
--- a/common/test/keyboards/baseline/k_034___options_double_set_reset.kmn
+++ b/common/test/keyboards/baseline/k_0505___options_double_set_reset.kmn
@@ -1,8 +1,8 @@
-store(&NAME) '034 - options double set reset'
+store(&NAME) '0505 - options double set reset'
 c Description: Tests basic option rules with save reset+set+reset
 c keys: [K_A][K_A]
 c expected: foo.foo.
-c context: 
+c context:
 c option: foo=1
 c expected option: foo=1
 
diff --git a/common/test/keyboards/baseline/k_0505___options_double_set_reset.kmx b/common/test/keyboards/baseline/k_0505___options_double_set_reset.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..f44ef699c0f52077b291ffcc34bd3668a4640185
GIT binary patch
literal 676
zcmY+C&q{(p6vdBHR8~+awu^7&B1qJ58x=%>6hQ?M5ojt1rt$R$3RgkU1GJD9(L!28
zi)ax&Ld(`s5IsTk0`;43CdCV9&bepq-0S#FZgYK25$WUnrC&tIEW|J{dKNq*ehFkd
zT45{W&?k5Y<KP>7fj*Go+z)ITFQI2lLt+Qs0wd@uTz2{lZh#5=CVc7iHGJiC3%+ss
z4!(8z0ls(o34R1AGfX*^bfP`wRSWWzvg~B#X$sV}uR~SfnhwZ|s3R3r<&=k0V%L)o
zTP-EDqB$*Vfo^F!C4)H$9aG~|WqaA_WxCaax-9D=l^!Sa)R^Cr)->z9HpnX4rLss5
z<D19?tEuSL_ExVU=?(lx55lCK?s>9Nw>`<%S_Q@%bKW+2*?Cdt`Q#1f#hiCR-URk8
wNnS!!y&8byu+1VaGw&pZ8xFpCfq6dvPsbfZ8~3!!9m1_~d#^pCbHcpCKUr*4!T<mO

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0506___options_double_set_staged.js b/common/test/keyboards/baseline/k_0506___options_double_set_staged.js
new file mode 100644
index 00000000000..d0e5bb58ff6
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0506___options_double_set_staged.js
@@ -0,0 +1,77 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0506___options_double_set_staged());
+}
+function Keyboard_k_0506___options_double_set_staged()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0506___options_double_set_staged";
+  this.KN="0506 - options double set staged";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_foo_4=KeymanWeb.KLOAD(this.KI,"foo","0");
+  this.s7="1";
+  this.s8="2";
+  this.s9="3";
+  this.s10="2";
+  this.s11="3";
+  this.s12="0";
+  this.KVS=['s_foo_4'];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_A /* 0x41 */)) {
+      if(this.s_foo_4===this.s7){
+        r=m=1;   // Line 17
+        k.KDC(0,t);
+        k.KO(-1,t,"foo.");
+        this.s_foo_4=this.s8;
+      }
+      else if(this.s_foo_4===this.s10){
+        r=m=1;   // Line 20
+        k.KDC(0,t);
+        k.KO(-1,t,"bar.");
+      }
+      else if(this.s_foo_4===this.s11){
+        r=m=1;   // Line 21
+        k.KDC(0,t);
+        k.KO(-1,t,"baz.");
+      }
+      else if(this.s_foo_4===this.s12){
+        r=m=1;   // Line 22
+        k.KDC(0,t);
+        k.KO(-1,t,"no foo.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_B /* 0x42 */)) {
+      if(1){
+        r=m=1;   // Line 18
+        k.KDC(0,t);
+        this.s_foo_4=k.KLOAD(this.KI,"foo","0");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_C /* 0x43 */)) {
+      if(1){
+        r=m=1;   // Line 19
+        k.KDC(0,t);
+        this.s_foo_4=this.s9;
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_035___options_double_set_staged.kmn b/common/test/keyboards/baseline/k_0506___options_double_set_staged.kmn
similarity index 90%
rename from common/test/keyboards/baseline/k_035___options_double_set_staged.kmn
rename to common/test/keyboards/baseline/k_0506___options_double_set_staged.kmn
index 75d1b81b89b..c78bee2fcf7 100644
--- a/common/test/keyboards/baseline/k_035___options_double_set_staged.kmn
+++ b/common/test/keyboards/baseline/k_0506___options_double_set_staged.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '035 - options double set staged'
+store(&NAME) '0506 - options double set staged'
 c Description: Tests basic option rules with save reset+set+reset
 c keys: [K_A][K_B][K_C][K_B][K_A]
 c expected: foo.foo.
diff --git a/common/test/keyboards/baseline/k_0506___options_double_set_staged.kmx b/common/test/keyboards/baseline/k_0506___options_double_set_staged.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..c6f03efa7cda28cfab4f975eaa2e0e63c8a3f384
GIT binary patch
literal 720
zcmY+CJugF17{{MB@lJwPZE`K$G%ac_2@(y9N(=^lr3trkm4t{vNX!O<h=@T9(m@Pj
z6tjrgAU=Wk0@v@k_h{26`JeyGIp;a|<)oK0i_$4_G;=a6R6qx+2dGYgXM{^3>-8S=
zWd!;HpI{LDfN#(S#@Y7^w}Ux!N*hwE@CxWf+wi*4$M7K-BENvojlPC2jlP9%jJ}8O
zjDCP?MnA!iAg+f=T8gqKo01jV^KnTsGa;6YfQoEMRm!j}+xP-%M{=^kE{mkdta6q8
zYq$bEqOu^9GB4BU1ifP3Nm1El-eIlZ%|E|Hzlygm$vDeOi=A24=+h)*jB!eqaAnD}
zvOo{bwMM;BS2Sz?y*>hbb?{%U2(^vwSzMo)&hWoVK(nyP9Q=XF226H}KQo#BTdga6
z4dl@MUc#NgzkobGWU^QM8}Q#b#+?aCi*zvSx?xn%y9qg-!Qq=V(k`^7`%P&#sm&L$
U>irr!^me*#gq~XdIb34u581X?V*mgE

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0507___options___double_reset_staged.js b/common/test/keyboards/baseline/k_0507___options___double_reset_staged.js
new file mode 100644
index 00000000000..754fd8ae658
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0507___options___double_reset_staged.js
@@ -0,0 +1,63 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0507___options___double_reset_staged());
+}
+function Keyboard_k_0507___options___double_reset_staged()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0507___options___double_reset_staged";
+  this.KN="0507- options - double reset staged";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_foo_4=KeymanWeb.KLOAD(this.KI,"foo","0");
+  this.s7="1";
+  this.s8="2";
+  this.s9="2";
+  this.s10="0";
+  this.KVS=['s_foo_4'];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_A /* 0x41 */)) {
+      if(this.s_foo_4===this.s7){
+        r=m=1;   // Line 17
+        k.KDC(0,t);
+        k.KO(-1,t,"foo.");
+        this.s_foo_4=this.s8;
+      }
+      else if(this.s_foo_4===this.s9){
+        r=m=1;   // Line 19
+        k.KDC(0,t);
+        k.KO(-1,t,"bar.");
+      }
+      else if(this.s_foo_4===this.s10){
+        r=m=1;   // Line 20
+        k.KDC(0,t);
+        k.KO(-1,t,"no foo.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_B /* 0x42 */)) {
+      if(1){
+        r=m=1;   // Line 18
+        k.KDC(0,t);
+        this.s_foo_4=k.KLOAD(this.KI,"foo","0");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_036___options___double_reset_staged.kmn b/common/test/keyboards/baseline/k_0507___options___double_reset_staged.kmn
similarity index 88%
rename from common/test/keyboards/baseline/k_036___options___double_reset_staged.kmn
rename to common/test/keyboards/baseline/k_0507___options___double_reset_staged.kmn
index 53157b487d3..e250695af1d 100644
--- a/common/test/keyboards/baseline/k_036___options___double_reset_staged.kmn
+++ b/common/test/keyboards/baseline/k_0507___options___double_reset_staged.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '036 - options - double reset staged'
+store(&NAME) '0507- options - double reset staged'
 c Description: Tests basic option rules with save reset+reset
 c keys: [K_A][K_B][K_B][K_A]
 c expected: foo.foo.
diff --git a/common/test/keyboards/baseline/k_036___options___double_reset_staged.kmx b/common/test/keyboards/baseline/k_0507___options___double_reset_staged.kmx
similarity index 79%
rename from common/test/keyboards/baseline/k_036___options___double_reset_staged.kmx
rename to common/test/keyboards/baseline/k_0507___options___double_reset_staged.kmx
index ccb05e04c1faa64a540ea3bf3307c988ddfd2e50..2aba8f9cdbcd1adf51d1287a0e109e7d48aea911 100644
GIT binary patch
delta 30
mcmaFC@`8oOJ0c{Qfs29R{g;=V6L~JMnlczLm~VX8&IkaW*a|iP

delta 30
mcmaFC@`8oOJ0c{Qfs27*?`=`3i98orjTy`s6gEC=X9NI_9SIcx

diff --git a/common/test/keyboards/baseline/k_0508___options___double_reset.js b/common/test/keyboards/baseline/k_0508___options___double_reset.js
new file mode 100644
index 00000000000..9f208eaaafb
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0508___options___double_reset.js
@@ -0,0 +1,58 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0508___options___double_reset());
+}
+function Keyboard_k_0508___options___double_reset()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0508___options___double_reset";
+  this.KN="0508 - options - double reset";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_foo_4=KeymanWeb.KLOAD(this.KI,"foo","0");
+  this.s7="1";
+  this.s8="2";
+  this.s9="2";
+  this.s10="0";
+  this.KVS=['s_foo_4'];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_A /* 0x41 */)) {
+      if(this.s_foo_4===this.s7){
+        r=m=1;   // Line 17
+        k.KDC(0,t);
+        k.KO(-1,t,"foo.");
+        this.s_foo_4=this.s8;
+        this.s_foo_4=k.KLOAD(this.KI,"foo","0");
+        this.s_foo_4=k.KLOAD(this.KI,"foo","0");
+      }
+      else if(this.s_foo_4===this.s9){
+        r=m=1;   // Line 18
+        k.KDC(0,t);
+        k.KO(-1,t,"bar.");
+      }
+      else if(this.s_foo_4===this.s10){
+        r=m=1;   // Line 19
+        k.KDC(0,t);
+        k.KO(-1,t,"no foo.");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_037___options___double_reset.kmn b/common/test/keyboards/baseline/k_0508___options___double_reset.kmn
similarity index 86%
rename from common/test/keyboards/baseline/k_037___options___double_reset.kmn
rename to common/test/keyboards/baseline/k_0508___options___double_reset.kmn
index 05e5fe7b024..766cf5f87c9 100644
--- a/common/test/keyboards/baseline/k_037___options___double_reset.kmn
+++ b/common/test/keyboards/baseline/k_0508___options___double_reset.kmn
@@ -1,8 +1,8 @@
-store(&NAME) '037 - options - double reset'
+store(&NAME) '0508 - options - double reset'
 c Description: Tests basic option rules with save reset+reset
 c keys: [K_A][K_A]
 c expected: foo.foo.
-c context: 
+c context:
 c option: foo=1
 c expected option: foo=1
 
diff --git a/common/test/keyboards/baseline/k_0508___options___double_reset.kmx b/common/test/keyboards/baseline/k_0508___options___double_reset.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..f34e800c022715d58e1dbf0be0f193f4af38bc23
GIT binary patch
literal 586
zcmYk4y-EW?6opSB;%}iwRx4QorqYloL93tv5fT(Z1xq)^Kp<vilZb*?h=o{)k74aI
zScp#`;xqUP`pwRm^}@O5+@HBK!%XeyU|-`>d+lpcSjsqT0vNpko)AA6a$wc8l^*m4
zUcnsr0PkP~c&z(`N5K+0YX)K!xD2MydvMk1CVUJQ$X~;kPT#^ePT#|KPCvpApkRio
zrc+(%Oo2LaTu_P1x_m8zQ0MBY1$WeSxdu^Rb+uXPE5dg{kJUNtYEwJfLKm5mkN3#w
zf_g-konv=yG9`@rO89L$eO3nam~#}him&L9sHGD+8_Y0yV=Mo>y~T4%dI5hngfL+;
zF(8_D<!?%pyoAZkxZFH(*5xuTmnSX*d)7R!nbEMuU=Oz5yzwkiI)1M@Gb8SuWceiA
NA(TIulGMy^`30?HM6Lh;

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_050___nul_and_context.js b/common/test/keyboards/baseline/k_050___nul_and_context.js
deleted file mode 100755
index 4d29aa66854..00000000000
--- a/common/test/keyboards/baseline/k_050___nul_and_context.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_050___nul_and_context());}function Keyboard_k_050___nul_and_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_050___nul_and_context";this.KN="050 - nul_and_context";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5="mnpqrstv";this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,66)) {if(k.KFCM(2,t,[{t:'n'},{t:'a',a:this.s5}])){r=m=1;k.KDC(1,t);k.KO(-1,t,"2");k.KIO(-1,this.s5,1,t);k.KO(-1,t,"3");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_050___nul_and_context.kmx b/common/test/keyboards/baseline/k_050___nul_and_context.kmx
deleted file mode 100644
index a777f48e2c8606ff20489375454e9c4794096c99..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 404
zcmYL_%_@XZ7{`AjA{%Tdt69x%G`<#gD3obtgR&xw@)oa;8KPW(3z#HVAQ$8UY;0`Y
zfY<Liy?E+(p8t71Pp7%Ny~QYeZ9aaWRpQWwCG@haD+*2dXZ^Bp(#VtaWlCP;S)%_<
zUS&i+<z2$Y?fnifRrR!lUeGrJH8eTqjx!F()4jo>nJRV3x#pDpl<Vk^I5*a_<JJ>u
zv{|9WntIl*nKZM;jTKjP$x=N|&$-|-#d>BbCv{Wbyyr&R*>Y2s-mzqCl^u1KYCBGZ
jJzsqyzZNq1?>qE1R;KSwJ;<EDI>7+3rzi%c!jSq0-H0_u

diff --git a/common/test/keyboards/baseline/k_051___if_and_context.js b/common/test/keyboards/baseline/k_051___if_and_context.js
deleted file mode 100755
index b43ca031c48..00000000000
--- a/common/test/keyboards/baseline/k_051___if_and_context.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_051___if_and_context());}function Keyboard_k_051___if_and_context(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_051___if_and_context";this.KN="051 - if_and_context";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5="mnpqrstv";this.s6=KeymanWeb.KLOAD(this.KI,"ifx","1");this.s9="1";this.KVER="16.0.138.0";this.KVS=['s6'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,68)) {if(k.KFCM(1,t,[{t:'a',a:this.s5}])&&this.s6===this.s9){r=m=1;k.KDC(1,t);k.KO(-1,t,"4");k.KIO(-1,this.s5,1,t);k.KO(-1,t,"5");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_051___if_and_context.kmx b/common/test/keyboards/baseline/k_051___if_and_context.kmx
deleted file mode 100644
index facfe9185907dbd013cba72c5fe2bf6596bc5828..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 450
zcmYL`&q@MO6vjUXG{=>J)J|NvOGcO$LW>e2LUf@f?nIm-L8m`T*aPI+M`+Qqh4cjB
z^Y{Sm>US=ae(<~JyXT&BE_bHU?{<`v-rl`yp_DDi2lM9;V}22Kr%h6LL}m@2a17t@
z1qZN&4P?Qi{)cEP;|ocDNDLrPzD_(#e2>_MBKZmN9s+AtL$`X>R71sXALvw7m2?7Q
z-D%)XBH~C7)Xb@0uyU_jx=>S>_$t#XZem$4R6J`&x7CZ;u^#p0a&u0VOq#hqxmy;_
zhpbmjDKT|O-nwg0*A0H``XZ*=eWoR^Si!%{8vE{uoqY?_2S;lN`TB?Qc&Gh`f--m?
Imr|O{AM0N?6aWAK

diff --git a/common/test/keyboards/baseline/k_052___nul_and_index.js b/common/test/keyboards/baseline/k_052___nul_and_index.js
deleted file mode 100755
index 1094d1b56ae..00000000000
--- a/common/test/keyboards/baseline/k_052___nul_and_index.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_052___nul_and_index());}function Keyboard_k_052___nul_and_index(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_052___nul_and_index";this.KN="052 - nul_and_index";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5="mnpqrstv";this.s6="MNPQRSTV";this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,66)) {if(k.KFCM(2,t,[{t:'n'},{t:'a',a:this.s5}])){r=m=1;k.KDC(1,t);k.KO(-1,t,"2");k.KIO(-1,this.s6,1,t);k.KO(-1,t,"3");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_052___nul_and_index.kmx b/common/test/keyboards/baseline/k_052___nul_and_index.kmx
deleted file mode 100644
index 7e533db7912c4e8278d8b7bf9a9bd7610f26fc7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 442
zcmYL_Juib%7>2Jll$cBy8$&lzRf9zk(xIuKFX<+whKjamHLRWehz?>jiNWfB_yK04
zq^@&PJjr#=eV&i|yzeR3k}5M$>c4+uq{3oMOVFEgp%@v;zjzxr&Y5|Xq0GyRJjs-N
z$g2deFZq-Z3(jW7^F{YXnKi%TzA@G{_eAn>qRct>w5ZdL=R9i^$g(7DZn@+n)*9|j
zGY$Li?98#p78Q2YD|#(QzZ`w*H+1doM8}rv71uG>vkGUi(p6RT*yn&lsw5nn>3Cz$
z>EKy(E$N!IuO9D)b#vPs>Di1v;cH;v-#o}~1R40BJM|RaA;i$qvlM*!G#S#YnjMWM
IB*moq2f&RvnE(I)

diff --git a/common/test/keyboards/baseline/k_053___if_and_index.js b/common/test/keyboards/baseline/k_053___if_and_index.js
deleted file mode 100755
index eb1710226be..00000000000
--- a/common/test/keyboards/baseline/k_053___if_and_index.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_053___if_and_index());}function Keyboard_k_053___if_and_index(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_053___if_and_index";this.KN="053 - if_and_index";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0000;this.s5="mnpqrstv";this.s6="MNPQRSTV";this.s7=KeymanWeb.KLOAD(this.KI,"ifx","1");this.s10="1";this.KVER="16.0.138.0";this.KVS=['s7'];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16384,68)) {if(k.KFCM(1,t,[{t:'a',a:this.s5}])&&this.s7===this.s10){r=m=1;k.KDC(1,t);k.KO(-1,t,"4");k.KIO(-1,this.s6,1,t);k.KO(-1,t,"5");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_053___if_and_index.kmx b/common/test/keyboards/baseline/k_053___if_and_index.kmx
deleted file mode 100644
index ee4261303484ecd53002c78e9d892ab151eb3770..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 488
zcmYL`KT88a5XD~(qLMTUqK!zZbO{L>(9S=IV2G$WC7lM(z!foSVo+OKi{Qtwwy+Ru
z3$gSw_yO$K-;S#eynAnF-puT=^;X<ePO9Cm=S5`vhahEo1->Wg2;^UU2ICBwXYd4O
z!5er1<KPRtg9(uH{?Jo~=YrmXmx6A=F_^^KfscZ|frnt8{0P1S6|_{>iLTXETc>ue
zsHO!KR063wI<!gxr#KSaSNMwB)~XuXKv$VmwrNETsb8p%w`cRZe9v@lxdBz_*eZQg
zgBd&8)t;J)bwH-4OAYAuGiBTTt|~W@HrY_1r)~F;mdUMYpZTfH^f&wIlOFiHNAMe7
idi-}MoTftgmC^@T<b@)QDYAXeP4fZ~ujpJxS-jt#2|M-x

diff --git a/common/test/keyboards/baseline/k_054___nul_and_contextex.kmx b/common/test/keyboards/baseline/k_054___nul_and_contextex.kmx
deleted file mode 100644
index 3c75d606f4430d71264b17c1d9bddee2be911dea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 420
zcmYL_JugH-6o#K&glLcmoopf7k;O{r*hD0|p+TaPd#z%Vb$#p-I=?{_qE?8X<Oisg
zy6c(A;3UtPcjlb;%w#&phX+i;cb2y?Dj^x;67-g|6{Vs4i`UdR=gG4?$-KPDiv<6N
zyvu}q$)|*v)mxQm^`h%S(i^T#X~eD$XWVm6MiKW7)@f2>NeXW0a}sM^*HbP$8|t`A
z8S3n_%^o|tSDd*V=hnHk>zV<*=)oHbF1d<lL#w1|gXmi`@9L~MDbo|)vMDW&)V<i-
obt2@xyf42IWZ>VIyPHbo2TPB#>d($ljd_G{TUm}ug|SqDAF#1F=Kufz

diff --git a/common/test/keyboards/baseline/k_055___deadkey_cancelled_by_arrow.js b/common/test/keyboards/baseline/k_055___deadkey_cancelled_by_arrow.js
deleted file mode 100755
index e6913c358e4..00000000000
--- a/common/test/keyboards/baseline/k_055___deadkey_cancelled_by_arrow.js
+++ /dev/null
@@ -1 +0,0 @@
-if(typeof keyman === 'undefined') {console.log('Keyboard requires KeymanWeb 10.0 or later');if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");} else {KeymanWeb.KR(new Keyboard_k_055___deadkey_cancelled_by_arrow());}function Keyboard_k_055___deadkey_cancelled_by_arrow(){this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;this.KI="Keyboard_k_055___deadkey_cancelled_by_arrow";this.KN="050 - deadkey cancelled by arrow";this.KMINVER="10.0";this.KV=null;this.KDU=0;this.KH='';this.KM=0;this.KBVER="1.0";this.KMBM=0x0010;this.KVER="16.0.138.0";this.KVS=[];this.gs=function(t,e) {return this.g0(t,e);};this.gs=function(t,e) {return this.g0(t,e);};this.g0=function(t,e) {var k=KeymanWeb,r=0,m=0;if(k.KKM(e,16400,54)) {if(1){r=m=1;k.KDC(0,t);k.KDO(-1,t,0);}}else if(k.KKM(e,16384,69)) {if(k.KFCM(1,t,[{t:'d',d:0}])){r=m=1;k.KDC(1,t);k.KO(-1,t,"FAIL.");}else if(1){r=m=1;k.KDC(0,t);k.KO(-1,t,"PASS.");}}return r;};}
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/k_055___deadkey_cancelled_by_arrow.kmx b/common/test/keyboards/baseline/k_055___deadkey_cancelled_by_arrow.kmx
deleted file mode 100644
index 551a263920962bfeedacfad7bce1988442f10d40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 474
zcmYL`yGjE=6o&sOk`VAxh(fBZQV52mP_RoR7bHdkF<>RcWWmKtU<JiKk6<Br0!d*h
zc4<=P0mNtU0qoZA3}bSJZ{|P$IWx1vHZRUQ%1Ud~(Og8zCL#@{%g{z71acAIzHtZV
z6<%N$-e3&2{|6?Jfff3HS+^jE-UibJ);+K5tYs+TOHGA()}4B~cX?3<R08e8fLf3F
z#`Og1yRJUjEhD57=!)F|e#{u^i8Jy#Q$;P+&?U|)xSR5NWJjzAMfBNSC5F^+x3xGS
za_$k{vAXDp`-bittoIPV>UwS0bxMliKUNWzF3-6nTleL6N*@rCZ+P#MeCEAP@6E}-
XAW1U*57l|eiB5UL(rx2)80JZT7dbcL

diff --git a/common/test/keyboards/baseline/k_0600___system_stores.js b/common/test/keyboards/baseline/k_0600___system_stores.js
new file mode 100644
index 00000000000..b72c56cc1cd
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0600___system_stores.js
@@ -0,0 +1,211 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0600___system_stores());
+}
+function Keyboard_k_0600___system_stores()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0600___system_stores";
+  this.KN="0600 - system stores";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_digit_4="1234567890";
+  this.s_letter_5="abcdefghij";
+  this.s8="windows";
+  this.s9="desktop";
+  this.s10="hardware";
+  this.s11="native";
+  this.s12="en-US";
+  this.s13="kbdus.dll";
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_0 /* 0x30 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_1 /* 0x31 */)) {
+      if(k.KIFS(31,this.s8,t)){
+        r=m=1;   // Line 19
+        k.KDC(0,t);
+        k.KO(-1,t,"windows.");
+      }
+      else if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_2 /* 0x32 */)) {
+      if(k.KIFS(31,this.s9,t)){
+        r=m=1;   // Line 20
+        k.KDC(0,t);
+        k.KO(-1,t,"desktop.");
+      }
+      else if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_3 /* 0x33 */)) {
+      if(k.KIFS(31,this.s10,t)){
+        r=m=1;   // Line 21
+        k.KDC(0,t);
+        k.KO(-1,t,"hardware.");
+      }
+      else if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_4 /* 0x34 */)) {
+      if(k.KIFS(31,this.s11,t)){
+        r=m=1;   // Line 22
+        k.KDC(0,t);
+        k.KO(-1,t,"native.");
+      }
+      else if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_5 /* 0x35 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_6 /* 0x36 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_7 /* 0x37 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_8 /* 0x38 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_9 /* 0x39 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_A /* 0x41 */)) {
+      if(k.KIFS(32,this.s12,t)){
+        r=m=1;   // Line 25
+        k.KDC(0,t);
+        k.KO(-1,t,"en-US.");
+      }
+      else if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_B /* 0x42 */)) {
+      if(k.KIFS(32,this.s13,t)){
+        r=m=1;   // Line 26
+        k.KDC(0,t);
+        k.KO(-1,t,"kbdus.dll.");
+      }
+      else if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_C /* 0x43 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_D /* 0x44 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_E /* 0x45 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_F /* 0x46 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_G /* 0x47 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_H /* 0x48 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_I /* 0x49 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_J /* 0x4A */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_026___system_stores.kmn b/common/test/keyboards/baseline/k_0600___system_stores.kmn
similarity index 94%
rename from common/test/keyboards/baseline/k_026___system_stores.kmn
rename to common/test/keyboards/baseline/k_0600___system_stores.kmn
index 0538c51364b..9b63ffb576c 100644
--- a/common/test/keyboards/baseline/k_026___system_stores.kmn
+++ b/common/test/keyboards/baseline/k_0600___system_stores.kmn
@@ -1,8 +1,8 @@
-store(&NAME) '026 - system stores'
+store(&NAME) '0600 - system stores'
 c Description: Tests platform and baselayout system store rules
 c keys: [K_1][K_2][K_3][K_4][K_A][K_B]
 c expected: windows.desktop.hardware.native.en-US.kbdus.dll.
-c context: 
+c context:
 c (default) option: &platform=windows desktop hardware native <-- ignored by test
 c (default) option: &baseLayout=kbdus.dll <-- ignored by test
 c (default) option: &baseLayoutAlt=en-US <-- ignored by test
diff --git a/common/test/keyboards/baseline/k_0600___system_stores.kmx b/common/test/keyboards/baseline/k_0600___system_stores.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..54c86383bc360fb33bd4c49a2b0deb24c54bc904
GIT binary patch
literal 1974
zcmd^<%}bO~6vm&VPcxA|v=qW1tVJW^w{D_@N)ko1AX=r)j82Z@@XnaoU(lk3NJxwR
zgcczo(z;cvh;S7x!$m|yv<S(5=X&3~*}~bi=nT)C^E~&Q^WOJ<y#2RsjHpsN*Kns-
z*dF`Cs)5CqK(a#G#0Y=e%7Lx07WWCPgF3JQJ_8#*PlKQMgWw`@yKkPs5Bc~ZJ_0r5
zJjE~hcp3i;oJN0#f92zk_%$E@z_0tbk~wbp_#|-^u-ayPJxCHu{Yq<I(;8LY@uWH#
zNvcr^P-LvA5;@b3l{BLWRwTDcgSxB%T_J9vqS<w9(mlo_GP2}a&la_+P3`KSbC<f+
z<ML9BPk<5`qZ-q=Qq*P8CQ<LA=HMmw?8tTL;{TeP*#H$;-@5~~S2tl<dd#>k(wrMl
z!ROpu<@BPa=r^MRHR3s=%rixX`LxsW#3gF&9n8}7P0)SBu_@-6(kvaD@i~5GeXQj$
zh^?N0WoKpLS=vh5Nie&;SGo^ch>tl%dH{dqwK(qyd<C?UbKK{x!e4tW&Rc_j18wA-
z@Oj_imHW1|IIkAoZXm}_s97ics@LMYVR!-9y2e@rUjUtfwg`U?x&mz({swdh+FSS+
z&=Y81;Whhh-=$N)>?pj^YYkhHF2D!D7~EFXYzUt5TAUZbAA@nmV{Hk(3Q~dg68;{f
z1MLIcu4X3CD&S|qM4&an`@m$NU5DpDHqi3$1z;yQp35Tq1t@T0?0jW7gAq3>L1bqn
z$9XdQ^VFKQxmm}(tI#3h-Ky>WY@hJ3nvdD8)jMxPSbw;T`tat2wN+)*?)GN?dVKpU
q5Wm?O_T&g}Hpc!HS$Esld3JS{-QBsXe}6T?F4bjrDd$Q5bIvamWdf`K

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0601___system_stores_2.js b/common/test/keyboards/baseline/k_0601___system_stores_2.js
new file mode 100644
index 00000000000..2a2d14135ea
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0601___system_stores_2.js
@@ -0,0 +1,211 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0601___system_stores_2());
+}
+function Keyboard_k_0601___system_stores_2()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0601___system_stores_2";
+  this.KN="0601 - system stores 2";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_digit_4="1234567890";
+  this.s_letter_5="abcdefghij";
+  this.s8="linux";
+  this.s9="desktop";
+  this.s10="hardware";
+  this.s11="native";
+  this.s12="fr-FR";
+  this.s13="kbdfr.dll";
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_0 /* 0x30 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_1 /* 0x31 */)) {
+      if(k.KIFS(31,this.s8,t)){
+        r=m=1;   // Line 19
+        k.KDC(0,t);
+        k.KO(-1,t,"linux.");
+      }
+      else if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_2 /* 0x32 */)) {
+      if(k.KIFS(31,this.s9,t)){
+        r=m=1;   // Line 20
+        k.KDC(0,t);
+        k.KO(-1,t,"desktop.");
+      }
+      else if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_3 /* 0x33 */)) {
+      if(k.KIFS(31,this.s10,t)){
+        r=m=1;   // Line 21
+        k.KDC(0,t);
+        k.KO(-1,t,"hardware.");
+      }
+      else if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_4 /* 0x34 */)) {
+      if(k.KIFS(31,this.s11,t)){
+        r=m=1;   // Line 22
+        k.KDC(0,t);
+        k.KO(-1,t,"native.");
+      }
+      else if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_5 /* 0x35 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_6 /* 0x36 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_7 /* 0x37 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_8 /* 0x38 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_9 /* 0x39 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"platform-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_A /* 0x41 */)) {
+      if(k.KIFS(32,this.s12,t)){
+        r=m=1;   // Line 25
+        k.KDC(0,t);
+        k.KO(-1,t,"fr-FR.");
+      }
+      else if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_B /* 0x42 */)) {
+      if(k.KIFS(32,this.s13,t)){
+        r=m=1;   // Line 26
+        k.KDC(0,t);
+        k.KO(-1,t,"kbdfr.dll.");
+      }
+      else if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_C /* 0x43 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_D /* 0x44 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_E /* 0x45 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_F /* 0x46 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_G /* 0x47 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_H /* 0x48 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_I /* 0x49 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_J /* 0x4A */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"baselayout-fail.");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_027___system_stores_2.kmn b/common/test/keyboards/baseline/k_0601___system_stores_2.kmn
similarity index 93%
rename from common/test/keyboards/baseline/k_027___system_stores_2.kmn
rename to common/test/keyboards/baseline/k_0601___system_stores_2.kmn
index 95457c84639..3e30cbf5e5d 100644
--- a/common/test/keyboards/baseline/k_027___system_stores_2.kmn
+++ b/common/test/keyboards/baseline/k_0601___system_stores_2.kmn
@@ -1,8 +1,8 @@
-store(&NAME) '027 - system stores 2'
+store(&NAME) '0601 - system stores 2'
 c Description: Tests platform and baselayout system store rules
 c keys: [K_1][K_2][K_3][K_4][K_A][K_B]
 c expected: linux.desktop.hardware.native.fr-FR.kbdfr.dll.
-c context: 
+c context:
 c option: &platform=linux desktop hardware native
 c option: &baseLayout=kbdfr.dll
 c option: &baseLayoutAlt=fr-FR
diff --git a/common/test/keyboards/baseline/k_0601___system_stores_2.kmx b/common/test/keyboards/baseline/k_0601___system_stores_2.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..f19063be7d9468a57f487aa5e5d6963171dbff6b
GIT binary patch
literal 1970
zcmd^<y-$--6vhukQL#3Dqi9TZAP&;Be3nfcMI*|9n4nurTiVhO(iQ~&0*8he<K*Pz
zWDFsMKfyQ{2V;zJbTABr7)R4kf9LkT_6CP`bMQ7#&v~Bvob$f#z4v`5W~T2+x5&3+
zuO0}aL;o0lp!ro0>J+InNdJuW1C8`FVH<3L9#8{2K&P+JV3&9hM9Cwzd6qbB^D1!(
z9L4jJ_`>F!#5HgM{S)z>&A$^r+x!=C%jVtOW6kDg$bCR-gT!7CA{UvEq^w9@Vp1?X
zBqPj(B_REv%v@P2c=Co-q$nj=88(2wPbTG>+?5;TVd{dWYo9FPDdEcC*S=xggEAz;
zbRU(7j2T~o`8iO*5tF#gN`kr+S{gNrnuAx&^-HG9DE~L94RFmEo<{Fs)TrEtW#~~f
zU9?u`7iF1QF<M#X=~a{kqonCjLVsjp(r5+p3Uzw_I#M|LWn88Vo97-AMhg;i{B+!6
zEvJAtdPzD!^A2^T^(5$cxKCsmgvn1BMdUI3iPb#cbND*YRX%Bb8}PSQ^L!uSKfoZK
zQ`Ywr-nGA>dA{TD5E#OvCsfA(JZd%1Hwn)HT~kjhz^h=y(N^KF!KkCXfxib4NBaQZ
z24jx41NU|5o{O9XI{fhSRy)^_<TCs=h{JVNb=*;IHP2UoKLxYQd)hPj21q#CCj1LX
zI@(uw4Wt}x7arhsopZEH@arJ$XyeL3#?i9yD$vvG-ODO`4J>eC^n9hvTa@QyrQjLV
zAa3`>DzDdjIOm;mh`d#$zBkR&?N;+4YgxVbO>pZEw^8rDHEyl1joMaE_OIugUjXmP
nF0v;_c(OQqS7zOHPgmH{MRs=Yj{g0{aJ%^1?9$Ga{%6l`<uU_@

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0700___caps_lock.js b/common/test/keyboards/baseline/k_0700___caps_lock.js
new file mode 100644
index 00000000000..a89cef36e44
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0700___caps_lock.js
@@ -0,0 +1,103 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0700___caps_lock());
+}
+function Keyboard_k_0700___caps_lock()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0700___caps_lock";
+  this.KN="0700 - caps lock";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=modCodes.SHIFT | modCodes.CAPS | modCodes.NO_CAPS /* 0x0310 */;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_3 /* 0x33 */)) {
+      if(1){
+        r=m=1;   // Line 20
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    else if(k.KKM(e, modCodes.NO_CAPS | modCodes.VIRTUAL_KEY /* 0x4200 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 14
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.CAPS | modCodes.VIRTUAL_KEY /* 0x4100 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 15
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_3 /* 0x33 */)) {
+      if(1){
+        r=m=1;   // Line 21
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.SHIFT | modCodes.NO_CAPS | modCodes.VIRTUAL_KEY /* 0x4210 */, keyCodes.K_2 /* 0x32 */)) {
+      if(1){
+        r=m=1;   // Line 17
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.SHIFT | modCodes.CAPS | modCodes.VIRTUAL_KEY /* 0x4110 */, keyCodes.K_2 /* 0x32 */)) {
+      if(1){
+        r=m=1;   // Line 18
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_A /* 0x41 */)) {
+      if(1){
+        r=m=1;   // Line 24
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_B /* 0x42 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_A /* 0x41 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_B /* 0x42 */)) {
+      if(1){
+        r=m=1;   // Line 26
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_031___caps_lock.kmn b/common/test/keyboards/baseline/k_0700___caps_lock.kmn
similarity index 93%
rename from common/test/keyboards/baseline/k_031___caps_lock.kmn
rename to common/test/keyboards/baseline/k_0700___caps_lock.kmn
index d14b8ad56ba..27fc5b6b739 100644
--- a/common/test/keyboards/baseline/k_031___caps_lock.kmn
+++ b/common/test/keyboards/baseline/k_0700___caps_lock.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '031 - caps lock'
+store(&NAME) '0700 - caps lock'
 c Description: Tests Caps Lock
 c keys: [K_1][SHIFT K_2][SHIFT K_3][K_A][SHIFT K_B]
 c expected: pass.pass.pass.pass.pass.
diff --git a/common/test/keyboards/baseline/k_0700___caps_lock.kmx b/common/test/keyboards/baseline/k_0700___caps_lock.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..072520eb51e6d47ebe9aa90e01323f6018dc05b5
GIT binary patch
literal 652
zcmbV}O-jR16oro>Dk54%qf`fiP(&~!EvQ2q{27!w&<YN1{ejTh1`9$#9E%iJAg;v)
zICc$=T!Q-DXIf_+c*~cZbKZUTh1b$)<yaF^q2qmt8nOp93Z{3!Lwr-nesza`rN^ra
z53m5w@C0M<3NJ7Y@9+j0_=JyCk1*Q~4nQjDQXO5Zs;2XSwpa<Yq767FPt-;=)WX&2
z$>~r<m9>Ws>Ga*CoNk$PLvKu{%?g$0dEjQ1nG>g}og3){7c;S?3-(DqU$qUr;)2|5
z{Ow#Nnd>cc7n2a;r!0$j<FjctZCO!T#;-vEJ8v1aj^70Px*5nsoQ&U1vsug7yN^Et
zq!z)df<J=@z2p+9hHpX@Z~uo?g1>_rI_nbY9{&gloo#-;%dgzcG*UNcZBXZb_x%9z
C;Xw%i

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0701___caps_control.js b/common/test/keyboards/baseline/k_0701___caps_control.js
new file mode 100644
index 00000000000..0b4ee57e6d9
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0701___caps_control.js
@@ -0,0 +1,131 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0701___caps_control());
+}
+function Keyboard_k_0701___caps_control()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0701___caps_control";
+  this.KN="0701 - caps control";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=modCodes.SHIFT | modCodes.CAPS | modCodes.NO_CAPS /* 0x0310 */;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.SHIFT | modCodes.NO_CAPS | modCodes.VIRTUAL_KEY /* 0x4210 */, keyCodes.K_3 /* 0x33 */)) {
+      if(1){
+        r=m=1;   // Line 24
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.SHIFT | modCodes.CAPS | modCodes.VIRTUAL_KEY /* 0x4110 */, keyCodes.K_3 /* 0x33 */)) {
+      if(1){
+        r=m=1;   // Line 25
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    else if(k.KKM(e, modCodes.CAPS | modCodes.VIRTUAL_KEY /* 0x4100 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 17
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.NO_CAPS | modCodes.VIRTUAL_KEY /* 0x4200 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 18
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    else if(k.KKM(e, modCodes.NO_CAPS | modCodes.VIRTUAL_KEY /* 0x4200 */, keyCodes.K_2 /* 0x32 */)) {
+      if(1){
+        r=m=1;   // Line 20
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.CAPS | modCodes.VIRTUAL_KEY /* 0x4100 */, keyCodes.K_2 /* 0x32 */)) {
+      if(1){
+        r=m=1;   // Line 21
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    else if(k.KKM(e, modCodes.CAPS | modCodes.VIRTUAL_KEY /* 0x4100 */, keyCodes.K_4 /* 0x34 */)) {
+      if(1){
+        r=m=1;   // Line 27
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.NO_CAPS | modCodes.VIRTUAL_KEY /* 0x4200 */, keyCodes.K_4 /* 0x34 */)) {
+      if(1){
+        r=m=1;   // Line 28
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    else if(k.KKM(e, modCodes.NO_CAPS | modCodes.VIRTUAL_KEY /* 0x4200 */, keyCodes.K_5 /* 0x35 */)) {
+      if(1){
+        r=m=1;   // Line 30
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.CAPS | modCodes.VIRTUAL_KEY /* 0x4100 */, keyCodes.K_5 /* 0x35 */)) {
+      if(1){
+        r=m=1;   // Line 31
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    else if(k.KKM(e, modCodes.NO_CAPS | modCodes.VIRTUAL_KEY /* 0x4200 */, keyCodes.K_6 /* 0x36 */)) {
+      if(1){
+        r=m=1;   // Line 33
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.CAPS | modCodes.VIRTUAL_KEY /* 0x4100 */, keyCodes.K_6 /* 0x36 */)) {
+      if(1){
+        r=m=1;   // Line 34
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    else if(k.KKM(e, modCodes.CAPS | modCodes.VIRTUAL_KEY /* 0x4100 */, keyCodes.K_7 /* 0x37 */)) {
+      if(1){
+        r=m=1;   // Line 37
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.NO_CAPS | modCodes.VIRTUAL_KEY /* 0x4200 */, keyCodes.K_7 /* 0x37 */)) {
+      if(1){
+        r=m=1;   // Line 38
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_032___caps_control.kmn b/common/test/keyboards/baseline/k_0701___caps_control.kmn
similarity index 96%
rename from common/test/keyboards/baseline/k_032___caps_control.kmn
rename to common/test/keyboards/baseline/k_0701___caps_control.kmn
index 884fb41a6d5..13c9aa29a05 100644
--- a/common/test/keyboards/baseline/k_032___caps_control.kmn
+++ b/common/test/keyboards/baseline/k_0701___caps_control.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '032 - caps control'
+store(&NAME) '0701 - caps control'
 c Description: Tests Caps Lock env set
 c keys: [K_1][K_CAPS][K_2][SHIFT K_3][K_4][K_CAPS][K_5][K_CAPS][K_6][K_SHIFT][K_7]
 c expected: pass.pass.pass.pass.pass.pass.pass.
diff --git a/common/test/keyboards/baseline/k_0701___caps_control.kmx b/common/test/keyboards/baseline/k_0701___caps_control.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..c9f04435d20f61f96ba98f4087eade84ca6f99ef
GIT binary patch
literal 882
zcmdUsxk^J(5QcvjTp|P&R}_tcDT0Q?En;N?E)cbG!9tLz2?nAGNf3MoYikR!v=R&P
z0YtD>D=V?El=S+|^+cb+xqRo$|DTz;TXJiCO+IPovHn>^jV(kISUv}3k}rZ(b+!;i
zmvoU|z&UioHC#d?yuuCGtO|TU3;3AV0L|oK_7Jp^FS9SWe3yM2BKT5LX`Sd$DIIw_
zq8KMp1vCbG_yv``EKfyQMdg*FGN@I>wW4|QC>>#MUQox(E7Fmr&L&2^+L8`%GW2IS
zO>>ogXIE>g_p&}C$8*`)6zd|>1Kcgel%J^+xCw2bvP{ZrpPABWjdTXp@ROMQ>$JWe
zXiZ30wbCt^*K1x}x<lWCJ$D=Ml6pWtIj`Nkg!F=bgK=bs^WM>)&g(Rf-U`}&?Ic^D
z^J>w4=k=SH;NIwdu(us>-T*q}yg~DrH;SHtY2=Wrn?)};Z`jo>q1PdX9&z3#de?bD
Y*Sn7{K*syFIsT(X0afDqQUB%a8*Er$$^ZZW

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0702___caps_always_off.js b/common/test/keyboards/baseline/k_0702___caps_always_off.js
new file mode 100644
index 00000000000..48455fb1a99
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0702___caps_always_off.js
@@ -0,0 +1,75 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0702___caps_always_off());
+}
+function Keyboard_k_0702___caps_always_off()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0702___caps_always_off";
+  this.KN="0702 - caps always off";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=modCodes.CAPS | modCodes.NO_CAPS /* 0x0300 */;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.CAPS | modCodes.VIRTUAL_KEY /* 0x4100 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 16
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.NO_CAPS | modCodes.VIRTUAL_KEY /* 0x4200 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 17
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    else if(k.KKM(e, modCodes.CAPS | modCodes.VIRTUAL_KEY /* 0x4100 */, keyCodes.K_2 /* 0x32 */)) {
+      if(1){
+        r=m=1;   // Line 19
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.NO_CAPS | modCodes.VIRTUAL_KEY /* 0x4200 */, keyCodes.K_2 /* 0x32 */)) {
+      if(1){
+        r=m=1;   // Line 20
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    else if(k.KKM(e, modCodes.CAPS | modCodes.VIRTUAL_KEY /* 0x4100 */, keyCodes.K_3 /* 0x33 */)) {
+      if(1){
+        r=m=1;   // Line 22
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.NO_CAPS | modCodes.VIRTUAL_KEY /* 0x4200 */, keyCodes.K_3 /* 0x33 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_033___caps_always_off.kmn b/common/test/keyboards/baseline/k_0702___caps_always_off.kmn
similarity index 90%
rename from common/test/keyboards/baseline/k_033___caps_always_off.kmn
rename to common/test/keyboards/baseline/k_0702___caps_always_off.kmn
index 912f2c5ac0d..fb2099bbe9b 100644
--- a/common/test/keyboards/baseline/k_033___caps_always_off.kmn
+++ b/common/test/keyboards/baseline/k_0702___caps_always_off.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '033 - caps always off'
+store(&NAME) '0702 - caps always off'
 c Description: Tests Caps Lock always off
 c keys: [K_1][K_CAPS][K_2][K_CAPS][K_3]
 c expected: pass.pass.pass.
diff --git a/common/test/keyboards/baseline/k_0702___caps_always_off.kmx b/common/test/keyboards/baseline/k_0702___caps_always_off.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..f8d6c0c9df547bbdbe6942e2d6fc9b4a9c73d61d
GIT binary patch
literal 574
zcmbV}KTE@45Ql$}P^FXAqJvB5P+S@k6?7=27K%er#6RE~)MBBU(t^_O(LwwK;^%R2
zbZ~NT6gPeDO#+?0@Vs}wd+)B-q<3+4s<O24`hFtJvjbZMi`#Ha@QV@3w*zY}WPT0z
z2s2oRXLthZe}flTf-m?0eoDR#hGpC)zLv)={2oN)rJk-e)vXfUIUQ-2n=J)uz$N*S
zCPaybdf=Qom8#Dp)pewO9jZ$l(-*p_b=@;{OyxkSn;W~@V%q$yVp6OfY7XcRn3vFL
z`^0P_b##szuuZBfCQCP-G={=T1SaP@vwzNd`sC^xY>SGubfh1&&)c>6tCpj#gkH&W
pRm)LVMF+5rw69=wHFTKg>}yzEgl<CL?LOp9n2k^qo=pAs?hiasK0yEg

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0703___caps_always_off_initially_on.js b/common/test/keyboards/baseline/k_0703___caps_always_off_initially_on.js
new file mode 100644
index 00000000000..a482844beca
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0703___caps_always_off_initially_on.js
@@ -0,0 +1,75 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0703___caps_always_off_initially_on());
+}
+function Keyboard_k_0703___caps_always_off_initially_on()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0703___caps_always_off_initially_on";
+  this.KN="0703 - caps always off initially on";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=modCodes.CAPS | modCodes.NO_CAPS /* 0x0300 */;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.CAPS | modCodes.VIRTUAL_KEY /* 0x4100 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 17
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.NO_CAPS | modCodes.VIRTUAL_KEY /* 0x4200 */, keyCodes.K_1 /* 0x31 */)) {
+      if(1){
+        r=m=1;   // Line 18
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    else if(k.KKM(e, modCodes.CAPS | modCodes.VIRTUAL_KEY /* 0x4100 */, keyCodes.K_2 /* 0x32 */)) {
+      if(1){
+        r=m=1;   // Line 20
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.NO_CAPS | modCodes.VIRTUAL_KEY /* 0x4200 */, keyCodes.K_2 /* 0x32 */)) {
+      if(1){
+        r=m=1;   // Line 21
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    else if(k.KKM(e, modCodes.CAPS | modCodes.VIRTUAL_KEY /* 0x4100 */, keyCodes.K_3 /* 0x33 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"fail.");
+      }
+    }
+    else if(k.KKM(e, modCodes.NO_CAPS | modCodes.VIRTUAL_KEY /* 0x4200 */, keyCodes.K_3 /* 0x33 */)) {
+      if(1){
+        r=m=1;   // Line 24
+        k.KDC(0,t);
+        k.KO(-1,t,"pass.");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_047___caps_always_off_initially_on.kmn b/common/test/keyboards/baseline/k_0703___caps_always_off_initially_on.kmn
similarity index 90%
rename from common/test/keyboards/baseline/k_047___caps_always_off_initially_on.kmn
rename to common/test/keyboards/baseline/k_0703___caps_always_off_initially_on.kmn
index 4c0b6913658..140a3167e00 100644
--- a/common/test/keyboards/baseline/k_047___caps_always_off_initially_on.kmn
+++ b/common/test/keyboards/baseline/k_0703___caps_always_off_initially_on.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '047 - caps always off initially on'
+store(&NAME) '0703 - caps always off initially on'
 c Description: Tests Caps Lock always off, entry to the test has Caps Lock
 c              on to test that it is then switched off on first keystroke event.
 c keys: [K_1][K_CAPS][K_2][K_CAPS][K_3]
diff --git a/common/test/keyboards/baseline/k_0703___caps_always_off_initially_on.kmx b/common/test/keyboards/baseline/k_0703___caps_always_off_initially_on.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..bd9c41c9dc5d6055ea0c7854d814a53eac903e05
GIT binary patch
literal 600
zcmbV}y-EX75QR@fR8mFpj}+lni-m^7AcCYY3!)gb@Q-bmXkcYE!H6NPSXx?$Par;t
zkKl9o0O~h)S4r(G=gyonf0w)M=;T;M>Er!jMOeWOY#La+4K4}3F+xq+fkhLUU&K9w
zC$I!w!3(hdPw)n249xh#vq}}>GAI#;_+}nQ_#;q5m)g3}NLPw=?Ria`WEyf>10D3f
z21Kz^4LL`i_0;8aO6W>-3oM_Kb?W&^fezKufp(Z$XJXaw3v|c68)hVVU7dXJw`Y7y
zw!^wNsM)38F)#KzO>LltI`uc`FzuYl(tSaC1iv;#V064wnzeL`cjkRdz-}>TT8M{N
zz&do^H0m6DHP;qQ3#BT23)nsEpIBWJzL#suriIcz{0wyc-BVt|tPdOTW$eGXA4ujw
A?*IS*

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0800___long_context.js b/common/test/keyboards/baseline/k_0800___long_context.js
new file mode 100644
index 00000000000..9870e97456e
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0800___long_context.js
@@ -0,0 +1,40 @@
+
+KeymanWeb.KR(new Keyboard_k_0800___long_context());
+
+function Keyboard_k_0800___long_context()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0800___long_context";
+  this.KN="0800 - long context";
+  this.KMINVER="6.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0000;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4000, 0x20)) {
+      if(1){
+        r=m=1;   // Line 13
+        k.KO(0,t," ");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x46)) {
+      if(k.KCM(1,t," ",1)){
+        r=m=1;   // Line 16
+        k.KO(1,t," ");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_040___long_context.kmn b/common/test/keyboards/baseline/k_0800___long_context.kmn
similarity index 91%
rename from common/test/keyboards/baseline/k_040___long_context.kmn
rename to common/test/keyboards/baseline/k_0800___long_context.kmn
index f570d257108..b14373ae3d0 100644
--- a/common/test/keyboards/baseline/k_040___long_context.kmn
+++ b/common/test/keyboards/baseline/k_0800___long_context.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '040 - long context'
+store(&NAME) '0800 - long context'
 c Description: Tests context longer than 64 chars
 c keys: [K_SPACE][K_F]
 c expected: 012345678901234567890123456789012345678901234567890123456789012\u0020
diff --git a/common/test/keyboards/baseline/k_0800___long_context.kmx b/common/test/keyboards/baseline/k_0800___long_context.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..7ff3b9dc82e133cb72829a0915a2926e915f63dc
GIT binary patch
literal 368
zcmYL^y-EX75Jpc@L>s}%SZ<X<h^&ohsu+kCAvRI4_1}g3ND_j+fra=4;^X)LmOg`(
zFQDfRYn<iW`+YNW=icp|oeZeKY>PvTN?Ht4q1*18CVvd&GVaU94KvU3Bz1X}7g>>a
zd6QN7ln+^#Z}}>9%{f)c_0Z#*M@F184xh7UB`2dPLnh{LRhOaWc0Vw;v%xV3^y#X1
z*^X%q7S^ZCD54v7{NO0&^}VBrTlUR$I8_%h_sUbg$2Ya)FRF@U|IcN*HK7d`mTnT-
P^oJ?#^h3$Qr8V&jEA1xH

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0801___long_context_and_deadkeys.js b/common/test/keyboards/baseline/k_0801___long_context_and_deadkeys.js
new file mode 100644
index 00000000000..01f5f0f0d20
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0801___long_context_and_deadkeys.js
@@ -0,0 +1,75 @@
+
+KeymanWeb.KR(new Keyboard_k_0801___long_context_and_deadkeys());
+
+function Keyboard_k_0801___long_context_and_deadkeys()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0801___long_context_and_deadkeys";
+  this.KN="0801 - long context and deadkeys";
+  this.KMINVER="6.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0000;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4000, 0x31)) {
+      if(k.KDM(60,t,0)&&k.KCM(60,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh",60)){
+        r=m=1;   // Line 18
+        k.KO(-1,t,"1");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x32)) {
+      if(k.KCM(63,t,"\x08\x01abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh1",63)){
+        r=m=1;   // Line 22
+        k.KO(63,t,"FAIL TEST 2");
+      }
+      else if(k.KCM(62,t,"\x01abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh1",62)){
+        r=m=1;   // Line 23
+        k.KO(62,t,"FAIL TEST 2");
+      }
+      else if(k.KCM(61,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh1",61)){
+        r=m=1;   // Line 24
+        k.KO(-1,t,"2");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x33)) {
+      if(k.KCM(64,t,"\x08\x01abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh12",64)){
+        r=m=1;   // Line 28
+        k.KO(64,t,"FAIL TEST 3");
+      }
+      else if(k.KCM(63,t,"\x01abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh12",63)){
+        r=m=1;   // Line 29
+        k.KO(63,t,"FAIL TEST 3");
+      }
+      else if(k.KCM(62,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh12",62)){
+        r=m=1;   // Line 30
+        k.KO(62,t,"abcdefghijklmnopqrstuvwxyz123");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x34)) {
+      if(k.KDM(29,t,0)&&k.KCM(29,t,"abcdefghijklmnopqrstuvwxyz123",29)){
+        r=m=1;   // Line 33
+        k.KO(29,t,"PASS");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x5A)) {
+      if(1){
+        r=m=1;   // Line 15
+        k.KDO(0,t,0);
+        k.KO(-1,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefgh");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_041___long_context_and_deadkeys.kmn b/common/test/keyboards/baseline/k_0801___long_context_and_deadkeys.kmn
similarity index 96%
rename from common/test/keyboards/baseline/k_041___long_context_and_deadkeys.kmn
rename to common/test/keyboards/baseline/k_0801___long_context_and_deadkeys.kmn
index 455fa1c41cb..29fea905903 100644
--- a/common/test/keyboards/baseline/k_041___long_context_and_deadkeys.kmn
+++ b/common/test/keyboards/baseline/k_0801___long_context_and_deadkeys.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '041 - long context and deadkeys'
+store(&NAME) '0801 - long context and deadkeys'
 c Description: Tests that we don't split a dk in context:set. Note that we start with a context
 c with length MAXCONTEXT-1 (abc...fgh is 60 characters/bytes long + 3 bytes for dk(1)).
 c keys: [K_Z][K_1][K_2][K_3][K_4]
diff --git a/common/test/keyboards/baseline/k_0801___long_context_and_deadkeys.kmx b/common/test/keyboards/baseline/k_0801___long_context_and_deadkeys.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..ff8c7a55ba229eaa123e993acea544e7bd50172c
GIT binary patch
literal 1818
zcmc(f%PvDv6o!B5QX^tOBS=je6HSYVVF?v!iKHcBAnJapYwP+LVj!MC47`BE(6CQn
zXy^f?lls=~AqGs4oOSZ=z1F|i*_VHvvs3fgj2fi!<3mYUjWt*!Fh2oia4Hz?r*&8Y
z)&{P@6=(;y;0D<6E4TweV3WPkwSW+QD=<Gw-|P8F`UHr<ODV1CT)WC?&&4qfGZI%=
zeIT!W_zk=j=M~95Q<2#6SLs(_a<n^co&s}3G_4U$X&iq@QMXP+CyXDdpe;9#SfQWs
z2}Z-@=HPApxXT{ZEYX%*)8>~3c%(6x9mm_Ok&eKJHQ`wJbtX>l4M%EG0N9GAq}e_3
zlgF8&X32oG2rMt;80ne#1=#wX9=B8{odM&zJg!XKT3_Y5J?@gY1O|zFJTA>wFb5Wh
zn~h6QS>h0-tW*LhV11C&<g|<ecK&rLu!$bqsGO%(duVu|L#Jm^$7p*>RnB$sFYllO
z^_x^$VP&aehBoXp@pD(E%TN3APpfLR0!|&j>h+T{_I3JOG5e3ctC{W0&zjl3ep4;G
evuy9bdG|lwsot40{GAz|zuXfaC-M8Hk=_AjP%`@f

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0802___long_context_and_split_deadkeys.js b/common/test/keyboards/baseline/k_0802___long_context_and_split_deadkeys.js
new file mode 100644
index 00000000000..467eb874724
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0802___long_context_and_split_deadkeys.js
@@ -0,0 +1,57 @@
+
+KeymanWeb.KR(new Keyboard_k_0802___long_context_and_split_deadkeys());
+
+function Keyboard_k_0802___long_context_and_split_deadkeys()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0802___long_context_and_split_deadkeys";
+  this.KN="0802 - long context and split deadkeys";
+  this.KMINVER="6.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0000;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4000, 0x20)) {
+      if(k.KCM(64,t,"\x01abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk",64)){
+        r=m=1;   // Line 18
+        k.KO(64,t,"FAIL");
+      }
+      else if(k.KDM(63,t,0)&&k.KCM(63,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk",63)){
+        r=m=1;   // Line 19
+        k.KO(63,t,"UNEXPECTED");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x31)) {
+      if(k.KCM(61,t,"defghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk ",61)){
+        r=m=1;   // Line 22
+        k.KO(61,t,"def");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x32)) {
+      if(k.KDM(6,t,0)&&k.KCM(6,t,"abcdef",6)){
+        r=m=1;   // Line 23
+        k.KO(6,t,"PASS");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x5A)) {
+      if(1){
+        r=m=1;   // Line 14
+        k.KDO(0,t,0);
+        k.KO(-1,t,"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_042___long_context_and_split_deadkeys.kmn b/common/test/keyboards/baseline/k_0802___long_context_and_split_deadkeys.kmn
similarity index 93%
rename from common/test/keyboards/baseline/k_042___long_context_and_split_deadkeys.kmn
rename to common/test/keyboards/baseline/k_0802___long_context_and_split_deadkeys.kmn
index ce31d18e282..a6d883886a1 100644
--- a/common/test/keyboards/baseline/k_042___long_context_and_split_deadkeys.kmn
+++ b/common/test/keyboards/baseline/k_0802___long_context_and_split_deadkeys.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '042 - long context and split deadkeys'
+store(&NAME) '0802 - long context and split deadkeys'
 c Description: Tests that we don't split a dk in context. Note that we start with a context with length MAXCONTEXT.
 c keys: [K_Z][K_SPACE][K_1][K_2]
 c context:
diff --git a/common/test/keyboards/baseline/k_0802___long_context_and_split_deadkeys.kmx b/common/test/keyboards/baseline/k_0802___long_context_and_split_deadkeys.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..f26e1e438669835cd63e808ed77e34432cbe3269
GIT binary patch
literal 1074
zcmd6k%Pxaa6opqQIuL{eBl!o?8L1MffutxxX_~Z>rn6F)QdMnTDn`bJBH{@|;+>2=
zfmwa~w3u`#sr_f2v-aief1h>YnRH6M(%a(rpfH~;SRXJR1zAV~gZ^09-=w2#Pv8NJ
zffw)$?EEKq1p&}c4?h@!PqI(6c!Yhf#gputAViH6*S_jHRZb=6hZG?bmZvFD)EV(Z
z*q&oGs;^bUxB5JLRb{FQE|w>oBYNU`R_Pa1LQC4#Dtunk?w>(jlCN;G;Cf0ke9}5u
zkJ=n@n`HqkYX@F%f4A;pvRT%ctF==VpL7eptp{T6ZyyhD7?{12`T!n$!~$5cOS%Kr
z&2%;kbfX~%!%c6qd;CX`g%4ODithL!-e`?mZfJ|3kNJ0**QPx{xg(}OMv)>Km$+|P
z=kD$`U7*7iYSwl0hi8Oh3G~h=$-1I6YmB)Xjle&ct*MGSrjCaaN!}{O*G`jmu}-|9
F^aaqPst5o8

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0803___if_and_context.js b/common/test/keyboards/baseline/k_0803___if_and_context.js
new file mode 100644
index 00000000000..68ac3f6dcfc
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0803___if_and_context.js
@@ -0,0 +1,51 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0803___if_and_context());
+}
+function Keyboard_k_0803___if_and_context()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0803___if_and_context";
+  this.KN="0803 - if and context";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_nfc_5=KeymanWeb.KLOAD(this.KI,"nfc","0");
+  this.s_diaeresisBase_6="ae";
+  this.s8="0";
+  this.KVS=['s_nfc_5'];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_A /* 0x41 */)) {
+      if(1){
+        r=m=1;   // Line 16
+        k.KDC(0,t);
+        k.KO(-1,t,"exay");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_B /* 0x42 */)) {
+      if(k.KFCM(4,t,[{t:'a',a:this.s_diaeresisBase_6},'x',{t:'a',a:this.s_diaeresisBase_6},'y'])&&this.s_nfc_5===this.s8){
+        r=m=1;   // Line 20
+        k.KDC(4,t);
+        k.KIO(-1,this.s_diaeresisBase_6,1,t);
+        k.KO(-1,t,"x");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_044___if_and_context.kmn b/common/test/keyboards/baseline/k_0803___if_and_context.kmn
similarity index 91%
rename from common/test/keyboards/baseline/k_044___if_and_context.kmn
rename to common/test/keyboards/baseline/k_0803___if_and_context.kmn
index 352490325cc..e19a96c17a1 100644
--- a/common/test/keyboards/baseline/k_044___if_and_context.kmn
+++ b/common/test/keyboards/baseline/k_0803___if_and_context.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '044 - if and context'
+store(&NAME) '0803 - if and context'
 c Description: Tests that context(x) takes if() statements into account. See #4275.
 c keys: [K_A][K_B]
 c expected: ex
diff --git a/common/test/keyboards/baseline/k_0803___if_and_context.kmx b/common/test/keyboards/baseline/k_0803___if_and_context.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..17e648142b55eb513a34e68e5e75cb7060eccecf
GIT binary patch
literal 502
zcmYL`yGjF55QhJaVvLnSh>b|9R4N;6Vk0IX7C{>o#6mbG3R@T@8$x^uYab$o_yi$^
zh4=(ML`n;r^_y`u1K-R)w{!N=zBoJ8iu5*}EengxVI?qq07FEEA^+_wAFNP$fibMZ
z1YV&CGnj%MyvY1FaTPYum3%)YZsmHP*Z`ZkB3{BKdO&=D7%jDRqetB-sONdC2Ay41
zwGD}G@z(1SJGw^=*cjoZnoiWzu@2F7ws!o?nubjDm9lN~)~n->=vJ8y)U9gw_c*^p
z3~Y!y5?6gP+fLOYPrbKCzom0F5`T`aSAXB(DUzPy&k6`j=XV7%`wnIkTJLa;E_+4#
gApZn=v%vQ-%d#~U+%I@m))IM%O2q#d<<Vw;06K_4g#Z8m

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0804___deadkey_and_context.js b/common/test/keyboards/baseline/k_0804___deadkey_and_context.js
new file mode 100644
index 00000000000..0b233bdc24d
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0804___deadkey_and_context.js
@@ -0,0 +1,64 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0804___deadkey_and_context());
+}
+function Keyboard_k_0804___deadkey_and_context()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0804___deadkey_and_context";
+  this.KN="0804 - deadkey and context";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=modCodes.SHIFT /* 0x0010 */;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_SLASH /* 0xBF */)) {
+      if(k.KFCM(7,t,['<',{t:'d',d:0},'a',{t:'d',d:1},'b',{t:'d',d:2},'>'])){
+        r=m=1;   // Line 18
+        k.KDC(7,t);
+        k.KO(-1,t,"correct");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_Y /* 0x59 */)) {
+      if(1){
+        r=m=1;   // Line 13
+        k.KDC(0,t);
+        k.KDO(-1,t,0);
+        k.KO(-1,t,"a");
+        k.KDO(-1,t,1);
+        k.KO(-1,t,"b");
+        k.KDO(-1,t,2);
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_Z /* 0x5A */)) {
+      if(k.KFCM(5,t,[{t:'d',d:0},'a',{t:'d',d:1},'b',{t:'d',d:2}])){
+        r=m=1;   // Line 17
+        k.KDC(5,t);
+        k.KO(-1,t,"<");
+        k.KDO(-1,t,0);
+        k.KO(-1,t,"a");
+        k.KDO(-1,t,1);
+        k.KO(-1,t,"b");
+        k.KDO(-1,t,2);
+        k.KO(-1,t,">");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_045___deadkey_and_context.kmn b/common/test/keyboards/baseline/k_0804___deadkey_and_context.kmn
similarity index 90%
rename from common/test/keyboards/baseline/k_045___deadkey_and_context.kmn
rename to common/test/keyboards/baseline/k_0804___deadkey_and_context.kmn
index c79953a05b8..3c6522d4704 100644
--- a/common/test/keyboards/baseline/k_045___deadkey_and_context.kmn
+++ b/common/test/keyboards/baseline/k_0804___deadkey_and_context.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '045 - deadkey and context'
+store(&NAME) '0804 - deadkey and context'
 c Description: Tests that context emits deadkeys correctly. See #4275.
 c keys: [K_Y][K_Z][SHIFT K_SLASH]
 c expected: correct
diff --git a/common/test/keyboards/baseline/k_0804___deadkey_and_context.kmx b/common/test/keyboards/baseline/k_0804___deadkey_and_context.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..c0a8199fa5ded9ea4d2cd160efad1532d3952870
GIT binary patch
literal 578
zcmaKp%`QVx6opq?p(F$YW_m`INJwvqlt`-$F(?Lp5(5Ue+Ck$lxkOYvhOs9w5Kkap
zz}zEv0yDmSoMIsM%{qInz1QC7-rV}$&b9`mgO|yih?E^fKQO)wZXh27^gC+lFFHng
z0QX=VJb_2h2j0Om$bunu^nhV_p6mi&B+m!FMP3iQLEaBMAs>SRvr=6xb#$Uwr(PFS
zqBAF_Y0#t_a~^q@^R6cKL!IHjpnAp0J7`l?ZD<u9F+bzC=XHrA(Ye~*Z@mb|8eNAw
zrf#<`fSPvUZNJ%WHE)S?#d~e4t0QKMzjP5ji@r@scc2>?h{>OODyY%Wex>yWI_SYr
t>*X&@fNS(fs5$f$urE${S}^<KCH`TS{jtw!HGIyfOz-cGEwrisJ)cBGN@D;3

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0805___deadkey_and_contextex.js b/common/test/keyboards/baseline/k_0805___deadkey_and_contextex.js
new file mode 100644
index 00000000000..b58f22a2230
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0805___deadkey_and_contextex.js
@@ -0,0 +1,60 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0805___deadkey_and_contextex());
+}
+function Keyboard_k_0805___deadkey_and_contextex()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0805___deadkey_and_contextex";
+  this.KN="0805 - deadkey and contextex";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=modCodes.SHIFT /* 0x0010 */;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_SLASH /* 0xBF */)) {
+      if(k.KFCM(3,t,['<',{t:'d',d:0},'>'])){
+        r=m=1;   // Line 18
+        k.KDC(3,t);
+        k.KO(-1,t,"correct");
+      }
+    }
+    else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_M /* 0x4D */)) {
+      if(k.KFCM(5,t,[{t:'d',d:0},'a',{t:'d',d:1},'b',{t:'d',d:2}])){
+        r=m=1;   // Line 17
+        k.KDC(5,t);
+        k.KO(-1,t,"<");
+        k.KDO(-1,t,0);
+        k.KO(-1,t,">");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_Y /* 0x59 */)) {
+      if(1){
+        r=m=1;   // Line 13
+        k.KDC(0,t);
+        k.KDO(-1,t,0);
+        k.KO(-1,t,"a");
+        k.KDO(-1,t,1);
+        k.KO(-1,t,"b");
+        k.KDO(-1,t,2);
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_046___deadkey_and_contextex.kmn b/common/test/keyboards/baseline/k_0805___deadkey_and_contextex.kmn
similarity index 89%
rename from common/test/keyboards/baseline/k_046___deadkey_and_contextex.kmn
rename to common/test/keyboards/baseline/k_0805___deadkey_and_contextex.kmn
index 48ad796c3e5..f120a982520 100644
--- a/common/test/keyboards/baseline/k_046___deadkey_and_contextex.kmn
+++ b/common/test/keyboards/baseline/k_0805___deadkey_and_contextex.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '046 - deadkey and contextex'
+store(&NAME) '0805 - deadkey and contextex'
 c Description: Tests that context() emits deadkeys correctly. See #4275.
 c keys: [K_Y][SHIFT K_M][SHIFT K_SLASH]
 c expected: correct
diff --git a/common/test/keyboards/baseline/k_0805___deadkey_and_contextex.kmx b/common/test/keyboards/baseline/k_0805___deadkey_and_contextex.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..73811a388add9124ceeb4bdc43f3589713cbeaf1
GIT binary patch
literal 568
zcmZ{hy-EX75QR@7=qd;%g?6%qq!5&BL|H{*6vZM$1T|Q?ng~JsAql~BK8AI$v=Ds(
z@hxn81Rp>I{qD^~ZM@5O=bV|jb9dSD;r^b+q`TLrs#qzvu|~n^65JrZSje9hr~7h}
z@BsHP1<&vZBk&0?5I~k00ZgE0i8H2)#1+$3;;!ja;*seN@e1;smCCBCt8*o~@IJ4Y
z%A!KeL5*s{e&)ME-&G@jqD%VQWUp<Pa@x_lD%xUB#Ef}=LrxvKnrf-x&$wDd$2QfF
z?u5L%c^NizfNuEd?q=5;vv2xdcWU4x&KCao0)7F1o057kSVIVBfA3ktWv%>1=^ZNg
wjO9M?!~Bgde%x}?_$6>(-Q=mG+SFG0j{)<GrZcAd*~C}VI`+}M$$xq28;{ILh5!Hn

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0806___modifier_keys_keep_context.js b/common/test/keyboards/baseline/k_0806___modifier_keys_keep_context.js
new file mode 100644
index 00000000000..afb8164deec
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0806___modifier_keys_keep_context.js
@@ -0,0 +1,40 @@
+
+KeymanWeb.KR(new Keyboard_k_0806___modifier_keys_keep_context());
+
+function Keyboard_k_0806___modifier_keys_keep_context()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0806___modifier_keys_keep_context";
+  this.KN="0806 - modifier keys keep context";
+  this.KMINVER="9.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0000;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.g_main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4000, 0x41)) {
+      if(1){
+        r=m=1;   // Line 13
+        k.KO(0,t,"a");
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0x42)) {
+      if(k.KCM(1,t,"a",1)){
+        r=m=1;   // Line 15
+        k.KO(1,t,"pass.");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_048___modifier_keys_keep_context.kmn b/common/test/keyboards/baseline/k_0806___modifier_keys_keep_context.kmn
similarity index 85%
rename from common/test/keyboards/baseline/k_048___modifier_keys_keep_context.kmn
rename to common/test/keyboards/baseline/k_0806___modifier_keys_keep_context.kmn
index bb0cfc4df5d..97cce24a6bc 100644
--- a/common/test/keyboards/baseline/k_048___modifier_keys_keep_context.kmn
+++ b/common/test/keyboards/baseline/k_0806___modifier_keys_keep_context.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '048 - modifier keys keep context'
+store(&NAME) '0806 - modifier keys keep context'
 c Description: Tests that modifier keys don't reset context (#5591)
 c keys: [K_A][K_SHIFT][K_B][K_A][K_ALT][K_B][K_A][K_CAPS][K_B]
 c expected: pass.pass.pass.
diff --git a/common/test/keyboards/baseline/k_0806___modifier_keys_keep_context.kmx b/common/test/keyboards/baseline/k_0806___modifier_keys_keep_context.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..fcf3ca65c5bb2e3aecbc8a4997b3da00d0f7c279
GIT binary patch
literal 404
zcmYL@F)xEr6o#J~sG*qHL=4?Dm5AupHW87cqBPbo`bipTi5gf8VlappOd@`W!H@9+
zj8>lW<-@so?tR~L&b{Zh4);4u!t>kvE=D0XV_ZVlWkvCADF5OqZ=5xAFLyF0FY+K0
z@*%HMlrQ;|8JY5KQ9>_z&P!DdEmE!+kTA@Al{G7?EU+X4PU+F-SW?c-oMio@T&0|;
zj_ew8Vdc^t%Iwf!n{{=KN;auXSHDMxP1@FB*##R`V@~3P_(4sY9H{%*yFFiptparA
lH^vlU|L-+)r6||o+R}|QwbOa-R{tnTcz>NRa#hrk`2iqlFEs!F

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0807___enter_invalidates_context.js b/common/test/keyboards/baseline/k_0807___enter_invalidates_context.js
new file mode 100644
index 00000000000..90948d0648e
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0807___enter_invalidates_context.js
@@ -0,0 +1,40 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0807___enter_invalidates_context());
+}
+function Keyboard_k_0807___enter_invalidates_context()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0807___enter_invalidates_context";
+  this.KN="0807 - enter_invalidates_context";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_C /* 0x43 */)) {
+      if(k.KFCM(2,t,['a','b'])){
+        r=m=1;   // Line 17
+        k.KDC(2,t);
+        k.KO(-1,t,"abd");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_049___enter_invalidates_context.kmn b/common/test/keyboards/baseline/k_0807___enter_invalidates_context.kmn
similarity index 89%
rename from common/test/keyboards/baseline/k_049___enter_invalidates_context.kmn
rename to common/test/keyboards/baseline/k_0807___enter_invalidates_context.kmn
index 78363865ef3..c66f2fccf03 100644
--- a/common/test/keyboards/baseline/k_049___enter_invalidates_context.kmn
+++ b/common/test/keyboards/baseline/k_0807___enter_invalidates_context.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '049 - enter_invalidates_context'
+store(&NAME) '0807 - enter_invalidates_context'
 c Description: Tests that core context is cleared when kb processor
 c              determines its invalid. eg Enter key See #10182.
 c keys: [K_A][K_B][K_ENTER][K_C]
diff --git a/common/test/keyboards/baseline/k_0807___enter_invalidates_context.kmx b/common/test/keyboards/baseline/k_0807___enter_invalidates_context.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..863379d98c803b81f35eb9fdfcfd8b93325e9133
GIT binary patch
literal 378
zcmYL@y=nqM6orpX6pN4)#!j{nyNFA`SQ>*^EZQW(c45t02>yVplH>_e1fL-IP(FcJ
zr%oHcJ6ZL@H}}lBKQlr2{G_~8*e>@XGIkIbV7du)#2<k?#YftBgYyNSP=s$-Ll$<h
zfgJq84_v_|vpFzbCYPXwmI4j+u8AT|-Myv;m3w)*g(2>ObFLSS&@1}JsF-Yig8!;n
z+VzGfRn*gix@x0+c2(U=6=rQu!nE~U?T)iU)uTId`_1)nTk6v@a=T;Zq#i#G;TR^3
W^W-D9Yb!UUF{K4W8t~WuEFA#veJ#-d

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0808___nul_and_context.js b/common/test/keyboards/baseline/k_0808___nul_and_context.js
new file mode 100644
index 00000000000..cca0be5e355
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0808___nul_and_context.js
@@ -0,0 +1,43 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0808___nul_and_context());
+}
+function Keyboard_k_0808___nul_and_context()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0808___nul_and_context";
+  this.KN="0808 - nul_and_context";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_cons_4="mnpqrstv";
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_B /* 0x42 */)) {
+      if(k.KFCM(2,t,[{t:'n'},{t:'a',a:this.s_cons_4}])){
+        r=m=1;   // Line 15
+        k.KDC(1,t);
+        k.KO(-1,t,"2");
+        k.KIO(-1,this.s_cons_4,1,t);
+        k.KO(-1,t,"3");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_050___nul_and_context.kmn b/common/test/keyboards/baseline/k_0808___nul_and_context.kmn
similarity index 87%
rename from common/test/keyboards/baseline/k_050___nul_and_context.kmn
rename to common/test/keyboards/baseline/k_0808___nul_and_context.kmn
index 206777b7f06..fabac4155c6 100644
--- a/common/test/keyboards/baseline/k_050___nul_and_context.kmn
+++ b/common/test/keyboards/baseline/k_0808___nul_and_context.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '050 - nul_and_context'
+store(&NAME) '0808 - nul_and_context'
 c Description: Tests that context has the right offset when used with nul
 c keys: [K_T][K_B]
 c expected: 2t3
diff --git a/common/test/keyboards/baseline/k_0808___nul_and_context.kmx b/common/test/keyboards/baseline/k_0808___nul_and_context.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..2304b23fe76af70fbe235faec5648f9ad493eea2
GIT binary patch
literal 406
zcmYL_&nkpr6o;P?k&-_PHWrh`lm*R<(%3O2YGQ-3V;E}0=g$nWaRJtnT!CDX3$S(z
zpXa=NIQ6{e_nvcp=X?8F`@1`g!u)A%45Ji>F)X21WmAzG%D;Fi2B)pO%CpSKySz#G
zKjlM4<XgTZVk*2cVVX0~7JAuSmud{r;)Dk-Xp^OTm4=-LWfmmkmU9kLw_`r$(pq27
zy(d)IW{oY@)ir&KX={Z$CvND`P4l=v<BIE4>)WN+)Jwi4&kdbrH?{S|OID=Gp1PZ6
mJ8pzS-+d;(5i<Dq9eEos+K;xLr0##6WPtcio)1ciA@vVI1~Rq)

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0809___if_and_context.js b/common/test/keyboards/baseline/k_0809___if_and_context.js
new file mode 100644
index 00000000000..a2e3ecd0356
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0809___if_and_context.js
@@ -0,0 +1,45 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0809___if_and_context());
+}
+function Keyboard_k_0809___if_and_context()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0809___if_and_context";
+  this.KN="0809 - if_and_context";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_cons_4="mnpqrstv";
+  this.s_ifx_5=KeymanWeb.KLOAD(this.KI,"ifx","1");
+  this.s8="1";
+  this.KVS=['s_ifx_5'];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_D /* 0x44 */)) {
+      if(k.KFCM(1,t,[{t:'a',a:this.s_cons_4}])&&this.s_ifx_5===this.s8){
+        r=m=1;   // Line 16
+        k.KDC(1,t);
+        k.KO(-1,t,"4");
+        k.KIO(-1,this.s_cons_4,1,t);
+        k.KO(-1,t,"5");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_051___if_and_context.kmn b/common/test/keyboards/baseline/k_0809___if_and_context.kmn
similarity index 88%
rename from common/test/keyboards/baseline/k_051___if_and_context.kmn
rename to common/test/keyboards/baseline/k_0809___if_and_context.kmn
index 7a6a3e3f63f..29c7c48ddb8 100644
--- a/common/test/keyboards/baseline/k_051___if_and_context.kmn
+++ b/common/test/keyboards/baseline/k_0809___if_and_context.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '051 - if_and_context'
+store(&NAME) '0809 - if_and_context'
 c Description: Tests that context has the right offset when used with if
 c keys: [K_T][K_D]
 c expected: 4t5
diff --git a/common/test/keyboards/baseline/k_0809___if_and_context.kmx b/common/test/keyboards/baseline/k_0809___if_and_context.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..ac1e467c9c25de221a545dc703f828a2061ffc0c
GIT binary patch
literal 452
zcmYL_!Ae3=5Qcw4Ep?+HwhLF%rZ7>-O;{8yL^m0@3+Wapc-0iqH)z$O2WZ*KMfe0F
zJx>qN=K9UyS_9vi|IExkhkF~H_MMVa>dpHQ5wU|vfayAn5CMVwi|=qSN97Baa0qKy
z!9M)J1`Z&~{4d$!7@Z6KRdNZ^)UU}Gq3)2|a75iF_n~NJHT0x~2I|Up_oB|})Rfl=
z^z^I;*Yn7a8ZtG-G3S&DYUxr<-Js8Kow}U`&6s%61h>tL?Y>4DyV{hl!c7zBlY3?E
zbeZ#(EqS(fshhh7SGq^{oX=ysy=U>tcf7+cOd9`gkDL7si%(iBDD(d_+EayE5M&ic
KCr}Z^sB8hh2REPq

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0810___nul_and_index.js b/common/test/keyboards/baseline/k_0810___nul_and_index.js
new file mode 100644
index 00000000000..1f86fe5ac04
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0810___nul_and_index.js
@@ -0,0 +1,44 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0810___nul_and_index());
+}
+function Keyboard_k_0810___nul_and_index()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0810___nul_and_index";
+  this.KN="0810 - nul_and_index";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_cons_4="mnpqrstv";
+  this.s_outs_5="MNPQRSTV";
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_B /* 0x42 */)) {
+      if(k.KFCM(2,t,[{t:'n'},{t:'a',a:this.s_cons_4}])){
+        r=m=1;   // Line 16
+        k.KDC(1,t);
+        k.KO(-1,t,"2");
+        k.KIO(-1,this.s_outs_5,1,t);
+        k.KO(-1,t,"3");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_052___nul_and_index.kmn b/common/test/keyboards/baseline/k_0810___nul_and_index.kmn
similarity index 88%
rename from common/test/keyboards/baseline/k_052___nul_and_index.kmn
rename to common/test/keyboards/baseline/k_0810___nul_and_index.kmn
index c56c411c076..91940d089c8 100644
--- a/common/test/keyboards/baseline/k_052___nul_and_index.kmn
+++ b/common/test/keyboards/baseline/k_0810___nul_and_index.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '052 - nul_and_index'
+store(&NAME) '0810 - nul_and_index'
 c Description: Tests that context has the right offset when used with nul
 c keys: [K_T][K_B]
 c expected: 2T3
diff --git a/common/test/keyboards/baseline/k_0810___nul_and_index.kmx b/common/test/keyboards/baseline/k_0810___nul_and_index.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..ea1a20064e46006982419a50c1f8bb87e34d189c
GIT binary patch
literal 444
zcmYL_J5K^p5QPuK2ce?U#LB|ZX;6&O4o$>jvqk}lp)n{HBs^5mNKb7^O^C6!FjoEz
zdw&2m?fT7R(Mi5L=g!<S_wELlm9o;(_&XShNZ3N8z;ppxh=@S`#aDcAg~}_8VHG~$
z4VK{tKEY<qU<wv%cvG=|kGugH>P2!P)-`e!a_$IptAX08tK<8e_O(rKU7OI+qguN1
zZiC#U(!lY|*{n`=s8Gjfb8Pv<te)sUsK?o^&up{a>E3I7y3&nzdZ>^YXF69&WmQzA
z(&ffJZkxHwdg5;hd4b(69l((;&`qCXuaSm)&kM}Mr19^&W@mrGVnXX3cKG*6Eh(uy
L)hJqkgci}i|JXUl

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0811___if_and_index.js b/common/test/keyboards/baseline/k_0811___if_and_index.js
new file mode 100644
index 00000000000..68205a31e72
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0811___if_and_index.js
@@ -0,0 +1,46 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0811___if_and_index());
+}
+function Keyboard_k_0811___if_and_index()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0811___if_and_index";
+  this.KN="0811 - if_and_index";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.s_cons_4="mnpqrstv";
+  this.s_outs_5="MNPQRSTV";
+  this.s_ifx_6=KeymanWeb.KLOAD(this.KI,"ifx","1");
+  this.s9="1";
+  this.KVS=['s_ifx_6'];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_D /* 0x44 */)) {
+      if(k.KFCM(1,t,[{t:'a',a:this.s_cons_4}])&&this.s_ifx_6===this.s9){
+        r=m=1;   // Line 17
+        k.KDC(1,t);
+        k.KO(-1,t,"4");
+        k.KIO(-1,this.s_outs_5,1,t);
+        k.KO(-1,t,"5");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_053___if_and_index.kmn b/common/test/keyboards/baseline/k_0811___if_and_index.kmn
similarity index 89%
rename from common/test/keyboards/baseline/k_053___if_and_index.kmn
rename to common/test/keyboards/baseline/k_0811___if_and_index.kmn
index 86479a8e88e..b019ffcc2b2 100644
--- a/common/test/keyboards/baseline/k_053___if_and_index.kmn
+++ b/common/test/keyboards/baseline/k_0811___if_and_index.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '053 - if_and_index'
+store(&NAME) '0811 - if_and_index'
 c Description: Tests that index() has the right offset when used with if
 c keys: [K_T][K_D]
 c expected: 4T5
diff --git a/common/test/keyboards/baseline/k_0811___if_and_index.kmx b/common/test/keyboards/baseline/k_0811___if_and_index.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..3313e890f9c24dc0855e0f7001a6daedac407aad
GIT binary patch
literal 490
zcmYL`&n`nj6vn^a#Gf=4gs^M6knYI62?<t6#G)!_HDV*>5_eHWTdBk|Scu245s6rc
z2N1FL3?9IC{N@;(n{U2v&iT%nxta1#t*X5Aa6dUJBIg%^l<7tImZT$)fAJZN<7A$}
z6PN&R-~|kTFYpcq!4Uo^^u%x>=rwpD=v}xDhVdW6`$1p9Jy0Nj17Cv}EtPesOEuNd
ziS1*}Dd8(>3S>Icp4Cz~!;|9g;VfxgOR8uEoiJ<K=9P3o{akIlEt}Y6J=K}zI#i_t
ztF%!SW^8CvTdJz2I+>Qb>d@_H%1-xZC7NYj<%A+V4ZDXlPi|S;%+GA5zu8ZpbjSZa
mg5U7c<G(v)HxkOPls>==ZxpFtk)7w<7;g~qj?U%OhxZ#u(LCn>

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_054___nul_and_contextex.kmn b/common/test/keyboards/baseline/k_0812___nul_and_contextex.kmn
similarity index 88%
rename from common/test/keyboards/baseline/k_054___nul_and_contextex.kmn
rename to common/test/keyboards/baseline/k_0812___nul_and_contextex.kmn
index 39ef0d4534d..ae57598e1c9 100644
--- a/common/test/keyboards/baseline/k_054___nul_and_contextex.kmn
+++ b/common/test/keyboards/baseline/k_0812___nul_and_contextex.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '054 - nul_and_contextex'
+store(&NAME) '0812 - nul_and_contextex'
 c Description: Tests that context in context part of rule has the right offset when used with nul
 c keys: [K_T][K_T][K_B]
 c expected: 2tt3
diff --git a/common/test/keyboards/baseline/k_0812___nul_and_contextex.kmx b/common/test/keyboards/baseline/k_0812___nul_and_contextex.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..ae1dd8d8f84358a9e6287c15c4acfc78226b113f
GIT binary patch
literal 422
zcmYL_&n`nj6o<c3AvW05_O7~+khT(0tCEOCu~CVglxxw1>rYGAdWJ5<T0}gP2e9@6
zx8F<#C;86&X3qJYnN0Vjcf>rjS9)(4m5_{C3A!WuiqcU2#d~V3dGaD-S(XoZmEix9
zPnnY+`IZnhy;WIM*Il!uw_G=*5xcrv@Wd5;inwpENs|^Ct5R^!C8x2PyPk9H*+|c0
z%FgDHZ4TJg-*oC)oLuL@t~-Vdq6hCNxZyUQjjWQU4Wn<}yr(mBQeRJaO<Q(2Ru5ut
o?nKCadm+COWZ>U-=58UCpDm50<=-wb74tOVwz8~Bg_%@=2@j4qjQ{`u

literal 0
HcmV?d00001

diff --git a/common/test/keyboards/baseline/k_0813___deadkey_cancelled_by_arrow.js b/common/test/keyboards/baseline/k_0813___deadkey_cancelled_by_arrow.js
new file mode 100644
index 00000000000..3991bda76c8
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0813___deadkey_cancelled_by_arrow.js
@@ -0,0 +1,52 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_k_0813___deadkey_cancelled_by_arrow());
+}
+function Keyboard_k_0813___deadkey_cancelled_by_arrow()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0813___deadkey_cancelled_by_arrow";
+  this.KN="0813 - deadkey cancelled by arrow";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=modCodes.SHIFT /* 0x0010 */;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_6 /* 0x36 */)) {
+      if(1){
+        r=m=1;   // Line 13
+        k.KDC(0,t);
+        k.KDO(-1,t,0);
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_E /* 0x45 */)) {
+      if(k.KFCM(1,t,[{t:'d',d:0}])){
+        r=m=1;   // Line 14
+        k.KDC(1,t);
+        k.KO(-1,t,"FAIL.");
+      }
+      else if(1){
+        r=m=1;   // Line 15
+        k.KDC(0,t);
+        k.KO(-1,t,"PASS.");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_055___deadkey_cancelled_by_arrow.kmn b/common/test/keyboards/baseline/k_0813___deadkey_cancelled_by_arrow.kmn
similarity index 88%
rename from common/test/keyboards/baseline/k_055___deadkey_cancelled_by_arrow.kmn
rename to common/test/keyboards/baseline/k_0813___deadkey_cancelled_by_arrow.kmn
index b84e9a4ab72..f52c747f362 100644
--- a/common/test/keyboards/baseline/k_055___deadkey_cancelled_by_arrow.kmn
+++ b/common/test/keyboards/baseline/k_0813___deadkey_cancelled_by_arrow.kmn
@@ -1,4 +1,4 @@
-store(&NAME) '050 - deadkey cancelled by arrow'
+store(&NAME) '0813 - deadkey cancelled by arrow'
 c Description: Tests that context gets reset if we encounter a right-arrow
 c              after a deadkey (#12968)
 c keys: [SHIFT K_6][K_RIGHT][K_E][SHIFT K_6][K_LEFT][K_E][SHIFT K_6][K_UP][K_E][SHIFT K_6][K_DOWN][K_E]
diff --git a/common/test/keyboards/baseline/k_0813___deadkey_cancelled_by_arrow.kmx b/common/test/keyboards/baseline/k_0813___deadkey_cancelled_by_arrow.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..526c9300b5609310f64e816218644ab09da09a73
GIT binary patch
literal 476
zcmYL`F-ikL6o&txU=X5KNn<fpswle%qMe4AC{a<PU?r?^i$s$^6vca3h$j#$OYs19
zdH}KV03N_*{oXJpZ}?{Z_rEtYJ8bj#u%&6K`@a7zB4-mZ1*X^F0Fe>MQGA8QBF;VB
zK?xq=0c`&dJV72N>HlS&gL!ljOh>Ghpf_2o5aCNrrMgv5iTXZ|w4zu`a$0~hstNPC
z?{aGUzBbtfBc<YW%6^AGWDIn}DP`?yT|3%9$K12%?<(t>9YbBJL!aFiGo%JpM|Xm6
z?kZGugzj+Pz<-1FF5}mHukGsQq$~K3352ENb56(#q5Mqg1yb^v;JuQ+1#dQZALO5q
WW%=-r>bzu2+q_}y?%}l<=1G4)IyjX8

literal 0
HcmV?d00001

diff --git a/common/test/resources/keyboards/options_with_save.js b/common/test/resources/keyboards/options_with_save.js
index 8252b516604..aa8507e0734 100644
--- a/common/test/resources/keyboards/options_with_save.js
+++ b/common/test/resources/keyboards/options_with_save.js
@@ -1,4 +1,4 @@
-// Original source may be found within the repo at /common/tests/keyboards/baseline/k_023___options_with_save.kmn
+// Original source may be found within the repo at /common/tests/keyboards/baseline/k_0502___options_with_save.kmn
 if(typeof keyman === 'undefined') {
   console.log('Keyboard requires KeymanWeb 10.0 or later');
 
@@ -61,4 +61,4 @@ function Keyboard_options_with_save() {
     }
     return r;
   };
-}
\ No newline at end of file
+}
diff --git a/common/test/resources/keyboards/test_8568_deadkeys.kmn b/common/test/resources/keyboards/test_8568_deadkeys.kmn
index 4cf7cc799d1..f7f3067daa4 100644
--- a/common/test/resources/keyboards/test_8568_deadkeys.kmn
+++ b/common/test/resources/keyboards/test_8568_deadkeys.kmn
@@ -1,6 +1,6 @@
 store(&NAME) 'Testcases for deadkeys bug (#8568)'
 c Description: Tests deadkey backspacing
-c See also common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
+c See also common/test/keyboards/baseline/k_0302___deadkeys_and_backspace.kmn
 c 1. One deadkey in context                   dk(1) + BKSP = nul
 c 2. One char and one deadkey in context      'a' dk(2) + BKSP = nul
 c 3. One deadkey and one char in context      dk(3) 'a' + BKSP = nul
diff --git a/core/tests/unit/km_core_keyboard_api.tests.cpp b/core/tests/unit/km_core_keyboard_api.tests.cpp
index 06e604c023a..aa49a93c0d6 100644
--- a/core/tests/unit/km_core_keyboard_api.tests.cpp
+++ b/core/tests/unit/km_core_keyboard_api.tests.cpp
@@ -23,7 +23,7 @@ class KmCoreKeyboardApiTests : public testing::Test {
 
 TEST_F(KmCoreKeyboardApiTests, LoadFromBlob) {
   // Setup
-  km::core::path kmxfile = km::core::path(test_dir / "kmx/k_020___deadkeys_and_backspace.kmx");
+  km::core::path kmxfile = km::core::path(test_dir / "kmx/k_0302___deadkeys_and_backspace.kmx");
 
   std::vector<uint8_t> data = km::tests::load_kmx_file(kmxfile.native());
   ASSERT_GT(data.size(), (size_t)0);
diff --git a/core/tests/unit/kmnkbd/action_set_api.tests.cpp b/core/tests/unit/kmnkbd/action_set_api.tests.cpp
index 72a2d9be531..96d30d35146 100644
--- a/core/tests/unit/kmnkbd/action_set_api.tests.cpp
+++ b/core/tests/unit/kmnkbd/action_set_api.tests.cpp
@@ -68,7 +68,7 @@ void setup(const char *keyboard, const km_core_cu* context) {
 }
 
 void run_test(km_core_action_item const * action_items, const km_core_actions &actions) {
-  setup("k_000___null_keyboard.kmx", u"");
+  setup("k_0000___null_keyboard.kmx", u"");
   test_state->set_actions(actions);
   auto set_actions = test_state->actions();
 
diff --git a/core/tests/unit/kmnkbd/debug_api.tests.cpp b/core/tests/unit/kmnkbd/debug_api.tests.cpp
index d40664436b0..6cd04200f6b 100644
--- a/core/tests/unit/kmnkbd/debug_api.tests.cpp
+++ b/core/tests/unit/kmnkbd/debug_api.tests.cpp
@@ -76,7 +76,7 @@ void setup(const char *keyboard) {
  * Test 1: Start with debugging disabled
  */
 void test_debugging_disabled() {
-  setup("k_000___null_keyboard.kmx");
+  setup("k_0000___null_keyboard.kmx");
   try_status(km_core_state_debug_set(test_state, 0));
   try_status(km_core_process_event(test_state, KM_CORE_VKEY_S, KM_CORE_MODIFIER_SHIFT, 1, KM_CORE_EVENT_FLAG_DEFAULT));
   test_assert(debug_items(test_state, {
@@ -93,7 +93,7 @@ void test_debugging_disabled() {
  * Test 2: Debugging enabled, no rule match
  */
 void test_debugging_no_rule_match() {
-  setup("k_000___null_keyboard.kmx");
+  setup("k_0000___null_keyboard.kmx");
   DEBUG_GROUP gp = {u"Main"};
   try_status(km_core_state_debug_set(test_state, 1));
   try_status(km_core_process_event(test_state, KM_CORE_VKEY_S, KM_CORE_MODIFIER_SHIFT, 1, KM_CORE_EVENT_FLAG_DEFAULT));
@@ -114,7 +114,7 @@ void test_debugging_no_rule_match() {
  * Test 3: Debugging enabled, function key pressed, no rule match
  */
 void test_debugging_function_key() {
-  setup("k_000___null_keyboard.kmx");
+  setup("k_0000___null_keyboard.kmx");
   DEBUG_GROUP gp = {u"Main"};
   try_status(km_core_state_debug_set(test_state, 1));
   try_status(km_core_process_event(test_state, KM_CORE_VKEY_F1, 0, 1, KM_CORE_EVENT_FLAG_DEFAULT));
@@ -136,7 +136,7 @@ void test_debugging_function_key() {
  * Test 4: basic rule match
  */
 void test_basic_rule_matches() {
-  setup("k_002___basic_input_unicode.kmx");
+  setup("k_0101___basic_input_unicode.kmx");
   DEBUG_GROUP gp = {u"Main"};
   DEBUG_KEY kp = { 'F', /*line*/17, /*shift*/0 }; // vkey is a char
   try_status(km_core_state_debug_set(test_state, 1));
@@ -202,7 +202,7 @@ void test_basic_rule_matches() {
  * Test 5: Multiple groups
  */
 void test_multiple_groups() {
-  setup("k_030___multiple_groups.kmx");
+  setup("k_0401___multiple_groups.kmx");
   DEBUG_GROUP gp = {u"Main"}, gpa = {u"a"}, gpb = {u"b"};
   DEBUG_KEY kp1 = { KM_CORE_VKEY_1, /*line*/13, /*shift*/KM_CORE_MODIFIER_VIRTUALKEY },
             kp2 = { KM_CORE_VKEY_2, /*line*/14, /*shift*/KM_CORE_MODIFIER_VIRTUALKEY },
@@ -283,7 +283,7 @@ void test_multiple_groups() {
  * Test 6: store offsets
  */
 void test_store_offsets() {
-  setup("k_044___if_and_context.kmx");
+  setup("k_0803___if_and_context.kmx");
   DEBUG_GROUP gp = {u"Main"};
   DEBUG_KEY kpa = { 'a', /*line*/16, },
             kpb = { 'b', /*line*/20, };
@@ -357,7 +357,7 @@ void test_store_offsets() {
  * Test 7: set option
  */
 void test_set_option() {
-  setup("k_021___options.kmx");
+  setup("k_0500___options.kmx");
   DEBUG_GROUP gp = {u"Main"};
   DEBUG_KEY kp1 = { '1', /*line*/17, };
   DEBUG_STORE sp = {0, u"foo", u"1"};
@@ -384,7 +384,7 @@ void test_set_option() {
  * Test 8: save option
  */
 void test_save_option() {
-  setup("k_023___options_with_save.kmx");
+  setup("k_0502___options_with_save.kmx");
   DEBUG_GROUP gp = {u"Main"};
   DEBUG_KEY kp1 = { '2', /*line*/21, };
   // DEBUG_STORE sp = {0, u"foo", u"0"};
@@ -420,7 +420,7 @@ void test_save_option() {
  * an 'unknown' backspace because we are at start-of-context
  */
 void test_backspace_markers() {
-  setup("k_000___null_keyboard.kmx");
+  setup("k_0000___null_keyboard.kmx");
   km_core_context_item marker_context[] = {
     {KM_CORE_CT_MARKER, {0,}, {1}},
     {KM_CORE_CT_MARKER, {0,}, {1}},
diff --git a/core/tests/unit/kmnkbd/state_context_api.tests.cpp b/core/tests/unit/kmnkbd/state_context_api.tests.cpp
index 34de27cd944..d66dc6663d2 100644
--- a/core/tests/unit/kmnkbd/state_context_api.tests.cpp
+++ b/core/tests/unit/kmnkbd/state_context_api.tests.cpp
@@ -133,7 +133,7 @@ void
 test_context_set_if_needed__identical_context() {
   km_core_cu const *cached_context  = u"This is a test";
   km_core_cu const *new_app_context = u"This is a test";
-  setup("k_000___null_keyboard.kmx", cached_context, false);
+  setup("k_0000___null_keyboard.kmx", cached_context, false);
   assert_equal_status(km_core_state_context_set_if_needed(test_state, new_app_context), KM_CORE_CONTEXT_STATUS_UNCHANGED);
   test_assert(is_identical_context(cached_context));
   teardown();
@@ -143,7 +143,7 @@ void
 test_context_set_if_needed__different_context() {
   km_core_cu const *cached_context  = u"This isn't a test";
   km_core_cu const *new_app_context = u"This is a    test";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
   assert_equal_status(km_core_state_context_set_if_needed(test_state, new_app_context), KM_CORE_CONTEXT_STATUS_UPDATED);
   test_assert(!is_identical_context(cached_context));
   test_assert(is_identical_context(new_app_context));
@@ -154,7 +154,7 @@ void
 test_context_set_if_needed__cached_context_cleared() {
   km_core_cu const *cached_context  = u"";
   km_core_cu const *new_app_context = u"This is a test";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
   km_core_state_context_clear(test_state);
   assert_equal_status(km_core_state_context_set_if_needed(test_state, new_app_context), KM_CORE_CONTEXT_STATUS_UPDATED);
   test_assert(!is_identical_context(cached_context));
@@ -166,7 +166,7 @@ void
 test_context_set_if_needed__application_context_empty() {
   km_core_cu const *cached_context  = u"This is a test";
   km_core_cu const *new_app_context = u"";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
   assert_equal_status(km_core_state_context_set_if_needed(test_state, new_app_context), KM_CORE_CONTEXT_STATUS_UPDATED);
   test_assert(!is_identical_context(cached_context));
   test_assert(is_identical_context(new_app_context));
@@ -177,7 +177,7 @@ void
 test_context_set_if_needed__app_context_is_longer() {
   km_core_cu const *cached_context  = u"This is a test";
   km_core_cu const *new_app_context = u"Longer This is a test";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
   assert_equal_status(km_core_state_context_set_if_needed(test_state, new_app_context), KM_CORE_CONTEXT_STATUS_UPDATED);
   test_assert(!is_identical_context(cached_context));
   test_assert(is_identical_context(new_app_context));
@@ -188,7 +188,7 @@ void
 test_context_set_if_needed__app_context_is_shorter() {
   km_core_cu const *cached_context  = u"This is a test";
   km_core_cu const *new_app_context = u"is a test";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
   assert_equal_status(km_core_state_context_set_if_needed(test_state, new_app_context), KM_CORE_CONTEXT_STATUS_UPDATED);
   test_assert(!is_identical_context(cached_context));
   test_assert(is_identical_context(new_app_context));
@@ -199,7 +199,7 @@ void
 test_context_set_if_needed__identical_context_and_markers() {
   km_core_cu const *cached_context  = u"123";
   km_core_cu const *new_app_context = u"123";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
 
   km_core_context_item const citems[] = {
       {KM_CORE_CT_MARKER, {0}, {5}}, {KM_CORE_CT_CHAR, {0}, {'1'}}, {KM_CORE_CT_MARKER, {0}, {1}},
@@ -220,7 +220,7 @@ void
 test_context_set_if_needed__cached_context_shorter_and_markers() {
   km_core_cu const *cached_context  = u"123";
   km_core_cu const *new_app_context = u"0123";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
 
   km_core_context_item const citems[] = {
       {KM_CORE_CT_MARKER, {0}, {5}}, {KM_CORE_CT_CHAR, {0}, {'1'}}, {KM_CORE_CT_MARKER, {0}, {1}},
@@ -279,7 +279,7 @@ void
 test_context_set_if_needed__cached_context_longer_and_markers() {
   km_core_cu const *cached_context  = u"0123";
   km_core_cu const *new_app_context = u"123";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
 
   km_core_context_item const citems[] = {
       {KM_CORE_CT_CHAR, {0}, {'0'}},
@@ -337,7 +337,7 @@ void
 test_context_set_if_needed__surrogate_pairs_unchanged() {
   km_core_cu const *cached_context  = u"a\U00010100";
   km_core_cu const *new_app_context = u"a\U00010100";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
   assert_equal_status(km_core_state_context_set_if_needed(test_state, new_app_context), KM_CORE_CONTEXT_STATUS_UNCHANGED);
   test_assert(is_identical_context(new_app_context));
   teardown();
@@ -347,7 +347,7 @@ void
 test_context_set_if_needed__surrogate_pairs_app_context_longer() {
   km_core_cu const *cached_context  = u"a\U00010100";
   km_core_cu const *new_app_context = u"xa\U00010100";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
   assert_equal_status(km_core_state_context_set_if_needed(test_state, new_app_context), KM_CORE_CONTEXT_STATUS_UPDATED);
   test_assert(is_identical_context(new_app_context));
   teardown();
@@ -357,7 +357,7 @@ void
 test_context_set_if_needed__surrogate_pairs_cached_context_longer() {
   km_core_cu const *cached_context  = u"xa\U00010100";
   km_core_cu const *new_app_context = u"a\U00010100";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
   assert_equal_status(km_core_state_context_set_if_needed(test_state, new_app_context), KM_CORE_CONTEXT_STATUS_UPDATED);
   test_assert(is_identical_context(new_app_context));
   teardown();
@@ -367,7 +367,7 @@ void
 test_context_set_if_needed__surrogate_pairs_unchanged_and_markers() {
   km_core_cu const *cached_context  = u"a\U00010100";
   km_core_cu const *new_app_context = u"a\U00010100";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
 
   km_core_context_item const citems[] = {
       {KM_CORE_CT_CHAR, {0}, {'a'}},
@@ -387,7 +387,7 @@ void
 test_context_set_if_needed__surrogate_pairs_app_context_longer_and_markers() {
   km_core_cu const *cached_context  = u"a\U00010100";
   km_core_cu const *new_app_context = u"\U00010200a\U00010100";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
 
   km_core_context_item const citems[] = {
       {KM_CORE_CT_CHAR, {0}, {'a'}},
@@ -414,7 +414,7 @@ void
 test_context_set_if_needed__surrogate_pairs_cached_context_longer_and_markers() {
   km_core_cu const *cached_context  = u"\U00010200a\U00010100";
   km_core_cu const *new_app_context = u"a\U00010100";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
 
   km_core_context_item const citems[] = {
       {KM_CORE_CT_CHAR, {0}, {0x10200}},
@@ -474,7 +474,7 @@ test_context_set_if_needed() {
 void
 test_context_clear() {
   km_core_cu const *cached_context = u"This is a test";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
   try_status(km_core_state_context_clear(test_state));
   test_assert(!is_identical_context(cached_context));
   test_assert(is_identical_context(u""));
@@ -485,7 +485,7 @@ test_context_clear() {
 
 void test_context_debug_empty() {
   km_core_cu const *cached_context =      u"";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
   auto str = km_core_state_context_debug(test_state, KM_CORE_DEBUG_CONTEXT_CACHED);
   // std::cout << str << std::endl;
   test_assert(std::u16string(str) == u"|| (len: 0) [ ]");
@@ -494,7 +494,7 @@ void test_context_debug_empty() {
 
 void test_context_debug_various() {
   km_core_cu const *cached_context =      u"123\U0001F923";
-  setup("k_000___null_keyboard.kmx", cached_context);
+  setup("k_0000___null_keyboard.kmx", cached_context);
 
   km_core_context_item const citems[] = {
     { KM_CORE_CT_MARKER, {0}, { 5 } },
diff --git a/core/tests/unit/kmx/README.md b/core/tests/unit/kmx/README.md
index 909d891f7da..434fb7b1978 100644
--- a/core/tests/unit/kmx/README.md
+++ b/core/tests/unit/kmx/README.md
@@ -65,12 +65,12 @@ Alternatively it's possible to run a single test with:
 
 ```bash
 cd core
-build/arch/debug/tests/unit/kmx/kmx '../common/test/keyboards/baseline/k_038___punctkeys.kmn' '../common/test/keyboards/baseline/k_038___punctkeys.kmx'
+build/arch/debug/tests/unit/kmx/kmx '../common/test/keyboards/baseline/k_0107___punctkeys.kmn' '../common/test/keyboards/baseline/k_0107___punctkeys.kmx'
 ```
 
 or shorter:
 
 ```bash
 cd core
-build/arch/debug/tests/unit/kmx/kmx '../common/test/keyboards/baseline/k_038___punctkeys'.km{n,x}
+build/arch/debug/tests/unit/kmx/kmx '../common/test/keyboards/baseline/k_0107___punctkeys'.km{n,x}
 ```
diff --git a/core/tests/unit/kmx/meson.build b/core/tests/unit/kmx/meson.build
index 71e2aed1b56..a3af0a741ea 100644
--- a/core/tests/unit/kmx/meson.build
+++ b/core/tests/unit/kmx/meson.build
@@ -35,59 +35,61 @@ kmx = executable('kmx',
     objects: [lib.extract_all_objects(recursive: false), kmx_test_source_lib.extract_all_objects(recursive: false)])
 
 tests = [
-  'k_000___null_keyboard',
-  'k_001___basic_input_unicodei',
-  'k_002___basic_input_unicode',
-  'k_003___nul',
-  'k_004___basic_input__shift_2_',
-  'k_005___nul_with_initial_context',
-  'k_006___vkey_input__shift_ctrl_',
-  'k_007___vkey_input__ctrl_alt_',
-  'k_008___vkey_input__ctrl_alt_2_',
-  'k_012___ralt',
-  'k_013___deadkeys',
-  'k_014___groups_and_virtual_keys',
-  'k_015___ralt_2',
-  'k_017___space_mnemonic_kbd',
-  'k_018___nul_testing',
-  'k_019___multiple_deadkeys',
-  'k_020___deadkeys_and_backspace',
-  'k_021___options',
-  'k_022___options_with_preset',
-  'k_023___options_with_save',
-  'k_024___options_with_save_and_preset',
-  'k_025___options_with_reset',
-  'k_026___system_stores',
-  'k_027___system_stores_2',
-  'k_028___smp',
-  'k_029___beep',
-  'k_030___multiple_groups',
-  'k_031___caps_lock',
-  'k_032___caps_control',
-  'k_033___caps_always_off',
-  'k_034___options_double_set_reset',
-  'k_035___options_double_set_staged',
-  'k_036___options___double_reset_staged',
-  'k_037___options___double_reset',
-  'k_038___punctkeys',
-  'k_039___generic_ctrlalt',
-  'k_040___long_context',
-  'k_041___long_context_and_deadkeys',
-  'k_042___long_context_and_split_deadkeys',
-  'k_043___output_and_keystroke',
-  'k_044___if_and_context',
-  'k_045___deadkey_and_context',
-  'k_046___deadkey_and_contextex',
-  'k_047___caps_always_off_initially_on',
-  'k_048___modifier_keys_keep_context',
-  'k_049___enter_invalidates_context',
-  'k_050___nul_and_context',
-  'k_051___if_and_context',
-  'k_052___nul_and_index',
-  'k_053___if_and_index',
-  'k_054___nul_and_contextex',
+  'k_0000___null_keyboard',
+  'k_0001___nul',
+  'k_0002___nul_with_initial_context',
+  'k_0003___nul_testing',
+  'k_0004___space_mnemonic_kbd',
+  'k_0005___beep',
+  'k_0100___basic_input_unicodei',
+  'k_0101___basic_input_unicode',
+  'k_0102___basic_input__shift_2_',
+  'k_0103___vkey_input__shift_ctrl_',
+  'k_0104___vkey_input__ctrl_alt_',
+  'k_0105___vkey_input__ctrl_alt_2_',
+  'k_0106___smp',
+  'k_0107___punctkeys',
+  'k_0200___ralt',
+  'k_0201___ralt_2',
+  'k_0203___generic_ctrlalt',
+  'k_0300___deadkeys',
+  'k_0301___multiple_deadkeys',
+  'k_0302___deadkeys_and_backspace',
+  'k_0400___groups_and_virtual_keys',
+  'k_0401___multiple_groups',
+  'k_0402___output_and_keystroke',
+  'k_0500___options',
+  'k_0501___options_with_preset',
+  'k_0502___options_with_save',
+  'k_0503___options_with_save_and_preset',
+  'k_0504___options_with_reset',
+  'k_0505___options_double_set_reset',
+  'k_0506___options_double_set_staged',
+  'k_0507___options___double_reset_staged',
+  'k_0508___options___double_reset',
+  'k_0600___system_stores',
+  'k_0601___system_stores_2',
+  'k_0700___caps_lock',
+  'k_0701___caps_control',
+  'k_0702___caps_always_off',
+  'k_0703___caps_always_off_initially_on',
+  'k_0800___long_context',
+  'k_0801___long_context_and_deadkeys',
+  'k_0802___long_context_and_split_deadkeys',
+  'k_0803___if_and_context',
+  'k_0804___deadkey_and_context',
+  'k_0805___deadkey_and_contextex',
+  'k_0806___modifier_keys_keep_context',
+  'k_0807___enter_invalidates_context',
+  'k_0808___nul_and_context',
+  'k_0809___if_and_context',
+  'k_0810___nul_and_index',
+  'k_0811___if_and_index',
+  'k_0812___nul_and_contextex',
+  # Skipped: 'k_0813___deadkey_cancelled_by_arrow',
 ]
 
+
 node = find_program('node', required: true)
 
 kmc_root = meson.current_source_dir() / '../../../../developer/src/kmc/build/src/kmc.js'
@@ -248,7 +250,7 @@ external_e = executable('ext_event_tests', ['kmx_external_event.tests.cpp', comm
                 dependencies: [icu_uc, icu_i18n],
                 objects: lib.extract_all_objects(recursive: false))
 
-test_kbd = 'k_033___caps_always_off'
+test_kbd = 'k_0702___caps_always_off'
 
 
 kbd_src = common_test_keyboards_baseline + '/' + test_kbd + '.kmn'
diff --git a/core/tests/unit/wasm/wasm.tests.js b/core/tests/unit/wasm/wasm.tests.js
index 0342c9db96c..1f73764539b 100644
--- a/core/tests/unit/wasm/wasm.tests.js
+++ b/core/tests/unit/wasm/wasm.tests.js
@@ -30,10 +30,10 @@ describe('Unit tests for wasm Core API', function () {
 
   it('can load keyboard from blob', function () {
     // Setup
-    const kmxdata = fs.readFileSync(path.join(__dirname, 'tests/unit/kmx/k_020___deadkeys_and_backspace.kmx'));
+    const kmxdata = fs.readFileSync(path.join(__dirname, 'tests/unit/kmx/k_0302___deadkeys_and_backspace.kmx'));
 
     // Execute
-    const result = km_core.keyboard_load_from_blob('k_020___deadkeys_and_backspace', kmxdata);
+    const result = km_core.keyboard_load_from_blob('k_0302___deadkeys_and_backspace', kmxdata);
 
     // Verify
     assert.equal(result.status, 0);
@@ -58,7 +58,7 @@ describe('Unit tests for wasm Core API', function () {
 
   it('can dispose keyboard', function () {
     // Setup
-    const keyboard = loadKeyboard('k_020___deadkeys_and_backspace');
+    const keyboard = loadKeyboard('k_0302___deadkeys_and_backspace');
 
     // Execute
     km_core.keyboard_dispose(keyboard);
@@ -66,7 +66,7 @@ describe('Unit tests for wasm Core API', function () {
 
   it('can get keyboard attributes', function () {
     // Setup
-    const keyboard = loadKeyboard('k_022___options_with_preset');
+    const keyboard = loadKeyboard('k_0501___options_with_preset');
 
     // Execute
     const result = km_core.keyboard_get_attrs(keyboard);
@@ -74,14 +74,14 @@ describe('Unit tests for wasm Core API', function () {
     // Verify
     assert.equal(result.status, 0);
     assert.isOk(result.object);
-    assert.equal(result.object.id, 'k_022___options_with_preset');
+    assert.equal(result.object.id, 'k_0501___options_with_preset');
     assert.equal(result.object.version_string, '0.0');
     assert.deepEqual(result.object.default_options, [{ key: 'foo', value: '0', scope: 1 }]);
   });
 
   it('can create the state object', function () {
     // Setup
-    const keyboard = loadKeyboard('k_020___deadkeys_and_backspace');
+    const keyboard = loadKeyboard('k_0302___deadkeys_and_backspace');
 
     // Execute
     const result = km_core.state_create(keyboard, []);
@@ -93,7 +93,7 @@ describe('Unit tests for wasm Core API', function () {
 
   it('can dispose the state object', function () {
     // Setup
-    const keyboard = loadKeyboard('k_020___deadkeys_and_backspace');
+    const keyboard = loadKeyboard('k_0302___deadkeys_and_backspace');
     const state = km_core.state_create(keyboard, []);
 
     // Execute
@@ -102,7 +102,7 @@ describe('Unit tests for wasm Core API', function () {
 
   it('can clone the state object', function () {
     // Setup
-    const keyboard = loadKeyboard('k_020___deadkeys_and_backspace');
+    const keyboard = loadKeyboard('k_0302___deadkeys_and_backspace');
     const state = km_core.state_create(keyboard, []);
 
     // Execute
@@ -116,7 +116,7 @@ describe('Unit tests for wasm Core API', function () {
 
   it('can process event', function () {
     // Setup
-    const state = createState('k_020___deadkeys_and_backspace');
+    const state = createState('k_0302___deadkeys_and_backspace');
 
     // Execute
     const status = km_core.process_event(state, 0x20, 0, 1, 0);
@@ -135,7 +135,7 @@ describe('Unit tests for wasm Core API', function () {
 
   it('can set the context', function () {
     // Setup
-    const state = createState('k_020___deadkeys_and_backspace');
+    const state = createState('k_0302___deadkeys_and_backspace');
 
     // Execute
     const status = km_core.state_context_set_if_needed(state, 'abc');
@@ -160,7 +160,7 @@ describe('Unit tests for wasm Core API', function () {
 
   it('can get and set context items', function () {
     // Setup
-    const state = createState('k_020___deadkeys_and_backspace');
+    const state = createState('k_0302___deadkeys_and_backspace');
     const context = km_core.state_context(state);
     const data = "Hello, အရှောက်, मानव अधिकारों की सार्वभौम घोषणा";
     const contextItems = contextItemsFromString(data);
diff --git a/developer/src/kmc-kmn/test/compiler.tests.ts b/developer/src/kmc-kmn/test/compiler.tests.ts
index cb190f519d6..3fced32b1e0 100644
--- a/developer/src/kmc-kmn/test/compiler.tests.ts
+++ b/developer/src/kmc-kmn/test/compiler.tests.ts
@@ -36,9 +36,9 @@ describe('Compiler class', function() {
     assert(await compiler.init(callbacks, {saveDebug: true, shouldAddCompilerVersion: false}));
     assert(compiler.verifyInitialized());
 
-    const fixtureName = baselineDir + 'k_000___null_keyboard.kmx';
-    const infile = baselineDir + 'k_000___null_keyboard.kmn';
-    const outFile = __dirname + '/k_000___null_keyboard.kmx';
+    const fixtureName = baselineDir + 'k_0000___null_keyboard.kmx';
+    const infile = baselineDir + 'k_0000___null_keyboard.kmn';
+    const outFile = __dirname + '/k_0000___null_keyboard.kmx';
 
     if(fs.existsSync(outFile)) {
       fs.rmSync(outFile);
diff --git a/developer/src/kmc-kmn/test/fixtures/kmw/test_options.kmn b/developer/src/kmc-kmn/test/fixtures/kmw/test_options.kmn
index 8f082806146..856d78a9c0f 100644
--- a/developer/src/kmc-kmn/test/fixtures/kmw/test_options.kmn
+++ b/developer/src/kmc-kmn/test/fixtures/kmw/test_options.kmn
@@ -1,4 +1,4 @@
-c Adapted from common baseline test keyboard k_021__options.kmn
+c Adapted from common baseline test keyboard k_0500___options.kmn
 
 store(&NAME) 'test_options'
 store(&version) '10.0'
diff --git a/developer/src/kmcmplib/tests/meson.build b/developer/src/kmcmplib/tests/meson.build
index e0a042ece45..7d90e03cf0e 100644
--- a/developer/src/kmcmplib/tests/meson.build
+++ b/developer/src/kmcmplib/tests/meson.build
@@ -29,57 +29,58 @@ kmcompxtest = executable('kmcompxtests', ['kmcompx.tests.cpp','util_filesystem.c
 # Test keyboards that we have in Core
 
 tests = [
-  'k_000___null_keyboard',
-  'k_001___basic_input_unicodei',
-  'k_002___basic_input_unicode',
-  'k_003___nul',
-  'k_004___basic_input__shift_2_',
-  'k_005___nul_with_initial_context',
-  'k_006___vkey_input__shift_ctrl_',
-  'k_007___vkey_input__ctrl_alt_',
-  'k_008___vkey_input__ctrl_alt_2_',
-  'k_012___ralt',
-  'k_013___deadkeys',
-  'k_014___groups_and_virtual_keys',
-  'k_015___ralt_2',
-  'k_017___space_mnemonic_kbd',
-  'k_018___nul_testing',
-  'k_019___multiple_deadkeys',
-  'k_020___deadkeys_and_backspace',
-  'k_021___options',
-  'k_022___options_with_preset',
-  'k_023___options_with_save',
-  'k_024___options_with_save_and_preset',
-  'k_025___options_with_reset',
-  'k_026___system_stores',
-  'k_027___system_stores_2',
-  'k_028___smp',
-  'k_029___beep',
-  'k_030___multiple_groups',
-  'k_031___caps_lock',
-  'k_032___caps_control',
-  'k_033___caps_always_off',
-  'k_034___options_double_set_reset',
-  'k_035___options_double_set_staged',
-  'k_036___options___double_reset_staged',
-  'k_037___options___double_reset',
-  'k_038___punctkeys',
-  'k_039___generic_ctrlalt',
-  'k_040___long_context',
-  'k_041___long_context_and_deadkeys',
-  'k_042___long_context_and_split_deadkeys',
-  'k_043___output_and_keystroke',
-  'k_044___if_and_context',
-  'k_045___deadkey_and_context',
-  'k_046___deadkey_and_contextex',
-  'k_047___caps_always_off_initially_on',
-  'k_048___modifier_keys_keep_context',
-  'k_049___enter_invalidates_context',
-  'k_050___nul_and_context',
-  'k_051___if_and_context',
-  'k_052___nul_and_index',
-  'k_053___if_and_index',
-  'k_054___nul_and_contextex',
+  'k_0000___null_keyboard',
+  'k_0001___nul',
+  'k_0002___nul_with_initial_context',
+  'k_0003___nul_testing',
+  'k_0004___space_mnemonic_kbd',
+  'k_0005___beep',
+  'k_0100___basic_input_unicodei',
+  'k_0101___basic_input_unicode',
+  'k_0102___basic_input__shift_2_',
+  'k_0103___vkey_input__shift_ctrl_',
+  'k_0104___vkey_input__ctrl_alt_',
+  'k_0105___vkey_input__ctrl_alt_2_',
+  'k_0106___smp',
+  'k_0107___punctkeys',
+  'k_0200___ralt',
+  'k_0201___ralt_2',
+  'k_0203___generic_ctrlalt',
+  'k_0300___deadkeys',
+  'k_0301___multiple_deadkeys',
+  'k_0302___deadkeys_and_backspace',
+  'k_0400___groups_and_virtual_keys',
+  'k_0401___multiple_groups',
+  'k_0402___output_and_keystroke',
+  'k_0500___options',
+  'k_0501___options_with_preset',
+  'k_0502___options_with_save',
+  'k_0503___options_with_save_and_preset',
+  'k_0504___options_with_reset',
+  'k_0505___options_double_set_reset',
+  'k_0506___options_double_set_staged',
+  'k_0507___options___double_reset_staged',
+  'k_0508___options___double_reset',
+  'k_0600___system_stores',
+  'k_0601___system_stores_2',
+  'k_0700___caps_lock',
+  'k_0701___caps_control',
+  'k_0702___caps_always_off',
+  'k_0703___caps_always_off_initially_on',
+  'k_0800___long_context',
+  'k_0801___long_context_and_deadkeys',
+  'k_0802___long_context_and_split_deadkeys',
+  'k_0803___if_and_context',
+  'k_0804___deadkey_and_context',
+  'k_0805___deadkey_and_contextex',
+  'k_0806___modifier_keys_keep_context',
+  'k_0807___enter_invalidates_context',
+  'k_0808___nul_and_context',
+  'k_0809___if_and_context',
+  'k_0810___nul_and_index',
+  'k_0811___if_and_index',
+  'k_0812___nul_and_contextex',
+  'k_0813___deadkey_cancelled_by_arrow',
 ]
 
 foreach kbd : tests
diff --git a/docs/settings/linux/launch.json b/docs/settings/linux/launch.json
index 1ddd8d73347..40a622645f1 100644
--- a/docs/settings/linux/launch.json
+++ b/docs/settings/linux/launch.json
@@ -20,7 +20,7 @@
       "name": "Launch kmx unit tests",
       "target": "build/arch/debug/tests/unit/kmx/kmx",
       "cwd": "${workspaceRoot}/core/",
-      "arguments": "tests/unit/kmx/k_033___caps_always_off.km{n,x}",
+      "arguments": "tests/unit/kmx/k_0702___caps_always_off.km{n,x}",
       "valuesFormatting": "parseText"
     },
     {
@@ -40,7 +40,7 @@
       "valuesFormatting": "parseText"
     },
     {
-      // start: linux/ibus-keyman/tests/scripts/run-tests.sh --remote-debug --no-surrounding-text --no-wayland -- k_001___basic_input_unicodei
+      // start: linux/ibus-keyman/tests/scripts/run-tests.sh --remote-debug --no-surrounding-text --no-wayland -- k_0100___basic_input_unicodei
       // then attach debugger in vscode
       "type": "gdb",
       "request": "attach",
@@ -58,7 +58,7 @@
       }
     },
     {
-      // - Run Docker container with `resources/docker-images/run.sh --remote-debug :linux -- linux/ibus-keyman/tests/scripts/run-tests.sh --no-x11 --remote-debug -- --directory /home/build/.local/share/keyman/test_kmx k_001___basic_input_unicodei`
+      // - Run Docker container with `resources/docker-images/run.sh --remote-debug :linux -- linux/ibus-keyman/tests/scripts/run-tests.sh --no-x11 --remote-debug -- --directory /home/build/.local/share/keyman/test_kmx k_0100___basic_input_unicodei`
       // - then attach debugger in vscode
       "type": "gdb",
       "request": "attach",
diff --git a/linux/ibus-keyman/tests/README.md b/linux/ibus-keyman/tests/README.md
index 0bee95e3b8b..90bd8e7e096 100644
--- a/linux/ibus-keyman/tests/README.md
+++ b/linux/ibus-keyman/tests/README.md
@@ -22,7 +22,7 @@ To run a single test you pass the testname (as found in
 `common/test/keyboards/baseline`). Multiple tests should be separated by space.
 
 ```bash
-scripts/run-tests.sh -- k_000___null_keyboard k_005___nul_with_initial_context
+scripts/run-tests.sh -- k_0000___null_keyboard k_0002___nul_with_initial_context
 ```
 
 ## Debugging tests
@@ -39,7 +39,7 @@ For example:
 
 ```bash
 linux/ibus-keyman/tests/scripts/run-tests.sh --remote-debug \
-  --no-surrounding-text --no-wayland -- k_001___basic_input_unicodei
+  --no-surrounding-text --no-wayland -- k_0100___basic_input_unicodei
 ```
 
 On the host, you can then attach to the VM. See the
diff --git a/linux/ibus-keyman/tests/testfixture.cpp b/linux/ibus-keyman/tests/testfixture.cpp
index f92fe594034..a28d67c273d 100644
--- a/linux/ibus-keyman/tests/testfixture.cpp
+++ b/linux/ibus-keyman/tests/testfixture.cpp
@@ -300,8 +300,8 @@ main(int argc, char *argv[]) {
 
     // Check for tests to skip - #3345
     const char *skipReason = NULL;
-    if (strcmp(filename->str, "k_026___system_stores") == 0 ||
-        strcmp(filename->str, "k_027___system_stores_2") == 0) {
+    if (strcmp(filename->str, "k_0600___system_stores") == 0 ||
+        strcmp(filename->str, "k_0601___system_stores_2") == 0) {
       skipReason = "mnemonic keyboards are not yet supported on Linux (#3345)";
     }
 
diff --git a/resources/docker-images/README.md b/resources/docker-images/README.md
index 2406ba7deed..51de3ff72df 100644
--- a/resources/docker-images/README.md
+++ b/resources/docker-images/README.md
@@ -154,7 +154,7 @@ For example to debug the integration tests in Docker:
 
   ```bash
   resources/docker-images/run.sh --remote-debug :linux -- linux/ibus-keyman/tests/scripts/run-tests.sh \
-    --no-x11 --remote-debug -- --directory /home/build/.local/share/keyman/test_kmx k_001___basic_input_unicodei
+    --no-x11 --remote-debug -- --directory /home/build/.local/share/keyman/test_kmx k_0100___basic_input_unicodei
   ```
 
 * then attach debugger in vscode
diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.ts b/web/src/test/auto/e2e/baseline/baseline.tests.ts
index 8a9994fb04a..38e45bb8b1d 100644
--- a/web/src/test/auto/e2e/baseline/baseline.tests.ts
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.ts
@@ -24,12 +24,12 @@ function KeymanRoot(): string {
 // Tests that are not supported in Web due to missing functionality
 const testsToSkip = {
   'all': new Map([
-    ['k_038___punctkeys.kmn', 'Playwright does not support 102nd key']
+    ['k_0107___punctkeys.kmn', 'Playwright does not support 102nd key']
   ]),
   '.kmx': new Map([
   ]),
   '.js': new Map([
-    ['k_054___nul_and_contextex.kmn', 'contextex is not supported in context() match in Web']
+    ['k_0812___nul_and_contextex.kmn', 'contextex is not supported in context() match in Web']
   ]),
 };
 
@@ -37,55 +37,55 @@ const testsToSkip = {
 const testsToFix = {
   // TODO-web-core: fix these tests
   '.kmx': [
-    'k_000___null_keyboard.kmn',
-    'k_006___vkey_input__shift_ctrl_.kmn',
-    'k_007___vkey_input__ctrl_alt_.kmn',
-    'k_008___vkey_input__ctrl_alt_2_.kmn',
-    'k_012___ralt.kmn',
-    'k_014___groups_and_virtual_keys.kmn',
-    'k_015___ralt_2.kmn', // kmx only
-    'k_022___options_with_preset.kmn',
-    'k_024___options_with_save_and_preset.kmn',
-    'k_025___options_with_reset.kmn',
-    'k_026___system_stores.kmn',
-    'k_027___system_stores_2.kmn',
-    'k_028___smp.kmn', // kmx only
-    'k_031___caps_lock.kmn',
-    'k_032___caps_control.kmn',
-    'k_034___options_double_set_reset.kmn',
-    'k_035___options_double_set_staged.kmn',
-    'k_036___options___double_reset_staged.kmn',
-    'k_037___options___double_reset.kmn',
-    'k_039___generic_ctrlalt.kmn',
-    'k_049___enter_invalidates_context.kmn',
-    'k_055___deadkey_cancelled_by_arrow.kmn',
+    'k_0000___null_keyboard.kmn',
+    'k_0103___vkey_input__shift_ctrl_.kmn', // kmx only
+    'k_0104___vkey_input__ctrl_alt_.kmn',
+    'k_0105___vkey_input__ctrl_alt_2_.kmn', // kmx only
+    'k_0106___smp.kmn', // kmx only
+    'k_0200___ralt.kmn', // kmx only
+    'k_0201___ralt_2.kmn', // kmx only
+    'k_0203___generic_ctrlalt.kmn',
+    'k_0400___groups_and_virtual_keys.kmn', // kmx only
+    'k_0501___options_with_preset.kmn',
+    'k_0503___options_with_save_and_preset.kmn',
+    'k_0504___options_with_reset.kmn',
+    'k_0505___options_double_set_reset.kmn',
+    'k_0506___options_double_set_staged.kmn',
+    'k_0507___options___double_reset_staged.kmn',
+    'k_0508___options___double_reset.kmn',
+    'k_0600___system_stores.kmn',
+    'k_0601___system_stores_2.kmn',
+    'k_0700___caps_lock.kmn',
+    'k_0701___caps_control.kmn',
+    'k_0807___enter_invalidates_context.kmn',
+    'k_0813___deadkey_cancelled_by_arrow.kmn',
   ],
   // TODO: fix these tests (#15342)
   '.js': [
-    'k_000___null_keyboard.kmn',
-    'k_006___vkey_input__shift_ctrl_.kmn',
-    'k_007___vkey_input__ctrl_alt_.kmn',
-    'k_008___vkey_input__ctrl_alt_2_.kmn',
-    'k_012___ralt.kmn',
-    'k_014___groups_and_virtual_keys.kmn',
-    'k_022___options_with_preset.kmn',
-    'k_024___options_with_save_and_preset.kmn',
-    'k_025___options_with_reset.kmn',
-    'k_026___system_stores.kmn',
-    'k_027___system_stores_2.kmn',
-    'k_031___caps_lock.kmn',
-    'k_032___caps_control.kmn',
-    'k_034___options_double_set_reset.kmn',
-    'k_035___options_double_set_staged.kmn',
-    'k_036___options___double_reset_staged.kmn',
-    'k_037___options___double_reset.kmn',
-    'k_039___generic_ctrlalt.kmn',
-    'k_041___long_context_and_deadkeys.kmn', // js only
-    'k_042___long_context_and_split_deadkeys.kmn', // js only
-    'k_049___enter_invalidates_context.kmn',
-    'k_050___nul_and_context.kmn', // js only
-    'k_052___nul_and_index.kmn', // js only
-    'k_055___deadkey_cancelled_by_arrow.kmn',
+    'k_0000___null_keyboard.kmn',
+    // 'k_0103___vkey_input__shift_ctrl_.kmn',
+    'k_0104___vkey_input__ctrl_alt_.kmn',
+    // 'k_0105___vkey_input__ctrl_alt_2_.kmn',
+    // 'k_0200___ralt.kmn',
+    'k_0203___generic_ctrlalt.kmn',
+    // 'k_0400___groups_and_virtual_keys.kmn',
+    'k_0501___options_with_preset.kmn',
+    'k_0503___options_with_save_and_preset.kmn',
+    'k_0504___options_with_reset.kmn',
+    'k_0505___options_double_set_reset.kmn',
+    'k_0506___options_double_set_staged.kmn',
+    'k_0507___options___double_reset_staged.kmn',
+    'k_0508___options___double_reset.kmn',
+    'k_0600___system_stores.kmn',
+    'k_0601___system_stores_2.kmn',
+    'k_0700___caps_lock.kmn',
+    'k_0701___caps_control.kmn',
+    'k_0801___long_context_and_deadkeys.kmn', // js only
+    'k_0802___long_context_and_split_deadkeys.kmn', // js only
+    'k_0807___enter_invalidates_context.kmn',
+    'k_0808___nul_and_context.kmn', // js only
+    'k_0810___nul_and_index.kmn', // js only
+    'k_0813___deadkey_cancelled_by_arrow.kmn',
   ]
 };
 

From e6a6b75115eed9e3c57d09c36951f6511c1c8345 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 12 Dec 2025 19:23:25 +0100
Subject: [PATCH 186/254] test(common): add new baseline test
 `k_0202___alt.kmn`

This is basically the same test as `k_0201___ralt_2.kmn` but uses
ALT instead of RALT in the rule.

Also update `k_0201___ralt_2.kmn` to be a bit more extensive.

Note: since the change in `k_0201___ralt_2.kmn` is only in the test
data, i.e. the comments, the .js and .kmx files don't change.

Related-to: #15358
Test-bot: skip
---
 .../keyboards/baseline/k_0201___ralt_2.kmn    |   4 +--
 .../test/keyboards/baseline/k_0202___alt.js   |  34 ++++++++++++++++++
 .../test/keyboards/baseline/k_0202___alt.kmn  |  13 +++++++
 .../test/keyboards/baseline/k_0202___alt.kmx  | Bin 0 -> 364 bytes
 core/tests/unit/kmx/meson.build               |   1 +
 developer/src/kmcmplib/tests/meson.build      |   1 +
 .../test/auto/e2e/baseline/baseline.tests.ts  |   9 +++--
 7 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 common/test/keyboards/baseline/k_0202___alt.js
 create mode 100755 common/test/keyboards/baseline/k_0202___alt.kmn
 create mode 100644 common/test/keyboards/baseline/k_0202___alt.kmx

diff --git a/common/test/keyboards/baseline/k_0201___ralt_2.kmn b/common/test/keyboards/baseline/k_0201___ralt_2.kmn
index 6606a5d96d5..d22af03e742 100644
--- a/common/test/keyboards/baseline/k_0201___ralt_2.kmn
+++ b/common/test/keyboards/baseline/k_0201___ralt_2.kmn
@@ -1,8 +1,8 @@
 store(&VERSION) '9.0'
 store(&NAME) '0201 - ralt 2'
 c Description: Tests Right Alt processing with non-US kbds.
-c keys: [K_A][K_B][K_C][RALT K_A]
-c expected: abcd
+c keys: [K_A][K_B][K_C][RALT K_A][K_A][K_B][K_C][K_A]
+c expected: abcdabca
 
 store(&TARGETS) 'any'
 
diff --git a/common/test/keyboards/baseline/k_0202___alt.js b/common/test/keyboards/baseline/k_0202___alt.js
new file mode 100644
index 00000000000..c0643cfca44
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0202___alt.js
@@ -0,0 +1,34 @@
+
+KeymanWeb.KR(new Keyboard_k_0202___alt());
+
+function Keyboard_k_0202___alt()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_k_0202___alt";
+  this.KN="0202 - alt";
+  this.KMINVER="9.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0040;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.g_main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4040, 0x41)) {
+      if(k.KCM(1,t,"c",1)){
+        r=m=1;   // Line 13
+        k.KO(1,t,"cd");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/keyboards/baseline/k_0202___alt.kmn b/common/test/keyboards/baseline/k_0202___alt.kmn
new file mode 100755
index 00000000000..3c5415f7293
--- /dev/null
+++ b/common/test/keyboards/baseline/k_0202___alt.kmn
@@ -0,0 +1,13 @@
+store(&VERSION) '9.0'
+store(&NAME) '0202 - alt'
+c Description: Tests Alt processing with non-US kbds.
+c keys: [K_A][K_B][K_C][RALT K_A][K_A][K_B][K_C][K_A]
+c expected: abcdabca
+
+store(&TARGETS) 'any'
+
+begin Unicode > use(main)
+
+group(main) using keys
+
+'c' + [Alt K_A] > "cd"
diff --git a/common/test/keyboards/baseline/k_0202___alt.kmx b/common/test/keyboards/baseline/k_0202___alt.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..14a61fc01b41a6265fa356230c5ac9ac88aef222
GIT binary patch
literal 364
zcmYL@J4ypl6ox+=ABA8Q!79~MDx+Pxi6|n$2+2fj^MVB8qp-<7QiQBPQf3XV!Ufpr
z7R+}pYR>T8`OkkI_ck8NHhb{07<^%D#bNA7=t7PaKZf!@Ccljpow>~9P~K!AyRwp{
z#I6r{mrTCpQx0T1_DJX>{}svA&|t`vN4h+vyvAv&WZZK_i#9jh(X^Ixo~Uv{)&2>u
zx|y{)xAu~DOp{mYwYb(T-2i8PnCDK$UE_3HP49w^dQ6{Z2EGL@eOpuhB4n_ctDEgh
NQ9#eqNcv9432P7EC>{U+

literal 0
HcmV?d00001

diff --git a/core/tests/unit/kmx/meson.build b/core/tests/unit/kmx/meson.build
index a3af0a741ea..9acf6cf94f7 100644
--- a/core/tests/unit/kmx/meson.build
+++ b/core/tests/unit/kmx/meson.build
@@ -51,6 +51,7 @@ tests = [
   'k_0107___punctkeys',
   'k_0200___ralt',
   'k_0201___ralt_2',
+  'k_0202___alt',
   'k_0203___generic_ctrlalt',
   'k_0300___deadkeys',
   'k_0301___multiple_deadkeys',
diff --git a/developer/src/kmcmplib/tests/meson.build b/developer/src/kmcmplib/tests/meson.build
index 7d90e03cf0e..9745699ace4 100644
--- a/developer/src/kmcmplib/tests/meson.build
+++ b/developer/src/kmcmplib/tests/meson.build
@@ -45,6 +45,7 @@ tests = [
   'k_0107___punctkeys',
   'k_0200___ralt',
   'k_0201___ralt_2',
+  'k_0202___alt',
   'k_0203___generic_ctrlalt',
   'k_0300___deadkeys',
   'k_0301___multiple_deadkeys',
diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.ts b/web/src/test/auto/e2e/baseline/baseline.tests.ts
index 38e45bb8b1d..945d5e6620d 100644
--- a/web/src/test/auto/e2e/baseline/baseline.tests.ts
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.ts
@@ -43,7 +43,8 @@ const testsToFix = {
     'k_0105___vkey_input__ctrl_alt_2_.kmn', // kmx only
     'k_0106___smp.kmn', // kmx only
     'k_0200___ralt.kmn', // kmx only
-    'k_0201___ralt_2.kmn', // kmx only
+    'k_0201___ralt_2.kmn',
+    'k_0202___alt.kmn',
     'k_0203___generic_ctrlalt.kmn',
     'k_0400___groups_and_virtual_keys.kmn', // kmx only
     'k_0501___options_with_preset.kmn',
@@ -63,12 +64,10 @@ const testsToFix = {
   // TODO: fix these tests (#15342)
   '.js': [
     'k_0000___null_keyboard.kmn',
-    // 'k_0103___vkey_input__shift_ctrl_.kmn',
     'k_0104___vkey_input__ctrl_alt_.kmn',
-    // 'k_0105___vkey_input__ctrl_alt_2_.kmn',
-    // 'k_0200___ralt.kmn',
+    'k_0201___ralt_2.kmn',  // #15358
+    'k_0202___alt.kmn',     // #15358
     'k_0203___generic_ctrlalt.kmn',
-    // 'k_0400___groups_and_virtual_keys.kmn',
     'k_0501___options_with_preset.kmn',
     'k_0503___options_with_save_and_preset.kmn',
     'k_0504___options_with_reset.kmn',

From e4e76caea76006d853d18711c97805eaa5b0395b Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 17 Dec 2025 15:55:52 +0100
Subject: [PATCH 187/254] refactor(web): address code review comment

Build-bot: skip
Test-bot: skip
---
 web/src/engine/src/keyboard/keyboards/jsKeyboard.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
index 4c6631a1a82..50cc7846b90 100644
--- a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
@@ -358,7 +358,7 @@ export class JSKeyboard {
    *
    * @param       {number}    command     event code (16,17,18) or 0
    * @param       {TextStore} textStore   textStore
-   * @param       {boolean}   data        1 or 0
+   * @param       {boolean}   data        true o false
    */
   public notify(command: number, textStore: TextStore, data: boolean): void { // I2187
     // Good example use case - the Japanese CJK-picker keyboard

From 1895a944a2b27747ce14e8879d3b1885c215b072 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
Date: Thu, 18 Dec 2025 12:48:45 +0100
Subject: [PATCH 188/254] Apply suggestions from code review

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
index ba78dc4e016..ff69acfa519 100644
--- a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
@@ -104,7 +104,7 @@ export class KMXKeyboard {
    * @param       {number}    eventCode     key code (16-18: Shift, Control or Alt),
    *                                        or 0 for focus
    * @param       {TextStore} textStore     textStore
-   * @param       {number}    boolean       true for KeyDown or FocusReceived,
+   * @param       {boolean}   data          true for KeyDown or FocusReceived,
    *                                        false for KeyUp or FocusLost
    */
   public notify(eventCode: number, textStore: TextStore, data: boolean): void { // I2187

From ba16fc703319b7aa755926854f78d0a5129e1aca Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 18 Dec 2025 19:30:36 +0100
Subject: [PATCH 189/254] =?UTF-8?q?test(web):=20add=20option=20setting/ver?=
 =?UTF-8?q?ification=20to=20baseline=20tests=20=F0=9F=A7=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test-bot: skip
---
 .../auto/e2e/baseline/baseline.tests.html     |  2 +-
 .../test/auto/e2e/baseline/baseline.tests.ts  | 52 ++++++++++++++-----
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.html b/web/src/test/auto/e2e/baseline/baseline.tests.html
index b736f4cccb2..34d4bc6f9a8 100644
--- a/web/src/test/auto/e2e/baseline/baseline.tests.html
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.html
@@ -16,7 +16,7 @@
     <script>
         const searchParams = new URLSearchParams(window.location.search);
         const keyboard = {
-          id: 'test',
+          id: searchParams.get('id'),
           name: 'Test Keyboard',
           languages: { id: 'en', name: 'English' },
           filename: searchParams.get('keyboard')
diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.ts b/web/src/test/auto/e2e/baseline/baseline.tests.ts
index 945d5e6620d..906ff5b18a8 100644
--- a/web/src/test/auto/e2e/baseline/baseline.tests.ts
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.ts
@@ -68,13 +68,6 @@ const testsToFix = {
     'k_0201___ralt_2.kmn',  // #15358
     'k_0202___alt.kmn',     // #15358
     'k_0203___generic_ctrlalt.kmn',
-    'k_0501___options_with_preset.kmn',
-    'k_0503___options_with_save_and_preset.kmn',
-    'k_0504___options_with_reset.kmn',
-    'k_0505___options_double_set_reset.kmn',
-    'k_0506___options_double_set_staged.kmn',
-    'k_0507___options___double_reset_staged.kmn',
-    'k_0508___options___double_reset.kmn',
     'k_0600___system_stores.kmn',
     'k_0601___system_stores_2.kmn',
     'k_0700___caps_lock.kmn',
@@ -108,6 +101,7 @@ test.describe('Baseline tests', () => {
             return;
           }
 
+          const kbdId = `Keyboard_${file.replace(/\.kmn$/, '')}`;
           const testSource = new KmxTestSource();
           const result = testSource.loadSource(path.join(KeymanRoot(), testDir, file));
           if (result !== 0) {
@@ -135,12 +129,31 @@ test.describe('Baseline tests', () => {
             return;
           }
 
-          await page.goto(`http://localhost:3000/src/test/auto/e2e/baseline/baseline.tests.html?keyboard=${testDir}/${kbdFile}`);
+          // Initialize option stores by setting cookies
+          if (testSource.options) {
+            const cookies = [];
+            for (const option of testSource.options) {
+              if (option.type === 'input') {
+                cookies.push({
+                  name: `KeymanWeb_${kbdId}_Option_${option.key}`,
+                  value: encodeURIComponent(`${option.key}=${option.value};`),
+                  domain: 'localhost',
+                  path: '/',
+                  expires: 1768672167
+                });
+              }
+            }
+            if (cookies.length > 0) {
+              await page.context().addCookies(cookies);
+            }
+          }
+
+          // Open page
+          await page.goto(`http://localhost:3000/src/test/auto/e2e/baseline/baseline.tests.html?keyboard=${testDir}/${kbdFile}&id=${kbdId}`);
           await page.evaluate(async () => { await window.KmwLoaded; });
           const textarea = page.locator('#inputarea');
           await textarea.click();
 
-          // TODO-web-core: set options from test source
           // TODO-web-core: set capslock state
 
           // set context
@@ -152,10 +165,25 @@ test.describe('Baseline tests', () => {
           await pressKeys(page, testSource.keys);
 
           // verify output
-          await expect(textarea).toHaveValue(testSource.expected, { timeout: 500 });
-        });
+          await expect(textarea, `Verify output is '${testSource.expected}'`).toHaveValue(testSource.expected, { timeout: 500 });
 
-      }
+          // verify persisted options
+          if (testSource.options) {
+            const cookies = await page.context().cookies();
+            for (const option of testSource.options) {
+              if (option.type === 'saved') {
+                const cookieName = `KeymanWeb_${kbdId}_Option_${option.key}`;
+                const cookie = cookies.find(c => c.name === cookieName);
+                expect(cookie, `Cookie '${cookieName}' not found`).toBeDefined();
+                if (cookie) {
+                  const decodedValue = decodeURIComponent(cookie.value);
+                  expect(decodedValue, `Cookie for '${option.key}' has unexpected value '${decodedValue}' instead of '${option.value}'`).toEqual(`${option.key}=${option.value};`);
+                }
+              }
+            }
+          }
+        });
+      };
     });
   }
 });
\ No newline at end of file

From 72d12622fff76308ec9124396440b9dd1547dee0 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 19 Dec 2025 11:59:32 +0100
Subject: [PATCH 190/254] refactor(web): address code review comment

---
 web/src/app/browser/src/contextManager.ts           |  4 ++--
 .../engine/src/js-processor/jsKeyboardProcessor.ts  |  4 ++--
 web/src/engine/src/keyboard/index.ts                |  2 +-
 web/src/engine/src/keyboard/keyboards/jsKeyboard.ts | 12 +++++++-----
 .../src/keyboard/keyboards/keyboardLoaderBase.ts    |  8 ++++++++
 .../engine/src/keyboard/keyboards/kmxKeyboard.ts    | 13 +++++++------
 6 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index 8004e743d84..30729b34dfb 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -613,7 +613,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
     const activeKeyboard = this.activeKeyboard?.keyboard;
     if(!focusAssistant.restoringFocus) {
       textStore?.deadkeys().clear();
-      activeKeyboard?.notify(0, textStore, true);  // I2187
+      activeKeyboard?.notify(0, textStore, 1);  // I2187
     }
 
     if(!focusAssistant.restoringFocus && this.mostRecentTextStore != textStore) {
@@ -711,7 +711,7 @@ export class ContextManager extends ContextManagerBase<BrowserConfiguration> {
     const {activeKeyboard} = this;
     const {maintainingFocus} = this.focusAssistant;
     if(!maintainingFocus && activeKeyboard) {
-      activeKeyboard.keyboard.notify(0, textStore, false);  // I2187
+      activeKeyboard.keyboard.notify(0, textStore, 0);  // I2187
     }
     if(previousTextStore && !this.activeTextStore) {
       this.emit('textstorechange', null);
diff --git a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
index 5b2bd705acd..a42ecc70673 100644
--- a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
@@ -539,7 +539,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
     }
 
     if(Levent.isModifier) {
-      this.activeKeyboard.notify(Levent.Lcode, textStore, isKeyDown);
+      this.activeKeyboard.notify(Levent.Lcode, textStore, isKeyDown ? 1 : 0);
       // For eventual integration - we bypass an OSK update for physical keystrokes when in touch mode.
       if(!Levent.device.touchable) {
         return this._UpdateVKShift(Levent); // I2187
@@ -549,7 +549,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
     }
 
     if(Levent.LmodifierChange) {
-      this.activeKeyboard.notify(0, textStore, true);
+      this.activeKeyboard.notify(0, textStore, 1);
       if(!Levent.device.touchable) {
         this._UpdateVKShift(Levent);
       }
diff --git a/web/src/engine/src/keyboard/index.ts b/web/src/engine/src/keyboard/index.ts
index c8ea67593fd..0e8fc53d3e7 100644
--- a/web/src/engine/src/keyboard/index.ts
+++ b/web/src/engine/src/keyboard/index.ts
@@ -4,7 +4,7 @@ export { JSKeyboard, LayoutState } from "./keyboards/jsKeyboard.js";
 export { KeyboardMinimalInterface } from './keyboards/keyboardMinimalInterface.js';
 export { KMXKeyboard } from './keyboards/kmxKeyboard.js';
 export { KeyboardHarness, KeyboardKeymanGlobal, MinimalCodesInterface, MinimalKeymanGlobal } from "./keyboards/keyboardHarness.js";
-export { Keyboard, KeyboardLoaderBase } from "./keyboards/keyboardLoaderBase.js";
+export { NotifyEventCode, Keyboard, KeyboardLoaderBase } from "./keyboards/keyboardLoaderBase.js";
 export { KeyboardLoadErrorBuilder, KeyboardMissingError, KeyboardScriptError, KeyboardDownloadError, InvalidKeyboardError } from './keyboards/keyboardLoadError.js'
 export { BeepHandler, EventMap, KeyboardProcessor } from "./keyboards/keyboardProcessor.js";
 export {
diff --git a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
index 50cc7846b90..5fd6e06530b 100644
--- a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
@@ -14,6 +14,7 @@ type TouchLayoutSpec = TouchLayout.TouchLayoutPlatform & { isDefault?: boolean};
 
 import { Version, DeviceSpec } from "keyman/common/web-utils";
 import { StateKeyMap } from "./stateKeyMap.js";
+import { NotifyEventCode } from './keyboardLoaderBase.js';
 
 /**
  * Stores preprocessed properties of a keyboard for quick retrieval later.
@@ -356,14 +357,15 @@ export class JSKeyboard {
   /**
    * Notifies keyboard of keystroke or other event
    *
-   * @param       {number}    command     event code (16,17,18) or 0
-   * @param       {TextStore} textStore   textStore
-   * @param       {boolean}   data        true o false
+   * @param       {NotifyEventCode}  command     event code (16,17,18) or 0
+   * @param       {TextStore}        textStore   textStore
+   * @param       {number}           data        1 for KeyDown or FocusReceived,
+   *                                             0 for KeyUp or FocusLost
    */
-  public notify(command: number, textStore: TextStore, data: boolean): void { // I2187
+  public notify(command: NotifyEventCode, textStore: TextStore, data: number): void { // I2187
     // Good example use case - the Japanese CJK-picker keyboard
     if(typeof(this.scriptObject['KNS']) == 'function') {
-      this.scriptObject['KNS'](command, textStore, data ? 1 : 0);
+      this.scriptObject['KNS'](command, textStore, data);
     }
   }
 
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts b/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
index b7fe16dd1d1..2d938e159e4 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
@@ -4,6 +4,14 @@ import { KMXKeyboard } from './kmxKeyboard.js';
 import { KeyboardHarness } from "./keyboardHarness.js";
 import KeyboardProperties from "./keyboardProperties.js";
 import { KeyboardLoadErrorBuilder, StubBasedErrorBuilder, UriBasedErrorBuilder } from './keyboardLoadError.js';
+import { Codes } from '../codes.js';
+
+export enum NotifyEventCode {
+  FocusEvent = 0,
+  ShiftKey = Codes.keyCodes.K_SHIFT,
+  ControlKey = Codes.keyCodes.K_CONTROL,
+  AltKey = Codes.keyCodes.K_ALT,
+};
 
 export type KeyboardStub = KeyboardProperties & { filename: string };
 export type Keyboard = JSKeyboard | KMXKeyboard;
diff --git a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
index ff69acfa519..1c8123192f1 100644
--- a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
@@ -7,6 +7,7 @@ import { ActiveKey, ActiveSubKey } from './activeLayout.js';
 import { StateKeyMap } from './stateKeyMap.js';
 import { KeyEvent } from '../keyEvent.js';
 import { TextStore } from '../textStore.js';
+import { NotifyEventCode } from './keyboardLoaderBase.js';
 
 /**
  * Acts as a wrapper class for KMX(+) Keyman keyboards
@@ -101,13 +102,13 @@ export class KMXKeyboard {
   /**
    * Notifies keyboard of keystroke or other event
    *
-   * @param       {number}    eventCode     key code (16-18: Shift, Control or Alt),
-   *                                        or 0 for focus
-   * @param       {TextStore} textStore     textStore
-   * @param       {boolean}   data          true for KeyDown or FocusReceived,
-   *                                        false for KeyUp or FocusLost
+   * @param       {NotifyEventCode}  eventCode     key code (16-18: Shift, Control or Alt),
+   *                                               or 0 for focus
+   * @param       {TextStore}        textStore     textStore
+   * @param       {number}           data          1 for KeyDown or FocusReceived,
+   *                                               0 for KeyUp or FocusLost
    */
-  public notify(eventCode: number, textStore: TextStore, data: boolean): void { // I2187
+  public notify(eventCode: NotifyEventCode, textStore: TextStore, data: number): void { // I2187
     // TODO-web-core: do we need to support this? (#15290)
   }
 

From 7a1964034c0d33dd9edf540c681693974c1133c0 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 19 Dec 2025 12:16:58 +0100
Subject: [PATCH 191/254] test(web): add another test to `testsToFix` for .kmx
 keyboards

Adding the option verification caused another .kmx test to fail because
the feature is not yet implemented.

Test-bot: skip
---
 web/src/test/auto/e2e/baseline/baseline.tests.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.ts b/web/src/test/auto/e2e/baseline/baseline.tests.ts
index 906ff5b18a8..8f52c823975 100644
--- a/web/src/test/auto/e2e/baseline/baseline.tests.ts
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.ts
@@ -47,13 +47,14 @@ const testsToFix = {
     'k_0202___alt.kmn',
     'k_0203___generic_ctrlalt.kmn',
     'k_0400___groups_and_virtual_keys.kmn', // kmx only
-    'k_0501___options_with_preset.kmn',
-    'k_0503___options_with_save_and_preset.kmn',
-    'k_0504___options_with_reset.kmn',
-    'k_0505___options_double_set_reset.kmn',
-    'k_0506___options_double_set_staged.kmn',
-    'k_0507___options___double_reset_staged.kmn',
-    'k_0508___options___double_reset.kmn',
+    'k_0501___options_with_preset.kmn', // kmx only
+    'k_0502___options_with_save.kmn', // kmx only
+    'k_0503___options_with_save_and_preset.kmn', // kmx only
+    'k_0504___options_with_reset.kmn', // kmx only
+    'k_0505___options_double_set_reset.kmn', // kmx only
+    'k_0506___options_double_set_staged.kmn', // kmx only
+    'k_0507___options___double_reset_staged.kmn', // kmx only
+    'k_0508___options___double_reset.kmn', // kmx only
     'k_0600___system_stores.kmn',
     'k_0601___system_stores_2.kmn',
     'k_0700___caps_lock.kmn',

From 5b385572270c96f2883848f099a9b7016f919772 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 19 Dec 2025 18:29:39 +0100
Subject: [PATCH 192/254] refactor(web): remove defaults in keyboard-storage

- Also renamed `prefixed` and `withoutPrefix` functions to use the name
  that was aliased on most cases: `toPrefixedKeyboardId` and
  `toUnprefixedKeyboardId`.
- Renamed `ModelManager` class to `ModelCache` which was the name used
  everywhere except in comments.

Part-of: #15292
Test-bot: skip
---
 .../KMEA/app/src/main/assets/android-host.js  |  2 +-
 .../Contents/Resources/ios-host.js            |  2 +-
 .../src/keyboard-storage/cloud/index.ts       |  4 +--
 .../src/keyboard-storage/cloud/queryEngine.ts |  6 ++--
 .../cloud/requesterInterface.ts               |  2 +-
 .../src/keyboard-storage/domCloudRequester.ts |  4 +--
 web/src/engine/src/keyboard-storage/index.ts  | 14 ++++-----
 .../keyboard-storage/keyboardRequisitioner.ts |  4 +--
 .../src/keyboard-storage/keyboardStub.ts      |  2 +-
 .../engine/src/keyboard-storage/modelCache.ts |  2 +-
 .../keyboard-storage/stubAndKeyboardCache.ts  | 30 ++++++++-----------
 .../src/main/headless/languageProcessor.ts    |  2 +-
 .../resources/loader/nodeCloudRequester.ts    |  4 +--
 13 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/android/KMEA/app/src/main/assets/android-host.js b/android/KMEA/app/src/main/assets/android-host.js
index ad440d493a2..48672c05728 100644
--- a/android/KMEA/app/src/main/assets/android-host.js
+++ b/android/KMEA/app/src/main/assets/android-host.js
@@ -247,7 +247,7 @@ function deregisterModel(modelID) {
 }
 
 function enableSuggestions(model, suggestionType) {
-  // Set the options first so that KMW's ModelManager can properly handle model enablement states
+  // Set the options first so that KMW's ModelCache can properly handle model enablement states
   // the moment we actually register the new model.
   // Use console_debug
   console_debug('enableSuggestions(model, maySuggest='+suggestionType+')');
diff --git a/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/ios-host.js b/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/ios-host.js
index b390b438de3..25af94b5bd2 100644
--- a/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/ios-host.js
+++ b/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/ios-host.js
@@ -327,7 +327,7 @@ function toHex(theString) {
 }
 
 function enableSuggestions(model, mayPredict, mayCorrect) {
-    // Set the options first so that KMW's ModelManager can properly handle model enablement states
+    // Set the options first so that KMW's ModelCache can properly handle model enablement states
     // the moment we actually register the new model.
     keyman.core.languageProcessor.mayPredict = mayPredict;
     keyman.core.languageProcessor.mayCorrect = mayCorrect;
diff --git a/web/src/engine/src/keyboard-storage/cloud/index.ts b/web/src/engine/src/keyboard-storage/cloud/index.ts
index eb477cacec6..2ab752bcded 100644
--- a/web/src/engine/src/keyboard-storage/cloud/index.ts
+++ b/web/src/engine/src/keyboard-storage/cloud/index.ts
@@ -1,2 +1,2 @@
-export { CloudQueryResult, default as QueryEngine } from './queryEngine.js';
-export { default as RequesterInterface } from './requesterInterface.js';
+export { CloudQueryResult, CloudQueryEngine as QueryEngine } from './queryEngine.js';
+export { CloudRequesterInterface as RequesterInterface } from './requesterInterface.js';
diff --git a/web/src/engine/src/keyboard-storage/cloud/queryEngine.ts b/web/src/engine/src/keyboard-storage/cloud/queryEngine.ts
index e94aaca1bd0..fe76a3fcb64 100644
--- a/web/src/engine/src/keyboard-storage/cloud/queryEngine.ts
+++ b/web/src/engine/src/keyboard-storage/cloud/queryEngine.ts
@@ -2,9 +2,9 @@ import { EventEmitter } from 'eventemitter3';
 
 import { PathConfiguration } from 'keyman/engine/interfaces';
 
-import { default as KeyboardStub, ErrorStub, KeyboardAPISpec } from '../keyboardStub.js';
+import { KeyboardStub, ErrorStub, KeyboardAPISpec } from '../keyboardStub.js';
 import { LanguageAPIPropertySpec, ManagedPromise, Version } from 'keyman/engine/keyboard';
-import CloudRequesterInterface from './requesterInterface.js';
+import { CloudRequesterInterface } from './requesterInterface.js';
 
 // For when the API call straight-up times out.
 export const CLOUD_TIMEOUT_ERR = "The Cloud API request timed out.";
@@ -56,7 +56,7 @@ interface EventMap {
   'unboundregister': (registration: ReturnType<CloudQueryEngine['_registerCore']>) => void
 }
 
-export default class CloudQueryEngine extends EventEmitter<EventMap> {
+export class CloudQueryEngine extends EventEmitter<EventMap> {
   private cloudResolutionPromises: Map<number, ManagedPromise<KeyboardStub[] | LanguageAPIPropertySpec[]>> = new Map();
 
   private _languageListPromise: ManagedPromise<LanguageAPIPropertySpec[]>;
diff --git a/web/src/engine/src/keyboard-storage/cloud/requesterInterface.ts b/web/src/engine/src/keyboard-storage/cloud/requesterInterface.ts
index 6c612d9cb20..b1c84b6c055 100644
--- a/web/src/engine/src/keyboard-storage/cloud/requesterInterface.ts
+++ b/web/src/engine/src/keyboard-storage/cloud/requesterInterface.ts
@@ -1,6 +1,6 @@
 import { ManagedPromise } from 'keyman/engine/keyboard';
 
-export default interface CloudRequesterInterface {
+export interface CloudRequesterInterface {
   request<T>(query: string): {
     promise: ManagedPromise<T>,
     queryId: number
diff --git a/web/src/engine/src/keyboard-storage/domCloudRequester.ts b/web/src/engine/src/keyboard-storage/domCloudRequester.ts
index a39310ad8ad..4901b4be15d 100644
--- a/web/src/engine/src/keyboard-storage/domCloudRequester.ts
+++ b/web/src/engine/src/keyboard-storage/domCloudRequester.ts
@@ -1,8 +1,8 @@
 import { ManagedPromise } from 'keyman/engine/keyboard';
-import CloudRequesterInterface from './cloud/requesterInterface.js';
+import { CloudRequesterInterface } from './cloud/requesterInterface.js';
 import { CLOUD_MALFORMED_OBJECT_ERR, CLOUD_TIMEOUT_ERR, CLOUD_STUB_REGISTRATION_ERR } from './cloud/queryEngine.js';
 
-export default class DOMCloudRequester implements CloudRequesterInterface {
+export class DOMCloudRequester implements CloudRequesterInterface {
   private readonly fileLocal: boolean;
 
   constructor(fileLocal: boolean = false) {
diff --git a/web/src/engine/src/keyboard-storage/index.ts b/web/src/engine/src/keyboard-storage/index.ts
index 80073844db1..08f44191c07 100644
--- a/web/src/engine/src/keyboard-storage/index.ts
+++ b/web/src/engine/src/keyboard-storage/index.ts
@@ -2,15 +2,15 @@
 export {
   ErrorStub,
   type KeyboardAPISpec,
-  default as KeyboardStub,
+  KeyboardStub,
   mergeAndResolveStubPromises,
   RawKeyboardStub,
   REGIONS,
   REGION_CODES
 } from './keyboardStub.js';
-export { default as StubAndKeyboardCache, toPrefixedKeyboardId, toUnprefixedKeyboardId } from './stubAndKeyboardCache.js';
-export { CloudQueryResult, default as CloudQueryEngine } from './cloud/queryEngine.js';
-export { default as CloudRequesterInterface } from './cloud/requesterInterface.js';
-export { default as KeyboardRequisitioner } from './keyboardRequisitioner.js';
-export { default as ModelCache } from './modelCache.js';
-export { default as DOMCloudRequester } from './domCloudRequester.js';
+export { StubAndKeyboardCache, toPrefixedKeyboardId, toUnprefixedKeyboardId } from './stubAndKeyboardCache.js';
+export { CloudQueryResult, CloudQueryEngine } from './cloud/queryEngine.js';
+export { CloudRequesterInterface } from './cloud/requesterInterface.js';
+export { KeyboardRequisitioner } from './keyboardRequisitioner.js';
+export { ModelCache } from './modelCache.js';
+export { DOMCloudRequester } from './domCloudRequester.js';
\ No newline at end of file
diff --git a/web/src/engine/src/keyboard-storage/keyboardRequisitioner.ts b/web/src/engine/src/keyboard-storage/keyboardRequisitioner.ts
index b629d2abbb5..d1da9ade893 100644
--- a/web/src/engine/src/keyboard-storage/keyboardRequisitioner.ts
+++ b/web/src/engine/src/keyboard-storage/keyboardRequisitioner.ts
@@ -17,7 +17,7 @@ import {
   mergeAndResolveStubPromises,
   toUnprefixedKeyboardId as unprefixed
  } from "./index.js";
-import { default as CloudRequesterInterface } from "./cloud/requesterInterface.js";
+import { CloudRequesterInterface } from "./cloud/requesterInterface.js";
 import { rejectErrorStubs } from "./keyboardStub.js";
 
 class CloudRequestEntry {
@@ -89,7 +89,7 @@ function isUniqueRequest(cache: StubAndKeyboardCache, cloudList: {id: string, la
 };
 
 // TODO:  Move to the keyboard-cache child project - we can test it headlessly there!
-export default class KeyboardRequisitioner {
+export class KeyboardRequisitioner {
   readonly cache: StubAndKeyboardCache;
   readonly cloudQueryEngine: CloudQueryEngine;
   readonly pathConfig: PathConfiguration;
diff --git a/web/src/engine/src/keyboard-storage/keyboardStub.ts b/web/src/engine/src/keyboard-storage/keyboardStub.ts
index 5f19d1d783e..17877dcfe83 100644
--- a/web/src/engine/src/keyboard-storage/keyboardStub.ts
+++ b/web/src/engine/src/keyboard-storage/keyboardStub.ts
@@ -48,7 +48,7 @@ function configureFilePathing(path: string, configurationBasePath: string) {
   }
 }
 
-export default class KeyboardStub extends KeyboardProperties {
+export class KeyboardStub extends KeyboardProperties {
   KR: string;
   KRC: string;
   KF: string;
diff --git a/web/src/engine/src/keyboard-storage/modelCache.ts b/web/src/engine/src/keyboard-storage/modelCache.ts
index 6f4b39999ad..1b01b45d57e 100644
--- a/web/src/engine/src/keyboard-storage/modelCache.ts
+++ b/web/src/engine/src/keyboard-storage/modelCache.ts
@@ -1,6 +1,6 @@
 import { ModelSpec } from 'keyman/engine/interfaces';
 
-export default class ModelManager {
+export class ModelCache {
   // Tracks registered models by ID.
   private registeredModels: {[id: string]: ModelSpec} = {};
 
diff --git a/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts b/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
index 1f267594166..1537a8cc523 100644
--- a/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
+++ b/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
@@ -1,11 +1,11 @@
 import { type Keyboard, JSKeyboard, KeyboardLoaderBase as KeyboardLoader, KMXKeyboard } from "keyman/engine/keyboard";
 import { EventEmitter } from "eventemitter3";
 
-import KeyboardStub from "./keyboardStub.js";
+import { KeyboardStub } from "./keyboardStub.js";
 
 const KEYBOARD_PREFIX = "Keyboard_";
 
-function prefixed(text: string) {
+export function toPrefixedKeyboardId(text: string) {
   if(!text.startsWith(KEYBOARD_PREFIX)) {
     return KEYBOARD_PREFIX + text;
   } else {
@@ -13,9 +13,7 @@ function prefixed(text: string) {
   }
 }
 
-export {prefixed as toPrefixedKeyboardId};
-
-function withoutPrefix(text: string) {
+export function toUnprefixedKeyboardId(text: string) {
   if(text.startsWith(KEYBOARD_PREFIX)) {
     return text.substring(KEYBOARD_PREFIX.length);
   } else {
@@ -23,8 +21,6 @@ function withoutPrefix(text: string) {
   }
 }
 
-export {withoutPrefix as toUnprefixedKeyboardId};
-
 interface EventMap {
   /**
    * Indicates that the specified stub has just been registered within the cache.
@@ -41,7 +37,7 @@ interface EventMap {
   keyboardadded: (keyboard: Keyboard) => void;
 }
 
-export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
+export class StubAndKeyboardCache extends EventEmitter<EventMap> {
   private stubSetTable: Record<string, Record<string, KeyboardStub>> = {};
   private keyboardTable: Record<string, Keyboard | Promise<Keyboard>> = {};
 
@@ -70,7 +66,7 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
     if(!keyboardID) {
       return null;
     }
-    const entry = this.keyboardTable[prefixed(keyboardID)];
+    const entry = this.keyboardTable[toPrefixedKeyboardId(keyboardID)];
 
     // Unit testing may 'trip up' in the DOM, as bundled versions of a class from one bundled
     // module will fail against an `instanceof` expecting the version bundled in a second.
@@ -123,7 +119,7 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
   }
 
   addKeyboard(keyboard: Keyboard) {
-    const keyboardID = prefixed(keyboard.id);
+    const keyboardID = toPrefixedKeyboardId(keyboard.id);
     this.keyboardTable[keyboardID] = keyboard;
 
     this.emit('keyboardadded', keyboard);
@@ -138,7 +134,7 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
       throw new Error("Keyboard ID must be specified");
     }
 
-    keyboardID = prefixed(keyboardID);
+    keyboardID = toPrefixedKeyboardId(keyboardID);
 
     const cachedEntry = this.keyboardTable[keyboardID];
     return cachedEntry instanceof Promise;
@@ -153,7 +149,7 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
       throw new Error("Cannot load keyboards; this cache was configured without a loader");
     }
 
-    keyboardID = prefixed(keyboardID);
+    keyboardID = toPrefixedKeyboardId(keyboardID);
 
     const cachedEntry = this.keyboardTable[keyboardID];
     if(cachedEntry instanceof JSKeyboard) {
@@ -164,11 +160,11 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
 
     const stub = this.getStub(keyboardID, null);
     if(!stub) {
-      throw new Error(`No stub for ${withoutPrefix(keyboardID)} has been registered`);
+      throw new Error(`No stub for ${toUnprefixedKeyboardId(keyboardID)} has been registered`);
     }
 
     if(!stub.filename) {
-      throw new Error(`The registered stub for ${withoutPrefix(keyboardID)} lacks a path to the main keyboard file`);
+      throw new Error(`The registered stub for ${toUnprefixedKeyboardId(keyboardID)} lacks a path to the main keyboard file`);
     }
 
     const promise = this.keyboardLoader.loadKeyboardFromStub(stub);
@@ -189,7 +185,7 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
   }
 
   addStub(stub: KeyboardStub) {
-    const keyboardID = prefixed(stub.KI);
+    const keyboardID = toPrefixedKeyboardId(stub.KI);
     const stubTable = this.stubSetTable[keyboardID] = this.stubSetTable[keyboardID] ?? {};
     stubTable[stub.KLC] = stub;
 
@@ -213,7 +209,7 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
     }
 
     if(keyboardID) {
-      keyboardID = prefixed(keyboardID);
+      keyboardID = toPrefixedKeyboardId(keyboardID);
     }
 
     const stubTable = this.stubSetTable[keyboardID] ?? {};
@@ -238,7 +234,7 @@ export default class StubAndKeyboardCache extends EventEmitter<EventMap> {
    *              If `false`, only forgets the metadata (stubs).
    */
   forgetKeyboard(keyboard: string | JSKeyboard, purge: boolean = false) {
-    const id: string = (keyboard instanceof JSKeyboard) ? keyboard.id : prefixed(keyboard);
+    const id: string = (keyboard instanceof JSKeyboard) ? keyboard.id : toPrefixedKeyboardId(keyboard);
 
     if(this.stubSetTable[id]) {
       delete this.stubSetTable[id];
diff --git a/web/src/engine/src/main/headless/languageProcessor.ts b/web/src/engine/src/main/headless/languageProcessor.ts
index bad68b5d2b5..589bed6b2e0 100644
--- a/web/src/engine/src/main/headless/languageProcessor.ts
+++ b/web/src/engine/src/main/headless/languageProcessor.ts
@@ -360,7 +360,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
   /**
    * Retrieves the context and output state of KMW immediately before the prediction with
    * token `id` was generated.  Must correspond to a 'recent' one, as only so many are stored
-   * in `ModelManager`'s history buffer.
+   * in `ModelCache`'s history buffer.
    * @param id A unique identifier corresponding to a recent `Transcription`.
    * @returns The matching `Transcription`, or `null` none is found.
    */
diff --git a/web/src/test/auto/resources/loader/nodeCloudRequester.ts b/web/src/test/auto/resources/loader/nodeCloudRequester.ts
index ae1b57e14d5..3b4e923b5ce 100644
--- a/web/src/test/auto/resources/loader/nodeCloudRequester.ts
+++ b/web/src/test/auto/resources/loader/nodeCloudRequester.ts
@@ -1,10 +1,10 @@
 import { ManagedPromise } from 'keyman/engine/keyboard';
-import CloudRequesterInterface from '../../../../engine/src/keyboard-storage/cloud/requesterInterface.js';
+import { CloudRequesterInterface } from '../../../../engine/src/keyboard-storage/cloud/requesterInterface.js';
 import {
   CLOUD_TIMEOUT_ERR,
   CLOUD_STUB_REGISTRATION_ERR,
   CloudQueryResult,
-  default as CloudQueryEngine
+  CloudQueryEngine
 } from '../../../../engine/src/keyboard-storage/cloud/queryEngine.js';
 
 import fs from 'node:fs';

From 0dbbcc452ea3827772ef20d34d5bb07ac29731fd Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 19 Dec 2025 10:07:29 +0100
Subject: [PATCH 193/254] maint(web): escape single quotes in TC service
 messages

This fixes a problem where TC shows an error because it can't find the
end of the service message for a failed test. Single quotes (and some
other characters) have to be escaped with `|'` inside of a message.

Build-bot: skip:all build:web
Test-bot: skip
---
 common/test/resources/playwright-TC-reporter.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/common/test/resources/playwright-TC-reporter.ts b/common/test/resources/playwright-TC-reporter.ts
index f550a48d2cf..8cbc0967e78 100644
--- a/common/test/resources/playwright-TC-reporter.ts
+++ b/common/test/resources/playwright-TC-reporter.ts
@@ -62,6 +62,15 @@ class TestNode {
     TestNode.OpenNodes.push(this.id);
   }
 
+  private escape(message: string): string {
+    // TeamCity escaping rules for: ' | [ ] \n \r \uNNNN
+    // See: https://www.jetbrains.com/help/teamcity/service-messages.html#Escaped+Values
+    return message?.replace(/['|\[\]]/g, (matched) => `|${matched}`)
+      .replace(/\n/g, '|n')
+      .replace(/\r/g, '|r')
+      .replace(/[\u0080-\uFFFF]/g, c => `|0x${c.charCodeAt(0).toString(16).padStart(4, '0')}`) ?? '';
+  }
+
   private getTestResult(result: TestResult): { msgTitle: string, details: string } {
     if (!result) {
       return null;
@@ -72,9 +81,9 @@ class TestNode {
       case 'failed':
       case 'interrupted':
       case 'timedOut':
-        return { msgTitle: 'testFailed', details: `message='${result.error?.message}' details='${result.error?.value ?? result.error?.cause}'` };
+        return { msgTitle: 'testFailed', details: `message='${this.escape(result.error?.message)}' details='${this.escape(result.error?.value ?? result.error?.cause)}'` };
       case 'skipped':
-        return { msgTitle: 'testIgnored', details: `message='${result.annotations?.toString() ?? ''}'` };
+        return { msgTitle: 'testIgnored', details: `message='${this.escape(result.annotations?.toString()) ?? ''}'` };
     }
   }
 

From 5f2e72749a13f0a370efcd2af3931502013899ab Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 6 Jan 2026 17:43:27 +0100
Subject: [PATCH 194/254] test(web): address code review comments

---
 web/src/test/auto/e2e/baseline/baseline.tests.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.ts b/web/src/test/auto/e2e/baseline/baseline.tests.ts
index 8a9994fb04a..489927762bc 100644
--- a/web/src/test/auto/e2e/baseline/baseline.tests.ts
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.ts
@@ -58,7 +58,7 @@ const testsToFix = {
     'k_037___options___double_reset.kmn',
     'k_039___generic_ctrlalt.kmn',
     'k_049___enter_invalidates_context.kmn',
-    'k_055___deadkey_cancelled_by_arrow.kmn',
+    'k_055___deadkey_cancelled_by_arrow.kmn', // Keyman Engine for Web does not interpret arrow keys - #15397
   ],
   // TODO: fix these tests (#15342)
   '.js': [
@@ -85,7 +85,7 @@ const testsToFix = {
     'k_049___enter_invalidates_context.kmn',
     'k_050___nul_and_context.kmn', // js only
     'k_052___nul_and_index.kmn', // js only
-    'k_055___deadkey_cancelled_by_arrow.kmn',
+    'k_055___deadkey_cancelled_by_arrow.kmn', // Keyman Engine for Web does not interpret arrow keys - #15397
   ]
 };
 

From f65a752b4784c99c18ea77d7b268bf7c2f41bc56 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 6 Jan 2026 18:19:07 +0100
Subject: [PATCH 195/254] test(web): address code review comments

---
 common/test/keyboards/baseline/README.md       | 18 ++++++++++++++++++
 core/tests/unit/kmx/meson.build                |  2 +-
 .../test/auto/e2e/baseline/baseline.tests.ts   |  4 ----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/common/test/keyboards/baseline/README.md b/common/test/keyboards/baseline/README.md
index 7894490d9bc..090fdcbd5bc 100644
--- a/common/test/keyboards/baseline/README.md
+++ b/common/test/keyboards/baseline/README.md
@@ -26,3 +26,21 @@ The keyboards can be built with:
 
 This builds the keyboards with debug information and no compiler version
 embedded.
+
+## Grouping of the test fixtures
+
+Fixtures that test similar functionality are roughly grouped together.
+There is some overlap between different groups, so this was done
+mainly by test name.
+
+| Name     | Test group                               |
+|----------|------------------------------------------|
+| k_00xx_* | Tests that didn't fit in any other group |
+| k_01xx_* | Basic rules                              |
+| k_02xx_* | RALT                                     |
+| k_03xx_* | deadkeys                                 |
+| k_04xx_* | Using multiple groups                    |
+| k_05xx_* | Options                                  |
+| k_06xx_* | System stores                            |
+| k_07xx_* | Caps related tests                       |
+| k_08xx_* | Context related                          |
diff --git a/core/tests/unit/kmx/meson.build b/core/tests/unit/kmx/meson.build
index a3af0a741ea..8193fe50468 100644
--- a/core/tests/unit/kmx/meson.build
+++ b/core/tests/unit/kmx/meson.build
@@ -86,7 +86,7 @@ tests = [
   'k_0810___nul_and_index',
   'k_0811___if_and_index',
   'k_0812___nul_and_contextex',
-  # Skipped: 'k_0813___deadkey_cancelled_by_arrow',
+  # TODO-web-core: Skipped: 'k_0813___deadkey_cancelled_by_arrow',
 ]
 
 
diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.ts b/web/src/test/auto/e2e/baseline/baseline.tests.ts
index 38e45bb8b1d..630330d156a 100644
--- a/web/src/test/auto/e2e/baseline/baseline.tests.ts
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.ts
@@ -63,12 +63,8 @@ const testsToFix = {
   // TODO: fix these tests (#15342)
   '.js': [
     'k_0000___null_keyboard.kmn',
-    // 'k_0103___vkey_input__shift_ctrl_.kmn',
     'k_0104___vkey_input__ctrl_alt_.kmn',
-    // 'k_0105___vkey_input__ctrl_alt_2_.kmn',
-    // 'k_0200___ralt.kmn',
     'k_0203___generic_ctrlalt.kmn',
-    // 'k_0400___groups_and_virtual_keys.kmn',
     'k_0501___options_with_preset.kmn',
     'k_0503___options_with_save_and_preset.kmn',
     'k_0504___options_with_reset.kmn',

From 79cc8e72580e04519c6fedb2dc960c843b7a5186 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 6 Jan 2026 18:42:58 +0100
Subject: [PATCH 196/254] test(web): address code review comments

---
 web/src/engine/src/keyboard/keyEvent.ts                |  7 -------
 .../core-processor/coreKeyboardProcessor.tests.ts      | 10 ----------
 2 files changed, 17 deletions(-)

diff --git a/web/src/engine/src/keyboard/keyEvent.ts b/web/src/engine/src/keyboard/keyEvent.ts
index 471541d3019..66b3fe060d2 100644
--- a/web/src/engine/src/keyboard/keyEvent.ts
+++ b/web/src/engine/src/keyboard/keyEvent.ts
@@ -141,13 +141,6 @@ export class KeyEvent implements KeyEventSpec {
       case Codes.keyCodes.K_CAPS:
       case Codes.keyCodes.K_NUMLOCK:
       case Codes.keyCodes.K_SCROLL:
-      case Codes.keyCodes.K_LSHIFT:
-      case Codes.keyCodes.K_RSHIFT:
-      case Codes.keyCodes.K_LCTRL:
-      case Codes.keyCodes.K_RCTRL:
-      case Codes.keyCodes.K_LALT:
-      case Codes.keyCodes.K_RALT:
-      case Codes.keyCodes.K_ALTGR:
         return true;
       default:
         return false;
diff --git a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
index 7d619f4dc43..46c3659d42b 100644
--- a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
+++ b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
@@ -559,16 +559,6 @@ describe('CoreKeyboardProcessor', function () {
       { code: Codes.keyCodes.K_CAPS, name: 'CapsLock' },
       { code: Codes.keyCodes.K_NUMLOCK, name: 'NumLock' },
       { code: Codes.keyCodes.K_SCROLL, name: 'ScrollLock' },
-      // TODO-web-core: should LSHIFT/RSHIFT etc also be detected as modifier?
-      // Currently .js keyboards don't don't support distinguishing
-      // between left and right keys, but should KMX keyboards in Web?
-      // { code: Codes.keyCodes.K_LSHIFT, name: 'LeftShift' },
-      // { code: Codes.keyCodes.K_RSHIFT, name: 'RightShift' },
-      // { code: Codes.keyCodes.K_LCTRL, name: 'LeftControl' },
-      // { code: Codes.keyCodes.K_RCTRL, name: 'RightControl' },
-      // { code: Codes.keyCodes.K_LALT, name: 'LeftAlt' },
-      // { code: Codes.keyCodes.K_RALT, name: 'RightAlt' },
-      // { code: Codes.keyCodes.K_ALTGR, name: 'AltGr'},
     ]) {
       it(`recognizes ${key.name} as modifier`, function () {
         // Setup

From f9f804c1907be9568c0deb180f234fa3f1ae1511 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 6 Jan 2026 19:44:09 +0100
Subject: [PATCH 197/254] feat(web): remove 'export default' to eliminate more
 aliases

Fixes: #15292
Test-bot: skip
---
 .../app/browser/src/defaultBrowserRules.ts    |  2 +-
 web/src/app/browser/src/keymanEngine.ts       |  2 +-
 web/src/app/webview/src/keymanEngine.ts       |  2 +-
 .../app/webview/src/passthroughKeyboard.ts    |  2 +-
 web/src/common/web-utils/src/deepCopy.ts      |  2 +-
 web/src/common/web-utils/src/deviceSpec.ts    |  2 --
 web/src/common/web-utils/src/globalObject.ts  |  2 +-
 web/src/common/web-utils/src/index.ts         | 14 ++++----
 .../common/web-utils/src/managedPromise.ts    |  2 +-
 .../common/web-utils/src/priority-queue.ts    |  2 +-
 .../common/web-utils/src/timeoutPromise.ts    |  4 +--
 web/src/common/web-utils/src/version.ts       |  2 +-
 .../predictive-text/templates/src/index.ts    |  4 +--
 .../templates/src/quote-behavior.ts           |  2 --
 .../templates/src/trie-model.ts               |  2 +-
 .../wordbreakers/src/main/ascii.ts            |  2 +-
 .../wordbreakers/src/main/default/index.ts    |  2 +-
 .../wordbreakers/src/main/index.ts            |  6 ++--
 .../wordbreakers/src/main/placeholder.ts      |  2 +-
 .../worker-main/src/lmlayer.ts                |  4 +--
 .../worker-main/src/node/index.ts             |  6 ++--
 .../worker-main/src/node/mappedWorker.ts      |  2 +-
 .../src/node/sourcemappedWorker.ts            |  6 ++--
 .../worker-main/src/node/worker.ts            |  6 ++--
 .../worker-main/src/promise-store.ts          |  2 +-
 .../predictive-text/worker-main/src/unwrap.ts |  2 +-
 .../worker-main/src/web/index.ts              |  8 ++---
 .../worker-main/src/web/sourcemappedWorker.ts |  4 +--
 .../worker-main/src/web/worker.ts             |  6 ++--
 .../headless/promise-store.tests.js           |  2 +-
 .../src/main/correction/context-tracker.ts    |  2 +-
 .../src/main/correction/index.ts              | 19 ++++++++---
 .../worker-thread/src/main/index.ts           |  4 +--
 .../src/main/model-compositor.ts              |  4 +--
 .../src/main/models/dummy-model.ts            |  2 --
 .../worker-thread/src/main/models/index.ts    |  2 +-
 .../worker-thread/src/main/predict-helpers.ts |  4 +--
 .../worker-thread/src/main/test-index.ts      | 19 ++++++++---
 .../worker-thread/src/main/transformUtils.ts  |  2 +-
 .../src/main/worker-interfaces.ts             |  2 +-
 .../worker-thread/src/main/worker-main.ts     |  2 +-
 .../engine/src/dom-utils/cookieSerializer.ts  |  2 +-
 .../dom-utils/createUnselectableElement.ts    |  2 +-
 web/src/engine/src/dom-utils/index.ts         |  6 ++--
 web/src/engine/src/dom-utils/landscapeView.ts |  2 +-
 web/src/engine/src/interfaces/index.ts        |  4 +--
 .../src/interfaces/pathConfiguration.ts       |  2 +-
 .../prediction/predictionContext.ts           |  2 +-
 web/src/engine/src/keyboard-storage/index.ts  |  1 -
 web/src/engine/src/keyboard/index.ts          |  4 +--
 .../keyboard/keyboards/keyboardLoaderBase.ts  |  2 +-
 .../keyboard/keyboards/keyboardProperties.ts  |  4 +--
 .../src/keyboard/keyboards/spacebarText.ts    |  4 +--
 .../engine/src/main/headless/contextWindow.ts |  2 +-
 .../src/main/headless/deviceDetector.ts       |  2 +-
 .../src/main/headless/inputProcessor.ts       |  8 ++---
 .../src/main/headless/languageProcessor.ts    |  2 +-
 .../src/main/headless/utils/styleConstants.ts |  2 +-
 web/src/engine/src/osk/banner/bannerView.ts   |  2 +-
 web/src/engine/src/osk/buttonClassNames.ts    |  4 +--
 .../engine/src/osk/components/emptyView.ts    |  4 +--
 .../engine/src/osk/components/helpPageView.ts |  4 +--
 .../osk/components/keyboardView.interface.ts  |  4 +--
 .../components/oskViewComponent.interface.ts  |  2 +-
 .../engine/src/osk/components/resizeBar.ts    |  6 ++--
 web/src/engine/src/osk/components/titleBar.ts |  6 ++--
 .../src/osk/config/commonConfiguration.ts     |  4 +--
 .../src/osk/config/embeddedGestureConfig.ts   |  6 ++--
 .../src/osk/config/viewConfiguration.ts       |  6 ++--
 web/src/engine/src/osk/globehint.interface.ts |  2 +-
 web/src/engine/src/osk/index.ts               | 33 ++++++++++---------
 .../src/osk/input/gestures/browser/flick.ts   |  4 +--
 .../osk/input/gestures/browser/modipress.ts   |  4 +--
 .../osk/input/gestures/browser/multitap.ts    |  6 ++--
 .../osk/input/gestures/browser/oskSubKey.ts   |  6 ++--
 .../browser/{keytip.ts => phoneKeytip.ts}     |  8 ++---
 .../osk/input/gestures/browser/subkeyPopup.ts |  8 ++---
 .../input/gestures/browser/tabletPreview.ts   |  6 ++--
 .../src/osk/input/mouseDragOperation.ts       |  2 +-
 web/src/engine/src/osk/keyElement.ts          |  2 +-
 .../osk/keyboard-layout/gesturePreviewHost.ts |  4 +--
 .../src/osk/keyboard-layout/oskBaseKey.ts     |  8 ++---
 .../engine/src/osk/keyboard-layout/oskKey.ts  |  8 ++---
 .../src/osk/keyboard-layout/oskLayer.ts       |  8 ++---
 .../src/osk/keyboard-layout/oskLayerGroup.ts  |  8 ++---
 .../engine/src/osk/keyboard-layout/oskRow.ts  |  8 ++---
 web/src/engine/src/osk/keytip.interface.ts    |  2 +-
 web/src/engine/src/osk/specialCharacters.ts   |  4 +--
 web/src/engine/src/osk/test-index.ts          |  6 ++--
 web/src/engine/src/osk/views/activator.ts     |  2 +-
 .../engine/src/osk/views/anchoredOskView.ts   | 10 +++---
 .../engine/src/osk/views/floatingOskView.ts   | 16 ++++-----
 .../engine/src/osk/views/inlinedOskView.ts    | 12 +++----
 web/src/engine/src/osk/views/oskView.ts       | 26 +++++++--------
 .../engine/src/osk/views/simpleActivator.ts   |  4 +--
 .../src/osk/views/touchEventPromiseMap.ts     |  2 +-
 .../engine/src/osk/views/twoStateActivator.ts |  4 +--
 web/src/engine/src/osk/visualKeyboard.ts      | 30 ++++++++---------
 .../tools/testing/recorder-core/src/index.ts  |  6 ++--
 .../testing/recorder-core/src/nodeProctor.ts  |  4 +--
 .../testing/recorder-core/src/proctor.ts      |  2 +-
 101 files changed, 264 insertions(+), 258 deletions(-)
 rename web/src/engine/src/osk/input/gestures/browser/{keytip.ts => phoneKeytip.ts} (97%)

diff --git a/web/src/app/browser/src/defaultBrowserRules.ts b/web/src/app/browser/src/defaultBrowserRules.ts
index f0002401519..a631c1a0c21 100644
--- a/web/src/app/browser/src/defaultBrowserRules.ts
+++ b/web/src/app/browser/src/defaultBrowserRules.ts
@@ -8,7 +8,7 @@ import {
 
 import { ContextManager } from './contextManager.js';
 
-export default class DefaultBrowserRules extends DefaultRules {
+export class DefaultBrowserRules extends DefaultRules {
   private contextManager: ContextManager;
 
   constructor(contextManager: ContextManager) {
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 2695cee82c3..33172bba29f 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -13,7 +13,7 @@ import KeyboardObject = KeymanWebKeyboard.KeyboardObject;
 import * as views from './viewsAnchorpoint.js';
 import { BrowserConfiguration, BrowserInitOptionDefaults, BrowserInitOptionSpec } from './configuration.js';
 import { ContextManager } from './contextManager.js';
-import DefaultBrowserRules from './defaultBrowserRules.js';
+import { DefaultBrowserRules } from './defaultBrowserRules.js';
 import { HardwareEventKeyboard } from './hardwareEventKeyboard.js';
 import { FocusStateAPIObject } from './context/focusAssistant.js';
 import { PageIntegrationHandlers } from './context/pageIntegrationHandlers.js';
diff --git a/web/src/app/webview/src/keymanEngine.ts b/web/src/app/webview/src/keymanEngine.ts
index 0ea022d99c9..fb411bc2d76 100644
--- a/web/src/app/webview/src/keymanEngine.ts
+++ b/web/src/app/webview/src/keymanEngine.ts
@@ -6,7 +6,7 @@ import { toPrefixedKeyboardId, toUnprefixedKeyboardId } from 'keyman/engine/keyb
 
 import { WebviewConfiguration, WebviewInitOptionDefaults, WebviewInitOptionSpec } from './configuration.js';
 import { ContextManager, HostTextStore } from './contextManager.js';
-import PassthroughKeyboard from './passthroughKeyboard.js';
+import { PassthroughKeyboard } from './passthroughKeyboard.js';
 import { buildEmbeddedGestureConfig, setupEmbeddedListeners } from './oskConfiguration.js';
 import { WorkerFactory } from '@keymanapp/lexical-model-layer';
 
diff --git a/web/src/app/webview/src/passthroughKeyboard.ts b/web/src/app/webview/src/passthroughKeyboard.ts
index c0361195089..43e118aebc8 100644
--- a/web/src/app/webview/src/passthroughKeyboard.ts
+++ b/web/src/app/webview/src/passthroughKeyboard.ts
@@ -2,7 +2,7 @@ import { DeviceSpec, Keyboard, KeyEvent, ManagedPromise } from 'keyman/engine/ke
 
 import { HardKeyboardBase, processForMnemonicsAndLegacy } from 'keyman/engine/main';
 
-export default class PassthroughKeyboard extends HardKeyboardBase {
+export class PassthroughKeyboard extends HardKeyboardBase {
   readonly baseDevice: DeviceSpec;
   public activeKeyboard: Keyboard;
 
diff --git a/web/src/common/web-utils/src/deepCopy.ts b/web/src/common/web-utils/src/deepCopy.ts
index c88f2556600..db0eb498343 100644
--- a/web/src/common/web-utils/src/deepCopy.ts
+++ b/web/src/common/web-utils/src/deepCopy.ts
@@ -6,7 +6,7 @@
  * Description  Makes an actual copy (not a reference) of an object, copying simple members,
  *              arrays and member objects but not functions, so use with care!
  */
-export default function deepCopy<T extends ({[key: string | number | symbol]: any} | Array<any>)>(p:T): T {
+export function deepCopy<T extends ({[key: string | number | symbol]: any} | Array<any>)>(p:T): T {
   // typeof undefined == 'undefined', ![] == false, !{} == false
   if(typeof p != 'object' || !p) {
     return p;
diff --git a/web/src/common/web-utils/src/deviceSpec.ts b/web/src/common/web-utils/src/deviceSpec.ts
index 3ab0352fc46..f993f94b82d 100644
--- a/web/src/common/web-utils/src/deviceSpec.ts
+++ b/web/src/common/web-utils/src/deviceSpec.ts
@@ -80,5 +80,3 @@ export namespace DeviceSpec {
 export function physicalKeyDeviceAlias(device: DeviceSpec) {
   return new DeviceSpec(device.browser, DeviceSpec.FormFactor.Desktop, device.OS, false);
 }
-
-export default DeviceSpec;
\ No newline at end of file
diff --git a/web/src/common/web-utils/src/globalObject.ts b/web/src/common/web-utils/src/globalObject.ts
index b2686872169..c6c0af33e50 100644
--- a/web/src/common/web-utils/src/globalObject.ts
+++ b/web/src/common/web-utils/src/globalObject.ts
@@ -4,7 +4,7 @@
  * - In WebWorkers, returns `self`.
  * - In Node, returns `global`.
  */
-export default function getGlobalObject(): typeof globalThis {
+export function globalObject(): typeof globalThis {
   // Evergreen browsers have started defining 'globalThis'.
   // Refer to https://devblogs.microsoft.com/typescript/announcing-typescript-3-4/#type-checking-for-globalthis
   // and its referenced polyfill.  Said polyfill is very complex, so we opt for this far leaner variant.
diff --git a/web/src/common/web-utils/src/index.ts b/web/src/common/web-utils/src/index.ts
index 343e1486e67..f471946d713 100644
--- a/web/src/common/web-utils/src/index.ts
+++ b/web/src/common/web-utils/src/index.ts
@@ -1,8 +1,8 @@
 // References all utility includes from a single file, making import/export simple.
 
-export { default as deepCopy } from "./deepCopy.js";
+export { deepCopy } from "./deepCopy.js";
 
-export { default as DeviceSpec, physicalKeyDeviceAlias } from "./deviceSpec.js";
+export { DeviceSpec, physicalKeyDeviceAlias } from "./deviceSpec.js";
 
 /*
   // An example valid use, post-import:
@@ -12,16 +12,16 @@ export { default as DeviceSpec, physicalKeyDeviceAlias } from "./deviceSpec.js";
                                 true);
  */
 
-export { default as Version } from "./version.js";
+export { Version } from "./version.js";
 
-export { default as globalObject } from "./globalObject.js";
+export { globalObject } from "./globalObject.js";
 
 export * as KMWString from './kmwstring.js';
 
-export { default as ManagedPromise } from "./managedPromise.js";
-export { default as TimeoutPromise, timedPromise } from "./timeoutPromise.js";
+export { ManagedPromise } from "./managedPromise.js";
+export { TimeoutPromise, timedPromise } from "./timeoutPromise.js";
 
-export { default as PriorityQueue, QueueComparator } from "./priority-queue.js"
+export { PriorityQueue, QueueComparator } from "./priority-queue.js"
 
 export { isEmptyTransform } from './isEmptyTransform.js';
 
diff --git a/web/src/common/web-utils/src/managedPromise.ts b/web/src/common/web-utils/src/managedPromise.ts
index 52885319023..4319575709e 100644
--- a/web/src/common/web-utils/src/managedPromise.ts
+++ b/web/src/common/web-utils/src/managedPromise.ts
@@ -1,7 +1,7 @@
 type ResolveSignature<Type> = (value: Type | PromiseLike<Type>) => void;
 type RejectSignature = (reason?: any) => void;
 
-export default class ManagedPromise<Type = void> {
+export class ManagedPromise<Type = void> {
   /**
    * Calling this function will fulfill the Promise represented by this class.
    */
diff --git a/web/src/common/web-utils/src/priority-queue.ts b/web/src/common/web-utils/src/priority-queue.ts
index 66867f37ad5..2d75d62a928 100644
--- a/web/src/common/web-utils/src/priority-queue.ts
+++ b/web/src/common/web-utils/src/priority-queue.ts
@@ -13,7 +13,7 @@
  */
 export type QueueComparator<Type> = (a: Type, b: Type) => number;
 
-export default class PriorityQueue<Type> {
+export class PriorityQueue<Type> {
 
   private comparator: QueueComparator<Type>;
   private heap: Type[];
diff --git a/web/src/common/web-utils/src/timeoutPromise.ts b/web/src/common/web-utils/src/timeoutPromise.ts
index 4b6fb3a7d61..0f48d096717 100644
--- a/web/src/common/web-utils/src/timeoutPromise.ts
+++ b/web/src/common/web-utils/src/timeoutPromise.ts
@@ -1,4 +1,4 @@
-import ManagedPromise from "./managedPromise.js";
+import { ManagedPromise } from "./managedPromise.js";
 
 /**
  * This class represents a cancelable timeout, wrapped in Promise form.
@@ -7,7 +7,7 @@ import ManagedPromise from "./managedPromise.js";
  * `reject` is called earlier.  Call `.resolve(false)` for early cancellation
  * or `.resolve(true)` to cancel the timer while resolving the Promise early.
  */
-export default class TimeoutPromise extends ManagedPromise<Boolean> {
+export class TimeoutPromise extends ManagedPromise<Boolean> {
   private timerHandle: number | NodeJS.Timeout;
   constructor(timeoutInMillis: number) {
     // Helps marshal the internal timer handle to its member field despite being
diff --git a/web/src/common/web-utils/src/version.ts b/web/src/common/web-utils/src/version.ts
index 145b3361064..61b94147b8d 100644
--- a/web/src/common/web-utils/src/version.ts
+++ b/web/src/common/web-utils/src/version.ts
@@ -1,7 +1,7 @@
 import KEYMAN_VERSION from "@keymanapp/keyman-version";
 
 // Dotted-decimal version
-export default class Version {
+export class Version {
   public static readonly CURRENT = new Version(KEYMAN_VERSION.VERSION_RELEASE);
 
   // Represents a default version value for keyboards compiled before this was compiled into keyboards.
diff --git a/web/src/engine/predictive-text/templates/src/index.ts b/web/src/engine/predictive-text/templates/src/index.ts
index 0966fb44949..18aaab78633 100644
--- a/web/src/engine/predictive-text/templates/src/index.ts
+++ b/web/src/engine/predictive-text/templates/src/index.ts
@@ -2,6 +2,6 @@ export {
   SENTINEL_CODE_UNIT, applyTransform, buildMergedTransform, isHighSurrogate, isLowSurrogate, isSentinel,
   transformToSuggestion, defaultApplyCasing
 } from "./common.js";
-export { default as QuoteBehavior } from "./quote-behavior.js";
+export { QuoteBehavior } from "./quote-behavior.js";
 export { getLastPreCaretToken, Token, Tokenization, tokenize, wordbreak } from "./tokenization.js";
-export { default as TrieModel, TrieModelOptions } from "./trie-model.js";
\ No newline at end of file
+export { TrieModel, TrieModelOptions } from "./trie-model.js";
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/templates/src/quote-behavior.ts b/web/src/engine/predictive-text/templates/src/quote-behavior.ts
index 25a886feef3..686b9db67f5 100644
--- a/web/src/engine/predictive-text/templates/src/quote-behavior.ts
+++ b/web/src/engine/predictive-text/templates/src/quote-behavior.ts
@@ -36,5 +36,3 @@ export namespace QuoteBehavior {
     }
   }
 }
-
-export default QuoteBehavior;
diff --git a/web/src/engine/predictive-text/templates/src/trie-model.ts b/web/src/engine/predictive-text/templates/src/trie-model.ts
index 7a99e64ef3b..ebb99b938b7 100644
--- a/web/src/engine/predictive-text/templates/src/trie-model.ts
+++ b/web/src/engine/predictive-text/templates/src/trie-model.ts
@@ -269,7 +269,7 @@ export class Traversal implements LexiconTraversal {
  * prefix searches within words, however they are not very good
  * at predicting the next word.
  */
-export default class TrieModel implements LexicalModel {
+export class TrieModel implements LexicalModel {
   configuration?: Configuration;
   private _trie: Trie;
   readonly breakWords: WordBreakingFunction;
diff --git a/web/src/engine/predictive-text/wordbreakers/src/main/ascii.ts b/web/src/engine/predictive-text/wordbreakers/src/main/ascii.ts
index 7ed05e331f4..545478abd26 100644
--- a/web/src/engine/predictive-text/wordbreakers/src/main/ascii.ts
+++ b/web/src/engine/predictive-text/wordbreakers/src/main/ascii.ts
@@ -5,7 +5,7 @@ import { LexicalModelTypes } from '@keymanapp/common-types';
  *
  * @param phrase
  */
-export default function ascii(phrase: string): LexicalModelTypes.Span[] {
+export function ascii(phrase: string): LexicalModelTypes.Span[] {
   let matchWord = /[A-Za-z0-9']+/g;
   let words: LexicalModelTypes.Span[] = [];
   let match: RegExpExecArray | null;
diff --git a/web/src/engine/predictive-text/wordbreakers/src/main/default/index.ts b/web/src/engine/predictive-text/wordbreakers/src/main/default/index.ts
index c807c4ab2a8..0f2408d8967 100644
--- a/web/src/engine/predictive-text/wordbreakers/src/main/default/index.ts
+++ b/web/src/engine/predictive-text/wordbreakers/src/main/default/index.ts
@@ -38,7 +38,7 @@ export interface DefaultWordBreakerOptions {
  * @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, options?: DefaultWordBreakerOptions): LexicalModelTypes.Span[] {
+export function default_(text: string, options?: DefaultWordBreakerOptions): LexicalModelTypes.Span[] {
   let boundaries = findBoundaries(text, options);
   if (boundaries.length == 0) {
     return [];
diff --git a/web/src/engine/predictive-text/wordbreakers/src/main/index.ts b/web/src/engine/predictive-text/wordbreakers/src/main/index.ts
index 79cba5d83af..0b44523e47e 100644
--- a/web/src/engine/predictive-text/wordbreakers/src/main/index.ts
+++ b/web/src/engine/predictive-text/wordbreakers/src/main/index.ts
@@ -1,6 +1,6 @@
-import placeholder from "./placeholder.js";
-import ascii from "./ascii.js";
-import default_ from "./default/index.js";
+import { placeholder } from "./placeholder.js";
+import { ascii } from "./ascii.js";
+import { default_ } from "./default/index.js";
 
 export { placeholder, ascii, default_ as default, default_ as defaultWordbreaker };
 export { type BreakerContext } from "./default/index.js";
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/wordbreakers/src/main/placeholder.ts b/web/src/engine/predictive-text/wordbreakers/src/main/placeholder.ts
index f1e44528b98..2a3c8807427 100644
--- a/web/src/engine/predictive-text/wordbreakers/src/main/placeholder.ts
+++ b/web/src/engine/predictive-text/wordbreakers/src/main/placeholder.ts
@@ -7,7 +7,7 @@ import { LexicalModelTypes } from '@keymanapp/common-types';
  * @param phrase The phrase in which to break words.
  * @deprecated Use a word breaker tailored to your language instead!
  */
-export default function placeholder(phrase: string): LexicalModelTypes.Span[] {
+export function placeholder(phrase: string): LexicalModelTypes.Span[] {
   let nextStart = 0;
   return phrase.split(/\s+/).map(utterance => {
     // XXX: The indices are NOT accurate to the original phrase!
diff --git a/web/src/engine/predictive-text/worker-main/src/lmlayer.ts b/web/src/engine/predictive-text/worker-main/src/lmlayer.ts
index 5727dabd945..c9660c54b2c 100644
--- a/web/src/engine/predictive-text/worker-main/src/lmlayer.ts
+++ b/web/src/engine/predictive-text/worker-main/src/lmlayer.ts
@@ -28,7 +28,7 @@ import Distribution = LexicalModelTypes.Distribution;
 import Reversion = LexicalModelTypes.Reversion;
 import Suggestion = LexicalModelTypes.Suggestion;
 import Transform = LexicalModelTypes.Transform;
-import PromiseStore from "./promise-store.js";
+import { PromiseStore } from "./promise-store.js";
 import { OutgoingMessage } from '@keymanapp/lm-message-types';
 
 /// <reference types="worker-interface.d.ts" />
@@ -53,7 +53,7 @@ import { OutgoingMessage } from '@keymanapp/lm-message-types';
  * The top-level LMLayer will automatically starts up its own Web Worker.
  */
 
-export default class LMLayer {
+export class LMLayer {
   /**
    * The underlying worker instance. By default, this is the LMLayerWorker.
    */
diff --git a/web/src/engine/predictive-text/worker-main/src/node/index.ts b/web/src/engine/predictive-text/worker-main/src/node/index.ts
index 3393c22b81b..f3b045b0c5a 100644
--- a/web/src/engine/predictive-text/worker-main/src/node/index.ts
+++ b/web/src/engine/predictive-text/worker-main/src/node/index.ts
@@ -1,6 +1,6 @@
-export { default as LMLayer } from '../lmlayer.js';
-export { default as Worker } from './worker.js';
-export { default as SourcemappedWorker } from './sourcemappedWorker.js';
+export { LMLayer } from '../lmlayer.js';
+export { Worker } from './worker.js';
+export { SourcemappedWorker } from './sourcemappedWorker.js';
 
 export interface WorkerFactory {
     constructInstance(): Worker
diff --git a/web/src/engine/predictive-text/worker-main/src/node/mappedWorker.ts b/web/src/engine/predictive-text/worker-main/src/node/mappedWorker.ts
index d588a19562c..8b3d9d2b7b9 100644
--- a/web/src/engine/predictive-text/worker-main/src/node/mappedWorker.ts
+++ b/web/src/engine/predictive-text/worker-main/src/node/mappedWorker.ts
@@ -60,7 +60,7 @@ self.importScripts = importScripts;
  * cross-platform Worker support in the future, it may be wise to swap to use of
  * that package.
  */
-export default class MappedWorker extends worker.Worker implements Worker {
+export class MappedWorker extends worker.Worker implements Worker {
   constructor(scriptStr: string) {
     const concatenatedScript = `
     ${nodeWorkerToWebWorkerMappingSource}
diff --git a/web/src/engine/predictive-text/worker-main/src/node/sourcemappedWorker.ts b/web/src/engine/predictive-text/worker-main/src/node/sourcemappedWorker.ts
index aaaf79e0f6f..a8141939ce9 100644
--- a/web/src/engine/predictive-text/worker-main/src/node/sourcemappedWorker.ts
+++ b/web/src/engine/predictive-text/worker-main/src/node/sourcemappedWorker.ts
@@ -1,9 +1,9 @@
-import MappedWorker from "./mappedWorker.js";
-import unwrap from '../unwrap.js';
+import { MappedWorker } from "./mappedWorker.js";
+import { unwrap } from '../unwrap.js';
 
 import { LMLayerWorkerCode, LMLayerWorkerSourcemapComment } from "@keymanapp/lm-worker/worker-main.wrapped.js";
 
-export default class SourcemappedWorker {
+export class SourcemappedWorker {
   static constructInstance(): Worker {
     let scriptStr = unwrap(LMLayerWorkerCode);
 
diff --git a/web/src/engine/predictive-text/worker-main/src/node/worker.ts b/web/src/engine/predictive-text/worker-main/src/node/worker.ts
index aafb2c4869a..3f5ffe7d717 100644
--- a/web/src/engine/predictive-text/worker-main/src/node/worker.ts
+++ b/web/src/engine/predictive-text/worker-main/src/node/worker.ts
@@ -1,9 +1,9 @@
-import MappedWorker from "./mappedWorker.js";
-import unwrap from '../unwrap.js';
+import { MappedWorker } from "./mappedWorker.js";
+import { unwrap } from '../unwrap.js';
 
 import { LMLayerWorkerCode, LMLayerWorkerSourcemapComment } from "@keymanapp/lm-worker/worker-main.wrapped.min.js";
 
-export default class Worker {
+export class Worker {
   static constructInstance(): Worker {
     let scriptStr = unwrap(LMLayerWorkerCode);
     const srcMapUrlIndex = scriptStr.indexOf("//# sourceMappingURL")
diff --git a/web/src/engine/predictive-text/worker-main/src/promise-store.ts b/web/src/engine/predictive-text/worker-main/src/promise-store.ts
index 9548dd1c971..77021a2e940 100644
--- a/web/src/engine/predictive-text/worker-main/src/promise-store.ts
+++ b/web/src/engine/predictive-text/worker-main/src/promise-store.ts
@@ -42,7 +42,7 @@ interface PromiseCallbacks<T> {
  *
  * <T> is the type of resolved value (value yielded successfully by promise).
  */
-export default class PromiseStore<T> {
+export class PromiseStore<T> {
   // IE11 offers partial support for new Map().
   // Assume only .get(), .set(), .has(), .delete(), and .size work.
   // See: http://kangax.github.io/compat-table/es6/#test-Map
diff --git a/web/src/engine/predictive-text/worker-main/src/unwrap.ts b/web/src/engine/predictive-text/worker-main/src/unwrap.ts
index fc0769e5bd1..6cb84f4da3a 100644
--- a/web/src/engine/predictive-text/worker-main/src/unwrap.ts
+++ b/web/src/engine/predictive-text/worker-main/src/unwrap.ts
@@ -5,7 +5,7 @@
  *
  * @param fn The function whose body will be returned.
  */
-export default function unwrap(encodedSrc: string): string {
+export function unwrap(encodedSrc: string): string {
   // There used to be more to this, but now it's a pretty simple passthrough!
   return encodedSrc;
 }
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-main/src/web/index.ts b/web/src/engine/predictive-text/worker-main/src/web/index.ts
index f133f6f2f8d..051404a4bb7 100644
--- a/web/src/engine/predictive-text/worker-main/src/web/index.ts
+++ b/web/src/engine/predictive-text/worker-main/src/web/index.ts
@@ -1,7 +1,7 @@
-export { default as LMLayer } from '../lmlayer.js';
-export { default as Worker } from './worker.js';
-export { default as SourcemappedWorker } from './sourcemappedWorker.js';
+export { LMLayer } from '../lmlayer.js';
+export { DefaultWorker as Worker } from './worker.js';
+export { SourcemappedWorker } from './sourcemappedWorker.js';
 
 export interface WorkerFactory {
   constructInstance(): Worker
-}
\ No newline at end of file
+}
diff --git a/web/src/engine/predictive-text/worker-main/src/web/sourcemappedWorker.ts b/web/src/engine/predictive-text/worker-main/src/web/sourcemappedWorker.ts
index 18a89ab05f5..35999f8b38a 100644
--- a/web/src/engine/predictive-text/worker-main/src/web/sourcemappedWorker.ts
+++ b/web/src/engine/predictive-text/worker-main/src/web/sourcemappedWorker.ts
@@ -1,7 +1,7 @@
-import unwrap from '../unwrap.js';
+import { unwrap } from '../unwrap.js';
 import { LMLayerWorkerCode, LMLayerWorkerSourcemapComment } from "@keymanapp/lm-worker/worker-main.wrapped.js";
 
-export default class SourcemappedWorker {
+export class SourcemappedWorker {
   // the only difference to DefaultWorker is that this class uses
   // the unminified LM* blobs
 
diff --git a/web/src/engine/predictive-text/worker-main/src/web/worker.ts b/web/src/engine/predictive-text/worker-main/src/web/worker.ts
index 372887fcddf..94b02dee7be 100644
--- a/web/src/engine/predictive-text/worker-main/src/web/worker.ts
+++ b/web/src/engine/predictive-text/worker-main/src/web/worker.ts
@@ -1,7 +1,7 @@
-import unwrap from '../unwrap.js';
+import { unwrap } from '../unwrap.js';
 import { LMLayerWorkerCode, LMLayerWorkerSourcemapComment } from "@keymanapp/lm-worker/worker-main.wrapped.min.js";
 
-export default class DefaultWorker {
+export class DefaultWorker {
   static constructInstance(): Worker {
     return new Worker(this.asBlobURI(LMLayerWorkerCode));
   }
@@ -28,7 +28,7 @@ export default class DefaultWorker {
     // if(false) {
       code += '\n' + LMLayerWorkerSourcemapComment;
     // }
-    let blob = new Blob([code], { type: 'text/javascript' });
+    const blob = new Blob([code], { type: 'text/javascript' });
     return URL.createObjectURL(blob);
   }
 }
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-main/unit_tests/headless/promise-store.tests.js b/web/src/engine/predictive-text/worker-main/unit_tests/headless/promise-store.tests.js
index 0809b215ce7..8e220a51766 100644
--- a/web/src/engine/predictive-text/worker-main/unit_tests/headless/promise-store.tests.js
+++ b/web/src/engine/predictive-text/worker-main/unit_tests/headless/promise-store.tests.js
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 import sinon from 'sinon';
 
-import PromiseStore from '#./promise-store.js';
+import { PromiseStore } from '#./promise-store.js';
 import { randomToken } from '@keymanapp/common-test-resources/model-helpers.mjs';
 
 describe('PromiseStore', function () {
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts b/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts
index 590a9aaa12e..1ad67f40ee4 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts
@@ -3,7 +3,7 @@ import { KMWString } from 'keyman/common/web-utils';
 
 import { ClassicalDistanceCalculation, EditOperation } from './classical-calculation.js';
 import { SearchSpace } from './distance-modeler.js';
-import TransformUtils from '../transformUtils.js';
+import { TransformUtils } from '../transformUtils.js';
 import { determineModelTokenizer } from '../model-helpers.js';
 import { tokenizeTransform, tokenizeTransformDistribution } from './transform-tokenization.js';
 import { LexicalModelTypes } from '@keymanapp/common-types';
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/correction/index.ts b/web/src/engine/predictive-text/worker-thread/src/main/correction/index.ts
index 6da63b7ced6..bfad65cf9af 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/correction/index.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/correction/index.ts
@@ -1,5 +1,14 @@
-export * from './classical-calculation.js';
-export * from './context-tracker.js';
-export * from './distance-modeler.js';
-export * from './execution-timer.js';
-export * from './transform-tokenization.js';
\ No newline at end of file
+export { type EditOperation, ClassicalDistanceCalculation } from './classical-calculation.js';
+export {
+    getEditPathLastMatch, TrackedContextSuggestion,
+    TrackedContextToken, TrackedContextState, ContextTracker
+} from './context-tracker.js';
+export {
+    type TraversableToken, QUEUE_NODE_COMPARATOR, PartialSearchEdge,
+    SearchNode, SearchResult, SearchSpace
+} from './distance-modeler.js';
+export {
+    STANDARD_TIME_BETWEEN_DEFERS, ExecutionBucket,
+    ExecutionSpan, ExecutionTimer
+} from './execution-timer.js';
+export { tokenizeTransform, tokenizeTransformDistribution } from './transform-tokenization.js';
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/index.ts b/web/src/engine/predictive-text/worker-thread/src/main/index.ts
index 167711a9444..6842b240412 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/index.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/index.ts
@@ -36,7 +36,7 @@ import * as correction from './correction/index.js';
 import * as wordBreakers from '@keymanapp/models-wordbreakers';
 import { KMWString } from "keyman/common/web-utils";
 
-import ModelCompositor from './model-compositor.js';
+import { ModelCompositor } from './model-compositor.js';
 import { ImportScripts, IncomingMessage, LMLayerWorkerState, LoadMessage, ModelEval, ModelFile, ModelSourceSpec, PostMessage } from './worker-interfaces.js';
 import { LexicalModelTypes } from '@keymanapp/common-types';
 import Capabilities = LexicalModelTypes.Capabilities;
@@ -66,7 +66,7 @@ import { OutgoingMessageKind } from '@keymanapp/lm-message-types';
  * The model and the configuration are ONLY relevant in the `ready` state;
  * as such, they are NOT direct properties of the LMLayerWorker.
  */
-export default class LMLayerWorker {
+export class LMLayerWorker {
   /**
    * State pattern. This object handles onMessage().
    * handleMessage() can transition to a different state, if
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts b/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts
index fff11f05b68..62352206721 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts
@@ -3,7 +3,7 @@ import { KMWString } from 'keyman/common/web-utils';
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
 import * as correction from './correction/index.js'
-import TransformUtils from './transformUtils.js';
+import { TransformUtils } from './transformUtils.js';
 import { applySuggestionCasing, correctAndEnumerate, dedupeSuggestions, finalizeSuggestions, predictionAutoSelect, processSimilarity, toAnnotatedSuggestion, tupleDisplayOrderSort } from './predict-helpers.js';
 import { detectCurrentCasing, determineModelTokenizer, determineModelWordbreaker, determinePunctuationFromModel } from './model-helpers.js';
 
@@ -355,5 +355,3 @@ export class ModelCompositor {
     }
   }
 }
-
-export default ModelCompositor;
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/models/dummy-model.ts b/web/src/engine/predictive-text/worker-thread/src/main/models/dummy-model.ts
index 40678312d30..b2de7695aee 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/models/dummy-model.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/models/dummy-model.ts
@@ -119,5 +119,3 @@ export class DummyModel implements LexicalModel {
     }
   }
 };
-
-export default DummyModel;
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/models/index.ts b/web/src/engine/predictive-text/worker-thread/src/main/models/index.ts
index 4a6f20da150..4489b94c62a 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/models/index.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/models/index.ts
@@ -1,2 +1,2 @@
 export * from '@keymanapp/models-templates';
-export { default as DummyModel, DummyOptions } from './dummy-model.js';
+export { DummyModel, DummyOptions } from './dummy-model.js';
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts b/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts
index 34383464e86..21328bf31c4 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts
@@ -2,11 +2,11 @@ import * as models from '@keymanapp/models-templates';
 import { KMWString } from 'keyman/common/web-utils';
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
-import TransformUtils from './transformUtils.js';
+import { TransformUtils } from './transformUtils.js';
 import { determineModelTokenizer, determineModelWordbreaker, determinePunctuationFromModel } from './model-helpers.js';
 import { ContextTracker, TrackedContextState } from './correction/context-tracker.js';
 import { ExecutionTimer } from './correction/execution-timer.js';
-import ModelCompositor from './model-compositor.js';
+import { ModelCompositor } from './model-compositor.js';
 import CasingForm = LexicalModelTypes.CasingForm;
 import Context = LexicalModelTypes.Context;
 import Distribution = LexicalModelTypes.Distribution;
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/test-index.ts b/web/src/engine/predictive-text/worker-thread/src/main/test-index.ts
index 5a2b5c6c849..168216f19b2 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/test-index.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/test-index.ts
@@ -1,11 +1,20 @@
 export { ClassicalDistanceCalculation } from './correction/classical-calculation.js';
 export { ContextTracker } from './correction/context-tracker.js';
 export * as correction from './correction/index.js';
-export * from './model-helpers.js';
+export {
+    determinePunctuationFromModel, determineModelWordbreaker,
+    determineModelTokenizer, detectCurrentCasing
+} from './model-helpers.js';
 export * as models from './models/index.js';
 export { ModelCompositor } from './model-compositor.js';
 export { tokenizeTransform, tokenizeTransformDistribution } from './correction/transform-tokenization.js';
-export * from './predict-helpers.js';
-export { default as TransformUtils } from './transformUtils.js'
-export { default as LMLayerWorker } from './index.js'
-export * from './transform-subsets.js';
\ No newline at end of file
+export {
+    AUTOSELECT_PROPORTION_THRESHOLD, CORRECTION_SEARCH_THRESHOLDS,
+    CorrectionPredictionTuple, SuggestionSimilarity, tupleDisplayOrderSort,
+    correctAndEnumerate, shouldStopSearchingEarly, predictFromCorrections,
+    applySuggestionCasing, toAnnotatedSuggestion, predictionAutoSelect,
+    dedupeSuggestions, finalizeSuggestions, processSimilarity
+} from './predict-helpers.js';
+export { TransformUtils } from './transformUtils.js'
+export { LMLayerWorker } from './index.js'
+export { TransformSubset, subsetByInterval, subsetByChar, mergeSubset } from './transform-subsets.js';
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/transformUtils.ts b/web/src/engine/predictive-text/worker-thread/src/main/transformUtils.ts
index 08188934c62..08991296eed 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/transformUtils.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/transformUtils.ts
@@ -1,6 +1,6 @@
 import { LexicalModelTypes } from '@keymanapp/common-types';
 
-export default class TransformUtils {
+export class TransformUtils {
   static isWhitespace(transform: LexicalModelTypes.Transform): boolean {
     // Matches a string that is entirely one or more characters with Unicode general property Z* or the following: CR, LF, and Tab.
     const whitespaceRemover = /^[\u0009\u000A\u000D\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u202f\u205f\u3000]+$/i;
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts b/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts
index 9a0865094f5..0af1e74795c 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts
@@ -36,7 +36,7 @@ import LexicalModel = LexicalModelTypes.LexicalModel;
 import Reversion = LexicalModelTypes.Reversion;
 import Suggestion = LexicalModelTypes.Suggestion;
 import Transform = LexicalModelTypes.Transform;
-import type ModelCompositor from './model-compositor.js';
+import { type ModelCompositor } from './model-compositor.js';
 import { Token } from '@keymanapp/models-templates';
 
 /**
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/worker-main.ts b/web/src/engine/predictive-text/worker-thread/src/main/worker-main.ts
index 665943f66fb..1d45a0137cb 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/worker-main.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/worker-main.ts
@@ -20,7 +20,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import LMLayerWorker from './index.js';
+import { LMLayerWorker } from './index.js';
 
 // Let LMLayerWorker be available both in the browser and in Node.
 if (typeof self !== 'undefined' && 'postMessage' in self && 'importScripts' in self) {
diff --git a/web/src/engine/src/dom-utils/cookieSerializer.ts b/web/src/engine/src/dom-utils/cookieSerializer.ts
index daa6c59667e..8b6465bd482 100644
--- a/web/src/engine/src/dom-utils/cookieSerializer.ts
+++ b/web/src/engine/src/dom-utils/cookieSerializer.ts
@@ -3,7 +3,7 @@ type DecodedCookieFieldValue = string | number | boolean;
 type FilteredRecordEncoder = (value: DecodedCookieFieldValue, key: string) => string;
 type FilteredRecordDecoder = (value: string, key: string) => DecodedCookieFieldValue;
 
-export default class CookieSerializer<Type extends Record<keyof Type, DecodedCookieFieldValue>> {
+export class CookieSerializer<Type extends Record<keyof Type, DecodedCookieFieldValue>> {
   readonly name: string;
 
   constructor(name: string) {
diff --git a/web/src/engine/src/dom-utils/createUnselectableElement.ts b/web/src/engine/src/dom-utils/createUnselectableElement.ts
index fafa53ca0ee..e4b904dd3dd 100644
--- a/web/src/engine/src/dom-utils/createUnselectableElement.ts
+++ b/web/src/engine/src/dom-utils/createUnselectableElement.ts
@@ -1,5 +1,5 @@
 // Found a bit of magic formatting that allows dynamic return typing for a specified element tag!
-export default function createUnselectableElement<E extends "p"|"style"|"script"|"div"|"canvas"|"span">(nodeName:E) {
+export function createUnselectableElement<E extends "p"|"style"|"script"|"div"|"canvas"|"span">(nodeName:E) {
   const e = document.createElement<E>(nodeName);
 
   e.style.userSelect="none";
diff --git a/web/src/engine/src/dom-utils/index.ts b/web/src/engine/src/dom-utils/index.ts
index ad667ea341e..ae4ddd18029 100644
--- a/web/src/engine/src/dom-utils/index.ts
+++ b/web/src/engine/src/dom-utils/index.ts
@@ -1,6 +1,6 @@
 export { arrayFromNodeList } from './arrayFromNodeList.js';
-export { default as createUnselectableElement } from './createUnselectableElement.js';
+export { createUnselectableElement } from './createUnselectableElement.js';
 export { createStyleSheet, StylesheetManager } from './stylesheets.js';
-export { default as landscapeView } from './landscapeView.js';
-export { default as CookieSerializer } from './cookieSerializer.js';
+export { landscapeView } from './landscapeView.js';
+export { CookieSerializer } from './cookieSerializer.js';
 export { getAbsoluteX, getAbsoluteY } from './getAbsolute.js';
diff --git a/web/src/engine/src/dom-utils/landscapeView.ts b/web/src/engine/src/dom-utils/landscapeView.ts
index 06873b3da2d..eeb02983941 100644
--- a/web/src/engine/src/dom-utils/landscapeView.ts
+++ b/web/src/engine/src/dom-utils/landscapeView.ts
@@ -3,7 +3,7 @@
  *
  * @return      {boolean}
  */
-export default function landscapeView(): boolean	{ // new for I3363 (Build 301)
+export function landscapeView(): boolean	{ // new for I3363 (Build 301)
   let orientation: number;
 
   // Assume portrait mode if orientation undefined
diff --git a/web/src/engine/src/interfaces/index.ts b/web/src/engine/src/interfaces/index.ts
index fb22d0c6d93..22366e36148 100644
--- a/web/src/engine/src/interfaces/index.ts
+++ b/web/src/engine/src/interfaces/index.ts
@@ -1,6 +1,6 @@
-export { default as PathConfiguration } from './pathConfiguration.js';
+export { PathConfiguration } from './pathConfiguration.js';
 export { PathOptionDefaults, PathOptionSpec } from './optionSpec.interface.js';
 export { ModelSpec } from './modelSpec.js';
-export { default as PredictionContext } from './prediction/predictionContext.js';
+export { PredictionContext } from './prediction/predictionContext.js';
 export { LanguageProcessorEventMap, StateChangeEnum, ReadySuggestions } from './prediction/languageProcessor.interface.js';
 export { OSKResourcePathConfiguration } from './oskResourcePathConfiguration.interface.js';
\ No newline at end of file
diff --git a/web/src/engine/src/interfaces/pathConfiguration.ts b/web/src/engine/src/interfaces/pathConfiguration.ts
index 18080374e48..090dc7d4c40 100644
--- a/web/src/engine/src/interfaces/pathConfiguration.ts
+++ b/web/src/engine/src/interfaces/pathConfiguration.ts
@@ -10,7 +10,7 @@ const addDelimiter = (p: string) => {
   }
 }
 
-export default class PathConfiguration implements OSKResourcePathConfiguration {
+export class PathConfiguration implements OSKResourcePathConfiguration {
   private readonly sourcePath: string;
   private _root: string;
   private _resources: string;
diff --git a/web/src/engine/src/interfaces/prediction/predictionContext.ts b/web/src/engine/src/interfaces/prediction/predictionContext.ts
index e4ce9821230..09749170fd1 100644
--- a/web/src/engine/src/interfaces/prediction/predictionContext.ts
+++ b/web/src/engine/src/interfaces/prediction/predictionContext.ts
@@ -13,7 +13,7 @@ interface PredictionContextEventMap {
 /**
  * Maintains predictive-text state information corresponding to the current context.
  */
-export default class PredictionContext extends EventEmitter<PredictionContextEventMap> {
+export class PredictionContext extends EventEmitter<PredictionContextEventMap> {
   // Historical note:  before 17.0, this code was intertwined with /web/source/osk/banner.ts's
   // SuggestionBanner class.  This class serves as the main implementation of the banner's core logic.
 
diff --git a/web/src/engine/src/keyboard-storage/index.ts b/web/src/engine/src/keyboard-storage/index.ts
index 08f44191c07..7f83893de2c 100644
--- a/web/src/engine/src/keyboard-storage/index.ts
+++ b/web/src/engine/src/keyboard-storage/index.ts
@@ -1,4 +1,3 @@
-// TODO-web-core: remove 'export default' to eliminate more aliases (#15292)
 export {
   ErrorStub,
   type KeyboardAPISpec,
diff --git a/web/src/engine/src/keyboard/index.ts b/web/src/engine/src/keyboard/index.ts
index 0e8fc53d3e7..3cf2aca3d30 100644
--- a/web/src/engine/src/keyboard/index.ts
+++ b/web/src/engine/src/keyboard/index.ts
@@ -14,13 +14,13 @@ export {
   KeyboardAPIPropertyMultilangSpec,
   KeyboardAPIPropertySpec,
   KeyboardInternalPropertySpec,
-  default as KeyboardProperties,
+  KeyboardProperties,
   KeyboardFont,
   MetadataObj as RawKeyboardMetadata,
   LanguageAPIPropertySpec
 } from "./keyboards/keyboardProperties.js";
 export { ProcessorAction as ProcessorAction } from "./keyboards/processorAction.js";
-export { default as SpacebarText } from "./keyboards/spacebarText.js";
+export { SpacebarText } from "./keyboards/spacebarText.js";
 export { StateKeyMap } from "./keyboards/stateKeyMap.js";
 export { type Alternate, TextTransform } from "./keyboards/textTransform.js";
 export { Transcription } from "./keyboards/transcription.js";
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts b/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
index 2d938e159e4..1229b585cab 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
@@ -2,7 +2,7 @@ import { KM_Core, KM_CORE_STATUS } from 'keyman/engine/core-adapter';
 import { JSKeyboard } from "./jsKeyboard.js";
 import { KMXKeyboard } from './kmxKeyboard.js';
 import { KeyboardHarness } from "./keyboardHarness.js";
-import KeyboardProperties from "./keyboardProperties.js";
+import { KeyboardProperties } from "./keyboardProperties.js";
 import { KeyboardLoadErrorBuilder, StubBasedErrorBuilder, UriBasedErrorBuilder } from './keyboardLoadError.js';
 import { Codes } from '../codes.js';
 
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardProperties.ts b/web/src/engine/src/keyboard/keyboards/keyboardProperties.ts
index 7f1d43282e3..411271e2546 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardProperties.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardProperties.ts
@@ -1,4 +1,4 @@
-import SpacebarText from './spacebarText.js';
+import { SpacebarText } from './spacebarText.js';
 
 export interface InternalKeyboardFont {
   family: string;
@@ -109,7 +109,7 @@ export type KeyboardAPIPropertyMultilangSpec = {
 
 export type MetadataObj = KeyboardInternalPropertySpec | KeyboardAPIPropertySpec | KeyboardAPIPropertyMultilangSpec;
 
-export default class KeyboardProperties implements KeyboardInternalPropertySpec {
+export class KeyboardProperties implements KeyboardInternalPropertySpec {
   KI: string;
   KN: string;
   KL: string;
diff --git a/web/src/engine/src/keyboard/keyboards/spacebarText.ts b/web/src/engine/src/keyboard/keyboards/spacebarText.ts
index d98e7b6462d..823c2550067 100644
--- a/web/src/engine/src/keyboard/keyboards/spacebarText.ts
+++ b/web/src/engine/src/keyboard/keyboards/spacebarText.ts
@@ -1,9 +1,7 @@
 // Compiles completely out if `const enum`, making it unavailable in JS-based unit tests.
-enum SpacebarText {
+export enum SpacebarText {
   KEYBOARD = 'keyboard',
   LANGUAGE = 'language',
   LANGUAGE_KEYBOARD = 'languageKeyboard',
   BLANK = 'blank'
 };
-
-export default SpacebarText;
\ No newline at end of file
diff --git a/web/src/engine/src/main/headless/contextWindow.ts b/web/src/engine/src/main/headless/contextWindow.ts
index dd243d3bc06..ed4afbc8fe4 100644
--- a/web/src/engine/src/main/headless/contextWindow.ts
+++ b/web/src/engine/src/main/headless/contextWindow.ts
@@ -2,7 +2,7 @@ import { LexicalModelTypes } from '@keymanapp/common-types';
 import { SyntheticTextStore } from "keyman/engine/keyboard";
 import { KMWString } from 'keyman/common/web-utils';
 
-export default class ContextWindow implements LexicalModelTypes.Context {
+export class ContextWindow implements LexicalModelTypes.Context {
   // Used to limit the range of context replicated for use of keyboard rules within
   // the engine, as used for fat-finger prep / `Alternate` generation.
   public static readonly ENGINE_RULE_WINDOW: LexicalModelTypes.Configuration = {
diff --git a/web/src/engine/src/main/headless/deviceDetector.ts b/web/src/engine/src/main/headless/deviceDetector.ts
index d2a694b693f..f71c6e0f4e6 100644
--- a/web/src/engine/src/main/headless/deviceDetector.ts
+++ b/web/src/engine/src/main/headless/deviceDetector.ts
@@ -3,7 +3,7 @@
  *
  * Detect the user's device.
  */
-import StyleConstants from './utils/styleConstants.js';
+import { StyleConstants } from './utils/styleConstants.js';
 import { DeviceSpec, Version } from "keyman/common/web-utils";
 
 export class DeviceDetector {
diff --git a/web/src/engine/src/main/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
index 88168a54f46..c921d309808 100644
--- a/web/src/engine/src/main/headless/inputProcessor.ts
+++ b/web/src/engine/src/main/headless/inputProcessor.ts
@@ -1,6 +1,6 @@
 // Defines a 'polyfill' of sorts for NPM's events module
 
-import ContextWindow from "./contextWindow.js";
+import { ContextWindow } from "./contextWindow.js";
 import { LanguageProcessor }  from "./languageProcessor.js";
 import type { ModelSpec, PathConfiguration }  from "keyman/engine/interfaces";
 import { globalObject, DeviceSpec, isEmptyTransform } from "keyman/common/web-utils";
@@ -172,9 +172,9 @@ export class InputProcessor {
     // The default OSK layout for desktop devices does not include nextlayer info, relying on
     // modifier detection here.
     // It's the OSK equivalent to doModifierPress on 'desktop' form factors.
-    if ((formFactor == DeviceSpec.FormFactor.Desktop || !this.activeKeyboard || 
-      (this.activeKeyboard instanceof JSKeyboard && 
-      this.activeKeyboard.usesDesktopLayoutOnDevice(keyEvent.device))) && 
+    if ((formFactor == DeviceSpec.FormFactor.Desktop || !this.activeKeyboard ||
+      (this.activeKeyboard instanceof JSKeyboard &&
+      this.activeKeyboard.usesDesktopLayoutOnDevice(keyEvent.device))) &&
       keyEvent.isSynthetic
     ) {
       // If it's a desktop OSK style and this triggers a layer change,
diff --git a/web/src/engine/src/main/headless/languageProcessor.ts b/web/src/engine/src/main/headless/languageProcessor.ts
index 589bed6b2e0..e258581514f 100644
--- a/web/src/engine/src/main/headless/languageProcessor.ts
+++ b/web/src/engine/src/main/headless/languageProcessor.ts
@@ -2,7 +2,7 @@ import { EventEmitter } from "eventemitter3";
 import { LMLayer, WorkerFactory } from "@keymanapp/lexical-model-layer/web";
 import { Transcription, TextStoreLanguageProcessorInterface, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { LanguageProcessorEventMap, ModelSpec, StateChangeEnum, ReadySuggestions } from 'keyman/engine/interfaces';
-import ContextWindow from "./contextWindow.js";
+import { ContextWindow } from "./contextWindow.js";
 import { TranscriptionCache } from "./transcriptionCache.js";
 import { LexicalModelTypes } from '@keymanapp/common-types';
 import Capabilities = LexicalModelTypes.Capabilities;
diff --git a/web/src/engine/src/main/headless/utils/styleConstants.ts b/web/src/engine/src/main/headless/utils/styleConstants.ts
index e948957a741..4e6e0ab12e4 100644
--- a/web/src/engine/src/main/headless/utils/styleConstants.ts
+++ b/web/src/engine/src/main/headless/utils/styleConstants.ts
@@ -7,7 +7,7 @@ import { DeviceSpec } from "keyman/common/web-utils";
 /**
  * Defines device-level constants used for CSS styling.
  */
-export default class StyleConstants {
+export class StyleConstants {
   constructor(device: DeviceSpec) {
     // popupCanvasBackgroundColor
     if(device.OS == DeviceSpec.OperatingSystem.Android) {
diff --git a/web/src/engine/src/osk/banner/bannerView.ts b/web/src/engine/src/osk/banner/bannerView.ts
index 7bab35659f1..547ed8d1ebf 100644
--- a/web/src/engine/src/osk/banner/bannerView.ts
+++ b/web/src/engine/src/osk/banner/bannerView.ts
@@ -3,7 +3,7 @@ import { EventEmitter } from 'eventemitter3';
 import { createUnselectableElement } from 'keyman/engine/dom-utils';
 
 import { Banner } from './banner.js';
-import OSKViewComponent from '../components/oskViewComponent.interface.js';
+import { OSKViewComponent } from '../components/oskViewComponent.interface.js';
 import { ParsedLengthStyle } from '../lengthStyle.js';
 import { BlankBanner } from './blankBanner.js';
 
diff --git a/web/src/engine/src/osk/buttonClassNames.ts b/web/src/engine/src/osk/buttonClassNames.ts
index 4186a9b75c3..8028cfccbd8 100644
--- a/web/src/engine/src/osk/buttonClassNames.ts
+++ b/web/src/engine/src/osk/buttonClassNames.ts
@@ -2,7 +2,7 @@
 /**
  * Maps 'sp' properties on a touch-layout spec to their corresponding CSS class names.
  */
-const BUTTON_CLASSES = [
+export const BUTTON_CLASSES = [
   'default',
   'shift',
   'shift-on',
@@ -15,5 +15,3 @@ const BUTTON_CLASSES = [
   'blank',
   'hidden'
 ];
-
-export default BUTTON_CLASSES;
\ No newline at end of file
diff --git a/web/src/engine/src/osk/components/emptyView.ts b/web/src/engine/src/osk/components/emptyView.ts
index a07c0422fe6..3cd514130b6 100644
--- a/web/src/engine/src/osk/components/emptyView.ts
+++ b/web/src/engine/src/osk/components/emptyView.ts
@@ -1,7 +1,7 @@
-import KeyboardView from "./keyboardView.interface.js";
+import { KeyboardView } from "./keyboardView.interface.js";
 import { ParsedLengthStyle } from "../lengthStyle.js";
 
-export default class EmptyView implements KeyboardView {
+export class EmptyView implements KeyboardView {
   readonly element: HTMLDivElement;
 
   constructor() {
diff --git a/web/src/engine/src/osk/components/helpPageView.ts b/web/src/engine/src/osk/components/helpPageView.ts
index 415a58a7f57..f34bb2df512 100644
--- a/web/src/engine/src/osk/components/helpPageView.ts
+++ b/web/src/engine/src/osk/components/helpPageView.ts
@@ -1,9 +1,9 @@
 import { JSKeyboard } from 'keyman/engine/keyboard';
 
-import KeyboardView from './keyboardView.interface.js';
+import { KeyboardView } from './keyboardView.interface.js';
 import { ParsedLengthStyle } from "../lengthStyle.js";
 
-export default class HelpPageView implements KeyboardView {
+export class HelpPageView implements KeyboardView {
   private readonly kbd: JSKeyboard;
   public readonly element: HTMLDivElement;
 
diff --git a/web/src/engine/src/osk/components/keyboardView.interface.ts b/web/src/engine/src/osk/components/keyboardView.interface.ts
index af4185b6c00..d515004a441 100644
--- a/web/src/engine/src/osk/components/keyboardView.interface.ts
+++ b/web/src/engine/src/osk/components/keyboardView.interface.ts
@@ -1,11 +1,11 @@
-import OSKViewComponent from "./oskViewComponent.interface.js";
+import { OSKViewComponent } from "./oskViewComponent.interface.js";
 
 /**
  * An abstract representation for visualizations of the active keyboard within an
  * OSKManager / OSKView.  Most keyboards will default to use of a VisualKeyboard,
  * though some will use HelpPage for certain form factors.
  */
-export default interface KeyboardView extends OSKViewComponent {
+export interface KeyboardView extends OSKViewComponent {
   readonly element: HTMLDivElement;
 
   /**
diff --git a/web/src/engine/src/osk/components/oskViewComponent.interface.ts b/web/src/engine/src/osk/components/oskViewComponent.interface.ts
index 10b2d73a32b..df1b6e15287 100644
--- a/web/src/engine/src/osk/components/oskViewComponent.interface.ts
+++ b/web/src/engine/src/osk/components/oskViewComponent.interface.ts
@@ -1,6 +1,6 @@
 import type { ParsedLengthStyle } from "../lengthStyle.js";
 
-export default interface OSKViewComponent {
+export interface OSKViewComponent {
   readonly element: HTMLElement;
   readonly layoutHeight: ParsedLengthStyle;
   refreshLayout(): void;
diff --git a/web/src/engine/src/osk/components/resizeBar.ts b/web/src/engine/src/osk/components/resizeBar.ts
index 7af6a8c682f..f90cae4763a 100644
--- a/web/src/engine/src/osk/components/resizeBar.ts
+++ b/web/src/engine/src/osk/components/resizeBar.ts
@@ -1,8 +1,8 @@
 import { EventEmitter } from 'eventemitter3';
 
-import OSKViewComponent from './oskViewComponent.interface.js';
+import { OSKViewComponent } from './oskViewComponent.interface.js';
 import { ParsedLengthStyle } from '../lengthStyle.js';
-import MouseDragOperation from '../input/mouseDragOperation.js';
+import { MouseDragOperation } from '../input/mouseDragOperation.js';
 
 import { createUnselectableElement } from 'keyman/engine/dom-utils';
 
@@ -13,7 +13,7 @@ interface EventMap {
   showbuild: () => void;
 }
 
-export default class ResizeBar extends EventEmitter<EventMap, ResizeBar> implements OSKViewComponent {
+export class ResizeBar extends EventEmitter<EventMap, ResizeBar> implements OSKViewComponent {
   private _element: HTMLDivElement;
   private _resizeHandle: HTMLDivElement;
 
diff --git a/web/src/engine/src/osk/components/titleBar.ts b/web/src/engine/src/osk/components/titleBar.ts
index 7f863a5a832..f7b76bf3437 100644
--- a/web/src/engine/src/osk/components/titleBar.ts
+++ b/web/src/engine/src/osk/components/titleBar.ts
@@ -2,9 +2,9 @@ import { EventEmitter } from 'eventemitter3';
 
 import { JSKeyboard } from 'keyman/engine/keyboard';
 
-import OSKViewComponent from './oskViewComponent.interface.js';
+import { OSKViewComponent } from './oskViewComponent.interface.js';
 import { ParsedLengthStyle } from '../lengthStyle.js';
-import MouseDragOperation from '../input/mouseDragOperation.js';
+import { MouseDragOperation } from '../input/mouseDragOperation.js';
 
 import { createUnselectableElement } from 'keyman/engine/dom-utils';
 
@@ -30,7 +30,7 @@ interface EventMap {
   unpin: () => void
 }
 
-export default class TitleBar extends EventEmitter<EventMap, TitleBar> implements OSKViewComponent {
+export class TitleBar extends EventEmitter<EventMap, TitleBar> implements OSKViewComponent {
   private _element: HTMLDivElement;
   private _unpinButton: HTMLDivElement;
   private _closeButton: HTMLDivElement;
diff --git a/web/src/engine/src/osk/config/commonConfiguration.ts b/web/src/engine/src/osk/config/commonConfiguration.ts
index b56f1e027b5..71d61217b95 100644
--- a/web/src/engine/src/osk/config/commonConfiguration.ts
+++ b/web/src/engine/src/osk/config/commonConfiguration.ts
@@ -1,10 +1,10 @@
 import { DeviceSpec } from "keyman/common/web-utils";
 
-import EmbeddedGestureConfig from './embeddedGestureConfig.js';
+import { EmbeddedGestureConfig } from './embeddedGestureConfig.js';
 import { OSKResourcePathConfiguration } from "keyman/engine/interfaces";
 import { GestureParams } from "../input/gestures/specsForLayout.js";
 
-export default interface CommonConfiguration {
+export interface CommonConfiguration {
   /**
    * Metadata for the type of device to emulate and target with the on-screen keyboard.
    * When not specified, the metadata specified for `hostDevice` will be used by default.
diff --git a/web/src/engine/src/osk/config/embeddedGestureConfig.ts b/web/src/engine/src/osk/config/embeddedGestureConfig.ts
index 774e66b7c5d..97817661e13 100644
--- a/web/src/engine/src/osk/config/embeddedGestureConfig.ts
+++ b/web/src/engine/src/osk/config/embeddedGestureConfig.ts
@@ -1,6 +1,6 @@
-import GlobeHint from "../globehint.interface.js";
-import VisualKeyboard from "../visualKeyboard.js";
+import { GlobeHint } from "../globehint.interface.js";
+import { VisualKeyboard } from "../visualKeyboard.js";
 
-export default interface EmbeddedGestureConfig {
+export interface EmbeddedGestureConfig {
   createGlobeHint?: (vkbd: VisualKeyboard) => GlobeHint;
 }
\ No newline at end of file
diff --git a/web/src/engine/src/osk/config/viewConfiguration.ts b/web/src/engine/src/osk/config/viewConfiguration.ts
index c0315709c4e..c780080f731 100644
--- a/web/src/engine/src/osk/config/viewConfiguration.ts
+++ b/web/src/engine/src/osk/config/viewConfiguration.ts
@@ -1,8 +1,8 @@
 import { type PredictionContext } from 'keyman/engine/interfaces';
-import type Activator from "../views/activator.js";
-import CommonConfiguration from "./commonConfiguration.js";
+import { type Activator } from "../views/activator.js";
+import { CommonConfiguration } from "./commonConfiguration.js";
 
-export default interface Configuration extends CommonConfiguration {
+export interface ViewConfiguration extends CommonConfiguration {
   /**
    * If set, the value returned by the function set here will be used instead of any automatic
    * width detection functionality.
diff --git a/web/src/engine/src/osk/globehint.interface.ts b/web/src/engine/src/osk/globehint.interface.ts
index 509ea0ae600..29600d6ca01 100644
--- a/web/src/engine/src/osk/globehint.interface.ts
+++ b/web/src/engine/src/osk/globehint.interface.ts
@@ -1,6 +1,6 @@
 import { type KeyElement } from "./keyElement.js";
 
-export default interface GlobeHint {
+export interface GlobeHint {
   text: string;
   state: boolean;
   element?: HTMLDivElement;
diff --git a/web/src/engine/src/osk/index.ts b/web/src/engine/src/osk/index.ts
index 447ba91cda1..8337c382a45 100644
--- a/web/src/engine/src/osk/index.ts
+++ b/web/src/engine/src/osk/index.ts
@@ -1,34 +1,37 @@
 export { Codes, DeviceSpec, JSKeyboard, KeyboardProperties, SpacebarText } from 'keyman/engine/keyboard';
 
-export { default as OSKView, JSKeyboardData } from './views/oskView.js';
-export { default as FloatingOSKView, FloatingOSKViewConfiguration } from './views/floatingOskView.js';
-export { default as AnchoredOSKView } from './views/anchoredOskView.js';
-export { default as InlinedOSKView } from './views/inlinedOskView.js';
+export { OSKView, JSKeyboardData } from './views/oskView.js';
+export { FloatingOSKView, FloatingOSKViewConfiguration } from './views/floatingOskView.js';
+export { AnchoredOSKView } from './views/anchoredOskView.js';
+export { InlinedOSKView } from './views/inlinedOskView.js';
 export { type KeyEventResultCallback, type KeyEventHandler, KeyEventSourceInterface } from './views/keyEventSource.interface.js';
 export { BannerController } from './banner/bannerController.js';
 // Is referenced by at least one desktop UI module.
 export { FloatingOSKCookie as FloatingOSKViewCookie } from './views/floatingOskCookie.js';
-export { default as VisualKeyboard } from './visualKeyboard.js';
-export { type default as ViewConfiguration } from './config/viewConfiguration.js';
+export { VisualKeyboard } from './visualKeyboard.js';
+export { type ViewConfiguration } from './config/viewConfiguration.js';
 export { type KeyElement } from './keyElement.js';
-export { type default as OSKBaseKey } from './keyboard-layout/oskBaseKey.js';
-export { type default as GlobeHint } from './globehint.interface.js';
-export { type default as KeyTip } from './keytip.interface.js';
-export { type default as EmbeddedGestureConfig } from './config/embeddedGestureConfig.js';
+export { type OSKBaseKey } from './keyboard-layout/oskBaseKey.js';
+export { type GlobeHint } from './globehint.interface.js';
+export { type KeyTip } from './keytip.interface.js';
+export { type EmbeddedGestureConfig } from './config/embeddedGestureConfig.js';
 
 export { getViewportScale } from './screenUtils.js';
 
-export { default as Activator, StaticActivator } from './views/activator.js';
-export { default as SimpleActivator } from './views/simpleActivator.js';
-export { default as TwoStateActivator } from './views/twoStateActivator.js';
+export { Activator, StaticActivator } from './views/activator.js';
+export { SimpleActivator } from './views/simpleActivator.js';
+export { TwoStateActivator } from './views/twoStateActivator.js';
 export { ParsedLengthStyle } from './lengthStyle.js';
 
 export { gestureSetForLayout, DEFAULT_GESTURE_PARAMS } from './input/gestures/specsForLayout.js'
 
 export { PredictionContext } from 'keyman/engine/interfaces';
 
-export * from './corrections.js';
-export * from './correctionLayout.js';
+export { keyTouchDistances, distributionFromDistanceMaps } from './corrections.js';
+export {
+    CorrectionLayoutEntry, CorrectionLayout, CorrectiveBaseKeyLayout,
+    correctionKeyFilter, buildCorrectiveLayout
+} from './correctionLayout.js';
 
 // TODO-web-core: use a unitTestEndpoints pattern here (#15292)
 export * as testIndex from './test-index.js';
diff --git a/web/src/engine/src/osk/input/gestures/browser/flick.ts b/web/src/engine/src/osk/input/gestures/browser/flick.ts
index d0e75f5203b..c9633af46ca 100644
--- a/web/src/engine/src/osk/input/gestures/browser/flick.ts
+++ b/web/src/engine/src/osk/input/gestures/browser/flick.ts
@@ -1,5 +1,5 @@
 import { type KeyElement } from '../../../keyElement.js';
-import VisualKeyboard from '../../../visualKeyboard.js';
+import { VisualKeyboard } from '../../../visualKeyboard.js';
 
 import { ActiveKey, ActiveKeyBase, ActiveSubKey, KeyDistribution, KeyEvent } from 'keyman/engine/keyboard';
 import { ConfigChangeClosure, CumulativePathStats, GestureRecognizerConfiguration, GestureSequence, GestureSource, GestureSourceSubview, InputSample, RecognitionZoneSource } from 'keyman/engine/gesture-processor';
@@ -85,7 +85,7 @@ export const MAX_TOLERANCE_ANGLE_SKEW = Math.PI / 3;
  * Represents a flick gesture's implementation within KeymanWeb, including
  * its predictive-text correction aspects.
  */
-export default class Flick implements GestureHandler {
+export class Flick implements GestureHandler {
   readonly directlyEmitsKeys = true;
 
   private readonly sequence: GestureSequence<KeyElement, string>;
diff --git a/web/src/engine/src/osk/input/gestures/browser/modipress.ts b/web/src/engine/src/osk/input/gestures/browser/modipress.ts
index 94e86848de2..6ac6b5f7efd 100644
--- a/web/src/engine/src/osk/input/gestures/browser/modipress.ts
+++ b/web/src/engine/src/osk/input/gestures/browser/modipress.ts
@@ -1,5 +1,5 @@
 import { type KeyElement } from '../../../keyElement.js';
-import VisualKeyboard from '../../../visualKeyboard.js';
+import { VisualKeyboard } from '../../../visualKeyboard.js';
 
 import { KeyDistribution, ActiveKeyBase } from 'keyman/engine/keyboard';
 import { GestureSequence } from 'keyman/engine/gesture-processor';
@@ -11,7 +11,7 @@ import { GestureHandler } from '../gestureHandler.js';
  *
  * This involves "locking" the current layer in place until the modipress is complete.
  */
-export default class Modipress implements GestureHandler {
+export class Modipress implements GestureHandler {
   readonly directlyEmitsKeys = true;
 
   private completionCallback: () => void;
diff --git a/web/src/engine/src/osk/input/gestures/browser/multitap.ts b/web/src/engine/src/osk/input/gestures/browser/multitap.ts
index 9de399d3372..d790cbb6006 100644
--- a/web/src/engine/src/osk/input/gestures/browser/multitap.ts
+++ b/web/src/engine/src/osk/input/gestures/browser/multitap.ts
@@ -1,11 +1,11 @@
 import { type KeyElement } from '../../../keyElement.js';
-import VisualKeyboard from '../../../visualKeyboard.js';
+import { VisualKeyboard } from '../../../visualKeyboard.js';
 
 import { ActiveSubKey, ActiveKey, KeyDistribution, ActiveKeyBase } from 'keyman/engine/keyboard';
 import { GestureSequence, GestureStageReport } from 'keyman/engine/gesture-processor';
 import { GestureHandler } from '../gestureHandler.js';
 import { distributionFromDistanceMaps } from '../../../corrections.js';
-import Modipress from './modipress.js';
+import { Modipress } from './modipress.js';
 import { keySupportsModipress } from '../specsForLayout.js';
 import { GesturePreviewHost } from '../../../keyboard-layout/gesturePreviewHost.js';
 import { correctionKeyFilter } from '../../../correctionLayout.js';
@@ -18,7 +18,7 @@ import { correctionKeyFilter } from '../../../correctionLayout.js';
  * * UI feedback regarding the state of the ongoing multitap, as appropriate
  * * Proper selection of the appropriate multitap key for subsequent taps.
  */
-export default class Multitap implements GestureHandler {
+export class Multitap implements GestureHandler {
   readonly directlyEmitsKeys = true;
 
   public readonly baseKey: KeyElement;
diff --git a/web/src/engine/src/osk/input/gestures/browser/oskSubKey.ts b/web/src/engine/src/osk/input/gestures/browser/oskSubKey.ts
index 13af906658d..344f51f706e 100644
--- a/web/src/engine/src/osk/input/gestures/browser/oskSubKey.ts
+++ b/web/src/engine/src/osk/input/gestures/browser/oskSubKey.ts
@@ -1,12 +1,12 @@
 import { ActiveSubKey } from 'keyman/engine/keyboard';
-import OSKKey from '../../../keyboard-layout/oskKey.js';
+import { OSKKey } from '../../../keyboard-layout/oskKey.js';
 import { KeyData, KeyElement, link } from '../../../keyElement.js';
-import VisualKeyboard from '../../../visualKeyboard.js';
+import { VisualKeyboard } from '../../../visualKeyboard.js';
 
 // Typing is to ensure that the keys specified below actually are on the type...
 // and to gain Intellisense if more need to be added.
 
-export default class OSKSubKey extends OSKKey {
+export class OSKSubKey extends OSKKey {
   constructor(spec: ActiveSubKey, layer: string) {
     if(typeof(layer) != 'string' || layer == '') {
       throw "The 'layer' parameter for subkey construction must be properly defined.";
diff --git a/web/src/engine/src/osk/input/gestures/browser/keytip.ts b/web/src/engine/src/osk/input/gestures/browser/phoneKeytip.ts
similarity index 97%
rename from web/src/engine/src/osk/input/gestures/browser/keytip.ts
rename to web/src/engine/src/osk/input/gestures/browser/phoneKeytip.ts
index 28dd93d11f2..a92feb699a0 100644
--- a/web/src/engine/src/osk/input/gestures/browser/keytip.ts
+++ b/web/src/engine/src/osk/input/gestures/browser/phoneKeytip.ts
@@ -1,7 +1,7 @@
-import OSKBaseKey from '../../../keyboard-layout/oskBaseKey.js';
+import { OSKBaseKey } from '../../../keyboard-layout/oskBaseKey.js';
 import { KeyElement } from '../../../keyElement.js';
-import KeyTipInterface from '../../../keytip.interface.js';
-import VisualKeyboard from '../../../visualKeyboard.js';
+import { KeyTip } from '../../../keytip.interface.js';
+import { VisualKeyboard } from '../../../visualKeyboard.js';
 import { GesturePreviewHost } from '../../../keyboard-layout/gesturePreviewHost.js';
 import { ParsedLengthStyle } from '../../../lengthStyle.js';
 
@@ -10,7 +10,7 @@ const DEFAULT_TIP_ORIENTATION: PhoneKeyTipOrientation = 'top';
 
 export type PhoneKeyTipOrientation = 'top' | 'bottom';
 
-export default class KeyTip implements KeyTipInterface {
+export class PhoneKeyTip implements KeyTip {
   public readonly element: HTMLDivElement;
   public key: KeyElement;
   public state: boolean = false;
diff --git a/web/src/engine/src/osk/input/gestures/browser/subkeyPopup.ts b/web/src/engine/src/osk/input/gestures/browser/subkeyPopup.ts
index 4c9ae5101fc..dbeae665cf2 100644
--- a/web/src/engine/src/osk/input/gestures/browser/subkeyPopup.ts
+++ b/web/src/engine/src/osk/input/gestures/browser/subkeyPopup.ts
@@ -1,7 +1,7 @@
-import OSKSubKey from './oskSubKey.js';
+import { OSKSubKey } from './oskSubKey.js';
 import { type KeyElement } from '../../../keyElement.js';
-import OSKBaseKey from '../../../keyboard-layout/oskBaseKey.js';
-import VisualKeyboard from '../../../visualKeyboard.js';
+import { OSKBaseKey } from '../../../keyboard-layout/oskBaseKey.js';
+import { VisualKeyboard } from '../../../visualKeyboard.js';
 
 import { DeviceSpec, ActiveSubKey, KeyDistribution, ActiveKeyBase } from 'keyman/engine/keyboard';
 import { ConfigChangeClosure, GestureRecognizerConfiguration, GestureSequence, PaddedZoneSource, RecognitionZoneSource } from 'keyman/engine/gesture-processor';
@@ -51,7 +51,7 @@ const CALLOUT_BASE_HEIGHT = 6 + SUBKEY_MENU_VERT_OFFSET;
  * As selection of the subkey occurs after the subkey popup is
  * displayed, selection of the subkey is inherently asynchronous.
  */
-export default class SubkeyPopup implements GestureHandler {
+export class SubkeyPopup implements GestureHandler {
   readonly directlyEmitsKeys = true;
 
   public readonly element: HTMLDivElement;
diff --git a/web/src/engine/src/osk/input/gestures/browser/tabletPreview.ts b/web/src/engine/src/osk/input/gestures/browser/tabletPreview.ts
index e2eb4394d9b..0438fa85f72 100644
--- a/web/src/engine/src/osk/input/gestures/browser/tabletPreview.ts
+++ b/web/src/engine/src/osk/input/gestures/browser/tabletPreview.ts
@@ -1,13 +1,13 @@
 import { KeyElement } from '../../../keyElement.js';
-import KeyTipInterface from '../../../keytip.interface.js';
-import VisualKeyboard from '../../../visualKeyboard.js';
+import { KeyTip } from '../../../keytip.interface.js';
+import { VisualKeyboard } from '../../../visualKeyboard.js';
 import { GesturePreviewHost } from '../../../keyboard-layout/gesturePreviewHost.js';
 
 const BASE_CLASS = 'kmw-keypreview';
 const OVERLAY_CLASS = 'kmw-preview-overlay';
 const BASE_ID = 'kmw-keytip';
 
-export class TabletKeyTip implements KeyTipInterface {
+export class TabletKeyTip implements KeyTip {
   public readonly element: HTMLDivElement;
   public key: KeyElement;
   public state: boolean = false;
diff --git a/web/src/engine/src/osk/input/mouseDragOperation.ts b/web/src/engine/src/osk/input/mouseDragOperation.ts
index 158fd26821f..c14f9bfa935 100644
--- a/web/src/engine/src/osk/input/mouseDragOperation.ts
+++ b/web/src/engine/src/osk/input/mouseDragOperation.ts
@@ -78,7 +78,7 @@ class MouseStartSnapshot {
   }
 }
 
-export default abstract class MouseDragOperation {
+export abstract class MouseDragOperation {
   private _enabled: boolean;
   private _startCoord: InputEventCoordinate;
   private _mouseStartSnapshot: MouseStartSnapshot;
diff --git a/web/src/engine/src/osk/keyElement.ts b/web/src/engine/src/osk/keyElement.ts
index e62ea436c3d..051d700e530 100644
--- a/web/src/engine/src/osk/keyElement.ts
+++ b/web/src/engine/src/osk/keyElement.ts
@@ -1,5 +1,5 @@
 import { ActiveSubKey } from 'keyman/engine/keyboard';
-import OSKKey from "./keyboard-layout/oskKey.js";
+import { OSKKey } from "./keyboard-layout/oskKey.js";
 
 export class KeyData {
   ['key']: OSKKey;
diff --git a/web/src/engine/src/osk/keyboard-layout/gesturePreviewHost.ts b/web/src/engine/src/osk/keyboard-layout/gesturePreviewHost.ts
index 32a30c3f5d7..a861a04d239 100644
--- a/web/src/engine/src/osk/keyboard-layout/gesturePreviewHost.ts
+++ b/web/src/engine/src/osk/keyboard-layout/gesturePreviewHost.ts
@@ -3,8 +3,8 @@ import { EventEmitter } from "eventemitter3";
 
 import { KeyElement } from "../keyElement.js";
 import { FlickNameCoordMap, OrderedFlickDirections } from "../input/gestures/browser/flick.js";
-import { PhoneKeyTipOrientation } from "../input/gestures/browser/keytip.js";
-import { default as VisualKeyboard } from "../visualKeyboard.js";
+import { PhoneKeyTipOrientation } from "../input/gestures/browser/phoneKeytip.js";
+import { VisualKeyboard } from "../visualKeyboard.js";
 import { renameSpecialKey } from "./oskKey.js";
 
 /**With edge lengths of 1, to keep flick-text invisible at the start, the
diff --git a/web/src/engine/src/osk/keyboard-layout/oskBaseKey.ts b/web/src/engine/src/osk/keyboard-layout/oskBaseKey.ts
index e0b8f794694..738703dae6b 100644
--- a/web/src/engine/src/osk/keyboard-layout/oskBaseKey.ts
+++ b/web/src/engine/src/osk/keyboard-layout/oskBaseKey.ts
@@ -1,13 +1,13 @@
 import { ActiveKey, Codes } from 'keyman/engine/keyboard';
 
-import OSKKey, { KeyLayoutParams, renameSpecialKey } from './oskKey.js';
+import { OSKKey, KeyLayoutParams, renameSpecialKey } from './oskKey.js';
 import { KeyData, KeyElement, link } from '../keyElement.js';
-import OSKRow from './oskRow.js';
-import VisualKeyboard from '../visualKeyboard.js';
+import { OSKRow } from './oskRow.js';
+import { VisualKeyboard } from '../visualKeyboard.js';
 import { ParsedLengthStyle } from '../lengthStyle.js';
 import { GesturePreviewHost } from './gesturePreviewHost.js';
 
-export default class OSKBaseKey extends OSKKey {
+export class OSKBaseKey extends OSKKey {
   private capLabel: HTMLDivElement;
   private previewHost: GesturePreviewHost;
   private preview: HTMLDivElement;
diff --git a/web/src/engine/src/osk/keyboard-layout/oskKey.ts b/web/src/engine/src/osk/keyboard-layout/oskKey.ts
index 55262f9a5fc..423a89aa605 100644
--- a/web/src/engine/src/osk/keyboard-layout/oskKey.ts
+++ b/web/src/engine/src/osk/keyboard-layout/oskKey.ts
@@ -1,11 +1,11 @@
 import { ActiveKey, ActiveSubKey, ButtonClass, ButtonClasses, DeviceSpec } from 'keyman/engine/keyboard';
 
 // At present, we don't use @keymanapp/keyman.  Just `keyman`.  (Refer to <root>/web/package.json.)
-import specialChars from '../specialCharacters.js';
-import buttonClassNames from '../buttonClassNames.js';
+import { specialCharacters as specialChars } from '../specialCharacters.js';
+import { BUTTON_CLASSES as buttonClassNames } from '../buttonClassNames.js';
 
 import { KeyElement } from '../keyElement.js';
-import VisualKeyboard from '../visualKeyboard.js';
+import { VisualKeyboard } from '../visualKeyboard.js';
 import { getTextMetrics } from './getTextMetrics.js';
 import { ParsedLengthStyle } from '../lengthStyle.js';
 
@@ -50,7 +50,7 @@ export function renameSpecialKey(oldText: string, vkbd: VisualKeyboard): string
    oldText;
 }
 
-export default abstract class OSKKey {
+export abstract class OSKKey {
   // Only set here to act as an alias for code built against legacy versions.
   static readonly specialCharacters = specialChars;
 
diff --git a/web/src/engine/src/osk/keyboard-layout/oskLayer.ts b/web/src/engine/src/osk/keyboard-layout/oskLayer.ts
index 248e9a197e0..be5692e54aa 100644
--- a/web/src/engine/src/osk/keyboard-layout/oskLayer.ts
+++ b/web/src/engine/src/osk/keyboard-layout/oskLayer.ts
@@ -1,8 +1,8 @@
 import { ActiveLayer, ActiveLayout } from 'keyman/engine/keyboard';
 
-import OSKRow from './oskRow.js';
-import OSKBaseKey from './oskBaseKey.js';
-import VisualKeyboard from '../visualKeyboard.js';
+import { OSKRow } from './oskRow.js';
+import { OSKBaseKey } from './oskBaseKey.js';
+import { VisualKeyboard } from '../visualKeyboard.js';
 import { ParsedLengthStyle } from '../lengthStyle.js';
 
 export interface LayerLayoutParams {
@@ -14,7 +14,7 @@ export interface LayerLayoutParams {
   layoutFontSize: ParsedLengthStyle;
   spacebarText: string;
 }
-export default class OSKLayer {
+export class OSKLayer {
   public readonly element: HTMLDivElement;
   public readonly rows: OSKRow[];
   public readonly spec: ActiveLayer;
diff --git a/web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts b/web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts
index dc97bc0cba3..55412074c2c 100644
--- a/web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts
+++ b/web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts
@@ -3,13 +3,13 @@ import { type DeviceSpec, JSKeyboard, ActiveLayout, ButtonClasses } from 'keyman
 import { InputSample } from 'keyman/engine/gesture-processor';
 
 import { KeyElement } from '../keyElement.js';
-import OSKLayer, { LayerLayoutParams } from './oskLayer.js';
-import VisualKeyboard from '../visualKeyboard.js';
-import OSKBaseKey from './oskBaseKey.js';
+import { OSKLayer, LayerLayoutParams } from './oskLayer.js';
+import { VisualKeyboard } from '../visualKeyboard.js';
+import { OSKBaseKey } from './oskBaseKey.js';
 
 const NEAREST_KEY_TOUCH_MARGIN_PERCENT = 0.06;
 
-export default class OSKLayerGroup {
+export class OSKLayerGroup {
   public readonly element: HTMLDivElement;
   private readonly _layers: {[layerID: string]: OSKLayer} = {};
   public readonly spec: ActiveLayout;
diff --git a/web/src/engine/src/osk/keyboard-layout/oskRow.ts b/web/src/engine/src/osk/keyboard-layout/oskRow.ts
index 46893f51cec..0a883432002 100644
--- a/web/src/engine/src/osk/keyboard-layout/oskRow.ts
+++ b/web/src/engine/src/osk/keyboard-layout/oskRow.ts
@@ -1,9 +1,9 @@
 import { ActiveKey, ActiveLayer, ActiveRow } from 'keyman/engine/keyboard';
 
-import OSKBaseKey from './oskBaseKey.js';
+import { OSKBaseKey } from './oskBaseKey.js';
 import { ParsedLengthStyle } from '../lengthStyle.js';
-import VisualKeyboard from '../visualKeyboard.js';
-import OSKKey, { KeyLayoutParams } from './oskKey.js';
+import { VisualKeyboard } from '../visualKeyboard.js';
+import { OSKKey, KeyLayoutParams } from './oskKey.js';
 import { LayerLayoutParams } from './oskLayer.js';
 
 /*
@@ -16,7 +16,7 @@ export const KEY_BTN_Y_PAD_RATIO = 0.15;
 /**
  * Models one row of one layer of the OSK (`VisualKeyboard`) for a keyboard.
  */
-export default class OSKRow {
+export class OSKRow {
   public readonly element: HTMLDivElement;
   public readonly keys: OSKBaseKey[];
   public readonly heightFraction: number;
diff --git a/web/src/engine/src/osk/keytip.interface.ts b/web/src/engine/src/osk/keytip.interface.ts
index 7215b89149c..fd1491eec9a 100644
--- a/web/src/engine/src/osk/keytip.interface.ts
+++ b/web/src/engine/src/osk/keytip.interface.ts
@@ -1,7 +1,7 @@
 import { GesturePreviewHost } from "./keyboard-layout/gesturePreviewHost.js";
 import { KeyElement } from "./keyElement.js";
 
-export default interface KeyTip {
+export interface KeyTip {
   key: KeyElement;
   state: boolean;
   element?: HTMLDivElement;
diff --git a/web/src/engine/src/osk/specialCharacters.ts b/web/src/engine/src/osk/specialCharacters.ts
index c13e63715e5..d6bfaedd291 100644
--- a/web/src/engine/src/osk/specialCharacters.ts
+++ b/web/src/engine/src/osk/specialCharacters.ts
@@ -1,6 +1,6 @@
 // Defines the PUA code mapping for the various 'special' modifier/control/non-printing keys on keyboards.
 // `specialCharacters` must be kept in sync with the same variable in constants.js. See also CompileKeymanWeb.pas: CSpecialText10
-const specialCharacters = {
+export const specialCharacters = {
   '*Shift*':    8,
   '*Enter*':    5,
   '*Tab*':      6,
@@ -68,5 +68,3 @@ const specialCharacters = {
   // TODO: Skipping size references
 
 };
-
-export default specialCharacters;
\ No newline at end of file
diff --git a/web/src/engine/src/osk/test-index.ts b/web/src/engine/src/osk/test-index.ts
index 6cdf4d7ea59..c54adc93813 100644
--- a/web/src/engine/src/osk/test-index.ts
+++ b/web/src/engine/src/osk/test-index.ts
@@ -1,4 +1,4 @@
-export { default as OSKBaseKey } from './keyboard-layout/oskBaseKey.js';
-export { default as OSKRow }  from './keyboard-layout/oskRow.js';
-export { default as SubkeyPopup } from './input/gestures/browser/subkeyPopup.js'
+export { OSKBaseKey } from './keyboard-layout/oskBaseKey.js';
+export { OSKRow }  from './keyboard-layout/oskRow.js';
+export { SubkeyPopup } from './input/gestures/browser/subkeyPopup.js'
 export { link } from './keyElement.js'
diff --git a/web/src/engine/src/osk/views/activator.ts b/web/src/engine/src/osk/views/activator.ts
index d1a53e8badb..877c2c806dd 100644
--- a/web/src/engine/src/osk/views/activator.ts
+++ b/web/src/engine/src/osk/views/activator.ts
@@ -8,7 +8,7 @@ interface EventMap {
  * Used to encapsulate activation logic for the on-screen keyboadr, conditionally activating
  * and deactivating it based on specified conditions.
  */
-export default abstract class Activator<ExtraEvents = void> extends EventEmitter<EventMap & ExtraEvents, Activator> {
+export abstract class Activator<ExtraEvents = void> extends EventEmitter<EventMap & ExtraEvents, Activator> {
   /**
    * For certain sub-types, this may be set to `false` to "turn activation off", putting
    * the `Activator` in a state that ignores changes to any other conditions.
diff --git a/web/src/engine/src/osk/views/anchoredOskView.ts b/web/src/engine/src/osk/views/anchoredOskView.ts
index 327a132f041..62989c249fd 100644
--- a/web/src/engine/src/osk/views/anchoredOskView.ts
+++ b/web/src/engine/src/osk/views/anchoredOskView.ts
@@ -1,18 +1,18 @@
 import { DeviceSpec } from 'keyman/engine/keyboard';
 import { landscapeView } from 'keyman/engine/dom-utils';
 
-import OSKView, { OSKPos, OSKRect } from './oskView.js';
+import { OSKView, OSKPos, OSKRect } from './oskView.js';
 import { getViewportScale } from '../screenUtils.js';
-import Configuration from '../config/viewConfiguration.js';
+import { ViewConfiguration } from '../config/viewConfiguration.js';
 import { StaticActivator } from './activator.js';
-import TwoStateActivator from './twoStateActivator.js';
+import { TwoStateActivator } from './twoStateActivator.js';
 
 /***
    KeymanWeb 10.0
    Copyright 2017 SIL International
 ***/
 
-export default class AnchoredOSKView extends OSKView {
+export class AnchoredOSKView extends OSKView {
 
   // OSK positioning fields
   x: number;
@@ -20,7 +20,7 @@ export default class AnchoredOSKView extends OSKView {
 
   private isResizing: boolean = false;
 
-  public constructor(config: Configuration) {
+  public constructor(config: ViewConfiguration) {
     if(config.isEmbedded) {
       config.activator = config.activator || new StaticActivator();
     } else {
diff --git a/web/src/engine/src/osk/views/floatingOskView.ts b/web/src/engine/src/osk/views/floatingOskView.ts
index 12b396ace17..83f1209e753 100644
--- a/web/src/engine/src/osk/views/floatingOskView.ts
+++ b/web/src/engine/src/osk/views/floatingOskView.ts
@@ -2,14 +2,14 @@ import { DeviceSpec, ManagedPromise, Version } from 'keyman/engine/keyboard';
 import { getAbsoluteX, getAbsoluteY, landscapeView } from 'keyman/engine/dom-utils';
 import { EmitterListenerSpy } from 'keyman/engine/events';
 
-import OSKView, { EventMap, type LegacyOSKEventMap, OSKPos, OSKRect } from './oskView.js';
-import TitleBar from '../components/titleBar.js';
-import ResizeBar from '../components/resizeBar.js';
+import { OSKView, EventMap, type LegacyOSKEventMap, OSKPos, OSKRect } from './oskView.js';
+import { TitleBar } from '../components/titleBar.js';
+import { ResizeBar } from '../components/resizeBar.js';
 
-import MouseDragOperation from '../input/mouseDragOperation.js';
+import { MouseDragOperation } from '../input/mouseDragOperation.js';
 import { getViewportScale } from '../screenUtils.js';
-import Configuration from '../config/viewConfiguration.js';
-import TwoStateActivator from './twoStateActivator.js';
+import { ViewConfiguration } from '../config/viewConfiguration.js';
+import { TwoStateActivator } from './twoStateActivator.js';
 import { FloatingOSKCookie, FloatingOSKCookieSerializer } from './floatingOskCookie.js';
 
 /***
@@ -17,11 +17,11 @@ import { FloatingOSKCookie, FloatingOSKCookieSerializer } from './floatingOskCoo
    Copyright 2017 SIL International
 ***/
 
-export interface FloatingOSKViewConfiguration extends Configuration {
+export interface FloatingOSKViewConfiguration extends ViewConfiguration {
   activator?: TwoStateActivator<HTMLElement>;
 }
 
-export default class FloatingOSKView extends OSKView {
+export class FloatingOSKView extends OSKView {
   // OSK positioning fields
   userPositioned: boolean = false;
   specifiedPosition: boolean = false;
diff --git a/web/src/engine/src/osk/views/inlinedOskView.ts b/web/src/engine/src/osk/views/inlinedOskView.ts
index 25eecdb4a17..aa10013b812 100644
--- a/web/src/engine/src/osk/views/inlinedOskView.ts
+++ b/web/src/engine/src/osk/views/inlinedOskView.ts
@@ -1,9 +1,9 @@
 import { DeviceSpec } from 'keyman/engine/keyboard';
 
-import OSKView, { OSKPos, OSKRect } from './oskView.js';
-import VisualKeyboard from '../visualKeyboard.js';
-import Configuration from '../config/viewConfiguration.js';
-import SimpleActivator from './simpleActivator.js';
+import { OSKView, OSKPos, OSKRect } from './oskView.js';
+import { VisualKeyboard } from '../visualKeyboard.js';
+import { ViewConfiguration } from '../config/viewConfiguration.js';
+import { SimpleActivator } from './simpleActivator.js';
 
 /*
  * Keyman is copyright (c) SIL International.  MIT License.
@@ -14,8 +14,8 @@ import SimpleActivator from './simpleActivator.js';
  * insertion into the DOM.  Rather than "floating" over the page, this version is inlined
  * as part of the host page's layout.
  */
-export default class InlinedOSKView extends OSKView {
-  public constructor(config: Configuration) {
+export class InlinedOSKView extends OSKView {
+  public constructor(config: ViewConfiguration) {
     config.activator = config.activator || new SimpleActivator();
     super(config);
   }
diff --git a/web/src/engine/src/osk/views/oskView.ts b/web/src/engine/src/osk/views/oskView.ts
index 6c08892f62f..451a2854e43 100644
--- a/web/src/engine/src/osk/views/oskView.ts
+++ b/web/src/engine/src/osk/views/oskView.ts
@@ -2,11 +2,11 @@ import { EventEmitter } from 'eventemitter3';
 
 import { BannerView } from '../banner/bannerView.js';
 import { BannerController } from '../banner/bannerController.js';
-import OSKViewComponent from '../components/oskViewComponent.interface.js';
-import EmptyView from '../components/emptyView.js';
-import HelpPageView from '../components/helpPageView.js';
-import KeyboardView from '../components/keyboardView.interface.js';
-import VisualKeyboard from '../visualKeyboard.js';
+import { OSKViewComponent } from '../components/oskViewComponent.interface.js';
+import { EmptyView } from '../components/emptyView.js';
+import { HelpPageView } from '../components/helpPageView.js';
+import { KeyboardView } from '../components/keyboardView.interface.js';
+import { VisualKeyboard } from '../visualKeyboard.js';
 import { LengthStyle, ParsedLengthStyle } from '../lengthStyle.js';
 import { type KeyElement } from '../keyElement.js';
 
@@ -22,9 +22,9 @@ import {
 import { createUnselectableElement, getAbsoluteX, getAbsoluteY, StylesheetManager } from 'keyman/engine/dom-utils';
 import { EventListener, LegacyEventEmitter } from 'keyman/engine/events';
 
-import Configuration from '../config/viewConfiguration.js';
-import Activator, { StaticActivator } from './activator.js';
-import TouchEventPromiseMap from './touchEventPromiseMap.js';
+import { ViewConfiguration } from '../config/viewConfiguration.js';
+import { Activator, StaticActivator } from './activator.js';
+import { TouchEventPromiseMap } from './touchEventPromiseMap.js';
 import { KeyEventHandler, KeyEventSourceInterface } from './keyEventSource.interface.js';
 import { DEFAULT_GESTURE_PARAMS, GestureParams } from '../input/gestures/specsForLayout.js';
 
@@ -125,7 +125,7 @@ export interface EventMap {
   pointerinteraction: (promise: Promise<void>) => void;
 }
 
-export function getResourcePath(config: Configuration) {
+export function getResourcePath(config: ViewConfiguration) {
   let resourcePathExt = 'osk/';
   if(config.isEmbedded) {
     resourcePathExt = '';
@@ -133,7 +133,7 @@ export function getResourcePath(config: Configuration) {
   return `${config.pathConfig.resources}/${resourcePathExt}`
 }
 
-export default abstract class OSKView
+export abstract class OSKView
   extends EventEmitter<EventMap>
   implements MinimalCodesInterface, KeyEventSourceInterface<EventMap> {
   _Box: HTMLDivElement;
@@ -167,7 +167,7 @@ export default abstract class OSKView
   private kbdStyleSheetManager: StylesheetManager;
   private uiStyleSheetManager: StylesheetManager;
 
-  private config: Configuration;
+  private config: ViewConfiguration;
   private deferLayout: boolean;
 
   private _boxBaseTouchStart:       (e: TouchEvent) => boolean;
@@ -226,7 +226,7 @@ export default abstract class OSKView
 
   static readonly STYLESHEET_FILES = ['kmwosk.css', 'globe-hint.css'];
 
-  constructor(configuration: Configuration) {
+  constructor(configuration: ViewConfiguration) {
     super();
 
     // Clone the config; do not allow object references to be altered later.
@@ -278,7 +278,7 @@ export default abstract class OSKView
     this._Box.style.display = 'none';
   }
 
-  protected get configuration(): Configuration {
+  protected get configuration(): ViewConfiguration {
     return this.config;
   }
 
diff --git a/web/src/engine/src/osk/views/simpleActivator.ts b/web/src/engine/src/osk/views/simpleActivator.ts
index 17bad3c9dbb..516b3d16d5f 100644
--- a/web/src/engine/src/osk/views/simpleActivator.ts
+++ b/web/src/engine/src/osk/views/simpleActivator.ts
@@ -1,6 +1,6 @@
-import Activator from './activator.js';
+import { Activator } from './activator.js';
 
-export default class SimpleActivator extends Activator {
+export class SimpleActivator extends Activator {
   private flag: boolean = true;
 
   get enabled(): boolean {
diff --git a/web/src/engine/src/osk/views/touchEventPromiseMap.ts b/web/src/engine/src/osk/views/touchEventPromiseMap.ts
index 939f3668bb4..1763e601f40 100644
--- a/web/src/engine/src/osk/views/touchEventPromiseMap.ts
+++ b/web/src/engine/src/osk/views/touchEventPromiseMap.ts
@@ -1,6 +1,6 @@
 import { ManagedPromise } from "keyman/common/web-utils";
 
-export default class TouchEventPromiseMap {
+export class TouchEventPromiseMap {
   private map: Map<number, ManagedPromise<void>> = new Map();
 
   // Used to
diff --git a/web/src/engine/src/osk/views/twoStateActivator.ts b/web/src/engine/src/osk/views/twoStateActivator.ts
index b5895158ad2..786952b6688 100644
--- a/web/src/engine/src/osk/views/twoStateActivator.ts
+++ b/web/src/engine/src/osk/views/twoStateActivator.ts
@@ -1,10 +1,10 @@
-import Activator from './activator.js';
+import { Activator } from './activator.js';
 
 interface TriggerEventMap<Type> {
   triggerchange: (trigger: Type) => void;
 }
 
-export default class TwoStateActivator<Type> extends Activator<TriggerEventMap<Type>> {
+export class TwoStateActivator<Type> extends Activator<TriggerEventMap<Type>> {
   private _enabled: boolean = true;
   private actValue: Type = null;
 
diff --git a/web/src/engine/src/osk/visualKeyboard.ts b/web/src/engine/src/osk/visualKeyboard.ts
index ebcc7127f5d..f1a055ba690 100644
--- a/web/src/engine/src/osk/visualKeyboard.ts
+++ b/web/src/engine/src/osk/visualKeyboard.ts
@@ -33,31 +33,31 @@ import { createStyleSheet, StylesheetManager } from 'keyman/engine/dom-utils';
 
 import { KeyEventHandler, KeyEventResultCallback } from './views/keyEventSource.interface.js';
 
-import GlobeHint from './globehint.interface.js';
-import KeyboardView from './components/keyboardView.interface.js';
+import { GlobeHint } from './globehint.interface.js';
+import { KeyboardView } from './components/keyboardView.interface.js';
 import { type KeyElement } from './keyElement.js';
-import KeyTip from './keytip.interface.js';
-import OSKKey from './keyboard-layout/oskKey.js';
-import OSKLayer, { LayerLayoutParams } from './keyboard-layout/oskLayer.js';
-import OSKLayerGroup from './keyboard-layout/oskLayerGroup.js';
-import OSKView from './views/oskView.js';
+import { KeyTip } from './keytip.interface.js';
+import { OSKKey } from './keyboard-layout/oskKey.js';
+import { OSKLayer, LayerLayoutParams } from './keyboard-layout/oskLayer.js';
+import { OSKLayerGroup } from './keyboard-layout/oskLayerGroup.js';
+import { OSKView } from './views/oskView.js';
 import { ParsedLengthStyle } from './lengthStyle.js';
 import { defaultFontSize } from './fontSizeUtils.js';
-import PhoneKeyTip from './input/gestures/browser/keytip.js';
+import { PhoneKeyTip } from './input/gestures/browser/phoneKeytip.js';
 import { TabletKeyTip } from './input/gestures/browser/tabletPreview.js';
-import CommonConfiguration from './config/commonConfiguration.js';
+import { CommonConfiguration } from './config/commonConfiguration.js';
 
 import { DEFAULT_GESTURE_PARAMS, GestureParams, gestureSetForLayout } from './input/gestures/specsForLayout.js';
 
 import { getViewportScale } from './screenUtils.js';
 import { HeldRepeater } from './input/gestures/heldRepeater.js';
-import SubkeyPopup from './input/gestures/browser/subkeyPopup.js';
-import Multitap from './input/gestures/browser/multitap.js';
+import { SubkeyPopup } from './input/gestures/browser/subkeyPopup.js';
+import { Multitap } from './input/gestures/browser/multitap.js';
 import { GestureHandler } from './input/gestures/gestureHandler.js';
-import Modipress from './input/gestures/browser/modipress.js';
-import Flick from './input/gestures/browser/flick.js';
+import { Modipress } from './input/gestures/browser/modipress.js';
+import { Flick } from './input/gestures/browser/flick.js';
 import { GesturePreviewHost } from './keyboard-layout/gesturePreviewHost.js';
-import OSKBaseKey from './keyboard-layout/oskBaseKey.js';
+import { OSKBaseKey } from './keyboard-layout/oskBaseKey.js';
 import { OSKResourcePathConfiguration } from 'keyman/engine/interfaces';
 import KEYMAN_VERSION from '@keymanapp/keyman-version';
 
@@ -139,7 +139,7 @@ interface EventMap {
 }
 
 // #region VisualKeyboard
-export default class VisualKeyboard extends EventEmitter<EventMap> implements KeyboardView {
+export class VisualKeyboard extends EventEmitter<EventMap> implements KeyboardView {
   /**
    * The gesture-engine used to support user interaction with this keyboard.
    *
diff --git a/web/src/tools/testing/recorder-core/src/index.ts b/web/src/tools/testing/recorder-core/src/index.ts
index c1d9c44978f..e1d3d913ce2 100644
--- a/web/src/tools/testing/recorder-core/src/index.ts
+++ b/web/src/tools/testing/recorder-core/src/index.ts
@@ -1,9 +1,9 @@
 import { KeyDistribution, KeyEvent, type TextStore, SyntheticTextStore } from "keyman/engine/keyboard";
 
-import Proctor from "./proctor.js";
+import { Proctor } from "./proctor.js";
 
-export { default as Proctor } from "./proctor.js";
-export { default as NodeProctor } from "./nodeProctor.js";
+export { Proctor } from "./proctor.js";
+export { NodeProctor } from "./nodeProctor.js";
 
 import * as utils from "keyman/common/web-utils";
 
diff --git a/web/src/tools/testing/recorder-core/src/nodeProctor.ts b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
index 5bb98290b22..0c8655e0494 100644
--- a/web/src/tools/testing/recorder-core/src/nodeProctor.ts
+++ b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
@@ -1,4 +1,4 @@
-import Proctor, { AssertCallback } from "./proctor.js";
+import { Proctor, AssertCallback } from "./proctor.js";
 import {
   KeyboardTest,
   TestSet,
@@ -12,7 +12,7 @@ import { KeyEvent, KeyEventSpec, KeyboardHarness, SyntheticTextStore, TextStore
 import { DeviceSpec } from "keyman/common/web-utils";
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 
-export default class NodeProctor extends Proctor {
+export class NodeProctor extends Proctor {
   private keyboardWithHarness: KeyboardHarness;
   public __debug = false;
 
diff --git a/web/src/tools/testing/recorder-core/src/proctor.ts b/web/src/tools/testing/recorder-core/src/proctor.ts
index 549ffe618d5..52db386818c 100644
--- a/web/src/tools/testing/recorder-core/src/proctor.ts
+++ b/web/src/tools/testing/recorder-core/src/proctor.ts
@@ -11,7 +11,7 @@ export type AssertCallback = (s1: any, s2: any, msg?: string) => void;
  * Note that DOM-aware KeymanWeb will implement a Browser-based version, while
  * keyboard and input-processor will use a Node-based version instead.
  */
-export default abstract class Proctor {
+export abstract class Proctor {
   device: DeviceSpec;
 
   _assert: AssertCallback;

From 1a8c909274a877ef9fe8fb8cc424d009136c03af Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
Date: Fri, 9 Jan 2026 09:36:00 +0100
Subject: [PATCH 198/254] Apply suggestions from code review

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 web/src/engine/predictive-text/worker-main/src/web/index.ts | 2 +-
 web/src/engine/src/osk/keyboard-layout/oskKey.ts            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/src/engine/predictive-text/worker-main/src/web/index.ts b/web/src/engine/predictive-text/worker-main/src/web/index.ts
index 051404a4bb7..2614966ff05 100644
--- a/web/src/engine/predictive-text/worker-main/src/web/index.ts
+++ b/web/src/engine/predictive-text/worker-main/src/web/index.ts
@@ -1,5 +1,5 @@
 export { LMLayer } from '../lmlayer.js';
-export { DefaultWorker as Worker } from './worker.js';
+export { DefaultWorker as Worker } from './worker.js'; // TODO: eliminate rename
 export { SourcemappedWorker } from './sourcemappedWorker.js';
 
 export interface WorkerFactory {
diff --git a/web/src/engine/src/osk/keyboard-layout/oskKey.ts b/web/src/engine/src/osk/keyboard-layout/oskKey.ts
index 423a89aa605..fab314c9749 100644
--- a/web/src/engine/src/osk/keyboard-layout/oskKey.ts
+++ b/web/src/engine/src/osk/keyboard-layout/oskKey.ts
@@ -1,8 +1,8 @@
 import { ActiveKey, ActiveSubKey, ButtonClass, ButtonClasses, DeviceSpec } from 'keyman/engine/keyboard';
 
 // At present, we don't use @keymanapp/keyman.  Just `keyman`.  (Refer to <root>/web/package.json.)
-import { specialCharacters as specialChars } from '../specialCharacters.js';
-import { BUTTON_CLASSES as buttonClassNames } from '../buttonClassNames.js';
+import { specialCharacters as specialChars } from '../specialCharacters.js'; // TODO: eliminate 'as specialChars'
+import { BUTTON_CLASSES as buttonClassNames } from '../buttonClassNames.js'; // TODO: eliminate 'as buttonClasNames'
 
 import { KeyElement } from '../keyElement.js';
 import { VisualKeyboard } from '../visualKeyboard.js';

From 3833f19c44c32050f14183045cad7a2e09b4bacd Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 9 Jan 2026 10:52:08 +0100
Subject: [PATCH 199/254] refactor(web): remove some aliases
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up of review comments in #15401.
- rename `DefaultWorker` → `Worker`
- rename `BUTTON_CLASSES` → `buttonClassNames`
Both exports now also match the filename.

Follow-up-of: #15401
Test-bot: skip
---
 .../engine/predictive-text/worker-main/src/web/index.ts  | 2 +-
 .../engine/predictive-text/worker-main/src/web/worker.ts | 4 ++--
 web/src/engine/src/osk/buttonClassNames.ts               | 2 +-
 web/src/engine/src/osk/keyboard-layout/oskKey.ts         | 9 ++++-----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/web/src/engine/predictive-text/worker-main/src/web/index.ts b/web/src/engine/predictive-text/worker-main/src/web/index.ts
index 2614966ff05..473ecc7a745 100644
--- a/web/src/engine/predictive-text/worker-main/src/web/index.ts
+++ b/web/src/engine/predictive-text/worker-main/src/web/index.ts
@@ -1,5 +1,5 @@
 export { LMLayer } from '../lmlayer.js';
-export { DefaultWorker as Worker } from './worker.js'; // TODO: eliminate rename
+export { Worker } from './worker.js';
 export { SourcemappedWorker } from './sourcemappedWorker.js';
 
 export interface WorkerFactory {
diff --git a/web/src/engine/predictive-text/worker-main/src/web/worker.ts b/web/src/engine/predictive-text/worker-main/src/web/worker.ts
index 94b02dee7be..6db685019b9 100644
--- a/web/src/engine/predictive-text/worker-main/src/web/worker.ts
+++ b/web/src/engine/predictive-text/worker-main/src/web/worker.ts
@@ -1,9 +1,9 @@
 import { unwrap } from '../unwrap.js';
 import { LMLayerWorkerCode, LMLayerWorkerSourcemapComment } from "@keymanapp/lm-worker/worker-main.wrapped.min.js";
 
-export class DefaultWorker {
+export class Worker {
   static constructInstance(): Worker {
-    return new Worker(this.asBlobURI(LMLayerWorkerCode));
+    return new globalThis.Worker(this.asBlobURI(LMLayerWorkerCode));
   }
 
   /**
diff --git a/web/src/engine/src/osk/buttonClassNames.ts b/web/src/engine/src/osk/buttonClassNames.ts
index 8028cfccbd8..b27d8854e8c 100644
--- a/web/src/engine/src/osk/buttonClassNames.ts
+++ b/web/src/engine/src/osk/buttonClassNames.ts
@@ -2,7 +2,7 @@
 /**
  * Maps 'sp' properties on a touch-layout spec to their corresponding CSS class names.
  */
-export const BUTTON_CLASSES = [
+export const buttonClassNames = [
   'default',
   'shift',
   'shift-on',
diff --git a/web/src/engine/src/osk/keyboard-layout/oskKey.ts b/web/src/engine/src/osk/keyboard-layout/oskKey.ts
index fab314c9749..8d3be810002 100644
--- a/web/src/engine/src/osk/keyboard-layout/oskKey.ts
+++ b/web/src/engine/src/osk/keyboard-layout/oskKey.ts
@@ -1,9 +1,8 @@
 import { ActiveKey, ActiveSubKey, ButtonClass, ButtonClasses, DeviceSpec } from 'keyman/engine/keyboard';
 
 // At present, we don't use @keymanapp/keyman.  Just `keyman`.  (Refer to <root>/web/package.json.)
-import { specialCharacters as specialChars } from '../specialCharacters.js'; // TODO: eliminate 'as specialChars'
-import { BUTTON_CLASSES as buttonClassNames } from '../buttonClassNames.js'; // TODO: eliminate 'as buttonClasNames'
-
+import { specialCharacters } from '../specialCharacters.js';
+import { buttonClassNames } from '../buttonClassNames.js';
 import { KeyElement } from '../keyElement.js';
 import { VisualKeyboard } from '../visualKeyboard.js';
 import { getTextMetrics } from './getTextMetrics.js';
@@ -42,7 +41,7 @@ export function renameSpecialKey(oldText: string, vkbd: VisualKeyboard): string
      // do nothing.
  }
 
- const specialCode = specialChars[oldText as keyof typeof specialChars];
+ const specialCode = specialCharacters[oldText as keyof typeof specialCharacters];
  const specialCodePUA = 0XE000 + specialCode;
 
  return specialCode ?
@@ -52,7 +51,7 @@ export function renameSpecialKey(oldText: string, vkbd: VisualKeyboard): string
 
 export abstract class OSKKey {
   // Only set here to act as an alias for code built against legacy versions.
-  static readonly specialCharacters = specialChars;
+  static readonly specialCharacters = specialCharacters;
 
   static readonly BUTTON_CLASSES = buttonClassNames;
 

From 08a94ad9619d55eee1b3047b4097a497fa3ba7ca Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 9 Jan 2026 11:05:20 +0100
Subject: [PATCH 200/254] docs(web): document purpose of key codes > 50000

Build-bot: skip
Test-bot: skip
---
 common/web/types/src/consts/virtual-key-constants.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/web/types/src/consts/virtual-key-constants.ts b/common/web/types/src/consts/virtual-key-constants.ts
index 7b083241bdc..0ce728b2f9f 100644
--- a/common/web/types/src/consts/virtual-key-constants.ts
+++ b/common/web/types/src/consts/virtual-key-constants.ts
@@ -127,6 +127,10 @@ export const USVirtualKeyCodes = {
   'k_?C1':193,
   K_oDF:0xDF,
   K_ODF:0xDF,
+
+  // Key codes > 50000 are special virtual key codes that are only used
+  // in touch layouts and should probably not be used elsewhere.
+  // See https://github.com/keymanapp/keyman/pull/15343#discussion_r2674949933
   K_LOPT:50001,
   K_ROPT:50002,
   K_NUMERALS:50003,

From 050d18aa94bb09167c71ab77efaa0b7f16af5511 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 12 Jan 2026 10:49:36 +0100
Subject: [PATCH 201/254] refactor(web): Rename `(Default)Worker` to
 `WebWorker` and `NodeWorker`

Addresses code review comment: `Worker` is a generic and semi-reserved
name that we should not be stepping on.

This renames it to `WebWorker` instead of the suggested `LMWorker` or
`PredictiveTextWorker`. `WebWorker` is a name that was already used
in a few places and seems to better match: there is a corresponding
class for running with node. Naming it `WebWorker` makes it clearer
that this is the corresponding class when running in the browser.

The corresponding class for running under node was renamed to `NodeWorker`.

Test-bot: skip
---
 web/src/app/browser/src/release-main.ts                  | 4 ++--
 web/src/app/webview/src/release-main.ts                  | 4 ++--
 web/src/engine/predictive-text/worker-main/src/index.ts  | 6 +++---
 .../engine/predictive-text/worker-main/src/node/index.ts | 2 +-
 .../worker-main/src/node/{worker.ts => node-worker.ts}   | 9 +++++----
 .../engine/predictive-text/worker-main/src/web/index.ts  | 2 +-
 .../worker-main/src/web/sourcemappedWorker.ts            | 2 +-
 .../worker-main/src/web/{worker.ts => web-worker.ts}     | 7 +++++--
 .../in_browser/cases/top-level-lmlayer.tests.ts          | 6 +++---
 .../in_browser/cases/worker-dummy-integration.tests.ts   | 6 +++---
 .../in_browser/cases/worker-trie-integration.tests.ts    | 6 +++---
 11 files changed, 29 insertions(+), 25 deletions(-)
 rename web/src/engine/predictive-text/worker-main/src/node/{worker.ts => node-worker.ts} (80%)
 rename web/src/engine/predictive-text/worker-main/src/web/{worker.ts => web-worker.ts} (88%)

diff --git a/web/src/app/browser/src/release-main.ts b/web/src/app/browser/src/release-main.ts
index da6b5be1092..3e3a168ccd9 100644
--- a/web/src/app/browser/src/release-main.ts
+++ b/web/src/app/browser/src/release-main.ts
@@ -1,5 +1,5 @@
 import { KeymanEngine } from './keymanEngine.js'
-import { Worker } from '@keymanapp/lexical-model-layer/web'
+import { WebWorker } from '@keymanapp/lexical-model-layer/web'
 
 /**
 * Determine path and protocol of executing script, setting them as
@@ -9,4 +9,4 @@ const ss = (document.currentScript as HTMLScriptElement)?.src;
 const sPath = ss ? ss.substring(0, ss.lastIndexOf('/') + 1) : './';
 
 // @ts-ignore
-window['keyman'] = new KeymanEngine(Worker, sPath);
\ No newline at end of file
+window['keyman'] = new KeymanEngine(WebWorker, sPath);
\ No newline at end of file
diff --git a/web/src/app/webview/src/release-main.ts b/web/src/app/webview/src/release-main.ts
index da6b5be1092..3e3a168ccd9 100644
--- a/web/src/app/webview/src/release-main.ts
+++ b/web/src/app/webview/src/release-main.ts
@@ -1,5 +1,5 @@
 import { KeymanEngine } from './keymanEngine.js'
-import { Worker } from '@keymanapp/lexical-model-layer/web'
+import { WebWorker } from '@keymanapp/lexical-model-layer/web'
 
 /**
 * Determine path and protocol of executing script, setting them as
@@ -9,4 +9,4 @@ const ss = (document.currentScript as HTMLScriptElement)?.src;
 const sPath = ss ? ss.substring(0, ss.lastIndexOf('/') + 1) : './';
 
 // @ts-ignore
-window['keyman'] = new KeymanEngine(Worker, sPath);
\ No newline at end of file
+window['keyman'] = new KeymanEngine(WebWorker, sPath);
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-main/src/index.ts b/web/src/engine/predictive-text/worker-main/src/index.ts
index 98a9dd9101c..bdee0489174 100644
--- a/web/src/engine/predictive-text/worker-main/src/index.ts
+++ b/web/src/engine/predictive-text/worker-main/src/index.ts
@@ -1,6 +1,6 @@
-export { default as LMLayer } from './lmlayer.js';
-export { default as NodeWorker } from './node/worker.js';
-export { default as WebWorker } from './web/worker.js';
+export { LMLayer } from './lmlayer.js';
+export { NodeWorker } from './node/node-worker.js';
+export { WebWorker } from './web/web-worker.js';
 
 export interface WorkerFactory {
   constructInstance(): Worker
diff --git a/web/src/engine/predictive-text/worker-main/src/node/index.ts b/web/src/engine/predictive-text/worker-main/src/node/index.ts
index f3b045b0c5a..dc5957207b4 100644
--- a/web/src/engine/predictive-text/worker-main/src/node/index.ts
+++ b/web/src/engine/predictive-text/worker-main/src/node/index.ts
@@ -1,5 +1,5 @@
 export { LMLayer } from '../lmlayer.js';
-export { Worker } from './worker.js';
+export { NodeWorker } from './node-worker.js';
 export { SourcemappedWorker } from './sourcemappedWorker.js';
 
 export interface WorkerFactory {
diff --git a/web/src/engine/predictive-text/worker-main/src/node/worker.ts b/web/src/engine/predictive-text/worker-main/src/node/node-worker.ts
similarity index 80%
rename from web/src/engine/predictive-text/worker-main/src/node/worker.ts
rename to web/src/engine/predictive-text/worker-main/src/node/node-worker.ts
index 3f5ffe7d717..e773ea9ffa4 100644
--- a/web/src/engine/predictive-text/worker-main/src/node/worker.ts
+++ b/web/src/engine/predictive-text/worker-main/src/node/node-worker.ts
@@ -1,9 +1,12 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
 import { MappedWorker } from "./mappedWorker.js";
 import { unwrap } from '../unwrap.js';
 
 import { LMLayerWorkerCode, LMLayerWorkerSourcemapComment } from "@keymanapp/lm-worker/worker-main.wrapped.min.js";
 
-export class Worker {
+export class NodeWorker {
   static constructInstance(): Worker {
     let scriptStr = unwrap(LMLayerWorkerCode);
     const srcMapUrlIndex = scriptStr.indexOf("//# sourceMappingURL")
@@ -12,8 +15,6 @@ export class Worker {
     }
 
     scriptStr += '\n' + LMLayerWorkerSourcemapComment;
-    let worker = new MappedWorker(scriptStr);
-
-    return worker as any as Worker;
+    return new MappedWorker(scriptStr);
   }
 }
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-main/src/web/index.ts b/web/src/engine/predictive-text/worker-main/src/web/index.ts
index 473ecc7a745..299f51a0346 100644
--- a/web/src/engine/predictive-text/worker-main/src/web/index.ts
+++ b/web/src/engine/predictive-text/worker-main/src/web/index.ts
@@ -1,5 +1,5 @@
 export { LMLayer } from '../lmlayer.js';
-export { Worker } from './worker.js';
+export { WebWorker } from './web-worker.js';
 export { SourcemappedWorker } from './sourcemappedWorker.js';
 
 export interface WorkerFactory {
diff --git a/web/src/engine/predictive-text/worker-main/src/web/sourcemappedWorker.ts b/web/src/engine/predictive-text/worker-main/src/web/sourcemappedWorker.ts
index 35999f8b38a..81a7c1d4a35 100644
--- a/web/src/engine/predictive-text/worker-main/src/web/sourcemappedWorker.ts
+++ b/web/src/engine/predictive-text/worker-main/src/web/sourcemappedWorker.ts
@@ -2,7 +2,7 @@ import { unwrap } from '../unwrap.js';
 import { LMLayerWorkerCode, LMLayerWorkerSourcemapComment } from "@keymanapp/lm-worker/worker-main.wrapped.js";
 
 export class SourcemappedWorker {
-  // the only difference to DefaultWorker is that this class uses
+  // the only difference to WebWorker is that this class uses
   // the unminified LM* blobs
 
   static constructInstance(): Worker {
diff --git a/web/src/engine/predictive-text/worker-main/src/web/worker.ts b/web/src/engine/predictive-text/worker-main/src/web/web-worker.ts
similarity index 88%
rename from web/src/engine/predictive-text/worker-main/src/web/worker.ts
rename to web/src/engine/predictive-text/worker-main/src/web/web-worker.ts
index 6db685019b9..8e2a8edbbd3 100644
--- a/web/src/engine/predictive-text/worker-main/src/web/worker.ts
+++ b/web/src/engine/predictive-text/worker-main/src/web/web-worker.ts
@@ -1,9 +1,12 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
 import { unwrap } from '../unwrap.js';
 import { LMLayerWorkerCode, LMLayerWorkerSourcemapComment } from "@keymanapp/lm-worker/worker-main.wrapped.min.js";
 
-export class Worker {
+export class WebWorker {
   static constructInstance(): Worker {
-    return new globalThis.Worker(this.asBlobURI(LMLayerWorkerCode));
+    return new Worker(this.asBlobURI(LMLayerWorkerCode));
   }
 
   /**
diff --git a/web/src/engine/predictive-text/worker-main/unit_tests/in_browser/cases/top-level-lmlayer.tests.ts b/web/src/engine/predictive-text/worker-main/unit_tests/in_browser/cases/top-level-lmlayer.tests.ts
index 2eb5c4d4275..df5cb45e3bc 100644
--- a/web/src/engine/predictive-text/worker-main/unit_tests/in_browser/cases/top-level-lmlayer.tests.ts
+++ b/web/src/engine/predictive-text/worker-main/unit_tests/in_browser/cases/top-level-lmlayer.tests.ts
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { LMLayer, Worker as WorkerBuilder }  from "@keymanapp/lexical-model-layer/web";
+import { LMLayer, WebWorker }  from "@keymanapp/lexical-model-layer/web";
 
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
 import { defaultCapabilities } from '../helpers.mjs';
@@ -10,7 +10,7 @@ describe('LMLayer', function () {
 
   describe('[[constructor]]', function () {
     it('should construct with a single argument', function () {
-      let lmLayer = new LMLayer(defaultCapabilities, WorkerBuilder.constructInstance(), true);
+      let lmLayer = new LMLayer(defaultCapabilities, WebWorker.constructInstance(), true);
       assert.instanceOf(lmLayer, LMLayer);
       lmLayer.shutdown();
     });
@@ -31,7 +31,7 @@ describe('LMLayer', function () {
       // Note:  the full declaration exists; the code we want is wrapped within the func.
       // So... let's just call the func.
       const workerSrc = dummyHandler.toString() + "\ndummyHandler()";
-      let uri = WorkerBuilder.asBlobURI(workerSrc);
+      let uri = WebWorker.asBlobURI(workerSrc);
       assert.match(uri, /^blob:/);
 
       let worker = new Worker(uri);
diff --git a/web/src/engine/predictive-text/worker-main/unit_tests/in_browser/cases/worker-dummy-integration.tests.ts b/web/src/engine/predictive-text/worker-main/unit_tests/in_browser/cases/worker-dummy-integration.tests.ts
index 2ac5f62d004..04af7ec8dcc 100644
--- a/web/src/engine/predictive-text/worker-main/unit_tests/in_browser/cases/worker-dummy-integration.tests.ts
+++ b/web/src/engine/predictive-text/worker-main/unit_tests/in_browser/cases/worker-dummy-integration.tests.ts
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { LMLayer, Worker }   from "@keymanapp/lexical-model-layer/web";
+import { LMLayer, WebWorker }   from "@keymanapp/lexical-model-layer/web";
 
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
 import { defaultCapabilities } from '../helpers.mjs';
@@ -52,7 +52,7 @@ describe('LMLayer using dummy model', function () {
 
   describe('Prediction', function () {
     it('will predict future suggestions', function () {
-      var lmLayer = new LMLayer(defaultCapabilities, Worker.constructInstance(), true);
+      var lmLayer = new LMLayer(defaultCapabilities, WebWorker.constructInstance(), true);
 
       var stripIDs = function(suggestions) {
         suggestions.forEach(function(suggestion) {
@@ -93,7 +93,7 @@ describe('LMLayer using dummy model', function () {
 
   describe('Wordbreaking', function () {
     it('will perform (default) wordbreaking and return word at caret', function () {
-      var lmLayer = new LMLayer(defaultCapabilities, Worker.constructInstance());
+      var lmLayer = new LMLayer(defaultCapabilities, WebWorker.constructInstance());
 
       // We're testing many as asynchronous messages in a row.
       // this would be cleaner using async/await syntax, but
diff --git a/web/src/engine/predictive-text/worker-main/unit_tests/in_browser/cases/worker-trie-integration.tests.ts b/web/src/engine/predictive-text/worker-main/unit_tests/in_browser/cases/worker-trie-integration.tests.ts
index d551814dd96..bf8d0aef5c8 100644
--- a/web/src/engine/predictive-text/worker-main/unit_tests/in_browser/cases/worker-trie-integration.tests.ts
+++ b/web/src/engine/predictive-text/worker-main/unit_tests/in_browser/cases/worker-trie-integration.tests.ts
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { LMLayer, Worker }   from "@keymanapp/lexical-model-layer/web";
+import { LMLayer, WebWorker }   from "@keymanapp/lexical-model-layer/web";
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
 import { defaultCapabilities } from '../helpers.mjs';
 
@@ -29,7 +29,7 @@ describe('LMLayer using the trie model', function () {
       // Parameter 3 = true:  enables 'test mode', disables correction-search timeout.
       // This helps prevent the correction-search timeout from flaking out periodically during unit tests in
       // CI, since remote servers / devices are involved.
-      var lmLayer = new LMLayer(defaultCapabilities, Worker.constructInstance(), true);
+      var lmLayer = new LMLayer(defaultCapabilities, WebWorker.constructInstance(), true);
 
       // We're testing many as asynchronous messages in a row.
       // this would be cleaner using async/await syntax, but
@@ -71,7 +71,7 @@ describe('LMLayer using the trie model', function () {
     //
     // https://community.software.sil.org/t/search-term-to-key-in-lexical-model-not-working-both-ways-by-default/3133
     it('should use the default searchTermToKey()', function () {
-      var lmLayer = new LMLayer(defaultCapabilities, Worker.constructInstance(), /* testMode */ true);
+      var lmLayer = new LMLayer(defaultCapabilities, WebWorker.constructInstance(), /* testMode */ true);
 
       let loc = document.location;
       return lmLayer.loadModel(

From 26ba3c85101c6778432e9b540af224fb958b2fc2 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 7 Jan 2026 18:58:00 +0100
Subject: [PATCH 202/254] refactor(web): explicitly specify public/private on
 CookieSerializer

---
 web/src/engine/src/dom-utils/cookieSerializer.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/src/engine/src/dom-utils/cookieSerializer.ts b/web/src/engine/src/dom-utils/cookieSerializer.ts
index 8b6465bd482..fe3eaa0550a 100644
--- a/web/src/engine/src/dom-utils/cookieSerializer.ts
+++ b/web/src/engine/src/dom-utils/cookieSerializer.ts
@@ -4,17 +4,17 @@ type FilteredRecordEncoder = (value: DecodedCookieFieldValue, key: string) => st
 type FilteredRecordDecoder = (value: string, key: string) => DecodedCookieFieldValue;
 
 export class CookieSerializer<Type extends Record<keyof Type, DecodedCookieFieldValue>> {
-  readonly name: string;
+  private readonly name: string;
 
-  constructor(name: string) {
+  public constructor(name: string) {
     this.name = name;
   }
 
-  load(decoder?: FilteredRecordDecoder): Type {
+  public load(decoder?: FilteredRecordDecoder): Type {
     return this.loadCookie(this.name, decoder || ((val: string) => val as DecodedCookieFieldValue)) as Type;
   }
 
-  save(cookie: Type, encoder?: FilteredRecordEncoder) {
+  public save(cookie: Type, encoder?: FilteredRecordEncoder) {
     this.saveCookie(this.name, cookie, encoder || ((val: DecodedCookieFieldValue) => val as string));
   }
 

From ac22e0b1c5af9f9d7843319e543f7b8303f146c8 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 13 Jan 2026 17:47:42 +0100
Subject: [PATCH 203/254] feat(web): add `CookieSerializer.loadAllMatching`
 function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- rename tests from `cookies.tests.ts` → `cookieSerializer.tests.ts`
- add test for new function

Part-of: #13426
Test-bot: skip
---
 .../engine/src/dom-utils/cookieSerializer.ts  | 15 ++++++
 ...ies.tests.ts => cookieSerializer.tests.ts} | 50 +++++++++++++++++++
 2 files changed, 65 insertions(+)
 rename web/src/test/auto/dom/cases/dom-utils/{cookies.tests.ts => cookieSerializer.tests.ts} (59%)

diff --git a/web/src/engine/src/dom-utils/cookieSerializer.ts b/web/src/engine/src/dom-utils/cookieSerializer.ts
index fe3eaa0550a..019cd6c2bd7 100644
--- a/web/src/engine/src/dom-utils/cookieSerializer.ts
+++ b/web/src/engine/src/dom-utils/cookieSerializer.ts
@@ -18,6 +18,21 @@ export class CookieSerializer<Type extends Record<keyof Type, DecodedCookieField
     this.saveCookie(this.name, cookie, encoder || ((val: DecodedCookieFieldValue) => val as string));
   }
 
+  public static loadAllMatching<Type extends Record<keyof Type, DecodedCookieFieldValue>>(pattern: RegExp, decoder?: FilteredRecordDecoder): { name: string, value: Type }[] {
+    const cookieSerializer = new CookieSerializer('');
+    const allCookies = cookieSerializer._loadRawCookies();
+    const matchingCookies: { name: string, value: Type }[] = [];
+
+    for (const cookieName in allCookies) {
+      if (pattern.test(cookieName)) {
+        const cookieValue = cookieSerializer.loadCookie(cookieName, decoder || ((val: string) => val as DecodedCookieFieldValue)) as Type;
+        matchingCookies.push({ name: cookieName, value: cookieValue });
+      }
+    }
+
+    return matchingCookies;
+  }
+
   /**
    * Document cookie parsing for use by kernel, OSK, UI etc.
    *
diff --git a/web/src/test/auto/dom/cases/dom-utils/cookies.tests.ts b/web/src/test/auto/dom/cases/dom-utils/cookieSerializer.tests.ts
similarity index 59%
rename from web/src/test/auto/dom/cases/dom-utils/cookies.tests.ts
rename to web/src/test/auto/dom/cases/dom-utils/cookieSerializer.tests.ts
index f4fc2583bc9..843872ea7c9 100644
--- a/web/src/test/auto/dom/cases/dom-utils/cookies.tests.ts
+++ b/web/src/test/auto/dom/cases/dom-utils/cookieSerializer.tests.ts
@@ -15,6 +15,10 @@ describe('CookieSerializer', function () {
       assert.deepEqual(cookieLoader.load(), {});
     });
 
+    afterEach(() => {
+      document.cookie = `${COOKIE_ID}=; ${RESET}`;
+    })
+
     it('serializes & reloads when all values are strings', () => {
       const cookieWriter = new CookieSerializer(COOKIE_ID);
       const obj = {
@@ -94,4 +98,50 @@ describe('CookieSerializer', function () {
       assert.notStrictEqual(reloadedObj, obj);
     });
   });
+
+  describe('loadAllMatching', () => {
+    type TestStore = { [name: string]: string; };
+    const COOKIE_ID_1 = "TestCookie_One";
+    const COOKIE_ID_2 = "TestCookie_Two";
+    const NONMATCHING_COOKIE_ID = "NonmatchingCookie";
+
+    beforeEach(() => {
+      const cookieSerializer1 = new CookieSerializer<TestStore>(COOKIE_ID_1);
+      cookieSerializer1.save({ COOKIE_ID_1: 'foobar1' });
+
+      const cookieSerializer2 = new CookieSerializer<TestStore>(COOKIE_ID_2);
+      cookieSerializer2.save({ COOKIE_ID_2: 'foobar2' });
+
+      const nonmatchingCookieSerializer = new CookieSerializer<TestStore>(NONMATCHING_COOKIE_ID);
+      nonmatchingCookieSerializer.save({ NONMATCHING_COOKIE_ID: 'foobar3' });
+    });
+
+    afterEach(() => {
+      document.cookie = `${COOKIE_ID_1}=; ${RESET}`;
+      document.cookie = `${COOKIE_ID_2}=; ${RESET}`;
+      document.cookie = `${NONMATCHING_COOKIE_ID}=; ${RESET}`;
+    });
+
+    it('finds all matching cookies starting with TestCookie_', () => {
+      const result = CookieSerializer.loadAllMatching(/^TestCookie_/);
+      assert.deepEqual(result, [
+        { name: COOKIE_ID_1, value: { COOKIE_ID_1: 'foobar1' } },
+        { name: COOKIE_ID_2, value: { COOKIE_ID_2: 'foobar2' } }
+      ]);
+    });
+
+    it('finds all matching cookies containing Cookie', () => {
+      const result = CookieSerializer.loadAllMatching(/Cookie/);
+      assert.deepEqual(result, [
+        { name: COOKIE_ID_1, value: { COOKIE_ID_1: 'foobar1' } },
+        { name: COOKIE_ID_2, value: { COOKIE_ID_2: 'foobar2' } },
+        { name: NONMATCHING_COOKIE_ID, value: { NONMATCHING_COOKIE_ID: 'foobar3' } }
+      ]);
+    });
+
+    it('returns empty array if no matching cookies', () => {
+      const result = CookieSerializer.loadAllMatching(/^UnknownCookie_/);
+      assert.deepEqual(result, []);
+    });
+  });
 });
\ No newline at end of file

From b339a9772cf80c1edde69e8c5b5d82dd06e0f484 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 14 Jan 2026 18:12:08 +0100
Subject: [PATCH 204/254] docs(common): improve documentation for .kmn test
 files

Build-bot: skip
Test-bot: skip
---
 common/test/keyboards/baseline/README.md |  5 +++++
 core/tests/unit/kmx/README.md            | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/common/test/keyboards/baseline/README.md b/common/test/keyboards/baseline/README.md
index 090fdcbd5bc..28106b6f1db 100644
--- a/common/test/keyboards/baseline/README.md
+++ b/common/test/keyboards/baseline/README.md
@@ -44,3 +44,8 @@ mainly by test name.
 | k_06xx_* | System stores                            |
 | k_07xx_* | Caps related tests                       |
 | k_08xx_* | Context related                          |
+
+## Description of file format
+
+See [README.md](/core/tests/unit/kmx/README.md) in core for a description
+of the file format.
diff --git a/core/tests/unit/kmx/README.md b/core/tests/unit/kmx/README.md
index 434fb7b1978..66b2a3114f9 100644
--- a/core/tests/unit/kmx/README.md
+++ b/core/tests/unit/kmx/README.md
@@ -19,7 +19,7 @@ Following the comments are the normal rules of a Keyman keyboard.
 c Description: Tests Caps Lock env set
 ```
 
-- **option**: allows to put the system in a defined state. The example below sets the platform.
+- **option**: allows to put the system in a defined state. The example sets the platform:
 
 ```text
 c option: &platform=linux
@@ -57,6 +57,20 @@ c keys: [K_1][K_CAPS][K_2][SHIFT K_3][K_4][K_CAPS][K_5][K_CAPS][K_6]
 c expected: pass.pass.pass.pass.pass.pass.
 ```
 
+### Expected Options
+
+- **expected option**: the resulting key/value pairs for the in-memory options.
+
+```text
+c expected option: foo=0
+```
+
+- **saved option**: the resulting key/value pairs of persisted options.
+
+```text
+c saved option: foo=0
+```
+
 ## Running the tests
 
 All tests can be run at once with `./build.sh --debug tests`.

From 4e1b7730e4bda5f59013d7fbaad1819780bb951c Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 14 Jan 2026 18:14:17 +0100
Subject: [PATCH 205/254] chore(web): fix e2e tests

The Playwright tests occasionally failed complaining about `Page`
and `Locator` not being defined. The solution is to import them as
types.

Test-bot: skip
---
 web/src/test/auto/e2e/baseline/baseline.tests.ts | 2 +-
 web/src/test/auto/e2e/baseline/keyHandling.ts    | 2 +-
 web/src/test/auto/e2e/baseline/kmxTestSource.ts  | 1 -
 web/src/test/auto/e2e/keyboard.tests.ts          | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.ts b/web/src/test/auto/e2e/baseline/baseline.tests.ts
index 9998bc3820d..636cdbb4612 100644
--- a/web/src/test/auto/e2e/baseline/baseline.tests.ts
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.ts
@@ -3,7 +3,7 @@
  */
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import { expect, test, /*expect, Page, Locator */} from '@playwright/test';
+import { expect, test } from '@playwright/test';
 import { KmxTestSource } from './kmxTestSource.js';
 import { pressKeys } from './keyHandling';
 
diff --git a/web/src/test/auto/e2e/baseline/keyHandling.ts b/web/src/test/auto/e2e/baseline/keyHandling.ts
index 5b2de53951b..3bff89e6564 100644
--- a/web/src/test/auto/e2e/baseline/keyHandling.ts
+++ b/web/src/test/auto/e2e/baseline/keyHandling.ts
@@ -2,7 +2,7 @@
  * Keyman is copyright (C) SIL Global. MIT License.
  */
 
-import { Page } from '@playwright/test';
+import { type Page } from '@playwright/test';
 
 function getKeycodeFromVk(vk: string): string {
   const virtualKeyToKeyCodeMap = new Map([
diff --git a/web/src/test/auto/e2e/baseline/kmxTestSource.ts b/web/src/test/auto/e2e/baseline/kmxTestSource.ts
index 58793bf8e36..8f1fcdda44c 100644
--- a/web/src/test/auto/e2e/baseline/kmxTestSource.ts
+++ b/web/src/test/auto/e2e/baseline/kmxTestSource.ts
@@ -2,7 +2,6 @@
  * Keyman is copyright (C) SIL Global. MIT License.
  */
 import * as fs from 'fs';
-import * as path from 'path';
 
 // Helper types
 type KmxOptionType = 'input' | 'output' | 'saved';
diff --git a/web/src/test/auto/e2e/keyboard.tests.ts b/web/src/test/auto/e2e/keyboard.tests.ts
index b51dc3cbcb7..78d6cd9aee4 100644
--- a/web/src/test/auto/e2e/keyboard.tests.ts
+++ b/web/src/test/auto/e2e/keyboard.tests.ts
@@ -1,7 +1,7 @@
 /*
  * Keyman is copyright (C) SIL Global. MIT License.
  */
-import { test, expect, Page, Locator } from '@playwright/test';
+import { test, expect, type Page, type Locator } from '@playwright/test';
 
 test.describe('KMX keyboards', function () {
   let textarea: Locator;

From f8546c0e5f65e3d0adec3df7611bb97e30e4a35e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 15 Jan 2026 11:57:41 +0100
Subject: [PATCH 206/254] feat(web): address code review comments

Test-bot: skip
---
 web/src/engine/src/dom-utils/cookieSerializer.ts       | 10 ++++++++++
 .../auto/dom/cases/dom-utils/cookieSerializer.tests.ts |  9 +--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/web/src/engine/src/dom-utils/cookieSerializer.ts b/web/src/engine/src/dom-utils/cookieSerializer.ts
index 019cd6c2bd7..87288381d87 100644
--- a/web/src/engine/src/dom-utils/cookieSerializer.ts
+++ b/web/src/engine/src/dom-utils/cookieSerializer.ts
@@ -18,6 +18,16 @@ export class CookieSerializer<Type extends Record<keyof Type, DecodedCookieField
     this.saveCookie(this.name, cookie, encoder || ((val: DecodedCookieFieldValue) => val as string));
   }
 
+  /**
+   * Finds and loads all cookies whose names match the given pattern into typed records.
+   *
+   * @param   {RegExp}                  pattern   Regex for cookie names to include
+   * @param   {FilteredRecordDecoder}   [decoder] Optional decoder applied to each cookie
+   *                                              field value before returning.
+   *
+   * @returns {{ name: string, value: Type }[]}   Array of objects containing each matching
+   *                                              cookie's name and decoded value.
+   */
   public static loadAllMatching<Type extends Record<keyof Type, DecodedCookieFieldValue>>(pattern: RegExp, decoder?: FilteredRecordDecoder): { name: string, value: Type }[] {
     const cookieSerializer = new CookieSerializer('');
     const allCookies = cookieSerializer._loadRawCookies();
diff --git a/web/src/test/auto/dom/cases/dom-utils/cookieSerializer.tests.ts b/web/src/test/auto/dom/cases/dom-utils/cookieSerializer.tests.ts
index 843872ea7c9..aa447d361a1 100644
--- a/web/src/test/auto/dom/cases/dom-utils/cookieSerializer.tests.ts
+++ b/web/src/test/auto/dom/cases/dom-utils/cookieSerializer.tests.ts
@@ -7,15 +7,8 @@ describe('CookieSerializer', function () {
   describe('SimpleTestCookie', () => {
     const COOKIE_ID = "SimpleTestCookie";
 
-    beforeEach(() => {
-      // Purge the cookie!
-      document.cookie = `${COOKIE_ID}=foobar; ${RESET}`;
-
-      const cookieLoader = new CookieSerializer(COOKIE_ID);
-      assert.deepEqual(cookieLoader.load(), {});
-    });
-
     afterEach(() => {
+      // Purge the cookie!
       document.cookie = `${COOKIE_ID}=; ${RESET}`;
     })
 

From a329ef967d869a102a2d42566980c29dcf954d7c Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:05:25 +0100
Subject: [PATCH 207/254] Update core/tests/unit/kmx/README.md

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 core/tests/unit/kmx/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/tests/unit/kmx/README.md b/core/tests/unit/kmx/README.md
index 66b2a3114f9..065a2a1abbd 100644
--- a/core/tests/unit/kmx/README.md
+++ b/core/tests/unit/kmx/README.md
@@ -19,7 +19,7 @@ Following the comments are the normal rules of a Keyman keyboard.
 c Description: Tests Caps Lock env set
 ```
 
-- **option**: allows to put the system in a defined state. The example sets the platform:
+- **option**: allows to put the system in a defined state. The example below sets the platform:
 
 ```text
 c option: &platform=linux

From a8c68711da6885adab2ac38bed4d06c4a08fe6b1 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 19 Dec 2025 19:19:02 +0100
Subject: [PATCH 208/254] feat(web): add `findStores` functions

This change adds a static `findStores` function to `VarStoreSerializer`
and `VariableStoreCookieSerializer` as well as to the
`VariableStoreSerializer` interface.

Also add unit tests for `VariableStoreCookieSerializer`.

Part-of: #13426
Test-bot: skip
---
 web/src/engine/src/keyboard/variableStore.ts  |   1 +
 .../src/main/variableStoreCookieSerializer.ts |  34 ++++-
 .../variableStoreCookieSerializer.tests.ts    | 144 ++++++++++++++++++
 .../test/auto/dom/web-test-runner.config.mjs  |   7 +-
 4 files changed, 180 insertions(+), 6 deletions(-)
 create mode 100644 web/src/test/auto/dom/cases/main/variableStoreCookieSerializer.tests.ts

diff --git a/web/src/engine/src/keyboard/variableStore.ts b/web/src/engine/src/keyboard/variableStore.ts
index 29de6ececa4..2b7687245ae 100644
--- a/web/src/engine/src/keyboard/variableStore.ts
+++ b/web/src/engine/src/keyboard/variableStore.ts
@@ -13,4 +13,5 @@ export type VariableStore = { [name: string]: string; };
 export interface VariableStoreSerializer {
   loadStore(keyboardID: string, storeName: string): VariableStore;
   saveStore(keyboardID: string, storeName: string, storeMap: VariableStore): void;
+  findStores(keyboardID: string): VariableStore[];
 }
diff --git a/web/src/engine/src/main/variableStoreCookieSerializer.ts b/web/src/engine/src/main/variableStoreCookieSerializer.ts
index de7da7e7029..58425d61ee2 100644
--- a/web/src/engine/src/main/variableStoreCookieSerializer.ts
+++ b/web/src/engine/src/main/variableStoreCookieSerializer.ts
@@ -9,27 +9,51 @@ import { CookieSerializer } from "keyman/engine/dom-utils";
 // dynamic property names; they'd have to be known at compile time to facilitate
 // strict type checking.
 class VarStoreSerializer extends CookieSerializer<VariableStore> {
-  constructor(keyboardID: string, storeName: string) {
+  public constructor(keyboardID: string, storeName: string) {
     super(`KeymanWeb_${keyboardID}_Option_${storeName}`);
   }
 
-  load() {
+  public load(): VariableStore {
     return super.load(decodeURIComponent);
   }
 
-  save(storeMap: VariableStore) {
+  public save(storeMap: VariableStore) {
     super.save(storeMap, encodeURIComponent);
   }
+
+  /**
+   * Find all variable stores associated with a given keyboard.
+   *
+   * @param {string}  keyboardID  The keyboard ID whose variable stores are to be found.
+   *
+   * @returns An array of VariableStore objects found for the keyboard.
+   */
+  public static findStores(keyboardID: string): VariableStore[] {
+    const pattern = new RegExp(`^KeymanWeb_${keyboardID}_Option_`);
+    const matching = CookieSerializer.loadAllMatching<VariableStore>(pattern, decodeURIComponent);
+    return matching.map(m => m.value);
+  }
 }
 
 export class VariableStoreCookieSerializer implements VariableStoreSerializer {
-  loadStore(keyboardID: string, storeName: string): VariableStore {
+  public loadStore(keyboardID: string, storeName: string): VariableStore {
     const storeCookieSerializer = new VarStoreSerializer(keyboardID, storeName);
     return storeCookieSerializer.load();
   }
 
-  saveStore(keyboardID: string, storeName: string, storeMap: VariableStore) {
+  public saveStore(keyboardID: string, storeName: string, storeMap: VariableStore) {
     const storeCookieSerializer = new VarStoreSerializer(keyboardID, storeName);
     storeCookieSerializer.save(storeMap);
   }
+
+  /**
+   * Find all variable stores associated with a given keyboard.
+   *
+   * @param {string}  keyboardID  The keyboard ID whose variable stores are to be found.
+   *
+   * @returns An array of VariableStore objects found for the keyboard.
+   */
+  public findStores(keyboardID: string): VariableStore[] {
+    return VarStoreSerializer.findStores(keyboardID);
+  }
 }
\ No newline at end of file
diff --git a/web/src/test/auto/dom/cases/main/variableStoreCookieSerializer.tests.ts b/web/src/test/auto/dom/cases/main/variableStoreCookieSerializer.tests.ts
new file mode 100644
index 00000000000..1730e7c1013
--- /dev/null
+++ b/web/src/test/auto/dom/cases/main/variableStoreCookieSerializer.tests.ts
@@ -0,0 +1,144 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import { assert } from 'chai';
+import { VariableStore } from 'keyman/engine/keyboard';
+import { VariableStoreCookieSerializer } from 'keyman/engine/main';
+
+describe('VariableStoreCookieSerializer', () => {
+  describe('saveStore and loadStore', () => {
+    const keyboardID = 'test-keyboard';
+    const storeName = 'testStore';
+    const cookieName = `KeymanWeb_${keyboardID}_Option_${storeName}`;
+
+    afterEach(async () => {
+      document.cookie = `${cookieName}=; max-age=0`;
+    });
+
+    it('should save and load a simple store with string values', () => {
+      // Arrange
+      const serializer = new VariableStoreCookieSerializer();
+      const storeData: VariableStore = {
+        option1: 'value1',
+        option2: 'value2',
+        option3: 'value3'
+      };
+
+      // Act
+      serializer.saveStore(keyboardID, storeName, storeData);
+      const loaded = serializer.loadStore(keyboardID, storeName);
+
+      // Assert
+      assert.deepEqual(loaded, storeData, 'loaded store should match saved store');
+    });
+
+    it('should save and load a store with empty values', () => {
+      // Arrange
+      const serializer = new VariableStoreCookieSerializer();
+      const storeData: VariableStore = {
+        option1: '',
+        option2: 'value',
+        option3: ''
+      };
+
+      // Act
+      serializer.saveStore(keyboardID, storeName, storeData);
+      const loaded = serializer.loadStore(keyboardID, storeName);
+
+      // Assert
+      assert.deepEqual(loaded, storeData, 'empty string values should be preserved');
+    });
+
+    it('should save and load a store with special characters', () => {
+      // Arrange
+      const serializer = new VariableStoreCookieSerializer();
+      const storeData: VariableStore = {
+        encoded: 'value:with;special&chars=',
+        emoji: '⭐'
+      };
+
+      // Act
+      serializer.saveStore(keyboardID, storeName, storeData);
+      const loaded = serializer.loadStore(keyboardID, storeName);
+
+      // Assert
+      assert.deepEqual(loaded, storeData, 'special characters should be properly encoded/decoded');
+    });
+
+    it('should handle multiple stores for the same keyboard independently', () => {
+      // Arrange
+      const serializer = new VariableStoreCookieSerializer();
+      const store1Data: VariableStore = { option: 'store1value' };
+      const store2Data: VariableStore = { option: 'store2value' };
+
+      // Act
+      serializer.saveStore(keyboardID, 'store1', store1Data);
+      serializer.saveStore(keyboardID, 'store2', store2Data);
+      const loaded1 = serializer.loadStore(keyboardID, 'store1');
+      const loaded2 = serializer.loadStore(keyboardID, 'store2');
+
+      // Assert
+      assert.deepEqual(loaded1, store1Data, 'first store should be independent');
+      assert.deepEqual(loaded2, store2Data, 'second store should be independent');
+
+      // Cleanup
+      document.cookie = `KeymanWeb_${keyboardID}_Option_store1=; max-age=0`;
+      document.cookie = `KeymanWeb_${keyboardID}_Option_store2=; max-age=0`;
+    });
+
+    it('should return empty object for non-existent store', () => {
+      // Arrange
+      const serializer = new VariableStoreCookieSerializer();
+
+      // Act
+      const loaded = serializer.loadStore(keyboardID, 'nonexistent');
+
+      // Assert
+      assert.deepEqual(loaded, {}, 'non-existent store should return empty object');
+    });
+  });
+
+  describe('findStores', () => {
+    it('should return an empty array when no stores exist for a keyboardID', () => {
+
+      // Arrange
+      const serializer = new VariableStoreCookieSerializer();
+      const keyboardID = 'test-keyboard';
+      const expected: VariableStore[] = [];
+
+      // Act
+      const result = serializer.findStores(keyboardID);
+
+      // Assert
+      assert.deepEqual(result, expected, 'result should be an empty array');
+      assert.isTrue(Array.isArray(result), 'result should be an array');
+      assert.strictEqual(result.length, 0, 'result array length should be 0');
+    });
+
+    it('should return store for keyboard', () => {
+      // Arrange
+      const serializer = new VariableStoreCookieSerializer();
+      const storeData1: VariableStore = {
+        option1: 'value1',
+        option2: 'value2',
+        option3: 'value3'
+      };
+      serializer.saveStore('test-keyboard', 'storeName', storeData1);
+      const storeData2: VariableStore = {
+        settingA: 'A',
+        settingB: 'B'
+      };
+      serializer.saveStore('another-keyboard', 'anotherStore', storeData2);
+
+      // Act
+      const stores = serializer.findStores('test-keyboard');
+
+      // Assert
+      assert.deepEqual(stores, [storeData1], 'stores should match saved store');
+
+      // Cleanup
+      document.cookie = `KeymanWeb_test-keyboard_Option_storeName=; max-age=0`;
+    });
+
+  });
+});
diff --git a/web/src/test/auto/dom/web-test-runner.config.mjs b/web/src/test/auto/dom/web-test-runner.config.mjs
index 881d428f4c2..25eab564926 100644
--- a/web/src/test/auto/dom/web-test-runner.config.mjs
+++ b/web/src/test/auto/dom/web-test-runner.config.mjs
@@ -84,11 +84,16 @@ export default {
       // Relative, from the containing package.json
       files: ['web/build/test/dom/cases/keyboard-storage/**/*.tests.mjs']
     },
+    {
+      name: 'engine/main',
+      // Relative, from the containing package.json
+      files: ['web/build/test/dom/cases/main/**/*.tests.mjs']
+    },
     {
       name: 'engine/osk',
       // Relative, from the containing package.json
       files: ['web/build/test/dom/cases/osk/**/*.tests.mjs']
-    }
+    },
   ],
   middleware: [
     // Rewrites short-hand paths for test resources, making them fully relative to the repo root.

From 9909d7d901e63d44fab5e96ca282c8c4244cd936 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 15 Jan 2026 12:19:41 +0100
Subject: [PATCH 209/254] feat(core): expose `km_core_state_options_update` to
 WASM

Part-of: #13426
Test-bot: skip
---
 core/src/wasm.cpp                        | 17 +++++++++++++++++
 web/src/engine/src/core-adapter/index.ts |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/core/src/wasm.cpp b/core/src/wasm.cpp
index 1f0f383feed..d291dc87388 100644
--- a/core/src/wasm.cpp
+++ b/core/src/wasm.cpp
@@ -340,6 +340,21 @@ km_core_state_get_actions_wasm(km_core_state const *state) {
   return actions_wasm;
 }
 
+int
+km_core_state_options_update_wasm(
+  km_core_state const *state,
+  const std::vector<km_core_option_item_wasm>& new_options
+) {
+  km_core_option_item* options_c = new km_core_option_item[new_options.size() + 1];
+  for (size_t i = 0; i < new_options.size(); ++i) {
+    options_c[i].key = new_options[i].key.c_str();
+    options_c[i].value = new_options[i].value.c_str();
+    options_c[i].scope = new_options[i].scope;
+  }
+  options_c[new_options.size()] = {nullptr, nullptr, 0};
+  return km_core_state_options_update(const_cast<km_core_state*>(state), options_c);
+}
+
 const CoreReturn<km_core_context_items>*
 km_core_context_get_wasm(
   km_core_context const* context
@@ -484,6 +499,8 @@ EMSCRIPTEN_BINDINGS(core_interface) {
 
   em::function("state_get_actions(state)", &km_core_state_get_actions_wasm, em::allow_raw_pointers());
 
+  em::function("state_options_update(state, new_options)", &km_core_state_options_update_wasm, em::allow_raw_pointers());
+
   em::function("context_get(context)", &km_core_context_get_wasm, em::allow_raw_pointers());
   em::function("context_set(context, context_items)", &km_core_context_set_wasm, em::allow_raw_pointers());
 }
diff --git a/web/src/engine/src/core-adapter/index.ts b/web/src/engine/src/core-adapter/index.ts
index 9052d97a9d0..f5a4ff2c785 100644
--- a/web/src/engine/src/core-adapter/index.ts
+++ b/web/src/engine/src/core-adapter/index.ts
@@ -1,3 +1,3 @@
 export { KM_Core, KM_CORE_STATUS, KM_CORE_OPTION_SCOPE, KM_CORE_KMX_ENV, KM_CORE_CT } from './KM_Core.js';
-import { type km_core_keyboard, type km_core_state, type km_core_context, type km_core_context_item, type km_core_context_items } from './import/core/keymancore.js';
-export { km_core_keyboard, km_core_state, km_core_context, km_core_context_item, km_core_context_items };
+import { type km_core_keyboard, type km_core_state, type km_core_context, type km_core_context_item, type km_core_context_items, type km_core_option_item } from './import/core/keymancore.js';
+export { km_core_keyboard, km_core_state, km_core_context, km_core_context_item, km_core_context_items, km_core_option_item };

From aa0a02cdb3a7f61f15cc6e6222e1ad7ab8e6abff Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 15 Jan 2026 12:21:54 +0100
Subject: [PATCH 210/254] feat(web): small changes to test keyboards

- in `baseline.tests.html` default to keyboard name if `id` is not set
- in `kmxkeyboard.html` allow to pass the keyboard name (as `keyboard`
  query parameter), and rename existing `keyboard` query parameter to
  `type`.

Test-bot: skip
---
 .../test/auto/e2e/baseline/baseline.tests.html    | 13 +++++++++++--
 web/src/test/auto/e2e/keyboard.tests.ts           |  4 ++--
 web/src/test/manual/web/kmxkeyboard.html          | 15 ++++++++++-----
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.html b/web/src/test/auto/e2e/baseline/baseline.tests.html
index 34d4bc6f9a8..3fa5fcd14d0 100644
--- a/web/src/test/auto/e2e/baseline/baseline.tests.html
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.html
@@ -15,11 +15,20 @@
     <!-- Initialization: set paths to keyboards, resources and fonts as required -->
     <script>
         const searchParams = new URLSearchParams(window.location.search);
+        const keyboardFile = searchParams.get('keyboard');
+        let keyboardId = searchParams.get('id');
+
+        // If id is not set, extract from basename of keyboardFile
+        if (!keyboardId && keyboardFile) {
+          const basename = keyboardFile.split('/').pop(); // Get last part after /
+          keyboardId = basename.replace(/\.[^.]+$/, ''); // Remove file extension
+        }
+
         const keyboard = {
-          id: searchParams.get('id'),
+          id: keyboardId,
           name: 'Test Keyboard',
           languages: { id: 'en', name: 'English' },
-          filename: searchParams.get('keyboard')
+          filename: keyboardFile
         };
         // allow to wait on KMW being fully initialized
         window.KmwLoaded = new Promise((resolve) => {
diff --git a/web/src/test/auto/e2e/keyboard.tests.ts b/web/src/test/auto/e2e/keyboard.tests.ts
index 78d6cd9aee4..590da8a840b 100644
--- a/web/src/test/auto/e2e/keyboard.tests.ts
+++ b/web/src/test/auto/e2e/keyboard.tests.ts
@@ -6,7 +6,7 @@ import { test, expect, type Page, type Locator } from '@playwright/test';
 test.describe('KMX keyboards', function () {
   let textarea: Locator;
   const beforeEach = async (page: Page) => {
-    await page.goto('http://localhost:3000/src/test/manual/web/kmxkeyboard.html?keyboard=kmx');
+    await page.goto('http://localhost:3000/src/test/manual/web/kmxkeyboard.html?type=kmx');
     await page.evaluate(async () => { await window.KmwLoaded; });
     textarea = page.locator('#inputarea');
     await textarea.click();
@@ -37,7 +37,7 @@ test.describe('KMX keyboards', function () {
 test.describe('JS keyboards', function () {
   let textarea: Locator;
   const beforeEach = async (page: Page) => {
-    await page.goto('http://localhost:3000/src/test/manual/web/kmxkeyboard.html?keyboard=js');
+    await page.goto('http://localhost:3000/src/test/manual/web/kmxkeyboard.html?type=js');
     await page.evaluate(async () => { await window.KmwLoaded; });
     textarea = page.locator('#inputarea');
     await textarea.click();
diff --git a/web/src/test/manual/web/kmxkeyboard.html b/web/src/test/manual/web/kmxkeyboard.html
index 01629764b04..80e18c16287 100644
--- a/web/src/test/manual/web/kmxkeyboard.html
+++ b/web/src/test/manual/web/kmxkeyboard.html
@@ -37,12 +37,15 @@
     <!-- Initialization: set paths to keyboards, resources and fonts as required -->
     <script>
         const searchParams = new URLSearchParams(window.location.search);
+        const filename = searchParams.get('keyboard') || '/build/test-resources/keyboards/khmer_angkor.kmx';
         const kmx = {
             id: 'khmer_angkor',
             name: 'Khmer Angkor',
-            languages: { id: 'km', name: 'Khmer' }, filename: '/build/test-resources/keyboards/khmer_angkor.kmx' };
+            languages: { id: 'km', name: 'Khmer' },
+            filename: filename
+          };
         let keyboard;
-        switch (searchParams.get('keyboard')) {
+        switch (searchParams.get('type')) {
           case 'js':
             keyboard = { id: 'khmer_angkor', name: 'Khmer Angkor', languages: { id: 'km' } };
             break;
@@ -83,9 +86,11 @@ <h2>KeymanWeb Sample Page - Khmer Angkor KMX and JS Keyboards</h2>
     -->
     <div id='KeymanWebControl'></div>
 
-    <p>This page allows to use either the .kmx or the .js version of the Khmer Angkor keyboard.
-      Which one can be selected by the <code>keyboard</code> query parameter:
-      append <code>?keyboard=kmx</code> or <code>?keyboard=js</code> to the URL..
+    <p>This page allows to use either the .kmx or the .js version of the Khmer Angkor
+      keyboard (or whatever .kmx keyboard specified by the <code>keyboard</code> query
+      parameter).
+      Which one can be selected by the <code>type</code> query parameter:
+      append <code>?type=kmx</code> or <code>?type=js</code> to the URL.
       The default is to use the .kmx version.
     </p>
     <h3>Type Khmer in this text area:</h3>

From 5e380c0f72afaafeb54c6010d516c05e58860318 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 15 Jan 2026 12:27:12 +0100
Subject: [PATCH 211/254] feat(web): implement persisting keyboard options

- move `CoreKeyboardInterface` to separate file
- add variable store to `CoreKeyboardInterface` to manage variable stores
  for active keyboard
- Add `VariableStoreSerializer` parameter to `CoreKeyboardProcessor.init()`
- Implement `process_persist_action()` to save options to persistent
  storage
- Update keyboard activation to load stored options from serializer

Closes: #13426
Test-bot: skip
---
 .../core-processor/coreKeyboardInterface.ts   | 40 ++++++++++++++++
 .../core-processor/coreKeyboardProcessor.ts   | 47 ++++++++++++++-----
 .../engine/src/dom-utils/cookieSerializer.ts  |  2 +-
 .../keyboard-storage/stubAndKeyboardCache.ts  |  4 +-
 .../keyboard/keyboards/keyboardLoaderBase.ts  |  5 +-
 .../keyboards/keyboardMinimalInterface.ts     |  5 +-
 .../src/main/headless/inputProcessor.ts       |  9 ++--
 web/src/engine/src/main/keymanEngineBase.ts   |  3 +-
 .../test/auto/e2e/baseline/baseline.tests.ts  |  9 ----
 9 files changed, 91 insertions(+), 33 deletions(-)
 create mode 100644 web/src/engine/src/core-processor/coreKeyboardInterface.ts

diff --git a/web/src/engine/src/core-processor/coreKeyboardInterface.ts b/web/src/engine/src/core-processor/coreKeyboardInterface.ts
new file mode 100644
index 00000000000..b8960bbd14f
--- /dev/null
+++ b/web/src/engine/src/core-processor/coreKeyboardInterface.ts
@@ -0,0 +1,40 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import { KM_Core, km_core_option_item, KM_CORE_OPTION_SCOPE } from 'keyman/engine/core-adapter';
+import { KeyboardMinimalInterface, Keyboard, VariableStoreSerializer, KMXKeyboard } from 'keyman/engine/keyboard';
+import { toPrefixedKeyboardId } from 'keyman/engine/keyboard-storage';
+
+export class CoreKeyboardInterface implements KeyboardMinimalInterface {
+  private _activeKeyboard: Keyboard;
+
+  public constructor(public variableStoreSerializer?: VariableStoreSerializer) {
+  }
+
+  public get activeKeyboard(): Keyboard {
+    return this._activeKeyboard;
+  }
+  public set activeKeyboard(keyboard: Keyboard) {
+    this._activeKeyboard = keyboard;
+    const stores = this.variableStoreSerializer.findStores(toPrefixedKeyboardId(keyboard.id));
+    const options: km_core_option_item[] = [];
+    for (const store of stores) {
+      for (const key in store) {
+        if (store.hasOwnProperty(key)) {
+          const item: km_core_option_item = {
+            key: key,
+            value: store[key],
+            scope: KM_CORE_OPTION_SCOPE.OPT_KEYBOARD
+          };
+          options.push(item);
+        }
+      }
+    }
+
+    if (options.length > 0) {
+      const kmxKeyboard = this._activeKeyboard as KMXKeyboard;
+      KM_Core.instance.state_options_update(kmxKeyboard.state, options);
+    }
+  }
+
+}
diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index 625a7255a71..7ddc3cd0a47 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -3,19 +3,19 @@
  */
 
 import { EventEmitter } from 'eventemitter3';
-import { KM_Core, KM_CORE_STATUS, KM_CORE_CT, km_core_context, km_core_context_items } from 'keyman/engine/core-adapter';
+import { KM_Core, KM_CORE_STATUS, KM_CORE_CT, km_core_context, km_core_context_items, km_core_option_item } from 'keyman/engine/core-adapter';
 import {
   BeepHandler,
   DeviceSpec, EventMap, Keyboard, KeyboardMinimalInterface, KeyboardProcessor,
   KeyEvent, KMXKeyboard, SyntheticTextStore, MutableSystemStore, TextStore, ProcessorAction,
   StateKeyMap,
-  Deadkey
+  Deadkey,
+  VariableStore,
+  VariableStoreSerializer
 } from "keyman/engine/keyboard";
-import { KM_CORE_EVENT_FLAG } from '../core-adapter/KM_Core.js';
-
-export class CoreKeyboardInterface implements KeyboardMinimalInterface {
-  public activeKeyboard: Keyboard;
-}
+import { KM_CORE_EVENT_FLAG, KM_CORE_OPTION_SCOPE } from '../core-adapter/KM_Core.js';
+import { CoreKeyboardInterface } from './coreKeyboardInterface.js';
+import { toPrefixedKeyboardId } from 'keyman/engine/keyboard-storage';
 
 /**
  * Implements the core keyboard processing engine that interacts with the
@@ -25,18 +25,21 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
   private _newLayerStore: MutableSystemStore = new MutableSystemStore(0, 'default');
   private _oldLayerStore: MutableSystemStore = new MutableSystemStore(0, 'default');
   private _layerStore: MutableSystemStore = new MutableSystemStore(0, 'default');
-  private _keyboardInterface: CoreKeyboardInterface = new CoreKeyboardInterface();
+  private _keyboardInterface: CoreKeyboardInterface;
 
   /**
    * Initialize the core processor with the provided base path.
    * Sets up the necessary environment for processing keyboard events.
    *
-   * @param {string}  basePath    The path for the core processor resources, i.e. where the
-   *                              km-core.js file is located.
+   * @param {string}                   basePath         The path for the core processor
+   *                                                    resources, i.e. where the
+   *                                                    km-core.js file is located.
+   * @param {VariableStoreSerializer}  storeSerializer  Optional serializer for variable stores.
    * @returns {Promise<void>} A promise that resolves when initialization is complete.
    */
-  public async init(basePath: string): Promise<void> {
+  public async init(basePath: string, storeSerializer?: VariableStoreSerializer): Promise<void> {
     await KM_Core.createCoreProcessor(basePath);
+    this._keyboardInterface = new CoreKeyboardInterface(storeSerializer);
   }
 
   /**
@@ -276,10 +279,14 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     this.saveMarkersToTextStore(coreContext, textStore);
 
     processorAction.beep = core_actions.do_alert;
+    if (this.beepHandler && processorAction.beep) {
+      this.beepHandler(textStore);
+    }
+
     processorAction.triggerKeyDefault = core_actions.emit_keystroke;
 
-    // TODO-web-core: Implement options (#13426)
-    // process_persist_action(engine, actions->persist_options);
+    this.process_persist_action(core_actions.persist_options);
+
     // TODO-web-core: do we have to do anything with the new_caps_lock_state? (#15285)
     // process_capslock_action(actions->new_caps_lock_state);
 
@@ -288,6 +295,20 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     return processorAction;
   }
 
+  private process_persist_action(options: km_core_option_item[]): void {
+    if (this.keyboardInterface.variableStoreSerializer) {
+      for (const option of options) {
+        console.assert(option.scope === KM_CORE_OPTION_SCOPE.OPT_KEYBOARD);
+        if (option.scope !== KM_CORE_OPTION_SCOPE.OPT_KEYBOARD) {
+          continue;
+        }
+        const valueObj: VariableStore = {};
+        valueObj[option.key] = option.value;
+        this.keyboardInterface.variableStoreSerializer.saveStore(toPrefixedKeyboardId(this.activeKeyboard.id), option.key, valueObj);
+      }
+    }
+  }
+
   /**
    * Processes post-keystroke actions for the given device and text store.
    * Handles any actions that should occur after a keystroke is processed.
diff --git a/web/src/engine/src/dom-utils/cookieSerializer.ts b/web/src/engine/src/dom-utils/cookieSerializer.ts
index 019cd6c2bd7..2ab94d00fce 100644
--- a/web/src/engine/src/dom-utils/cookieSerializer.ts
+++ b/web/src/engine/src/dom-utils/cookieSerializer.ts
@@ -23,7 +23,7 @@ export class CookieSerializer<Type extends Record<keyof Type, DecodedCookieField
     const allCookies = cookieSerializer._loadRawCookies();
     const matchingCookies: { name: string, value: Type }[] = [];
 
-    for (const cookieName in allCookies) {
+    for (const cookieName of Object.keys(allCookies)) {
       if (pattern.test(cookieName)) {
         const cookieValue = cookieSerializer.loadCookie(cookieName, decoder || ((val: string) => val as DecodedCookieFieldValue)) as Type;
         matchingCookies.push({ name: cookieName, value: cookieValue });
diff --git a/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts b/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
index 1537a8cc523..e24b69709ad 100644
--- a/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
+++ b/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
@@ -6,7 +6,7 @@ import { KeyboardStub } from "./keyboardStub.js";
 const KEYBOARD_PREFIX = "Keyboard_";
 
 export function toPrefixedKeyboardId(text: string) {
-  if(!text.startsWith(KEYBOARD_PREFIX)) {
+  if(!text?.startsWith(KEYBOARD_PREFIX)) {
     return KEYBOARD_PREFIX + text;
   } else {
     return text;
@@ -14,7 +14,7 @@ export function toPrefixedKeyboardId(text: string) {
 }
 
 export function toUnprefixedKeyboardId(text: string) {
-  if(text.startsWith(KEYBOARD_PREFIX)) {
+  if(text?.startsWith(KEYBOARD_PREFIX)) {
     return text.substring(KEYBOARD_PREFIX.length);
   } else {
     return text;
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts b/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
index 1229b585cab..dfff6e0d2a4 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
@@ -60,11 +60,12 @@ export abstract class KeyboardLoaderBase {
 
     if (this.isKMXKeyboard(byteArray)) {
       // KMX or LDML (KMX+) keyboard
-      const result = KM_Core.instance.keyboard_load_from_blob(uri, byteArray);
+      const name = uri.split('/').pop().replace(/\.[^/.]+$/, '');
+      const result = KM_Core.instance.keyboard_load_from_blob(name, byteArray);
       if (result.status == KM_CORE_STATUS.OK) {
         return new KMXKeyboard(result.object);
       }
-      return null;
+      throw errorBuilder.invalidKeyboard(new Error(`Loading KMX keyboard from ${uri} failed with status ${result.status}`));
     }
 
     let script: string;
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardMinimalInterface.ts b/web/src/engine/src/keyboard/keyboards/keyboardMinimalInterface.ts
index 564a7b2acb9..30e30ffc1a9 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardMinimalInterface.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardMinimalInterface.ts
@@ -1,5 +1,8 @@
+import { VariableStoreSerializer } from '../variableStore.js';
 import { Keyboard } from './keyboardLoaderBase.js';
 
 export interface KeyboardMinimalInterface {
-    activeKeyboard: Keyboard;
+  activeKeyboard: Keyboard;
+  variableStoreSerializer?: VariableStoreSerializer;
+
 }
\ No newline at end of file
diff --git a/web/src/engine/src/main/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
index c921d309808..886c26cf65b 100644
--- a/web/src/engine/src/main/headless/inputProcessor.ts
+++ b/web/src/engine/src/main/headless/inputProcessor.ts
@@ -18,7 +18,8 @@ import {
   type Alternate,
   type Keyboard,
   type KeyEvent,
-  KeyboardProcessor
+  KeyboardProcessor,
+  VariableStoreSerializer
 } from "keyman/engine/keyboard";
 import {
   JSKeyboardProcessor,
@@ -64,8 +65,8 @@ export class InputProcessor {
     this._languageProcessor = new LanguageProcessor(predictiveWorkerFactory, this.contextCache);
   }
 
-  public async init(paths: PathConfiguration): Promise<void> {
-    await this.coreKbdProcessor.init(paths.basePath);
+  public async init(paths: PathConfiguration, storeSerializer?: VariableStoreSerializer): Promise<void> {
+    await this.coreKbdProcessor.init(paths.basePath, storeSerializer);
   }
 
   public get languageProcessor(): LanguageProcessor {
@@ -258,7 +259,7 @@ export class InputProcessor {
 
       // -- All keystroke (and 'alternate') processing is now complete.  Time to finalize everything! --
 
-      // Notify the ModelManager of new input - it's predictive text time!
+      // Notify the ModelCache of new input - it's predictive text time!
       if(alternates && alternates.length > 0) {
         ruleBehavior.transcription.alternates = alternates;
       }
diff --git a/web/src/engine/src/main/keymanEngineBase.ts b/web/src/engine/src/main/keymanEngineBase.ts
index dd4aa09af20..8c6f9f17722 100644
--- a/web/src/engine/src/main/keymanEngineBase.ts
+++ b/web/src/engine/src/main/keymanEngineBase.ts
@@ -13,6 +13,7 @@ import { KeyboardInterfaceBase } from "./keyboardInterfaceBase.js";
 import { ContextManagerBase } from "./contextManagerBase.js";
 import { HardKeyboardBase } from "./hardKeyboardBase.js";
 import { LegacyAPIEvents } from "./legacyAPIEvents.js";
+import { VariableStoreCookieSerializer } from './variableStoreCookieSerializer.js';
 import { EventNames, EventListener, LegacyEventEmitter } from "keyman/engine/events";
 import KEYMAN_VERSION from "@keymanapp/keyman-version";
 import { KMWString } from "keyman/common/web-utils";
@@ -337,7 +338,7 @@ export class KeymanEngineBase<
     //
     // #endregion
 
-    await this.core.init(config.paths);
+    await this.core.init(config.paths, new VariableStoreCookieSerializer());
   }
 
   /**
diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.ts b/web/src/test/auto/e2e/baseline/baseline.tests.ts
index 636cdbb4612..3984213904c 100644
--- a/web/src/test/auto/e2e/baseline/baseline.tests.ts
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.ts
@@ -47,14 +47,6 @@ const testsToFix = {
     'k_0202___alt.kmn',
     'k_0203___generic_ctrlalt.kmn',
     'k_0400___groups_and_virtual_keys.kmn', // kmx only
-    'k_0501___options_with_preset.kmn', // kmx only
-    'k_0502___options_with_save.kmn', // kmx only
-    'k_0503___options_with_save_and_preset.kmn', // kmx only
-    'k_0504___options_with_reset.kmn', // kmx only
-    'k_0505___options_double_set_reset.kmn', // kmx only
-    'k_0506___options_double_set_staged.kmn', // kmx only
-    'k_0507___options___double_reset_staged.kmn', // kmx only
-    'k_0508___options___double_reset.kmn', // kmx only
     'k_0600___system_stores.kmn',
     'k_0601___system_stores_2.kmn',
     'k_0700___caps_lock.kmn',
@@ -140,7 +132,6 @@ test.describe('Baseline tests', () => {
                   value: encodeURIComponent(`${option.key}=${option.value};`),
                   domain: 'localhost',
                   path: '/',
-                  expires: 1768672167
                 });
               }
             }

From 44326731ddc1bf35be98ba712ee03629494f84e9 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 16 Jan 2026 15:52:17 +0100
Subject: [PATCH 212/254] =?UTF-8?q?refactor(web):=20rename=20`ruleBehavior?=
 =?UTF-8?q?`=20variables=20=E2=86=92=20`processorAction`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The changes in PR #12291 renamed the `RuleBehavior` class to
`ProcessorAction`. This change now renames the local variables in
`InputProcessor` accordingly.

Follow-up-of: #12291
Test-bot: skip
---
 .../src/main/headless/inputProcessor.ts       | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/web/src/engine/src/main/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
index c921d309808..c936be3dc72 100644
--- a/web/src/engine/src/main/headless/inputProcessor.ts
+++ b/web/src/engine/src/main/headless/inputProcessor.ts
@@ -218,7 +218,7 @@ export class InputProcessor {
 
     // We presently need the true keystroke to run on the FULL context.  That index is still
     // needed for some indexing operations when comparing two different textStores.
-    let ruleBehavior = this.keyboardProcessor.processKeystroke(keyEvent, textStore);
+    let processorAction = this.keyboardProcessor.processKeystroke(keyEvent, textStore);
 
     // Swap layer as appropriate.
     if(keyEvent.kNextLayer) {
@@ -241,37 +241,37 @@ export class InputProcessor {
     // If any of the four above conditions aren't met - no problem!
     // So it's a pretty niche scenario.
 
-    if(isEmptyTransform(ruleBehavior?.transcription?.transform) && keyEvent.kNextLayer) {
+    if(isEmptyTransform(processorAction?.transcription?.transform) && keyEvent.kNextLayer) {
       isOnlyLayerSwitchKey = true;
     }
 
-    const keepRuleBehavior = ruleBehavior != null;
+    const keepProcessorAction = processorAction != null;
     // Should we swallow any further processing of keystroke events for this keydown-keypress sequence?
-    if(keepRuleBehavior) {
+    if(keepProcessorAction) {
       // alternates are our fat-finger alternate outputs. We don't build these for keys we detect as
       // layer switch keys
-      const alternates = isOnlyLayerSwitchKey ? null : this.buildAlternates(ruleBehavior, keyEvent, preInputTextStore);
+      const alternates = isOnlyLayerSwitchKey ? null : this.buildAlternates(processorAction, keyEvent, preInputTextStore);
 
       // Now that we've done all the keystroke processing needed, ensure any extra effects triggered
       // by the actual keystroke occur.
-      this.keyboardProcessor.finalizeProcessorAction(ruleBehavior, textStore);
+      this.keyboardProcessor.finalizeProcessorAction(processorAction, textStore);
 
       // -- All keystroke (and 'alternate') processing is now complete.  Time to finalize everything! --
 
       // Notify the ModelManager of new input - it's predictive text time!
       if(alternates && alternates.length > 0) {
-        ruleBehavior.transcription.alternates = alternates;
+        processorAction.transcription.alternates = alternates;
       }
     } else {
       // We need a dummy ProcessorAction for keys which have no output (e.g. Shift)
-      ruleBehavior = new ProcessorAction();
-      ruleBehavior.transcription = textStore.buildTranscriptionFrom(textStore, null, false);
-      ruleBehavior.triggersDefaultCommand = true;
+      processorAction = new ProcessorAction();
+      processorAction.transcription = textStore.buildTranscriptionFrom(textStore, null, false);
+      processorAction.triggersDefaultCommand = true;
     }
 
     // Multitaps operate in part by referencing 'committed' Transcriptions to rewind
     // the context as necessary.
-    this.contextCache.save(ruleBehavior.transcription); //
+    this.contextCache.save(processorAction.transcription); //
 
     // The keyboard may want to take an action after all other keystroke processing is
     // finished, for example to switch layers. This action may not have any output
@@ -280,33 +280,33 @@ export class InputProcessor {
 
     // We need to tell the keyboard if the layer has been changed, either by a keyboard rule itself,
     // or by the touch layout 'nextlayer' control.
-    const hasLayerChanged = ruleBehavior.setStore[SystemStoreIDs.TSS_LAYER] || keyEvent.kNextLayer;
+    const hasLayerChanged = processorAction.setStore[SystemStoreIDs.TSS_LAYER] || keyEvent.kNextLayer;
     this.keyboardProcessor.newLayerStore.set(hasLayerChanged ? this.keyboardProcessor.layerId : '');
     this.keyboardProcessor.oldLayerStore.set(hasLayerChanged ? startingLayerId : '');
 
-    const postRuleBehavior = this.keyboardProcessor.processPostKeystroke(this.contextDevice, textStore);
-    if (postRuleBehavior) {
-      this.keyboardProcessor.finalizeProcessorAction(postRuleBehavior, textStore);
+    const postProcessorAction = this.keyboardProcessor.processPostKeystroke(this.contextDevice, textStore);
+    if (postProcessorAction) {
+      this.keyboardProcessor.finalizeProcessorAction(postProcessorAction, textStore);
     }
 
-    // Yes, even for ruleBehavior.triggersDefaultCommand.  Those tend to change the context.
-    ruleBehavior.predictionPromise = this.languageProcessor.predict(ruleBehavior.transcription, this.keyboardProcessor.layerId);
+    // Yes, even for processorAction.triggersDefaultCommand.  Those tend to change the context.
+    processorAction.predictionPromise = this.languageProcessor.predict(processorAction.transcription, this.keyboardProcessor.layerId);
 
     // Text did not change (thus, no text "input") if we tabbed or merely moved the caret.
-    if(!ruleBehavior.triggersDefaultCommand) {
+    if(!processorAction.triggersDefaultCommand) {
       // For DOM-aware textStores, this will trigger a DOM event page designers may listen for.
       textStore.doInputEvent();
     }
 
-    return keepRuleBehavior ? ruleBehavior : null;
+    return keepProcessorAction ? processorAction : null;
   }
 
-  private buildAlternates(ruleBehavior: ProcessorAction, keyEvent: KeyEvent, preInputTextStore: SyntheticTextStore): Alternate[] {
+  private buildAlternates(processorAction: ProcessorAction, keyEvent: KeyEvent, preInputTextStore: SyntheticTextStore): Alternate[] {
     let alternates: Alternate[];
 
     // If we're performing a 'default command', it's not a standard 'typing' event - don't do fat-finger stuff.
     // Also, don't do fat-finger stuff if predictive text isn't enabled.
-    if(this.languageProcessor.isActive && !ruleBehavior.triggersDefaultCommand) {
+    if(this.languageProcessor.isActive && !processorAction.triggersDefaultCommand) {
       const keyDistribution = keyEvent.keyDistribution;
 
       // We don't need to track absolute indexing during alternate-generation;
@@ -378,18 +378,18 @@ export class InputProcessor {
           }
 
           const altEvent = this.keyboardProcessor.activeKeyboard.constructKeyEvent(altKey, keyEvent.device, this.keyboardProcessor.stateKeys);
-          const alternateBehavior = this.keyboardProcessor.processKeystroke(altEvent, textStore);
+          const alternateProcessorAction = this.keyboardProcessor.processKeystroke(altEvent, textStore);
 
-          // If alternateBehavior.beep == true, ignore it.  It's a disallowed key sequence,
+          // If alternateProcessorAction.beep == true, ignore it.  It's a disallowed key sequence,
           // so we expect users to never intend their use.
           //
           // Also possible that this set of conditions fail for all evaluated alternates.
-          if(alternateBehavior && !alternateBehavior.beep && pair.p > 0) {
-            const transform: LexicalModelTypes.Transform = alternateBehavior.transcription.transform;
+          if(alternateProcessorAction && !alternateProcessorAction.beep && pair.p > 0) {
+            const transform: LexicalModelTypes.Transform = alternateProcessorAction.transcription.transform;
 
             // Ensure that the alternate's token id matches that of the current keystroke, as we only
             // record the matched rule's context (since they match)
-            transform.id = ruleBehavior.transcription.token;
+            transform.id = processorAction.transcription.token;
             alternates.push({sample: transform, 'p': pair.p});
             totalMass += pair.p;
           }

From 9930a8cbae5f1e5aaf7979912515d1e922853099 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 16 Jan 2026 16:25:32 +0100
Subject: [PATCH 213/254] refactor(web): remove web-utils exports from keyboard

Types defined in keyman/common/web-utils were re-exported in
keyman/engine/keyboard. This change removes the re-export.

Part-of: #15292
Test-bot: skip
---
 web/src/app/browser/src/hardwareEventKeyboard.ts         | 3 ++-
 web/src/app/browser/src/keymanEngine.ts                  | 3 ++-
 web/src/app/webview/src/keymanEngine.ts                  | 3 ++-
 web/src/app/webview/src/oskConfiguration.ts              | 5 ++---
 web/src/app/webview/src/passthroughKeyboard.ts           | 3 ++-
 web/src/engine/src/attachment/pageContextAttachment.ts   | 3 ++-
 .../engine/src/core-processor/coreKeyboardProcessor.ts   | 3 ++-
 web/src/engine/src/keyboard-storage/cloud/queryEngine.ts | 3 ++-
 .../src/keyboard-storage/cloud/requesterInterface.ts     | 2 +-
 web/src/engine/src/keyboard-storage/domCloudRequester.ts | 2 +-
 web/src/engine/src/keyboard/index.ts                     | 9 ---------
 web/src/engine/src/main/contextManagerBase.ts            | 3 ++-
 web/src/engine/src/main/engineConfiguration.ts           | 5 +++--
 web/src/engine/src/osk/banner/suggestionBanner.ts        | 3 ++-
 web/src/engine/src/osk/index.ts                          | 4 +++-
 .../engine/src/osk/input/gestures/browser/subkeyPopup.ts | 3 ++-
 web/src/engine/src/osk/input/gestures/specsForLayout.ts  | 6 ++----
 web/src/engine/src/osk/keyboard-layout/oskKey.ts         | 3 ++-
 web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts  | 3 ++-
 web/src/engine/src/osk/views/anchoredOskView.ts          | 2 +-
 web/src/engine/src/osk/views/floatingOskView.ts          | 2 +-
 web/src/engine/src/osk/views/inlinedOskView.ts           | 2 +-
 web/src/engine/src/osk/views/oskView.ts                  | 3 +--
 web/src/engine/src/osk/visualKeyboard.ts                 | 3 +--
 .../element-text-stores/element_interfaces.tests.ts      | 3 ++-
 .../element-text-stores/syntheticTextStore.tests.ts      | 3 ++-
 .../auto/dom/cases/keyboard/domKeyboardLoader.tests.ts   | 3 ++-
 .../headless/engine/js-processor/kbdInterface.tests.ts   | 3 ++-
 .../test/auto/headless/engine/keyboard/keyboard.tests.ts | 3 ++-
 .../headless/engine/keyboard/keyboardLoaderBase.tests.ts | 3 ++-
 .../osk/input/gestures/browser/subkeyPopup.tests.ts      | 6 +++---
 web/src/test/auto/resources/loader/nodeCloudRequester.ts | 2 +-
 32 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts
index 22f47544d7d..b64fd760e14 100644
--- a/web/src/app/browser/src/hardwareEventKeyboard.ts
+++ b/web/src/app/browser/src/hardwareEventKeyboard.ts
@@ -1,4 +1,5 @@
-import { Codes, DeviceSpec, KeyEvent, KeyMapping, KeyboardProcessor, Keyboard } from 'keyman/engine/keyboard';
+import { DeviceSpec } from 'keyman/common/web-utils';
+import { Codes, KeyEvent, KeyMapping, KeyboardProcessor, Keyboard } from 'keyman/engine/keyboard';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
 import { HardKeyboardBase, processForMnemonicsAndLegacy } from 'keyman/engine/main';
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 33172bba29f..92ced8cd9f8 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -7,7 +7,8 @@ import {
   VisualKeyboard
 } from 'keyman/engine/osk';
 import { ErrorStub, KeyboardStub, CloudQueryResult, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage';
-import { DeviceSpec, JSKeyboard, Keyboard, KMXKeyboard } from "keyman/engine/keyboard";
+import { DeviceSpec } from 'keyman/common/web-utils';
+import { JSKeyboard, Keyboard, KMXKeyboard } from "keyman/engine/keyboard";
 import KeyboardObject = KeymanWebKeyboard.KeyboardObject;
 
 import * as views from './viewsAnchorpoint.js';
diff --git a/web/src/app/webview/src/keymanEngine.ts b/web/src/app/webview/src/keymanEngine.ts
index fb411bc2d76..4e5af1d2a2c 100644
--- a/web/src/app/webview/src/keymanEngine.ts
+++ b/web/src/app/webview/src/keymanEngine.ts
@@ -1,4 +1,5 @@
-import { DeviceSpec, DefaultRules, ProcessorAction } from 'keyman/engine/keyboard';
+import { DeviceSpec } from 'keyman/common/web-utils';
+import { DefaultRules, ProcessorAction } from 'keyman/engine/keyboard';
 import { KeymanEngineBase, KeyboardInterfaceBase } from 'keyman/engine/main';
 import { AnchoredOSKView, ViewConfiguration, StaticActivator } from 'keyman/engine/osk';
 import { getAbsoluteX, getAbsoluteY } from 'keyman/engine/dom-utils';
diff --git a/web/src/app/webview/src/oskConfiguration.ts b/web/src/app/webview/src/oskConfiguration.ts
index cd0bdd9b4fb..e71c6bab7f6 100644
--- a/web/src/app/webview/src/oskConfiguration.ts
+++ b/web/src/app/webview/src/oskConfiguration.ts
@@ -1,6 +1,5 @@
-import { OSKView } from "keyman/engine/osk";
-import { DeviceSpec } from "keyman/engine/keyboard";
-import { type EmbeddedGestureConfig } from "keyman/engine/osk";
+import { OSKView, type EmbeddedGestureConfig } from "keyman/engine/osk";
+import { DeviceSpec } from 'keyman/common/web-utils';
 
 import { GlobeHint } from './osk/globeHint.js';
 import { type KeymanEngine }  from "./keymanEngine.js";
diff --git a/web/src/app/webview/src/passthroughKeyboard.ts b/web/src/app/webview/src/passthroughKeyboard.ts
index 43e118aebc8..293be9883b1 100644
--- a/web/src/app/webview/src/passthroughKeyboard.ts
+++ b/web/src/app/webview/src/passthroughKeyboard.ts
@@ -1,4 +1,5 @@
-import { DeviceSpec, Keyboard, KeyEvent, ManagedPromise } from 'keyman/engine/keyboard';
+import { DeviceSpec, ManagedPromise } from 'keyman/common/web-utils';
+import { Keyboard, KeyEvent } from 'keyman/engine/keyboard';
 
 import { HardKeyboardBase, processForMnemonicsAndLegacy } from 'keyman/engine/main';
 
diff --git a/web/src/engine/src/attachment/pageContextAttachment.ts b/web/src/engine/src/attachment/pageContextAttachment.ts
index 2ffaf18f432..45c403c8610 100644
--- a/web/src/engine/src/attachment/pageContextAttachment.ts
+++ b/web/src/engine/src/attachment/pageContextAttachment.ts
@@ -1,6 +1,7 @@
 import { EventEmitter } from 'eventemitter3';
 
-import { DeviceSpec, InternalKeyboardFont } from "keyman/engine/keyboard";
+import { DeviceSpec } from 'keyman/common/web-utils';
+import { InternalKeyboardFont } from "keyman/engine/keyboard";
 import { InputElementTextStore, nestedInstanceOf, createTextStoreForElement } from "keyman/engine/element-text-stores";
 import {
   arrayFromNodeList,
diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index 625a7255a71..8cd3e710e51 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -6,12 +6,13 @@ import { EventEmitter } from 'eventemitter3';
 import { KM_Core, KM_CORE_STATUS, KM_CORE_CT, km_core_context, km_core_context_items } from 'keyman/engine/core-adapter';
 import {
   BeepHandler,
-  DeviceSpec, EventMap, Keyboard, KeyboardMinimalInterface, KeyboardProcessor,
+  EventMap, Keyboard, KeyboardMinimalInterface, KeyboardProcessor,
   KeyEvent, KMXKeyboard, SyntheticTextStore, MutableSystemStore, TextStore, ProcessorAction,
   StateKeyMap,
   Deadkey
 } from "keyman/engine/keyboard";
 import { KM_CORE_EVENT_FLAG } from '../core-adapter/KM_Core.js';
+import { DeviceSpec } from 'keyman/common/web-utils';
 
 export class CoreKeyboardInterface implements KeyboardMinimalInterface {
   public activeKeyboard: Keyboard;
diff --git a/web/src/engine/src/keyboard-storage/cloud/queryEngine.ts b/web/src/engine/src/keyboard-storage/cloud/queryEngine.ts
index fe76a3fcb64..b6ec76df07e 100644
--- a/web/src/engine/src/keyboard-storage/cloud/queryEngine.ts
+++ b/web/src/engine/src/keyboard-storage/cloud/queryEngine.ts
@@ -3,8 +3,9 @@ import { EventEmitter } from 'eventemitter3';
 import { PathConfiguration } from 'keyman/engine/interfaces';
 
 import { KeyboardStub, ErrorStub, KeyboardAPISpec } from '../keyboardStub.js';
-import { LanguageAPIPropertySpec, ManagedPromise, Version } from 'keyman/engine/keyboard';
+import { LanguageAPIPropertySpec } from 'keyman/engine/keyboard';
 import { CloudRequesterInterface } from './requesterInterface.js';
+import { ManagedPromise, Version } from 'keyman/common/web-utils';
 
 // For when the API call straight-up times out.
 export const CLOUD_TIMEOUT_ERR = "The Cloud API request timed out.";
diff --git a/web/src/engine/src/keyboard-storage/cloud/requesterInterface.ts b/web/src/engine/src/keyboard-storage/cloud/requesterInterface.ts
index b1c84b6c055..f1966559a79 100644
--- a/web/src/engine/src/keyboard-storage/cloud/requesterInterface.ts
+++ b/web/src/engine/src/keyboard-storage/cloud/requesterInterface.ts
@@ -1,4 +1,4 @@
-import { ManagedPromise } from 'keyman/engine/keyboard';
+import { ManagedPromise } from 'keyman/common/web-utils';
 
 export interface CloudRequesterInterface {
   request<T>(query: string): {
diff --git a/web/src/engine/src/keyboard-storage/domCloudRequester.ts b/web/src/engine/src/keyboard-storage/domCloudRequester.ts
index 4901b4be15d..85ab4cd73e1 100644
--- a/web/src/engine/src/keyboard-storage/domCloudRequester.ts
+++ b/web/src/engine/src/keyboard-storage/domCloudRequester.ts
@@ -1,4 +1,4 @@
-import { ManagedPromise } from 'keyman/engine/keyboard';
+import { ManagedPromise } from 'keyman/common/web-utils';
 import { CloudRequesterInterface } from './cloud/requesterInterface.js';
 import { CLOUD_MALFORMED_OBJECT_ERR, CLOUD_TIMEOUT_ERR, CLOUD_STUB_REGISTRATION_ERR } from './cloud/queryEngine.js';
 
diff --git a/web/src/engine/src/keyboard/index.ts b/web/src/engine/src/keyboard/index.ts
index 3cf2aca3d30..965e28df2d1 100644
--- a/web/src/engine/src/keyboard/index.ts
+++ b/web/src/engine/src/keyboard/index.ts
@@ -47,12 +47,3 @@ import { DeadkeyTracker } from './deadkeys.js';
 export const unitTestEndpoints = {
   DeadkeyTracker,
 };
-
-// TODO-web-core: why do we export these here? (#15292)
-export * from "keyman/common/web-utils";
-
-// At the top level, there should be no default export.
-
-// Without the line below... TextStore would likely be aliased there, as it's
-// the last `export { default as _ }` => `export * from` pairing seen above.
-export default undefined;
diff --git a/web/src/engine/src/main/contextManagerBase.ts b/web/src/engine/src/main/contextManagerBase.ts
index 51f968390be..3138bd084c5 100644
--- a/web/src/engine/src/main/contextManagerBase.ts
+++ b/web/src/engine/src/main/contextManagerBase.ts
@@ -1,5 +1,6 @@
 import { EventEmitter } from 'eventemitter3';
-import { ManagedPromise, type Keyboard, type TextStore } from 'keyman/engine/keyboard';
+import { ManagedPromise } from 'keyman/common/web-utils';
+import { type Keyboard, type TextStore } from 'keyman/engine/keyboard';
 import { type JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { StubAndKeyboardCache, type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { PredictionContext } from 'keyman/engine/interfaces';
diff --git a/web/src/engine/src/main/engineConfiguration.ts b/web/src/engine/src/main/engineConfiguration.ts
index 9ade2643a17..3e3015104a1 100644
--- a/web/src/engine/src/main/engineConfiguration.ts
+++ b/web/src/engine/src/main/engineConfiguration.ts
@@ -1,8 +1,9 @@
 import { EventEmitter } from "eventemitter3";
 
+import { DeviceSpec, ManagedPromise, physicalKeyDeviceAlias } from 'keyman/common/web-utils';
 import {
-  DeviceSpec, KeyboardProperties, ManagedPromise, TextStore,
-  ProcessorAction, physicalKeyDeviceAlias, SpacebarText
+  KeyboardProperties, TextStore,
+  ProcessorAction, SpacebarText
 } from "keyman/engine/keyboard";
 import { PathConfiguration, PathOptionDefaults, PathOptionSpec } from "keyman/engine/interfaces";
 import { DeviceDetector } from "./headless/deviceDetector.js";
diff --git a/web/src/engine/src/osk/banner/suggestionBanner.ts b/web/src/engine/src/osk/banner/suggestionBanner.ts
index 9e342ad8320..2efd91e2bed 100644
--- a/web/src/engine/src/osk/banner/suggestionBanner.ts
+++ b/web/src/engine/src/osk/banner/suggestionBanner.ts
@@ -13,7 +13,8 @@ import {
 
 import { BANNER_GESTURE_SET } from './bannerGestureSet.js';
 
-import { DeviceSpec, JSKeyboard, KeyboardProperties, timedPromise } from 'keyman/engine/keyboard';
+import { DeviceSpec, timedPromise } from 'keyman/common/web-utils';
+import { JSKeyboard, KeyboardProperties } from 'keyman/engine/keyboard';
 import { Banner } from './banner.js';
 import { ParsedLengthStyle } from '../lengthStyle.js';
 import { getFontSizeStyle } from '../fontSizeUtils.js';
diff --git a/web/src/engine/src/osk/index.ts b/web/src/engine/src/osk/index.ts
index 8337c382a45..ab4eb0e168c 100644
--- a/web/src/engine/src/osk/index.ts
+++ b/web/src/engine/src/osk/index.ts
@@ -1,4 +1,6 @@
-export { Codes, DeviceSpec, JSKeyboard, KeyboardProperties, SpacebarText } from 'keyman/engine/keyboard';
+// TODO-web-core: why do we export these types from web-utils and keyboard here?
+export { DeviceSpec } from 'keyman/common/web-utils';
+export { Codes, JSKeyboard, KeyboardProperties, SpacebarText } from 'keyman/engine/keyboard';
 
 export { OSKView, JSKeyboardData } from './views/oskView.js';
 export { FloatingOSKView, FloatingOSKViewConfiguration } from './views/floatingOskView.js';
diff --git a/web/src/engine/src/osk/input/gestures/browser/subkeyPopup.ts b/web/src/engine/src/osk/input/gestures/browser/subkeyPopup.ts
index dbeae665cf2..1dd46d20309 100644
--- a/web/src/engine/src/osk/input/gestures/browser/subkeyPopup.ts
+++ b/web/src/engine/src/osk/input/gestures/browser/subkeyPopup.ts
@@ -3,7 +3,8 @@ import { type KeyElement } from '../../../keyElement.js';
 import { OSKBaseKey } from '../../../keyboard-layout/oskBaseKey.js';
 import { VisualKeyboard } from '../../../visualKeyboard.js';
 
-import { DeviceSpec, ActiveSubKey, KeyDistribution, ActiveKeyBase } from 'keyman/engine/keyboard';
+import { ActiveSubKey, KeyDistribution, ActiveKeyBase } from 'keyman/engine/keyboard';
+import { DeviceSpec } from 'keyman/common/web-utils';
 import { ConfigChangeClosure, GestureRecognizerConfiguration, GestureSequence, PaddedZoneSource, RecognitionZoneSource } from 'keyman/engine/gesture-processor';
 import { GestureHandler } from '../gestureHandler.js';
 import { CorrectionLayout, CorrectionLayoutEntry } from '../../../correctionLayout.js';
diff --git a/web/src/engine/src/osk/input/gestures/specsForLayout.ts b/web/src/engine/src/osk/input/gestures/specsForLayout.ts
index 98e92f76db4..6feb5a37b68 100644
--- a/web/src/engine/src/osk/input/gestures/specsForLayout.ts
+++ b/web/src/engine/src/osk/input/gestures/specsForLayout.ts
@@ -9,10 +9,8 @@ import {
 } from '@keymanapp/common-types';
 import ButtonClasses = TouchLayout.TouchLayoutKeySp;
 
-import {
-  ActiveLayout,
-  deepCopy
-} from 'keyman/engine/keyboard';
+import { deepCopy } from 'keyman/common/web-utils';
+import { ActiveLayout } from 'keyman/engine/keyboard';
 
 import { type KeyElement } from '../../keyElement.js';
 
diff --git a/web/src/engine/src/osk/keyboard-layout/oskKey.ts b/web/src/engine/src/osk/keyboard-layout/oskKey.ts
index 8d3be810002..fe68bfc82dd 100644
--- a/web/src/engine/src/osk/keyboard-layout/oskKey.ts
+++ b/web/src/engine/src/osk/keyboard-layout/oskKey.ts
@@ -1,4 +1,5 @@
-import { ActiveKey, ActiveSubKey, ButtonClass, ButtonClasses, DeviceSpec } from 'keyman/engine/keyboard';
+import { DeviceSpec } from 'keyman/common/web-utils';
+import { ActiveKey, ActiveSubKey, ButtonClass, ButtonClasses } from 'keyman/engine/keyboard';
 
 // At present, we don't use @keymanapp/keyman.  Just `keyman`.  (Refer to <root>/web/package.json.)
 import { specialCharacters } from '../specialCharacters.js';
diff --git a/web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts b/web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts
index 55412074c2c..1b0733ea293 100644
--- a/web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts
+++ b/web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts
@@ -1,4 +1,5 @@
-import { type DeviceSpec, JSKeyboard, ActiveLayout, ButtonClasses } from 'keyman/engine/keyboard';
+import { JSKeyboard, ActiveLayout, ButtonClasses } from 'keyman/engine/keyboard';
+import { type DeviceSpec } from 'keyman/common/web-utils';
 
 import { InputSample } from 'keyman/engine/gesture-processor';
 
diff --git a/web/src/engine/src/osk/views/anchoredOskView.ts b/web/src/engine/src/osk/views/anchoredOskView.ts
index 62989c249fd..9e1229f4f03 100644
--- a/web/src/engine/src/osk/views/anchoredOskView.ts
+++ b/web/src/engine/src/osk/views/anchoredOskView.ts
@@ -1,4 +1,4 @@
-import { DeviceSpec } from 'keyman/engine/keyboard';
+import { DeviceSpec } from 'keyman/common/web-utils';
 import { landscapeView } from 'keyman/engine/dom-utils';
 
 import { OSKView, OSKPos, OSKRect } from './oskView.js';
diff --git a/web/src/engine/src/osk/views/floatingOskView.ts b/web/src/engine/src/osk/views/floatingOskView.ts
index 83f1209e753..841a0dff3d1 100644
--- a/web/src/engine/src/osk/views/floatingOskView.ts
+++ b/web/src/engine/src/osk/views/floatingOskView.ts
@@ -1,4 +1,4 @@
-import { DeviceSpec, ManagedPromise, Version } from 'keyman/engine/keyboard';
+import { DeviceSpec, ManagedPromise, Version } from 'keyman/common/web-utils';
 import { getAbsoluteX, getAbsoluteY, landscapeView } from 'keyman/engine/dom-utils';
 import { EmitterListenerSpy } from 'keyman/engine/events';
 
diff --git a/web/src/engine/src/osk/views/inlinedOskView.ts b/web/src/engine/src/osk/views/inlinedOskView.ts
index aa10013b812..6f850c17795 100644
--- a/web/src/engine/src/osk/views/inlinedOskView.ts
+++ b/web/src/engine/src/osk/views/inlinedOskView.ts
@@ -1,4 +1,4 @@
-import { DeviceSpec } from 'keyman/engine/keyboard';
+import { DeviceSpec } from 'keyman/common/web-utils';
 
 import { OSKView, OSKPos, OSKRect } from './oskView.js';
 import { VisualKeyboard } from '../visualKeyboard.js';
diff --git a/web/src/engine/src/osk/views/oskView.ts b/web/src/engine/src/osk/views/oskView.ts
index 451a2854e43..85804452f8a 100644
--- a/web/src/engine/src/osk/views/oskView.ts
+++ b/web/src/engine/src/osk/views/oskView.ts
@@ -10,12 +10,11 @@ import { VisualKeyboard } from '../visualKeyboard.js';
 import { LengthStyle, ParsedLengthStyle } from '../lengthStyle.js';
 import { type KeyElement } from '../keyElement.js';
 
+import { DeviceSpec, ManagedPromise } from 'keyman/common/web-utils';
 import {
   Codes,
-  DeviceSpec,
   JSKeyboard,
   KeyboardProperties,
-  ManagedPromise,
   type MinimalCodesInterface,
   type MutableSystemStore, type SystemStoreMutationHandler,
 } from 'keyman/engine/keyboard';
diff --git a/web/src/engine/src/osk/visualKeyboard.ts b/web/src/engine/src/osk/visualKeyboard.ts
index f1a055ba690..76126579676 100644
--- a/web/src/engine/src/osk/visualKeyboard.ts
+++ b/web/src/engine/src/osk/visualKeyboard.ts
@@ -5,17 +5,16 @@ import {
   ActiveKeyBase,
   ActiveLayout,
   ActiveSubKey,
-  DeviceSpec,
   JSKeyboard,
   KeyboardProperties,
   KeyDistribution,
   KeyEvent,
   Layouts,
   StateKeyMap,
-  timedPromise,
   type InternalKeyboardFont,
 } from 'keyman/engine/keyboard';
 import { isEmptyTransform } from 'keyman/common/web-utils';
+import { DeviceSpec, timedPromise } from 'keyman/common/web-utils';
 
 import { buildCorrectiveLayout } from './correctionLayout.js';
 import { distributionFromDistanceMaps, keyTouchDistances } from './corrections.js';
diff --git a/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts b/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts
index bf834577fc1..413923b5e6f 100644
--- a/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts
+++ b/web/src/test/auto/dom/cases/element-text-stores/element_interfaces.tests.ts
@@ -1,6 +1,7 @@
 import { assert } from 'chai';
 
-import { KMWString, SyntheticTextStore } from 'keyman/engine/keyboard';
+import { KMWString } from 'keyman/common/web-utils';
+import { SyntheticTextStore } from 'keyman/engine/keyboard';
 import * as wrappers from 'keyman/engine/element-text-stores';
 
 import { DynamicElements } from '../../test_utils.js';
diff --git a/web/src/test/auto/dom/cases/element-text-stores/syntheticTextStore.tests.ts b/web/src/test/auto/dom/cases/element-text-stores/syntheticTextStore.tests.ts
index 644a97a2b46..5419a322188 100644
--- a/web/src/test/auto/dom/cases/element-text-stores/syntheticTextStore.tests.ts
+++ b/web/src/test/auto/dom/cases/element-text-stores/syntheticTextStore.tests.ts
@@ -1,6 +1,7 @@
 import { assert } from 'chai';
 
-import { KMWString, SyntheticTextStore } from 'keyman/engine/keyboard';
+import { KMWString } from 'keyman/common/web-utils';
+import { SyntheticTextStore } from 'keyman/engine/keyboard';
 import { InputElementTextStore } from 'keyman/engine/element-text-stores';
 
 import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs';
diff --git a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
index e4ac046e106..8f5cafc5290 100644
--- a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
+++ b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
@@ -1,7 +1,8 @@
 import { assert } from 'chai';
 
 import { DOMKeyboardLoader } from 'keyman/engine/keyboard';
-import { KeyboardHarness, JSKeyboard, MinimalKeymanGlobal, DeviceSpec, KeyboardKeymanGlobal, KeyboardDownloadError, KeyboardScriptError, Keyboard, SyntheticTextStore } from 'keyman/engine/keyboard';
+import { DeviceSpec } from 'keyman/common/web-utils';
+import { KeyboardHarness, JSKeyboard, MinimalKeymanGlobal, KeyboardKeymanGlobal, KeyboardDownloadError, KeyboardScriptError, Keyboard, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { assertThrowsAsync } from 'keyman/tools/testing/test-utils';
 
diff --git a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
index fcf0c702048..a1cf76ca7aa 100644
--- a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
+++ b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
@@ -3,7 +3,8 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { DeviceSpec, JSKeyboard, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
+import { DeviceSpec } from 'keyman/common/web-utils';
+import { JSKeyboard, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
index ff4cd858152..aae762bc703 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
@@ -3,7 +3,8 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { KeyboardHarness, MinimalKeymanGlobal, DeviceSpec, JSKeyboard } from 'keyman/engine/keyboard';
+import { DeviceSpec } from 'keyman/common/web-utils';
+import { KeyboardHarness, MinimalKeymanGlobal, JSKeyboard } from 'keyman/engine/keyboard';
 import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 
 
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
index 59423db7b05..a5d4cad68d2 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
@@ -3,7 +3,8 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { KeyboardHarness, MinimalKeymanGlobal, KeyboardDownloadError, DeviceSpec, InvalidKeyboardError, JSKeyboard, SyntheticTextStore } from 'keyman/engine/keyboard';
+import { DeviceSpec } from 'keyman/common/web-utils';
+import { KeyboardHarness, MinimalKeymanGlobal, KeyboardDownloadError, InvalidKeyboardError, JSKeyboard, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 import { assertThrowsAsync, assertThrows } from 'keyman/tools/testing/test-utils';
diff --git a/web/src/test/auto/headless/engine/osk/input/gestures/browser/subkeyPopup.tests.ts b/web/src/test/auto/headless/engine/osk/input/gestures/browser/subkeyPopup.tests.ts
index e893362c00d..6f1df503877 100644
--- a/web/src/test/auto/headless/engine/osk/input/gestures/browser/subkeyPopup.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/input/gestures/browser/subkeyPopup.tests.ts
@@ -4,9 +4,9 @@ import { JSDOM } from 'jsdom';
 import sinon from 'sinon';
 
 import { GesturePath, GestureSequence, GestureSource, GestureSourceSubview } from 'keyman/engine/gesture-processor';
-import { ActiveSubKey, DeviceSpec } from 'keyman/engine/keyboard';
-import { DEFAULT_GESTURE_PARAMS, KeyElement, VisualKeyboard } from 'keyman/engine/osk';
-import { testIndex } from 'keyman/engine/osk';
+import { DeviceSpec } from 'keyman/common/web-utils';
+import { ActiveSubKey } from 'keyman/engine/keyboard';
+import { DEFAULT_GESTURE_PARAMS, KeyElement, VisualKeyboard, testIndex } from 'keyman/engine/osk';
 
 import OSKBaseKey = testIndex.OSKBaseKey;
 import OSKRow = testIndex.OSKRow;
diff --git a/web/src/test/auto/resources/loader/nodeCloudRequester.ts b/web/src/test/auto/resources/loader/nodeCloudRequester.ts
index 3b4e923b5ce..cd287eb407b 100644
--- a/web/src/test/auto/resources/loader/nodeCloudRequester.ts
+++ b/web/src/test/auto/resources/loader/nodeCloudRequester.ts
@@ -1,4 +1,4 @@
-import { ManagedPromise } from 'keyman/engine/keyboard';
+import { ManagedPromise } from 'keyman/common/web-utils';
 import { CloudRequesterInterface } from '../../../../engine/src/keyboard-storage/cloud/requesterInterface.js';
 import {
   CLOUD_TIMEOUT_ERR,

From aea2e2ab98bd282b993cb6c871c9dec2d32f1f1e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 16 Jan 2026 16:37:49 +0100
Subject: [PATCH 214/254] refactor(web): use unitTestEndpoint pattern in OSK

This changes the exports for unit testing to the unitTestEndpoint pattern.

Part-of: #15292
Test-bot: skip
---
 web/src/engine/src/main/keymanEngineBase.ts        |  9 ++++-----
 web/src/engine/src/osk/index.ts                    | 14 ++++++++++----
 web/src/engine/src/osk/test-index.ts               |  4 ----
 .../input/gestures/browser/subkeyPopup.tests.ts    | 10 +++++-----
 4 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 web/src/engine/src/osk/test-index.ts

diff --git a/web/src/engine/src/main/keymanEngineBase.ts b/web/src/engine/src/main/keymanEngineBase.ts
index dd4aa09af20..2609bba260b 100644
--- a/web/src/engine/src/main/keymanEngineBase.ts
+++ b/web/src/engine/src/main/keymanEngineBase.ts
@@ -1,11 +1,10 @@
 import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction, KMXKeyboard } from "keyman/engine/keyboard";
 import { ProcessorInitOptions } from 'keyman/engine/js-processor';
-// TODO-web-core: remove alias (#15292)
-import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard";
+import { DOMKeyboardLoader } from "keyman/engine/keyboard";
 import { WorkerFactory } from "@keymanapp/lexical-model-layer/web"
 import { InputProcessor } from './headless/inputProcessor.js';
 import { OSKView, JSKeyboardData } from "keyman/engine/osk";
-import { KeyboardRequisitioner, ModelCache, toUnprefixedKeyboardId as unprefixed, DOMCloudRequester } from "keyman/engine/keyboard-storage";
+import { KeyboardRequisitioner, ModelCache, toUnprefixedKeyboardId, DOMCloudRequester } from "keyman/engine/keyboard-storage";
 import { ModelSpec, PredictionContext } from "keyman/engine/interfaces";
 
 import { EngineConfiguration, InitOptionSpec } from "./engineConfiguration.js";
@@ -242,7 +241,7 @@ export class KeymanEngineBase<
 
     // Since we're not sandboxing keyboard loads yet, we just use `window` as the jsGlobal object.
     // All components initialized below require a properly-configured `config.paths` or similar.
-    const keyboardLoader = new KeyboardLoader(this.interface, config.applyCacheBusting);
+    const keyboardLoader = new DOMKeyboardLoader(this.interface, config.applyCacheBusting);
     this.keyboardRequisitioner = new KeyboardRequisitioner(keyboardLoader, new DOMCloudRequester(), this.config.paths);
     this.modelCache = new ModelCache();
     const kbdCache = this.keyboardRequisitioner.cache;
@@ -400,7 +399,7 @@ export class KeymanEngineBase<
     const report = {
       configReport: this.config?.debugReport(),
       keyboard: {
-        id: unprefixed(activeKbd?.metadata?.id ?? ''),
+        id: toUnprefixedKeyboardId(activeKbd?.metadata?.id ?? ''),
         langId: activeKbd?.metadata?.langId || '',
         version: activeKbd?.keyboard?.version ?? ''
       },
diff --git a/web/src/engine/src/osk/index.ts b/web/src/engine/src/osk/index.ts
index ab4eb0e168c..292ea9938cd 100644
--- a/web/src/engine/src/osk/index.ts
+++ b/web/src/engine/src/osk/index.ts
@@ -35,7 +35,13 @@ export {
     correctionKeyFilter, buildCorrectiveLayout
 } from './correctionLayout.js';
 
-// TODO-web-core: use a unitTestEndpoints pattern here (#15292)
-export * as testIndex from './test-index.js';
-
-// More things will likely need to be added.
\ No newline at end of file
+import { OSKBaseKey } from './keyboard-layout/oskBaseKey.js';
+import { OSKRow } from './keyboard-layout/oskRow.js';
+import { SubkeyPopup } from './input/gestures/browser/subkeyPopup.js'
+import { link } from './keyElement.js'
+export const unitTestEndpoints = {
+    OSKBaseKey,
+    OSKRow,
+    SubkeyPopup,
+    link
+};
diff --git a/web/src/engine/src/osk/test-index.ts b/web/src/engine/src/osk/test-index.ts
deleted file mode 100644
index c54adc93813..00000000000
--- a/web/src/engine/src/osk/test-index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { OSKBaseKey } from './keyboard-layout/oskBaseKey.js';
-export { OSKRow }  from './keyboard-layout/oskRow.js';
-export { SubkeyPopup } from './input/gestures/browser/subkeyPopup.js'
-export { link } from './keyElement.js'
diff --git a/web/src/test/auto/headless/engine/osk/input/gestures/browser/subkeyPopup.tests.ts b/web/src/test/auto/headless/engine/osk/input/gestures/browser/subkeyPopup.tests.ts
index 6f1df503877..e4ce793e141 100644
--- a/web/src/test/auto/headless/engine/osk/input/gestures/browser/subkeyPopup.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/input/gestures/browser/subkeyPopup.tests.ts
@@ -6,12 +6,12 @@ import sinon from 'sinon';
 import { GesturePath, GestureSequence, GestureSource, GestureSourceSubview } from 'keyman/engine/gesture-processor';
 import { DeviceSpec } from 'keyman/common/web-utils';
 import { ActiveSubKey } from 'keyman/engine/keyboard';
-import { DEFAULT_GESTURE_PARAMS, KeyElement, VisualKeyboard, testIndex } from 'keyman/engine/osk';
+import { DEFAULT_GESTURE_PARAMS, KeyElement, VisualKeyboard, unitTestEndpoints } from 'keyman/engine/osk';
 
-import OSKBaseKey = testIndex.OSKBaseKey;
-import OSKRow = testIndex.OSKRow;
-import SubkeyPopup = testIndex.SubkeyPopup;
-import link = testIndex.link;
+const OSKBaseKey = unitTestEndpoints.OSKBaseKey;
+const OSKRow = unitTestEndpoints.OSKRow;
+const SubkeyPopup = unitTestEndpoints.SubkeyPopup;
+const link = unitTestEndpoints.link;
 
 // Tests for #10126
 describe('subkey menu width', () => {

From f8d07549bab7ea629a15706bfd836e33d41d4a43 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 16 Jan 2026 15:48:54 +0100
Subject: [PATCH 215/254] chore(web): update TODO comments

This changes several `TODO-web-core` to `TODO-embed-osk-in-kmx` because
they are related to OSK and can't be implemented/tested without having
the OSK API available.

Also updated some additional comments.

Build-bot: skip
Test-bot: skip
---
 .../src/core-processor/coreKeyboardProcessor.ts     | 10 +++++++---
 .../engine/src/keyboard/keyboards/kmxKeyboard.ts    | 13 +++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index 625a7255a71..f6c0d767bf5 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -290,7 +290,8 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
 
   /**
    * Processes post-keystroke actions for the given device and text store.
-   * Handles any actions that should occur after a keystroke is processed.
+   * Handles any actions that should occur after a keystroke is processed
+   * or after applying suggestions.
    *
    * @param {DeviceSpec}  device     The device specification.
    * @param {TextStore}   textStore  The current text store context.
@@ -298,7 +299,10 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
    * @returns {ProcessorAction} The resulting processor action, or null if not applicable.
    */
   public processPostKeystroke(device: DeviceSpec, textStore: TextStore): ProcessorAction {
-    // TODO-web-core: Implement this method (#15286)
+    // TODO-embed-osk-in-kmx: Implement this method (#15286)
+    // This gets called after processing a keystroke to process the PostKeystroke group
+    // (irrelevant for web-core since that is handled in Core), but also after
+    // applying a suggestion, which we do need to handle.
     return null;
   }
 
@@ -343,7 +347,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
    * @returns {boolean} True if the keyboard layer changed, false otherwise.
    */
   public selectLayer(keyEvent: KeyEvent): boolean {
-    // TODO-web-core: Implement this method (#15284)
+    // TODO-embed-osk-in-kmx: Implement this method (#15284)
     return false;
   }
 
diff --git a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
index 1c8123192f1..3a7b8a43e79 100644
--- a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
@@ -34,7 +34,7 @@ export class KMXKeyboard {
         },{
           scope: KM_CORE_OPTION_SCOPE.OPT_ENVIRONMENT,
           key: KM_CORE_KMX_ENV.SIMULATEALTGR,
-          value: "0" // TODO: We won't support simulating AltGr option in v19
+          value: "0" // TODO: We won't support simulating AltGr option in v19 - see also emulatesAltGr
         }
       ]
     const result = KM_Core.instance.state_create(_keyboard, environment_opts);
@@ -55,7 +55,7 @@ export class KMXKeyboard {
   }
 
   public constructKeyEvent(key: ActiveKey | ActiveSubKey, device: DeviceSpec, stateKeys: StateKeyMap): KeyEvent {
-    // TODO-web-core: Implement this method (#15290)
+    // TODO-embed-osk-in-kmx: Implement this method (#15290)
     return null;
   }
 
@@ -86,7 +86,8 @@ export class KMXKeyboard {
   }
 
   public get isChiral(): boolean {
-    // TODO-web-core: Implement this method (#15290)
+    // TODO-embed-osk-in-kmx: Implement this method (#15290)
+    // Only relevant for OSK
     return false;
   }
 
@@ -95,7 +96,7 @@ export class KMXKeyboard {
    * @return  {boolean}
    */
   public get emulatesAltGr(): boolean {
-    // TODO-web-core: Implement this method (#15290)
+    // TODO: We won't support simulating AltGr option in v19 - see also c'tor
     return false;
   }
 
@@ -108,8 +109,8 @@ export class KMXKeyboard {
    * @param       {number}           data          1 for KeyDown or FocusReceived,
    *                                               0 for KeyUp or FocusLost
    */
-  public notify(eventCode: NotifyEventCode, textStore: TextStore, data: number): void { // I2187
-    // TODO-web-core: do we need to support this? (#15290)
+  public notify(eventCode: NotifyEventCode, textStore: TextStore, data: number): void {
+    // TODO: implement for IMX (cf #2239 and #7928)
   }
 
 }

From f22faa1c04a34cc8d28c7f76eaf813fcf7a07562 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 16 Jan 2026 17:11:28 +0100
Subject: [PATCH 216/254] =?UTF-8?q?refactor(web):=20rename=20`DefaultRules?=
 =?UTF-8?q?`=20=E2=86=92=20`DefaultOutputRules`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test-bot: skip
---
 web/docs/internal/keystroke-processing.md     |  9 +++++--
 .../app/browser/src/defaultBrowserRules.ts    |  4 +--
 web/src/app/webview/src/keymanEngine.ts       |  4 +--
 .../src/js-processor/jsKeyboardProcessor.ts   | 22 ++++++++--------
 ...{defaultRules.ts => defaultOutputRules.ts} | 26 +++++++++----------
 web/src/engine/src/keyboard/index.ts          |  2 +-
 web/src/engine/src/keyboard/keyEvent.ts       |  6 ++---
 .../keyboard/keyboards/keyboardProcessor.ts   |  2 +-
 8 files changed, 40 insertions(+), 35 deletions(-)
 rename web/src/engine/src/keyboard/{defaultRules.ts => defaultOutputRules.ts} (94%)

diff --git a/web/docs/internal/keystroke-processing.md b/web/docs/internal/keystroke-processing.md
index 60c2c44f7e0..ca44e597833 100644
--- a/web/docs/internal/keystroke-processing.md
+++ b/web/docs/internal/keystroke-processing.md
@@ -72,8 +72,13 @@ Note that for JS-keyboards, in 18.0 and before the true keystroke is processed a
 
 #### Keystroke-default emulation
 
-Note that browser-default keystroke processing is defined within the `DefaultRules` class found at [web/src/engine/keyboard/src/defaultRules.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/keyboard/src/defaultRules.ts).  It currently produces a (possibly `null`) string output rather than a `ProcessorAction`, but the latter can be easily constructed based on the returned string and the existing context state.
-- For `epic/web-core`, it may be wise to spin the `DefaultRules` component off as its own processor, serving as a backup for _all_ keystroke processing variants.
+Note that browser-default keystroke processing is defined within the `DefaultOutputRules` class
+found at
+[web/src/engine/keyboard/src/defaultOutputRules.ts](https://github.com/keymanapp/keyman/blob/master/web/src/engine/keyboard/src/defaultOutputRules.ts).
+It currently produces a (possibly `null`) string output rather than a `ProcessorAction`, but the
+latter can be easily constructed based on the returned string and the existing context state.
+- For `epic/web-core`, it may be wise to spin the `DefaultOutputRules` component off as its own
+  processor, serving as a backup for _all_ keystroke processing variants.
 
 ----
 
diff --git a/web/src/app/browser/src/defaultBrowserRules.ts b/web/src/app/browser/src/defaultBrowserRules.ts
index a631c1a0c21..75c1850868d 100644
--- a/web/src/app/browser/src/defaultBrowserRules.ts
+++ b/web/src/app/browser/src/defaultBrowserRules.ts
@@ -1,14 +1,14 @@
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 import {
   Codes,
-  DefaultRules,
+  DefaultOutputRules,
   type KeyEvent,
   type TextStore
 } from 'keyman/engine/keyboard';
 
 import { ContextManager } from './contextManager.js';
 
-export class DefaultBrowserRules extends DefaultRules {
+export class DefaultBrowserRules extends DefaultOutputRules {
   private contextManager: ContextManager;
 
   constructor(contextManager: ContextManager) {
diff --git a/web/src/app/webview/src/keymanEngine.ts b/web/src/app/webview/src/keymanEngine.ts
index fb411bc2d76..311e2adde2e 100644
--- a/web/src/app/webview/src/keymanEngine.ts
+++ b/web/src/app/webview/src/keymanEngine.ts
@@ -1,4 +1,4 @@
-import { DeviceSpec, DefaultRules, ProcessorAction } from 'keyman/engine/keyboard';
+import { DeviceSpec, DefaultOutputRules, ProcessorAction } from 'keyman/engine/keyboard';
 import { KeymanEngineBase, KeyboardInterfaceBase } from 'keyman/engine/main';
 import { AnchoredOSKView, ViewConfiguration, StaticActivator } from 'keyman/engine/osk';
 import { getAbsoluteX, getAbsoluteY } from 'keyman/engine/dom-utils';
@@ -35,7 +35,7 @@ export class KeymanEngine extends KeymanEngineBase<WebviewConfiguration, Context
         // The `engine` parameter cannot be supplied with the constructing instance before calling
         // `super`, hence the 'fun' rigging to supply it _from_ `super` via this closure.
         keyboardInterface: new KeyboardInterfaceBase(window, engine, config.stubNamespacer),
-        defaultOutputRules: new DefaultRules()
+        defaultOutputRules: new DefaultOutputRules()
       };
     });
 
diff --git a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
index a42ecc70673..c2fdc71a49c 100644
--- a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
@@ -10,7 +10,7 @@ import { EventEmitter } from 'eventemitter3';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 import {
   Codes, type JSKeyboard, MinimalKeymanGlobal, KeyEvent, Layouts,
-  DefaultRules, EmulationKeystrokes, type MutableSystemStore,
+  DefaultOutputRules, EmulationKeystrokes, type MutableSystemStore,
   TextStore, ProcessorAction, SystemStoreIDs, SyntheticTextStore,
   KeyboardProcessor,
   EventMap,
@@ -26,13 +26,13 @@ export type LogMessageHandler = (str: string) => void;
 export interface ProcessorInitOptions {
   baseLayout?: string;
   keyboardInterface?: JSKeyboardInterface; // for tests, replace keyboardInterface with a mock, TODO-web-core: refactor into a unit test pattern
-  defaultOutputRules?: DefaultRules; // Takes the class def object, not an instance thereof.
+  defaultOutputRules?: DefaultOutputRules; // Takes the class def object, not an instance thereof.
 }
 
 export class JSKeyboardProcessor extends EventEmitter<EventMap> implements KeyboardProcessor {
   private static readonly DEFAULT_OPTIONS: ProcessorInitOptions = {
     baseLayout: 'us',
-    defaultOutputRules: new DefaultRules()  // TODO-web-core: move this out of here and only in keymanEngine.ts, rename to DefaultOutputRules
+    defaultOutputRules: new DefaultOutputRules()  // TODO-web-core: move this out of here and only in keymanEngine.ts, rename to DefaultOutputRules
   };
 
   // Tracks the simulated value for supported state keys, allowing the OSK to mirror a physical keyboard for them.
@@ -59,7 +59,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
 
   public baseLayout: string;
 
-  public defaultRules: DefaultRules;
+  public defaultOutputRules: DefaultOutputRules;
 
   // Callbacks for various feedback types
   public beepHandler?: BeepHandler;
@@ -77,7 +77,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
 
     this.baseLayout = options.baseLayout || JSKeyboardProcessor.DEFAULT_OPTIONS.baseLayout;
     this.keyboardInterface = options.keyboardInterface || new JSKeyboardInterface(globalObject(), MinimalKeymanGlobal);
-    this.defaultRules = options.defaultOutputRules || JSKeyboardProcessor.DEFAULT_OPTIONS.defaultOutputRules;
+    this.defaultOutputRules = options.defaultOutputRules || JSKeyboardProcessor.DEFAULT_OPTIONS.defaultOutputRules;
   }
 
   public get activeKeyboard(): JSKeyboard {
@@ -133,13 +133,13 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
       matched = true;  // All the conditions below result in matches until the final else, which restores the expected default
                         // if no match occurs.
 
-      if(this.defaultRules.isCommand(Lkc)) {
+      if(this.defaultOutputRules.isCommand(Lkc)) {
         // Note this in the rule behavior, return successfully.  We'll consider applying it later.
         ruleBehavior.triggersDefaultCommand = true;
 
         // We'd rather let the browser handle these keys, but we're using emulated keystrokes, forcing KMW
         // to emulate default behavior here.
-      } else if((special = this.defaultRules.forSpecialEmulation(Lkc)) != null) {
+      } else if((special = this.defaultOutputRules.forSpecialEmulation(Lkc)) != null) {
         switch(special) {
           case EmulationKeystrokes.Backspace:
             this.keyboardInterface.defaultBackspace(textStore);
@@ -163,12 +163,12 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
     const isMnemonic = this.activeKeyboard && this.activeKeyboard.isMnemonic;
 
     if(!matched) {
-      if((char = this.defaultRules.forAny(Lkc, isMnemonic, ruleBehavior)) != null) {
-        special = this.defaultRules.forSpecialEmulation(Lkc)
+      if((char = this.defaultOutputRules.forAny(Lkc, isMnemonic, ruleBehavior)) != null) {
+        special = this.defaultOutputRules.forSpecialEmulation(Lkc)
         if(special == EmulationKeystrokes.Backspace) {
           // A browser's default backspace may fail to delete both parts of an SMP character.
           this.keyboardInterface.defaultBackspace(textStore);
-        } else if(special || this.defaultRules.isCommand(Lkc)) { // Filters out 'commands' like TAB.
+        } else if(special || this.defaultOutputRules.isCommand(Lkc)) { // Filters out 'commands' like TAB.
           // We only do the "for special emulation" cases under the condition above... aside from backspace
           // Let the browser handle those.
           return null;
@@ -638,7 +638,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
 
     if (data.triggersDefaultCommand) {
       const keyEvent = data.transcription.keystroke;
-      this.defaultRules.applyCommand(keyEvent, textStore);
+      this.defaultOutputRules.applyCommand(keyEvent, textStore);
     }
 
     if (this.warningLogger && data.warningLog) {
diff --git a/web/src/engine/src/keyboard/defaultRules.ts b/web/src/engine/src/keyboard/defaultOutputRules.ts
similarity index 94%
rename from web/src/engine/src/keyboard/defaultRules.ts
rename to web/src/engine/src/keyboard/defaultOutputRules.ts
index 585069f6d1f..1e773cb251a 100644
--- a/web/src/engine/src/keyboard/defaultRules.ts
+++ b/web/src/engine/src/keyboard/defaultOutputRules.ts
@@ -22,9 +22,9 @@ export class LogMessages {
 /**
  * Defines a collection of static library functions that define KeymanWeb's default (implied) keyboard rule behaviors.
  */
-export class DefaultRules {
-  codeForEvent(Lkc: KeyEvent) {
-    return Codes.keyCodes[Lkc.kName] || Lkc.Lcode;;
+export class DefaultOutputRules {
+  protected codeForEvent(Lkc: KeyEvent) {
+    return Codes.keyCodes[Lkc.kName] || Lkc.Lcode;
   }
 
   /**
@@ -32,7 +32,7 @@ export class DefaultRules {
    * Also used by Processor.defaultRuleBehavior to generate output after filtering for special cases.
    */
   public forAny(Lkc: KeyEvent, isMnemonic: boolean, logMessages?: LogMessages): string {
-    var char = '';
+    let char = '';
 
     // A pretty simple table of lookups, corresponding VERY closely to the original defaultKeyOutput.
     if((char = this.forSpecialEmulation(Lkc)) != null) {
@@ -48,7 +48,7 @@ export class DefaultRules {
       // // Not originally defined for text output within defaultKeyOutput.
       // // We can't enable it yet, as it'll cause hardware keystrokes in the DOM to output '\t' rather
       // // than rely on the browser-default handling.
-      let code = this.codeForEvent(Lkc);
+      const code = this.codeForEvent(Lkc);
       switch(code) {
       //   case Codes.keyCodes['K_TAB']:
       //   case Codes.keyCodes['K_TABBACK']:
@@ -64,7 +64,7 @@ export class DefaultRules {
    * isCommand - returns a boolean indicating if a non-text event should be triggered by the keystroke.
    */
   public isCommand(Lkc: KeyEvent): boolean {
-    let code = this.codeForEvent(Lkc);
+    const code = this.codeForEvent(Lkc);
 
     switch(code) {
       // Should we ever implement them:
@@ -115,7 +115,7 @@ export class DefaultRules {
    * for 'synthetic' `TextStore`s like `SyntheticTextStore`s, which have no default text handling.
    */
   public forSpecialEmulation(Lkc: KeyEvent): EmulationKeystrokes {
-    let code = this.codeForEvent(Lkc);
+    const code = this.codeForEvent(Lkc);
 
     switch(code) {
       case Codes.keyCodes['K_BKSP']:
@@ -141,13 +141,13 @@ export class DefaultRules {
     // Translate numpad keystrokes into their non-numpad equivalents
     if(Lkc.Lcode >= Codes.keyCodes["K_NP0"]  &&  Lkc.Lcode <= Codes.keyCodes["K_NPSLASH"]) {
       // Number pad, numlock on
+      let Lch: number;
       if(Lkc.Lcode < 106) {
-        var Lch = Lkc.Lcode-48;
+        Lch = Lkc.Lcode-48;
       } else {
         Lch = Lkc.Lcode-64;
       }
-      let ch = String.fromCodePoint(Lch);
-      return ch;
+      return String.fromCodePoint(Lch);
     } else {
       return null;
     }
@@ -166,7 +166,7 @@ export class DefaultRules {
 
     let result = '';
     const codePoints = keyName.substr(2).split('_');
-    for(let codePoint of codePoints) {
+    for(const codePoint of codePoints) {
       const codePointValue = parseInt(codePoint, 16);
       if (((0x0 <= codePointValue) && (codePointValue <= 0x1F)) || ((0x80 <= codePointValue) && (codePointValue <= 0x9F)) || isNaN(codePointValue)) {
         // Code points [U_0000 - U_001F] and [U_0080 - U_009F] refer to Unicode C0 and C1 control codes.
@@ -181,13 +181,13 @@ export class DefaultRules {
         result += String.fromCodePoint(codePointValue);
       }
     }
-    return result ? result : null;
+    return result ||  null;
   }
 
   // Test for otherwise unimplemented keys on the the base default & shift layers.
   // Those keys must be blocked by keyboard rules if intentionally unimplemented; otherwise, this function will trigger.
   public forBaseKeys(Lkc: KeyEvent, logMessages?: LogMessages) {
-    let n = Lkc.Lcode;
+    const n = Lkc.Lcode;
     let keyShiftState = Lkc.Lmodifiers;
 
     // check if exact match to SHIFT's code.  Only the 'default' and 'shift' layers should have default key outputs.
diff --git a/web/src/engine/src/keyboard/index.ts b/web/src/engine/src/keyboard/index.ts
index 3cf2aca3d30..65c5d0f96f7 100644
--- a/web/src/engine/src/keyboard/index.ts
+++ b/web/src/engine/src/keyboard/index.ts
@@ -26,7 +26,7 @@ export { type Alternate, TextTransform } from "./keyboards/textTransform.js";
 export { Transcription } from "./keyboards/transcription.js";
 
 export { Codes } from "./codes.js";
-export { EmulationKeystrokes, LogMessages, DefaultRules } from "./defaultRules.js";
+export { EmulationKeystrokes, LogMessages, DefaultOutputRules } from "./defaultOutputRules.js";
 export { type KeyDistribution, KeyEventSpec, KeyEvent } from "./keyEvent.js";
 export { KeyMapping } from "./keyMapping.js";
 export { type SystemStoreMutationHandler, MutableSystemStore, SystemStore, SystemStoreIDs, type SystemStoreDictionary } from "./systemStore.js";
diff --git a/web/src/engine/src/keyboard/keyEvent.ts b/web/src/engine/src/keyboard/keyEvent.ts
index 363212bb04f..c10605eaaf5 100644
--- a/web/src/engine/src/keyboard/keyEvent.ts
+++ b/web/src/engine/src/keyboard/keyEvent.ts
@@ -10,7 +10,7 @@ import { type JSKeyboard } from "./keyboards/jsKeyboard.js";
 import { type DeviceSpec } from "keyman/common/web-utils";
 
 import { Codes } from './codes.js';
-import { DefaultRules } from "./defaultRules.js";
+import { DefaultOutputRules } from "./defaultOutputRules.js";
 import { ActiveKeyBase } from './keyboards/activeLayout.js';
 
 // Represents a probability distribution over a keyboard's keys.
@@ -19,9 +19,9 @@ export type KeyDistribution = { keySpec: ActiveKeyBase, p: number }[];
 
 /**
  * A simple instance of the standard 'default rules' for keystroke processing from the
- * DefaultRules base class.
+ * DefaultOutputRules base class.
  */
-const BASE_DEFAULT_RULES = new DefaultRules();
+const BASE_DEFAULT_RULES = new DefaultOutputRules();
 
 export interface KeyEventSpec {
 
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts b/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts
index 331ea0a1bb7..7d8b06d4be2 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts
@@ -35,7 +35,7 @@ export type BeepHandler = (textStore: TextStore) => void;
 export interface KeyboardProcessor extends EventEmitter<EventMap> {
   // public static readonly DEFAULT_OPTIONS: ProcessorInitOptions = {
   //   baseLayout: 'us',
-  //   defaultOutputRules: new DefaultRules()
+  //   defaultOutputRules: new DefaultOutputRules()
   // };
 
   /**

From 77b4bd8037f32d5cc46f6da27159a01093778303 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 16 Jan 2026 17:48:40 +0100
Subject: [PATCH 217/254] refactor(web): `options` parameter mandatory in
 `JSKeyboardProcessor` c'tor

This makes the `options` parameter in the `JSKeyboardProcessor`
constructor no longer optional.
Also `baseLayout` and `defaultOutputRules` are now required in
`ProcessorInitOptions`.

For testing purposes we export `DEFAULT_OPTIONS` in a testing endpoint.

Test-bot: skip
---
 web/src/app/browser/src/keymanEngine.ts        |  1 +
 web/src/app/webview/src/keymanEngine.ts        |  1 +
 web/src/engine/src/js-processor/index.ts       | 10 ++++++++++
 .../src/js-processor/jsKeyboardProcessor.ts    | 18 +++++-------------
 .../keyboard/keyboards/keyboardProcessor.ts    |  5 -----
 .../engine/src/main/headless/inputProcessor.ts |  6 ++++--
 .../engine/js-processor/basic-init.tests.js    |  8 ++++----
 .../js-processor/bundled-module.tests.js       |  2 +-
 .../js-processor/engine/context.tests.js       |  6 +++---
 .../engine/js-processor/engine/stores.tests.js |  4 ++--
 .../specialized-backspace.tests.js             | 16 ++++++++--------
 .../testing/recorder-core/src/nodeProctor.ts   |  7 +++++--
 12 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 33172bba29f..bcd4745065e 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -63,6 +63,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
       return {
         // The `engine` parameter cannot be supplied with the constructing instance before calling
         // `super`, hence the 'fun' rigging to supply it _from_ `super` via this closure.
+        baseLayout: 'us',
         keyboardInterface: new KeyboardInterface(window, engine as KeymanEngine),
         defaultOutputRules: new DefaultBrowserRules(engine.contextManager)
       };
diff --git a/web/src/app/webview/src/keymanEngine.ts b/web/src/app/webview/src/keymanEngine.ts
index 311e2adde2e..07d31f250aa 100644
--- a/web/src/app/webview/src/keymanEngine.ts
+++ b/web/src/app/webview/src/keymanEngine.ts
@@ -34,6 +34,7 @@ export class KeymanEngine extends KeymanEngineBase<WebviewConfiguration, Context
       return {
         // The `engine` parameter cannot be supplied with the constructing instance before calling
         // `super`, hence the 'fun' rigging to supply it _from_ `super` via this closure.
+        baseLayout: 'us',
         keyboardInterface: new KeyboardInterfaceBase(window, engine, config.stubNamespacer),
         defaultOutputRules: new DefaultOutputRules()
       };
diff --git a/web/src/engine/src/js-processor/index.ts b/web/src/engine/src/js-processor/index.ts
index 4b544c1b710..e90b38d9dc3 100644
--- a/web/src/engine/src/js-processor/index.ts
+++ b/web/src/engine/src/js-processor/index.ts
@@ -1,3 +1,13 @@
 export { JSKeyboardProcessor, LogMessageHandler, ProcessorInitOptions } from "./jsKeyboardProcessor.js";
 export { JSKeyboardInterface, KeyInformation, StoreNonCharEntry } from "./jsKeyboardInterface.js";
 export { type ComplexKeyboardStore } from "./stores.js";
+
+
+import { DefaultOutputRules } from 'keyman/engine/keyboard';
+import { ProcessorInitOptions } from "./jsKeyboardProcessor.js";
+export const unitTestEndpoints = {
+  DEFAULT_OPTIONS: {
+    baseLayout: 'us',
+    defaultOutputRules: new DefaultOutputRules()
+  } as ProcessorInitOptions
+}
diff --git a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
index c2fdc71a49c..d0f7fb9c498 100644
--- a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
@@ -24,16 +24,12 @@ import { DeviceSpec, globalObject, KMWString } from "keyman/common/web-utils";
 export type LogMessageHandler = (str: string) => void;
 
 export interface ProcessorInitOptions {
-  baseLayout?: string;
+  baseLayout: string;
   keyboardInterface?: JSKeyboardInterface; // for tests, replace keyboardInterface with a mock, TODO-web-core: refactor into a unit test pattern
-  defaultOutputRules?: DefaultOutputRules; // Takes the class def object, not an instance thereof.
+  defaultOutputRules: DefaultOutputRules; // Takes the class def object, not an instance thereof.
 }
 
 export class JSKeyboardProcessor extends EventEmitter<EventMap> implements KeyboardProcessor {
-  private static readonly DEFAULT_OPTIONS: ProcessorInitOptions = {
-    baseLayout: 'us',
-    defaultOutputRules: new DefaultOutputRules()  // TODO-web-core: move this out of here and only in keymanEngine.ts, rename to DefaultOutputRules
-  };
 
   // Tracks the simulated value for supported state keys, allowing the OSK to mirror a physical keyboard for them.
   // Using the exact keyCode name from the Codes definitions will allow for certain optimizations elsewhere in the code.
@@ -66,18 +62,14 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
   public warningLogger?: LogMessageHandler;
   public errorLogger?: LogMessageHandler;
 
-  constructor(device: DeviceSpec, options?: ProcessorInitOptions) {
+  constructor(device: DeviceSpec, options: ProcessorInitOptions) {
     super();
 
-    if(!options) {
-      options = JSKeyboardProcessor.DEFAULT_OPTIONS;
-    }
-
     this.contextDevice = device;
 
-    this.baseLayout = options.baseLayout || JSKeyboardProcessor.DEFAULT_OPTIONS.baseLayout;
+    this.baseLayout = options.baseLayout;
     this.keyboardInterface = options.keyboardInterface || new JSKeyboardInterface(globalObject(), MinimalKeymanGlobal);
-    this.defaultOutputRules = options.defaultOutputRules || JSKeyboardProcessor.DEFAULT_OPTIONS.defaultOutputRules;
+    this.defaultOutputRules = options.defaultOutputRules;
   }
 
   public get activeKeyboard(): JSKeyboard {
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts b/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts
index 7d8b06d4be2..6b906fbfec8 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts
@@ -33,11 +33,6 @@ export type BeepHandler = (textStore: TextStore) => void;
  *   results against a TextStore.
  */
 export interface KeyboardProcessor extends EventEmitter<EventMap> {
-  // public static readonly DEFAULT_OPTIONS: ProcessorInitOptions = {
-  //   baseLayout: 'us',
-  //   defaultOutputRules: new DefaultOutputRules()
-  // };
-
   /**
    * Tracks the simulated values for supported state keys (e.g. CapsLock, NumLock)
    * so that the OSK can reflect a physical keyboard's state. Keys are referenced
diff --git a/web/src/engine/src/main/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
index c921d309808..36c09289ff5 100644
--- a/web/src/engine/src/main/headless/inputProcessor.ts
+++ b/web/src/engine/src/main/headless/inputProcessor.ts
@@ -18,7 +18,8 @@ import {
   type Alternate,
   type Keyboard,
   type KeyEvent,
-  KeyboardProcessor
+  KeyboardProcessor,
+  DefaultOutputRules
 } from "keyman/engine/keyboard";
 import {
   JSKeyboardProcessor,
@@ -31,7 +32,8 @@ import { WorkerFactory } from "@keymanapp/lexical-model-layer";
 
 export class InputProcessor {
   public static readonly DEFAULT_OPTIONS: ProcessorInitOptions = {
-    baseLayout: 'us'
+    baseLayout: 'us',
+    defaultOutputRules: new DefaultOutputRules()
   }
 
   /**
diff --git a/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js b/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
index 5c950539183..e295030f6a9 100644
--- a/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
@@ -3,7 +3,7 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { JSKeyboardProcessor } from 'keyman/engine/js-processor';
+import { JSKeyboardProcessor, unitTestEndpoints } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 
 global.keyman = {}; // So that keyboard-based checks against the global `keyman` succeed.
@@ -13,12 +13,12 @@ global.keyman = {}; // So that keyboard-based checks against the global `keyman`
 describe('JSKeyboardProcessor', function() {
   describe('[[constructor]]', function () {
     it('should initialize without errors', function () {
-      let kp = new JSKeyboardProcessor();
+      let kp = new JSKeyboardProcessor(null, unitTestEndpoints.DEFAULT_OPTIONS);
       assert.isNotNull(kp);
     });
 
     it('has expected default values after initialization', function () {
-      let kp = new JSKeyboardProcessor();
+      let kp = new JSKeyboardProcessor(null, unitTestEndpoints.DEFAULT_OPTIONS);
       assert.equal('us', kp.baseLayout, 'JSKeyboardProcessor has unexpected base layout')
       assert.isNotNull(global.KeymanWeb, 'KeymanWeb global was not automatically installed');
       assert.equal('default', kp.layerId, 'Default layer is not set to "default"');
@@ -28,7 +28,7 @@ describe('JSKeyboardProcessor', function() {
 
   describe('activeKeyboard', function() {
     it('is automatically set (in headless) on keyboard load', async function () {
-      let kp = new JSKeyboardProcessor();
+      let kp = new JSKeyboardProcessor(null, unitTestEndpoints.DEFAULT_OPTIONS);
 
       // These two lines will load a keyboard from its file; headless-mode `registerKeyboard` will
       // automatically set the keyboard as active.
diff --git a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
index bb0e0017f77..5d5f04272e4 100644
--- a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
@@ -17,7 +17,7 @@ let u = toSupplementaryPairString;
 describe('Bundled ES Module for js-processor', function() {
   describe('JSKeyboardProcessor', function () {
     it('should initialize without errors', function () {
-      let kp = new JSProcessorModule.JSKeyboardProcessor();
+      let kp = new JSProcessorModule.JSKeyboardProcessor(null, JSProcessorModule.unitTestEndpoints.DEFAULT_OPTIONS);
       assert.isNotNull(kp);
     });
   });
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
index 0115e5e39ba..ceef13ab175 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
@@ -4,7 +4,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
-import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, JSKeyboardProcessor, unitTestEndpoints } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 
 import { NodeProctor, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
@@ -65,7 +65,7 @@ function runEngineRuleSet(ruleSet, defaultNoun) {
       ruleSeq.test(proctor, textStore);
 
       // Now for the real test!
-      let processor = new JSKeyboardProcessor(device);
+      let processor = new JSKeyboardProcessor(device, unitTestEndpoints.DEFAULT_OPTIONS);
       processor.keyboardInterface = keyboardWithHarness;
       var res = processor.keyboardInterface.fullContextMatch(ruleDef.n, textStore, ruleDef.rule);
 
@@ -1121,7 +1121,7 @@ describe('Engine - Context Matching', function() {
       ruleSeq.test(proctor, textStore);
 
       // Now for the real test!
-      const processor = new JSKeyboardProcessor(device);
+      const processor = new JSKeyboardProcessor(device, unitTestEndpoints.DEFAULT_OPTIONS);
       processor.keyboardInterface = keyboardWithHarness;
       const res = processor.keyboardInterface._BuildExtendedContext(ruleDef.n, ruleDef.ln, textStore);
 
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
index 55a86ba0362..dab5cb721cf 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 
 import { JSKeyboard, KMWString } from 'keyman/engine/keyboard';
-import { JSKeyboardProcessor } from 'keyman/engine/js-processor';
+import { JSKeyboardProcessor, unitTestEndpoints } from 'keyman/engine/js-processor';
 
 let device = {
   formFactor: 'desktop',
@@ -18,7 +18,7 @@ describe('Engine - Stores', function() {
   }
 
   it('Store \'Explosion\'', function() {
-    let processor = new JSKeyboardProcessor(device);
+    let processor = new JSKeyboardProcessor(device, unitTestEndpoints.DEFAULT_OPTIONS);
     // A 'hollow' Keyboard that only follows default rules.  That said, we need a Keyboard
     // instance to host cache data for our exploded store tests.
     processor.activeKeyboard = new JSKeyboard();
diff --git a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
index 0e7d873a4e1..a1326c867d0 100644
--- a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
@@ -6,7 +6,7 @@ const require = createRequire(import.meta.url);
 
 import { KMWString } from 'keyman/common/web-utils';
 import { Codes, KeyEvent, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
-import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, JSKeyboardProcessor, unitTestEndpoints } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
@@ -141,7 +141,7 @@ describe('Engine - specialized backspace handling', function() {
 
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: angkorWithHarness
-    });
+    }, unitTestEndpoints.DEFAULT_OPTIONS);
     const result = processor.processKeystroke(event, contextSource);
 
     assert.isTrue(result.triggerKeyDefault);
@@ -172,7 +172,7 @@ describe('Engine - specialized backspace handling', function() {
     // like backspaces.
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: dummiedWithHarness
-    });
+    }, unitTestEndpoints.DEFAULT_OPTIONS);
     const result = processor.processKeystroke(event, contextSource);
 
     // Did match a keyboard rule.
@@ -204,7 +204,7 @@ describe('Engine - specialized backspace handling', function() {
 
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: angkorWithHarness
-    });
+    }, unitTestEndpoints.DEFAULT_OPTIONS);
     const result = processor.processKeystroke(event, contextSource);
 
     assert.isFalse(result.triggerKeyDefault);
@@ -239,7 +239,7 @@ describe('Engine - specialized backspace handling', function() {
 
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: angkorWithHarness
-    });
+    }, unitTestEndpoints.DEFAULT_OPTIONS);
     const result = processor.processKeystroke(event, contextSource);
 
     assert.isTrue(result.triggerKeyDefault);
@@ -267,7 +267,7 @@ describe('Engine - specialized backspace handling', function() {
 
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: ipaWithHarness
-    });
+    }, unitTestEndpoints.DEFAULT_OPTIONS);
     const result = processor.processKeystroke(event, contextSource);
 
     assert.isTrue(result.triggerKeyDefault);
@@ -298,7 +298,7 @@ describe('Engine - specialized backspace handling', function() {
 
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: bksp2xWithHarness
-    });
+    }, unitTestEndpoints.DEFAULT_OPTIONS);
     const result = processor.processKeystroke(event, contextSource);
 
     // Did match a keyboard rule.
@@ -333,7 +333,7 @@ describe('Engine - specialized backspace handling', function() {
     // like backspaces.
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: dummiedWithHarness
-    });
+    }, unitTestEndpoints.DEFAULT_OPTIONS);
     const result = processor.processKeystroke(event, contextSource);
 
     assert.isFalse(result.triggerKeyDefault);
diff --git a/web/src/tools/testing/recorder-core/src/nodeProctor.ts b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
index 0c8655e0494..ba58ae7181e 100644
--- a/web/src/tools/testing/recorder-core/src/nodeProctor.ts
+++ b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
@@ -8,7 +8,7 @@ import {
   RecordedSyntheticKeystroke
 } from "./index.js";
 
-import { KeyEvent, KeyEventSpec, KeyboardHarness, SyntheticTextStore, TextStore } from "keyman/engine/keyboard";
+import { DefaultOutputRules, KeyEvent, KeyEventSpec, KeyboardHarness, SyntheticTextStore, TextStore } from "keyman/engine/keyboard";
 import { DeviceSpec } from "keyman/common/web-utils";
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 
@@ -55,7 +55,10 @@ export class NodeProctor extends Proctor {
     }
 
     // Establish a fresh processor, setting its keyboard appropriately for the test.
-    const processor = new JSKeyboardProcessor(this.device);
+    const processor = new JSKeyboardProcessor(this.device, {
+      baseLayout: 'us',
+      defaultOutputRules: new DefaultOutputRules()
+    });
     processor.keyboardInterface = this.keyboardWithHarness as JSKeyboardInterface;
     const keyboard = processor.activeKeyboard;
 

From 0d67393f90db4c032686fce24b1ef8fa8f6df629 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 16 Jan 2026 17:52:10 +0100
Subject: [PATCH 218/254] refactor(web): `options` parameter mandatory in
 `InputProcessor` c'tor

This makes the `options` parameter in the `InputProcessor` constructor
no longer optional. Also removes the `DEFAULT_OPTIONS` from
`InputProcessor`.

Test-bot: skip
---
 web/src/engine/src/main/headless/inputProcessor.ts | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/web/src/engine/src/main/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
index 36c09289ff5..8feb18e2c63 100644
--- a/web/src/engine/src/main/headless/inputProcessor.ts
+++ b/web/src/engine/src/main/headless/inputProcessor.ts
@@ -18,8 +18,7 @@ import {
   type Alternate,
   type Keyboard,
   type KeyEvent,
-  KeyboardProcessor,
-  DefaultOutputRules
+  KeyboardProcessor
 } from "keyman/engine/keyboard";
 import {
   JSKeyboardProcessor,
@@ -31,11 +30,6 @@ import { LexicalModelTypes } from '@keymanapp/common-types';
 import { WorkerFactory } from "@keymanapp/lexical-model-layer";
 
 export class InputProcessor {
-  public static readonly DEFAULT_OPTIONS: ProcessorInitOptions = {
-    baseLayout: 'us',
-    defaultOutputRules: new DefaultOutputRules()
-  }
-
   /**
    * Indicates the device (platform) to be used for non-keystroke events,
    * such as those sent to `begin postkeystroke` and `begin newcontext`
@@ -50,15 +44,11 @@ export class InputProcessor {
 
   private readonly contextCache = new TranscriptionCache();
 
-  constructor(device: DeviceSpec, predictiveWorkerFactory: WorkerFactory, options?: ProcessorInitOptions) {
+  constructor(device: DeviceSpec, predictiveWorkerFactory: WorkerFactory, options: ProcessorInitOptions) {
     if(!device) {
       throw new Error('device must be defined');
     }
 
-    if(!options) {
-      options = InputProcessor.DEFAULT_OPTIONS;
-    }
-
     this.contextDevice = device;
     this.jsKbdProcessor = new JSKeyboardProcessor(device, options);
     this._keyboardProcessor = this.jsKbdProcessor;

From aa5c5bad664dbc57cfc1d409177f11d664eb9900 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 16 Jan 2026 18:08:37 +0100
Subject: [PATCH 219/254] refactor(web): make
 `ProcessorInitOptions.keyboardInterface` mandatory

This change moves the `ProcessorInitOptions` interface to a separate
file and makes `keyboardInterface` a required field.

Test-bot: skip
---
 web/src/engine/src/js-processor/index.ts            |  9 ++++++---
 .../engine/src/js-processor/jsKeyboardProcessor.ts  | 13 ++++---------
 .../engine/src/js-processor/processorInitOptions.ts | 11 +++++++++++
 .../tools/testing/recorder-core/src/nodeProctor.ts  |  2 +-
 4 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 web/src/engine/src/js-processor/processorInitOptions.ts

diff --git a/web/src/engine/src/js-processor/index.ts b/web/src/engine/src/js-processor/index.ts
index e90b38d9dc3..51ab930c63b 100644
--- a/web/src/engine/src/js-processor/index.ts
+++ b/web/src/engine/src/js-processor/index.ts
@@ -1,13 +1,16 @@
-export { JSKeyboardProcessor, LogMessageHandler, ProcessorInitOptions } from "./jsKeyboardProcessor.js";
+export { JSKeyboardProcessor, LogMessageHandler } from "./jsKeyboardProcessor.js";
 export { JSKeyboardInterface, KeyInformation, StoreNonCharEntry } from "./jsKeyboardInterface.js";
+export { ProcessorInitOptions } from './processorInitOptions.js';
 export { type ComplexKeyboardStore } from "./stores.js";
 
 
-import { DefaultOutputRules } from 'keyman/engine/keyboard';
-import { ProcessorInitOptions } from "./jsKeyboardProcessor.js";
+import { DefaultOutputRules, globalObject, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
+import { ProcessorInitOptions } from './processorInitOptions.js';
+import { JSKeyboardInterface } from './jsKeyboardInterface.js';
 export const unitTestEndpoints = {
   DEFAULT_OPTIONS: {
     baseLayout: 'us',
+    keyboardInterface:  new JSKeyboardInterface(globalObject(), MinimalKeymanGlobal),
     defaultOutputRules: new DefaultOutputRules()
   } as ProcessorInitOptions
 }
diff --git a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
index d0f7fb9c498..757819fb195 100644
--- a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
@@ -9,7 +9,7 @@
 import { EventEmitter } from 'eventemitter3';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 import {
-  Codes, type JSKeyboard, MinimalKeymanGlobal, KeyEvent, Layouts,
+  Codes, type JSKeyboard, KeyEvent, Layouts,
   DefaultOutputRules, EmulationKeystrokes, type MutableSystemStore,
   TextStore, ProcessorAction, SystemStoreIDs, SyntheticTextStore,
   KeyboardProcessor,
@@ -17,18 +17,13 @@ import {
   BeepHandler,
 } from "keyman/engine/keyboard";
 import { JSKeyboardInterface }  from './jsKeyboardInterface.js';
-import { DeviceSpec, globalObject, KMWString } from "keyman/common/web-utils";
+import { DeviceSpec, KMWString } from "keyman/common/web-utils";
+import { ProcessorInitOptions } from './processorInitOptions.js';
 
 // #endregion
 
 export type LogMessageHandler = (str: string) => void;
 
-export interface ProcessorInitOptions {
-  baseLayout: string;
-  keyboardInterface?: JSKeyboardInterface; // for tests, replace keyboardInterface with a mock, TODO-web-core: refactor into a unit test pattern
-  defaultOutputRules: DefaultOutputRules; // Takes the class def object, not an instance thereof.
-}
-
 export class JSKeyboardProcessor extends EventEmitter<EventMap> implements KeyboardProcessor {
 
   // Tracks the simulated value for supported state keys, allowing the OSK to mirror a physical keyboard for them.
@@ -68,7 +63,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
     this.contextDevice = device;
 
     this.baseLayout = options.baseLayout;
-    this.keyboardInterface = options.keyboardInterface || new JSKeyboardInterface(globalObject(), MinimalKeymanGlobal);
+    this.keyboardInterface = options.keyboardInterface;
     this.defaultOutputRules = options.defaultOutputRules;
   }
 
diff --git a/web/src/engine/src/js-processor/processorInitOptions.ts b/web/src/engine/src/js-processor/processorInitOptions.ts
new file mode 100644
index 00000000000..d9b3d099e5d
--- /dev/null
+++ b/web/src/engine/src/js-processor/processorInitOptions.ts
@@ -0,0 +1,11 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import { DefaultOutputRules } from "keyman/engine/keyboard";
+import { JSKeyboardInterface } from './jsKeyboardInterface.js';
+
+export interface ProcessorInitOptions {
+  baseLayout: string;
+  keyboardInterface: JSKeyboardInterface;
+  defaultOutputRules: DefaultOutputRules;
+}
diff --git a/web/src/tools/testing/recorder-core/src/nodeProctor.ts b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
index ba58ae7181e..10f30a49907 100644
--- a/web/src/tools/testing/recorder-core/src/nodeProctor.ts
+++ b/web/src/tools/testing/recorder-core/src/nodeProctor.ts
@@ -57,9 +57,9 @@ export class NodeProctor extends Proctor {
     // Establish a fresh processor, setting its keyboard appropriately for the test.
     const processor = new JSKeyboardProcessor(this.device, {
       baseLayout: 'us',
+      keyboardInterface: this.keyboardWithHarness as JSKeyboardInterface,
       defaultOutputRules: new DefaultOutputRules()
     });
-    processor.keyboardInterface = this.keyboardWithHarness as JSKeyboardInterface;
     const keyboard = processor.activeKeyboard;
 
     if(sequence instanceof RecordedKeystrokeSequence) {

From 4f154574f666cc2dc6ad1021ac0e486853f03b86 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 16 Jan 2026 18:34:10 +0100
Subject: [PATCH 220/254] feat(web): implement `KeyboardEngineBase.isChiral`

Part-of: #13426
Test-bot: skip
---
 web/src/engine/src/main/keymanEngineBase.ts | 29 +++++++--------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/web/src/engine/src/main/keymanEngineBase.ts b/web/src/engine/src/main/keymanEngineBase.ts
index dd4aa09af20..bc38c7eec53 100644
--- a/web/src/engine/src/main/keymanEngineBase.ts
+++ b/web/src/engine/src/main/keymanEngineBase.ts
@@ -1,4 +1,4 @@
-import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction, KMXKeyboard } from "keyman/engine/keyboard";
+import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeymanGlobal, ProcessorAction } from "keyman/engine/keyboard";
 import { ProcessorInitOptions } from 'keyman/engine/js-processor';
 // TODO-web-core: remove alias (#15292)
 import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard";
@@ -553,36 +553,27 @@ export class KeymanEngineBase<
   /**
    * Function     isChiral
    * Scope        Public
-   * @param       {string|Object=}   k0
+   * @param       {string|Keyboard}   k0
    * @return      {boolean}
    * Description  Tests if the active keyboard (or optional argument) uses chiral modifiers.
    *
    * See https://help.keyman.com/developer/engine/web/current-version/reference/core/isChiral
    */
-  public isChiral(k0?: string | JSKeyboard) {
-    let jsKbd: JSKeyboard;
+  public isChiral(k0?: string | Keyboard) {
+    let keyboard: Keyboard;
     if(k0) {
       if(typeof k0 == 'string') {
-        const kbdObj = this.keyboardRequisitioner.cache.getKeyboard(k0);
-        if (!kbdObj) {
+        keyboard = this.keyboardRequisitioner.cache.getKeyboard(k0);
+        if (!keyboard) {
           throw new Error(`Keyboard '${k0}' has not been loaded.`);
-        } else if (kbdObj instanceof KMXKeyboard) {
-          return false; // TODO-web-core: implement for KMX keyboards
-        } else {
-          k0 = kbdObj;
         }
-      }
-
-      jsKbd = k0;
-    } else {
-      const kbd = this.core.activeKeyboard;
-      if (kbd instanceof JSKeyboard) {
-        jsKbd = kbd;
       } else {
-        return false; // TODO-web-core: implement for KMX keyboards
+        keyboard = k0;
       }
+    } else {
+      keyboard = this.core.activeKeyboard;
     }
-    return jsKbd.isChiral;
+    return keyboard.isChiral;
   }
 
   /**

From 83dca0f7791b06bc14565a6dfdd4b070d5920d5a Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 19 Jan 2026 16:28:52 +0100
Subject: [PATCH 221/254] feat(core): address code review comments

Test-bot: skip
---
 core/src/wasm.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/wasm.cpp b/core/src/wasm.cpp
index d291dc87388..6289bf35f92 100644
--- a/core/src/wasm.cpp
+++ b/core/src/wasm.cpp
@@ -351,8 +351,10 @@ km_core_state_options_update_wasm(
     options_c[i].value = new_options[i].value.c_str();
     options_c[i].scope = new_options[i].scope;
   }
-  options_c[new_options.size()] = {nullptr, nullptr, 0};
-  return km_core_state_options_update(const_cast<km_core_state*>(state), options_c);
+  options_c[new_options.size()] = KM_CORE_OPTIONS_END;
+  km_core_status status = km_core_state_options_update(const_cast<km_core_state*>(state), options_c);
+  delete[] options_c;
+  return status;
 }
 
 const CoreReturn<km_core_context_items>*

From bc3f44760136a5b6688559f2dc1e3c5aaeb8e347 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 19 Jan 2026 17:07:59 +0100
Subject: [PATCH 222/254] feat(web): address code review comments

Test-bot: skip
---
 .../core-processor/coreKeyboardInterface.ts   | 19 ++++++++++++-------
 .../core-processor/coreKeyboardProcessor.ts   |  2 +-
 .../src/js-processor/jsKeyboardInterface.ts   |  2 +-
 .../keyboard-storage/stubAndKeyboardCache.ts  |  4 ++--
 .../keyboard/keyboards/keyboardLoaderBase.ts  |  7 ++++++-
 .../keyboards/keyboardMinimalInterface.ts     |  2 +-
 6 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/web/src/engine/src/core-processor/coreKeyboardInterface.ts b/web/src/engine/src/core-processor/coreKeyboardInterface.ts
index b8960bbd14f..f2203e53ad5 100644
--- a/web/src/engine/src/core-processor/coreKeyboardInterface.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardInterface.ts
@@ -8,7 +8,7 @@ import { toPrefixedKeyboardId } from 'keyman/engine/keyboard-storage';
 export class CoreKeyboardInterface implements KeyboardMinimalInterface {
   private _activeKeyboard: Keyboard;
 
-  public constructor(public variableStoreSerializer?: VariableStoreSerializer) {
+  public constructor(public variableStoreSerializer: VariableStoreSerializer) {
   }
 
   public get activeKeyboard(): Keyboard {
@@ -16,6 +16,16 @@ export class CoreKeyboardInterface implements KeyboardMinimalInterface {
   }
   public set activeKeyboard(keyboard: Keyboard) {
     this._activeKeyboard = keyboard;
+    const options = this.loadSerializedOptions(keyboard);
+
+    if (options.length > 0) {
+      const kmxKeyboard = this._activeKeyboard as KMXKeyboard;
+      KM_Core.instance.state_options_update(kmxKeyboard.state, options);
+    }
+  }
+
+
+  private loadSerializedOptions(keyboard: Keyboard): km_core_option_item[] {
     const stores = this.variableStoreSerializer.findStores(toPrefixedKeyboardId(keyboard.id));
     const options: km_core_option_item[] = [];
     for (const store of stores) {
@@ -30,11 +40,6 @@ export class CoreKeyboardInterface implements KeyboardMinimalInterface {
         }
       }
     }
-
-    if (options.length > 0) {
-      const kmxKeyboard = this._activeKeyboard as KMXKeyboard;
-      KM_Core.instance.state_options_update(kmxKeyboard.state, options);
-    }
+    return options;
   }
-
 }
diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index 7ddc3cd0a47..4e2a99b5593 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -298,8 +298,8 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
   private process_persist_action(options: km_core_option_item[]): void {
     if (this.keyboardInterface.variableStoreSerializer) {
       for (const option of options) {
-        console.assert(option.scope === KM_CORE_OPTION_SCOPE.OPT_KEYBOARD);
         if (option.scope !== KM_CORE_OPTION_SCOPE.OPT_KEYBOARD) {
+          console.error(`Unsupported option scope: ${option.scope}`);
           continue;
         }
         const valueObj: VariableStore = {};
diff --git a/web/src/engine/src/js-processor/jsKeyboardInterface.ts b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
index 2ea921871ad..5fac53a76e5 100644
--- a/web/src/engine/src/js-processor/jsKeyboardInterface.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
@@ -197,7 +197,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
   activeKeyboard: JSKeyboard;
   activeDevice: DeviceSpec;
 
-  variableStoreSerializer?: VariableStoreSerializer;
+  variableStoreSerializer: VariableStoreSerializer;
 
   // A 'reference point' that debug keyboards may use to access KMW's code constants.
   public get Codes(): typeof Codes {
diff --git a/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts b/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
index e24b69709ad..1537a8cc523 100644
--- a/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
+++ b/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
@@ -6,7 +6,7 @@ import { KeyboardStub } from "./keyboardStub.js";
 const KEYBOARD_PREFIX = "Keyboard_";
 
 export function toPrefixedKeyboardId(text: string) {
-  if(!text?.startsWith(KEYBOARD_PREFIX)) {
+  if(!text.startsWith(KEYBOARD_PREFIX)) {
     return KEYBOARD_PREFIX + text;
   } else {
     return text;
@@ -14,7 +14,7 @@ export function toPrefixedKeyboardId(text: string) {
 }
 
 export function toUnprefixedKeyboardId(text: string) {
-  if(text?.startsWith(KEYBOARD_PREFIX)) {
+  if(text.startsWith(KEYBOARD_PREFIX)) {
     return text.substring(KEYBOARD_PREFIX.length);
   } else {
     return text;
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts b/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
index dfff6e0d2a4..07c07882201 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
@@ -60,7 +60,7 @@ export abstract class KeyboardLoaderBase {
 
     if (this.isKMXKeyboard(byteArray)) {
       // KMX or LDML (KMX+) keyboard
-      const name = uri.split('/').pop().replace(/\.[^/.]+$/, '');
+      const name = this.extractIdFromUrl(uri);
       const result = KM_Core.instance.keyboard_load_from_blob(name, byteArray);
       if (result.status == KM_CORE_STATUS.OK) {
         return new KMXKeyboard(result.object);
@@ -79,6 +79,11 @@ export abstract class KeyboardLoaderBase {
     return await this.loadKeyboardFromScript(script, errorBuilder);
   }
 
+  private extractIdFromUrl(uri: string): string {
+    // Extract filename without extension from the URL
+    return uri.split('/').pop().replace(/\.[^/.]+$/, '');
+  }
+
   protected abstract loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Uint8Array>;
 
   protected abstract loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<JSKeyboard>;
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardMinimalInterface.ts b/web/src/engine/src/keyboard/keyboards/keyboardMinimalInterface.ts
index 30e30ffc1a9..7960b0708b3 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardMinimalInterface.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardMinimalInterface.ts
@@ -3,6 +3,6 @@ import { Keyboard } from './keyboardLoaderBase.js';
 
 export interface KeyboardMinimalInterface {
   activeKeyboard: Keyboard;
-  variableStoreSerializer?: VariableStoreSerializer;
+  variableStoreSerializer: VariableStoreSerializer;
 
 }
\ No newline at end of file

From 8d3a6da260356fbae7da78f7ede7f3903b24d080 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 19 Jan 2026 18:17:03 +0100
Subject: [PATCH 223/254] fix(web): fix  baseline tests

Previously the cookies for the baseline tests were set to a fixed time
which might be in the past. This change now calculates the expiration
time and sets them to expire in 60s.

Test-bot: skip
---
 web/src/test/auto/e2e/baseline/baseline.tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.ts b/web/src/test/auto/e2e/baseline/baseline.tests.ts
index 636cdbb4612..223e64565e3 100644
--- a/web/src/test/auto/e2e/baseline/baseline.tests.ts
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.ts
@@ -140,7 +140,7 @@ test.describe('Baseline tests', () => {
                   value: encodeURIComponent(`${option.key}=${option.value};`),
                   domain: 'localhost',
                   path: '/',
-                  expires: 1768672167
+                  expires: Date.now() / 1000 + 60, // expire in 1 minute
                 });
               }
             }

From 01bee770f968218028418cfbdb9ff5e08e6920d1 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 19 Jan 2026 15:46:31 +0100
Subject: [PATCH 224/254] feat(web): cleanup of variable stores

This addresses code review comments in #15437 and removes some
unnecessary definitions related to variable stores. It keeps the
`VariableStoreSerializer` interface although currently
`VariableStoreCookieSerializer` is the only implementation. Conceptually
IMO it makes sense to use a more abstract interface so that in the future
for example we could easily use a different store for a node
implementation.

Details of this change:
- remove `VariableStoreDictionary` interface and replace with
  `VariableStore` type
- remove `VarStoreSerializer` class and replace with
  ` CookieSerializer<VariableStore>`

Follow-up-of: #15437
Test-bot: skip
---
 .../src/js-processor/jsKeyboardInterface.ts   |  3 +-
 web/src/engine/src/keyboard/index.ts          |  2 +-
 .../src/keyboard/keyboards/jsKeyboard.ts      |  8 ++--
 .../src/keyboard/keyboards/processorAction.ts |  4 +-
 web/src/engine/src/keyboard/variableStore.ts  |  4 --
 .../src/main/variableStoreCookieSerializer.ts | 40 +++++--------------
 6 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/web/src/engine/src/js-processor/jsKeyboardInterface.ts b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
index 2ea921871ad..19f564d9d74 100644
--- a/web/src/engine/src/js-processor/jsKeyboardInterface.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
@@ -22,7 +22,6 @@ import {
   type KeyEvent,
   type TextStore,
   VariableStore,
-  VariableStoreDictionary,
   VariableStoreSerializer,
 } from "keyman/engine/keyboard";
 import { PlatformSystemStore } from './platformSystemStore.js';
@@ -1103,7 +1102,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param stores A dictionary of stores which should be found in the
    *               keyboard
    */
-  applyVariableStores(stores: VariableStoreDictionary): void {
+  applyVariableStores(stores: VariableStore): void {
     this.activeKeyboard.variableStores = stores;
   }
 
diff --git a/web/src/engine/src/keyboard/index.ts b/web/src/engine/src/keyboard/index.ts
index 3cf2aca3d30..ac4f70a4055 100644
--- a/web/src/engine/src/keyboard/index.ts
+++ b/web/src/engine/src/keyboard/index.ts
@@ -30,7 +30,7 @@ export { EmulationKeystrokes, LogMessages, DefaultRules } from "./defaultRules.j
 export { type KeyDistribution, KeyEventSpec, KeyEvent } from "./keyEvent.js";
 export { KeyMapping } from "./keyMapping.js";
 export { type SystemStoreMutationHandler, MutableSystemStore, SystemStore, SystemStoreIDs, type SystemStoreDictionary } from "./systemStore.js";
-export { type VariableStore, VariableStoreSerializer, VariableStoreDictionary } from "./variableStore.js";
+export { type VariableStore, VariableStoreSerializer } from "./variableStore.js";
 
 export { DOMKeyboardLoader } from './keyboards/loaders/domKeyboardLoader.js';
 export { SyntheticTextStore } from "./syntheticTextStore.js";
diff --git a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
index 5fd6e06530b..78eeaf53876 100644
--- a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
@@ -4,7 +4,7 @@ import { ActiveKey, ActiveLayout, ActiveSubKey } from "./activeLayout.js";
 import { KeyEvent } from "../keyEvent.js";
 import { type TextStore } from "../textStore.js";
 import { KeymanWebKeyboard, ModifierKeyConstants, TouchLayout } from "@keymanapp/common-types";
-import { VariableStoreDictionary } from "../variableStore.js";
+import { VariableStore } from "../variableStore.js";
 
 import ComplexKeyboardStore = KeymanWebKeyboard.ComplexKeyboardStore;
 import KeyboardObject = KeymanWebKeyboard.KeyboardObject;
@@ -120,9 +120,9 @@ export class JSKeyboard {
    *
    * @returns an object with each property referencing a variable store
    */
-  get variableStores(): VariableStoreDictionary {
+  get variableStores(): VariableStore {
     const storeNames = this.scriptObject['KVS'];
-    let values: VariableStoreDictionary = {};
+    let values: VariableStore = {};
     if(Array.isArray(storeNames)) {
       for(let store of storeNames) {
         values[store] = this.scriptObject[store];
@@ -139,7 +139,7 @@ export class JSKeyboard {
    *
    * @param values  name-value pairs for each store value
    */
-  set variableStores(values: VariableStoreDictionary) {
+  set variableStores(values: VariableStore) {
     const storeNames = this.scriptObject['KVS'];
     if(Array.isArray(storeNames)) {
       for(let store of storeNames) {
diff --git a/web/src/engine/src/keyboard/keyboards/processorAction.ts b/web/src/engine/src/keyboard/keyboards/processorAction.ts
index e6bb3be5dad..12e9c8bca21 100644
--- a/web/src/engine/src/keyboard/keyboards/processorAction.ts
+++ b/web/src/engine/src/keyboard/keyboards/processorAction.ts
@@ -3,7 +3,7 @@
  */
 import { LexicalModelTypes } from '@keymanapp/common-types';
 import { Transcription } from './transcription.js';
-import { VariableStore, VariableStoreDictionary } from '../variableStore.js';
+import { VariableStore } from '../variableStore.js';
 import { SystemStoreDictionary } from '../systemStore.js';
 
 /**
@@ -34,7 +34,7 @@ export class ProcessorAction {
   /**
    * A set of variable stores with possible changes to be applied during finalization.
    */
-  variableStores: VariableStoreDictionary = {};
+  variableStores: VariableStore = {};
 
   /**
    * Denotes a non-output default behavior; this should be evaluated later, against the true keystroke.
diff --git a/web/src/engine/src/keyboard/variableStore.ts b/web/src/engine/src/keyboard/variableStore.ts
index 2b7687245ae..09c80c500e9 100644
--- a/web/src/engine/src/keyboard/variableStore.ts
+++ b/web/src/engine/src/keyboard/variableStore.ts
@@ -4,10 +4,6 @@
  * Definitions for variable stores (see kmn reference)
  */
 
-export interface VariableStoreDictionary {
-  [name: string]: string;
-};
-
 export type VariableStore = { [name: string]: string; };
 
 export interface VariableStoreSerializer {
diff --git a/web/src/engine/src/main/variableStoreCookieSerializer.ts b/web/src/engine/src/main/variableStoreCookieSerializer.ts
index 58425d61ee2..b0772fb05b7 100644
--- a/web/src/engine/src/main/variableStoreCookieSerializer.ts
+++ b/web/src/engine/src/main/variableStoreCookieSerializer.ts
@@ -8,42 +8,20 @@ import { CookieSerializer } from "keyman/engine/dom-utils";
 // Also of note:  there's nothing we can do to allow TS to provide type-checking of
 // dynamic property names; they'd have to be known at compile time to facilitate
 // strict type checking.
-class VarStoreSerializer extends CookieSerializer<VariableStore> {
-  public constructor(keyboardID: string, storeName: string) {
-    super(`KeymanWeb_${keyboardID}_Option_${storeName}`);
-  }
-
-  public load(): VariableStore {
-    return super.load(decodeURIComponent);
-  }
-
-  public save(storeMap: VariableStore) {
-    super.save(storeMap, encodeURIComponent);
-  }
 
-  /**
-   * Find all variable stores associated with a given keyboard.
-   *
-   * @param {string}  keyboardID  The keyboard ID whose variable stores are to be found.
-   *
-   * @returns An array of VariableStore objects found for the keyboard.
-   */
-  public static findStores(keyboardID: string): VariableStore[] {
-    const pattern = new RegExp(`^KeymanWeb_${keyboardID}_Option_`);
-    const matching = CookieSerializer.loadAllMatching<VariableStore>(pattern, decodeURIComponent);
-    return matching.map(m => m.value);
+export class VariableStoreCookieSerializer implements VariableStoreSerializer {
+  private getStoreCookieName(keyboardID: string, storeName: string): string {
+    return `KeymanWeb_${keyboardID}_Option_${storeName}`;
   }
-}
 
-export class VariableStoreCookieSerializer implements VariableStoreSerializer {
   public loadStore(keyboardID: string, storeName: string): VariableStore {
-    const storeCookieSerializer = new VarStoreSerializer(keyboardID, storeName);
-    return storeCookieSerializer.load();
+    const storeCookieSerializer = new CookieSerializer<VariableStore>(this.getStoreCookieName(keyboardID, storeName));
+    return storeCookieSerializer.load(decodeURIComponent);
   }
 
   public saveStore(keyboardID: string, storeName: string, storeMap: VariableStore) {
-    const storeCookieSerializer = new VarStoreSerializer(keyboardID, storeName);
-    storeCookieSerializer.save(storeMap);
+    const storeCookieSerializer = new CookieSerializer<VariableStore>(this.getStoreCookieName(keyboardID, storeName));
+    storeCookieSerializer.save(storeMap, encodeURIComponent);
   }
 
   /**
@@ -54,6 +32,8 @@ export class VariableStoreCookieSerializer implements VariableStoreSerializer {
    * @returns An array of VariableStore objects found for the keyboard.
    */
   public findStores(keyboardID: string): VariableStore[] {
-    return VarStoreSerializer.findStores(keyboardID);
+    const pattern = new RegExp(`^${this.getStoreCookieName(keyboardID, '')}`);
+    const matching = CookieSerializer.loadAllMatching<VariableStore>(pattern, decodeURIComponent);
+    return matching.map(m => m.value);
   }
 }
\ No newline at end of file

From 63173a25ba64e22cfba4d38e29e50ebb93819534 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 20 Jan 2026 11:47:14 +0100
Subject: [PATCH 225/254] feat(developer): address code review comments

---
 web/src/engine/src/keyboard/defaultOutputRules.ts | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/web/src/engine/src/keyboard/defaultOutputRules.ts b/web/src/engine/src/keyboard/defaultOutputRules.ts
index 1e773cb251a..f3fce3472dd 100644
--- a/web/src/engine/src/keyboard/defaultOutputRules.ts
+++ b/web/src/engine/src/keyboard/defaultOutputRules.ts
@@ -141,13 +141,8 @@ export class DefaultOutputRules {
     // Translate numpad keystrokes into their non-numpad equivalents
     if(Lkc.Lcode >= Codes.keyCodes["K_NP0"]  &&  Lkc.Lcode <= Codes.keyCodes["K_NPSLASH"]) {
       // Number pad, numlock on
-      let Lch: number;
-      if(Lkc.Lcode < 106) {
-        Lch = Lkc.Lcode-48;
-      } else {
-        Lch = Lkc.Lcode-64;
-      }
-      return String.fromCodePoint(Lch);
+      const cp = (Lkc.Lcode < 106) ? Lkc.Lcode - 48 : Lkc.Lcode - 64;
+      return String.fromCodePoint(cp);
     } else {
       return null;
     }

From 8ecaae5f214cb1059b0d74ae1d0e83bb6d73ff67 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 20 Jan 2026 12:10:25 +0100
Subject: [PATCH 226/254] refactor(web): address code review comments

- remove confusing comment
- move default ProcessorInitOptions to tests folder
- add jsdoc comments to ProcessorInitOptions

Test-bot: skip
---
 web/src/app/browser/src/keymanEngine.ts            |  2 --
 web/src/engine/src/js-processor/index.ts           | 12 ------------
 .../src/js-processor/processorInitOptions.ts       | 14 ++++++++++++++
 .../engine/js-processor/basic-init.tests.js        |  6 +++---
 .../engine/js-processor/bundled-module.tests.js    |  2 +-
 .../engine/js-processor/engine/context.tests.js    |  4 ++--
 .../engine/js-processor/engine/stores.tests.js     |  2 +-
 .../js-processor/specialized-backspace.tests.js    | 14 +++++++-------
 8 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index bcd4745065e..7c0065591ca 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -61,8 +61,6 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
 
     super(workerFactory, config, new ContextManager(config, () => this.legacyAPIEvents), (engine) => {
       return {
-        // The `engine` parameter cannot be supplied with the constructing instance before calling
-        // `super`, hence the 'fun' rigging to supply it _from_ `super` via this closure.
         baseLayout: 'us',
         keyboardInterface: new KeyboardInterface(window, engine as KeymanEngine),
         defaultOutputRules: new DefaultBrowserRules(engine.contextManager)
diff --git a/web/src/engine/src/js-processor/index.ts b/web/src/engine/src/js-processor/index.ts
index 51ab930c63b..c6941d3733e 100644
--- a/web/src/engine/src/js-processor/index.ts
+++ b/web/src/engine/src/js-processor/index.ts
@@ -2,15 +2,3 @@ export { JSKeyboardProcessor, LogMessageHandler } from "./jsKeyboardProcessor.js
 export { JSKeyboardInterface, KeyInformation, StoreNonCharEntry } from "./jsKeyboardInterface.js";
 export { ProcessorInitOptions } from './processorInitOptions.js';
 export { type ComplexKeyboardStore } from "./stores.js";
-
-
-import { DefaultOutputRules, globalObject, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { ProcessorInitOptions } from './processorInitOptions.js';
-import { JSKeyboardInterface } from './jsKeyboardInterface.js';
-export const unitTestEndpoints = {
-  DEFAULT_OPTIONS: {
-    baseLayout: 'us',
-    keyboardInterface:  new JSKeyboardInterface(globalObject(), MinimalKeymanGlobal),
-    defaultOutputRules: new DefaultOutputRules()
-  } as ProcessorInitOptions
-}
diff --git a/web/src/engine/src/js-processor/processorInitOptions.ts b/web/src/engine/src/js-processor/processorInitOptions.ts
index d9b3d099e5d..3e46a681e67 100644
--- a/web/src/engine/src/js-processor/processorInitOptions.ts
+++ b/web/src/engine/src/js-processor/processorInitOptions.ts
@@ -4,8 +4,22 @@
 import { DefaultOutputRules } from "keyman/engine/keyboard";
 import { JSKeyboardInterface } from './jsKeyboardInterface.js';
 
+/**
+ * Configuration options for initializing a keyboard processor.
+ */
 export interface ProcessorInitOptions {
+  /**
+   * The base layout identifier for the keyboard.
+   */
   baseLayout: string;
+
+  /**
+   * The keyboard interface instance to use for processing.
+   */
   keyboardInterface: JSKeyboardInterface;
+
+  /**
+   * The default output rules configuration for key processing.
+   */
   defaultOutputRules: DefaultOutputRules;
 }
diff --git a/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js b/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
index e295030f6a9..1182e841a58 100644
--- a/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
@@ -13,12 +13,12 @@ global.keyman = {}; // So that keyboard-based checks against the global `keyman`
 describe('JSKeyboardProcessor', function() {
   describe('[[constructor]]', function () {
     it('should initialize without errors', function () {
-      let kp = new JSKeyboardProcessor(null, unitTestEndpoints.DEFAULT_OPTIONS);
+      let kp = new JSKeyboardProcessor(null, DEFAULT_PROCESSOR_INIT_OPTIONS);
       assert.isNotNull(kp);
     });
 
     it('has expected default values after initialization', function () {
-      let kp = new JSKeyboardProcessor(null, unitTestEndpoints.DEFAULT_OPTIONS);
+      let kp = new JSKeyboardProcessor(null, DEFAULT_PROCESSOR_INIT_OPTIONS);
       assert.equal('us', kp.baseLayout, 'JSKeyboardProcessor has unexpected base layout')
       assert.isNotNull(global.KeymanWeb, 'KeymanWeb global was not automatically installed');
       assert.equal('default', kp.layerId, 'Default layer is not set to "default"');
@@ -28,7 +28,7 @@ describe('JSKeyboardProcessor', function() {
 
   describe('activeKeyboard', function() {
     it('is automatically set (in headless) on keyboard load', async function () {
-      let kp = new JSKeyboardProcessor(null, unitTestEndpoints.DEFAULT_OPTIONS);
+      let kp = new JSKeyboardProcessor(null, DEFAULT_PROCESSOR_INIT_OPTIONS);
 
       // These two lines will load a keyboard from its file; headless-mode `registerKeyboard` will
       // automatically set the keyboard as active.
diff --git a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
index 5d5f04272e4..ecf32c9e2ce 100644
--- a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
@@ -17,7 +17,7 @@ let u = toSupplementaryPairString;
 describe('Bundled ES Module for js-processor', function() {
   describe('JSKeyboardProcessor', function () {
     it('should initialize without errors', function () {
-      let kp = new JSProcessorModule.JSKeyboardProcessor(null, JSProcessorModule.unitTestEndpoints.DEFAULT_OPTIONS);
+      let kp = new JSProcessorModule.JSKeyboardProcessor(null, JSProcessorModule.DEFAULT_PROCESSOR_INIT_OPTIONS);
       assert.isNotNull(kp);
     });
   });
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
index ceef13ab175..4d320650e7e 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
@@ -65,7 +65,7 @@ function runEngineRuleSet(ruleSet, defaultNoun) {
       ruleSeq.test(proctor, textStore);
 
       // Now for the real test!
-      let processor = new JSKeyboardProcessor(device, unitTestEndpoints.DEFAULT_OPTIONS);
+      let processor = new JSKeyboardProcessor(device, DEFAULT_PROCESSOR_INIT_OPTIONS);
       processor.keyboardInterface = keyboardWithHarness;
       var res = processor.keyboardInterface.fullContextMatch(ruleDef.n, textStore, ruleDef.rule);
 
@@ -1121,7 +1121,7 @@ describe('Engine - Context Matching', function() {
       ruleSeq.test(proctor, textStore);
 
       // Now for the real test!
-      const processor = new JSKeyboardProcessor(device, unitTestEndpoints.DEFAULT_OPTIONS);
+      const processor = new JSKeyboardProcessor(device, DEFAULT_PROCESSOR_INIT_OPTIONS);
       processor.keyboardInterface = keyboardWithHarness;
       const res = processor.keyboardInterface._BuildExtendedContext(ruleDef.n, ruleDef.ln, textStore);
 
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
index dab5cb721cf..08179d22b47 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
@@ -18,7 +18,7 @@ describe('Engine - Stores', function() {
   }
 
   it('Store \'Explosion\'', function() {
-    let processor = new JSKeyboardProcessor(device, unitTestEndpoints.DEFAULT_OPTIONS);
+    let processor = new JSKeyboardProcessor(device, DEFAULT_PROCESSOR_INIT_OPTIONS);
     // A 'hollow' Keyboard that only follows default rules.  That said, we need a Keyboard
     // instance to host cache data for our exploded store tests.
     processor.activeKeyboard = new JSKeyboard();
diff --git a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
index a1326c867d0..01715b7d3c8 100644
--- a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
@@ -141,7 +141,7 @@ describe('Engine - specialized backspace handling', function() {
 
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: angkorWithHarness
-    }, unitTestEndpoints.DEFAULT_OPTIONS);
+    }, DEFAULT_PROCESSOR_INIT_OPTIONS);
     const result = processor.processKeystroke(event, contextSource);
 
     assert.isTrue(result.triggerKeyDefault);
@@ -172,7 +172,7 @@ describe('Engine - specialized backspace handling', function() {
     // like backspaces.
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: dummiedWithHarness
-    }, unitTestEndpoints.DEFAULT_OPTIONS);
+    }, DEFAULT_PROCESSOR_INIT_OPTIONS);
     const result = processor.processKeystroke(event, contextSource);
 
     // Did match a keyboard rule.
@@ -204,7 +204,7 @@ describe('Engine - specialized backspace handling', function() {
 
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: angkorWithHarness
-    }, unitTestEndpoints.DEFAULT_OPTIONS);
+    }, DEFAULT_PROCESSOR_INIT_OPTIONS);
     const result = processor.processKeystroke(event, contextSource);
 
     assert.isFalse(result.triggerKeyDefault);
@@ -239,7 +239,7 @@ describe('Engine - specialized backspace handling', function() {
 
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: angkorWithHarness
-    }, unitTestEndpoints.DEFAULT_OPTIONS);
+    }, DEFAULT_PROCESSOR_INIT_OPTIONS);
     const result = processor.processKeystroke(event, contextSource);
 
     assert.isTrue(result.triggerKeyDefault);
@@ -267,7 +267,7 @@ describe('Engine - specialized backspace handling', function() {
 
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: ipaWithHarness
-    }, unitTestEndpoints.DEFAULT_OPTIONS);
+    }, DEFAULT_PROCESSOR_INIT_OPTIONS);
     const result = processor.processKeystroke(event, contextSource);
 
     assert.isTrue(result.triggerKeyDefault);
@@ -298,7 +298,7 @@ describe('Engine - specialized backspace handling', function() {
 
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: bksp2xWithHarness
-    }, unitTestEndpoints.DEFAULT_OPTIONS);
+    }, DEFAULT_PROCESSOR_INIT_OPTIONS);
     const result = processor.processKeystroke(event, contextSource);
 
     // Did match a keyboard rule.
@@ -333,7 +333,7 @@ describe('Engine - specialized backspace handling', function() {
     // like backspaces.
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
       keyboardInterface: dummiedWithHarness
-    }, unitTestEndpoints.DEFAULT_OPTIONS);
+    }, DEFAULT_PROCESSOR_INIT_OPTIONS);
     const result = processor.processKeystroke(event, contextSource);
 
     assert.isFalse(result.triggerKeyDefault);

From 0422b3f912d635fecca8ea316fb06241fc6783fb Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 19 Jan 2026 18:02:06 +0100
Subject: [PATCH 227/254] chore(core): Remove
 `km_core_keyboard_attrs.folder_path`

PR #12769 removed `km_core_keyboard_load` that allowed loading a keyboard
from a path. Instead we now pass a BLOB to core to load a keyboard.
With the function gone there is no longer a need to have a field with the
path.

Follow-up-of: #12497
Related-to: #12769
Test-bot: skip
---
 core/docs/api/keyboards.md                           | 6 +-----
 core/include/keyman/keyman_core_api.h                | 8 --------
 core/src/keyboard.hpp                                | 2 +-
 developer/src/tike/main/Keyman.System.KeymanCore.pas | 1 -
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/core/docs/api/keyboards.md b/core/docs/api/keyboards.md
index 3439e20722b..07a30921c9c 100644
--- a/core/docs/api/keyboards.md
+++ b/core/docs/api/keyboards.md
@@ -20,7 +20,6 @@ Provides read-only information about a keyboard.
 typedef struct {
   km_core_cp const * version_string;
   km_core_cp const * id;
-  km_core_path_name  folder_path;
   km_core_option_item const * default_options;
 } km_core_keyboard_attrs;
 
@@ -33,9 +32,6 @@ typedef struct {
 `id`
 : Keyman keyboard ID string.
 
-`folder_path`
-: Path to the unpacked folder containing the keyboard and associated resources.
-
 `default_options`
 : Set of default values for any options included in the keyboard.
 
@@ -662,4 +658,4 @@ km_core_state_to_json(km_core_state const *state,
 [km_core_event_flags]: processor#km_core_event_flags "km_core_event_flags enum"
 [km_core_process_event]: processor#km_core_process_event "km_core_process_event function"
 [km_core_event]: processor#km_core_event "km_core_event function"
-[km_core_event_code]: processor#km_core_event_code "km_core_event_code enum"
\ No newline at end of file
+[km_core_event_code]: processor#km_core_event_code "km_core_event_code enum"
diff --git a/core/include/keyman/keyman_core_api.h b/core/include/keyman/keyman_core_api.h
index eb9e5ec7b60..4de4863a5fd 100644
--- a/core/include/keyman/keyman_core_api.h
+++ b/core/include/keyman/keyman_core_api.h
@@ -1011,11 +1011,6 @@ Provides read-only information about a keyboard.
 typedef struct {
   km_core_cu const * version_string;
   km_core_cu const * id;
-
-  // TODO-web-core: Deprecate this field (#12497)
-  // KMN_DEPRECATED
-  km_core_path_name  folder_path;
-
   km_core_option_item const * default_options;
 } km_core_keyboard_attrs;
 
@@ -1029,9 +1024,6 @@ typedef struct {
 `id`
 : Keyman keyboard ID string.
 
-`folder_path`
-: Path to the unpacked folder containing the keyboard and associated resources (deprecated).
-
 `default_options`
 : Set of default values for any options included in the keyboard.
 
diff --git a/core/src/keyboard.hpp b/core/src/keyboard.hpp
index 2ca7118d870..1c617b27e88 100644
--- a/core/src/keyboard.hpp
+++ b/core/src/keyboard.hpp
@@ -36,7 +36,7 @@ namespace core
     using options_store = decltype(_default_opts);
 
     keyboard_attributes()
-    : km_core_keyboard_attrs {nullptr, nullptr, nullptr, nullptr} {}
+    : km_core_keyboard_attrs {nullptr, nullptr, nullptr} {}
     keyboard_attributes(keyboard_attributes const &) = delete;
     keyboard_attributes(keyboard_attributes &&);
 
diff --git a/developer/src/tike/main/Keyman.System.KeymanCore.pas b/developer/src/tike/main/Keyman.System.KeymanCore.pas
index 22c4ac49430..154032c0599 100644
--- a/developer/src/tike/main/Keyman.System.KeymanCore.pas
+++ b/developer/src/tike/main/Keyman.System.KeymanCore.pas
@@ -239,7 +239,6 @@ function km_core_state_options_to_json(
   km_core_keyboard_attrs = record
     version_string: pkm_core_cu;
     id: pkm_core_cu;
-    folder_path: km_core_path_name;
     default_optons: pkm_core_option_item
   end;
 

From 40ce71a63f8fe92d392769c1c78a10dc416b9317 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 21 Jan 2026 13:04:12 +0100
Subject: [PATCH 228/254] refactor(web): address code review comments

The definition of `DEFAULT_PROCESSOR_INIT_OPTIONS` got lost in
last PR.

Test-bot: skip
---
 web/src/app/webview/src/keymanEngine.ts             |  2 --
 .../engine/src/js-processor/processorInitOptions.ts |  2 +-
 .../engine/js-processor/basic-init.tests.js         |  3 ++-
 .../engine/js-processor/bundled-module.tests.js     |  3 ++-
 .../engine/js-processor/engine/context.tests.js     |  3 ++-
 .../engine/js-processor/engine/stores.tests.js      |  3 ++-
 .../js-processor/specialized-backspace.tests.js     |  4 ++--
 .../auto/resources/defaultProcessorInitOptions.ts   | 13 +++++++++++++
 8 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 web/src/test/auto/resources/defaultProcessorInitOptions.ts

diff --git a/web/src/app/webview/src/keymanEngine.ts b/web/src/app/webview/src/keymanEngine.ts
index 19bbba85c08..87896956a9c 100644
--- a/web/src/app/webview/src/keymanEngine.ts
+++ b/web/src/app/webview/src/keymanEngine.ts
@@ -33,8 +33,6 @@ export class KeymanEngine extends KeymanEngineBase<WebviewConfiguration, Context
 
     super(workerFactory, config, new ContextManager(config), (engine) => {
       return {
-        // The `engine` parameter cannot be supplied with the constructing instance before calling
-        // `super`, hence the 'fun' rigging to supply it _from_ `super` via this closure.
         baseLayout: 'us',
         keyboardInterface: new KeyboardInterfaceBase(window, engine, config.stubNamespacer),
         defaultOutputRules: new DefaultOutputRules()
diff --git a/web/src/engine/src/js-processor/processorInitOptions.ts b/web/src/engine/src/js-processor/processorInitOptions.ts
index 3e46a681e67..2637a0b3dfe 100644
--- a/web/src/engine/src/js-processor/processorInitOptions.ts
+++ b/web/src/engine/src/js-processor/processorInitOptions.ts
@@ -9,7 +9,7 @@ import { JSKeyboardInterface } from './jsKeyboardInterface.js';
  */
 export interface ProcessorInitOptions {
   /**
-   * The base layout identifier for the keyboard.
+   * The base layout identifier for the keyboard, currently always 'us'.
    */
   baseLayout: string;
 
diff --git a/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js b/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
index 1182e841a58..63fdeb9536a 100644
--- a/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
@@ -3,8 +3,9 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { JSKeyboardProcessor, unitTestEndpoints } from 'keyman/engine/js-processor';
+import { JSKeyboardProcessor } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+import { DEFAULT_PROCESSOR_INIT_OPTIONS } from '../../../resources/defaultProcessorInitOptions.js';
 
 global.keyman = {}; // So that keyboard-based checks against the global `keyman` succeed.
                     // 10.0+ dependent keyboards, like khmer_angkor, will otherwise fail to load.
diff --git a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
index ecf32c9e2ce..a70cc14991a 100644
--- a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
@@ -1,4 +1,5 @@
 import { assert } from "chai";
+import { DEFAULT_PROCESSOR_INIT_OPTIONS } from '../../../resources/defaultProcessorInitOptions.js';
 import * as JSProcessorModule from "keyman/engine/js-processor";
 import * as KeyboardModule from "keyman/engine/keyboard";
 const KMWString = KeyboardModule.KMWString;
@@ -17,7 +18,7 @@ let u = toSupplementaryPairString;
 describe('Bundled ES Module for js-processor', function() {
   describe('JSKeyboardProcessor', function () {
     it('should initialize without errors', function () {
-      let kp = new JSProcessorModule.JSKeyboardProcessor(null, JSProcessorModule.DEFAULT_PROCESSOR_INIT_OPTIONS);
+      let kp = new JSProcessorModule.JSKeyboardProcessor(null, DEFAULT_PROCESSOR_INIT_OPTIONS);
       assert.isNotNull(kp);
     });
   });
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
index 4d320650e7e..0105eb4d95f 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
@@ -4,8 +4,9 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
-import { JSKeyboardInterface, JSKeyboardProcessor, unitTestEndpoints } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+import { DEFAULT_PROCESSOR_INIT_OPTIONS } from '../../../resources/defaultProcessorInitOptions.js';
 
 import { NodeProctor, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
 
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
index 08179d22b47..ebf2c976000 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
@@ -1,7 +1,8 @@
 import { assert } from 'chai';
 
 import { JSKeyboard, KMWString } from 'keyman/engine/keyboard';
-import { JSKeyboardProcessor, unitTestEndpoints } from 'keyman/engine/js-processor';
+import { JSKeyboardProcessor } from 'keyman/engine/js-processor';
+import { DEFAULT_PROCESSOR_INIT_OPTIONS } from '../../../resources/defaultProcessorInitOptions.js';
 
 let device = {
   formFactor: 'desktop',
diff --git a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
index 01715b7d3c8..4357cf59689 100644
--- a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
@@ -1,14 +1,14 @@
 import { assert } from 'chai';
-import fs from 'fs';
 
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { KMWString } from 'keyman/common/web-utils';
 import { Codes, KeyEvent, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
-import { JSKeyboardInterface, JSKeyboardProcessor, unitTestEndpoints } from 'keyman/engine/js-processor';
+import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
+import { DEFAULT_PROCESSOR_INIT_OPTIONS } from '../../../resources/defaultProcessorInitOptions.js';
 
 
 const TEST_DEVICE = {
diff --git a/web/src/test/auto/resources/defaultProcessorInitOptions.ts b/web/src/test/auto/resources/defaultProcessorInitOptions.ts
new file mode 100644
index 00000000000..92ce52a87f4
--- /dev/null
+++ b/web/src/test/auto/resources/defaultProcessorInitOptions.ts
@@ -0,0 +1,13 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+
+import { globalObject } from 'keyman/common/web-utils';
+import { JSKeyboardInterface, ProcessorInitOptions } from 'keyman/engine/js-processor';
+import { DefaultOutputRules, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
+
+export const DEFAULT_PROCESSOR_INIT_OPTIONS = {
+  baseLayout: 'us',
+  keyboardInterface:  new JSKeyboardInterface(globalObject(), MinimalKeymanGlobal),
+  defaultOutputRules: new DefaultOutputRules()
+} as ProcessorInitOptions;

From 54e6a8adefbccf872dbe19bee1f628b059b48e12 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 21 Jan 2026 15:25:35 +0100
Subject: [PATCH 229/254] fix(web): fix problem with tests if KEYMAN_ROOT is
 not set

When running mocha without starting it through `build.sh`/`test.sh`
the tests failed if the `KEYMAN_ROOT` environment variable was not set.
Things were almost correct, but the undefined `KEYMAN_ROOT` variable
added an extra `undefined` subdirectory. This change fixes this problem
by setting `KEYMAN_ROOT` to the current directory (`.`). This gets
removed by `pathToFileURL` which also adds the absolute path to the
current directory since we pass a relative path as argument.

Build-bot: skip
Test-bot: skip
---
 web/src/test/auto/headless/engine/loadKeyboardHelper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/test/auto/headless/engine/loadKeyboardHelper.ts b/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
index 920dd6755c2..935651792af 100644
--- a/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
+++ b/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
@@ -5,7 +5,7 @@
 import fs from 'node:fs';
 import { pathToFileURL } from 'node:url';
 
-const KEYMAN_ROOT = process.env['KEYMAN_ROOT'];
+const KEYMAN_ROOT = process.env['KEYMAN_ROOT'] ?? '.';
 export const coreurl = pathToFileURL(`${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core`).toString();
 
 export function loadKeyboardBlob(filename: string) {

From de49944aa74f679bff48f956efade2c3b619419c Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 21 Jan 2026 18:27:37 +0100
Subject: [PATCH 230/254] chore(web): remove `keyboard_attributes._folder_path`

---
 core/src/keyboard.cpp | 2 --
 core/src/keyboard.hpp | 2 --
 2 files changed, 4 deletions(-)

diff --git a/core/src/keyboard.cpp b/core/src/keyboard.cpp
index 0f104f9422a..da8054a6aeb 100644
--- a/core/src/keyboard.cpp
+++ b/core/src/keyboard.cpp
@@ -26,7 +26,6 @@ keyboard_attributes::keyboard_attributes(std::u16string const & kbid,
     options_store const &opts)
 : _keyboard_id(kbid),
   _version_string(version),
-  _folder_path(""),
   _default_opts(opts)
 {
   // Ensure that the default_options array will be properly terminated.
@@ -38,7 +37,6 @@ keyboard_attributes::keyboard_attributes(std::u16string const & kbid,
 keyboard_attributes::keyboard_attributes(keyboard_attributes &&rhs)
 : _keyboard_id(std::move(rhs._keyboard_id)),
   _version_string(std::move(rhs._version_string)),
-  _folder_path(""),
   _default_opts(std::move(rhs._default_opts))
 {
     rhs.id = rhs.version_string = nullptr;
diff --git a/core/src/keyboard.hpp b/core/src/keyboard.hpp
index 1c617b27e88..fd5a10898ca 100644
--- a/core/src/keyboard.hpp
+++ b/core/src/keyboard.hpp
@@ -26,8 +26,6 @@ namespace core
   {
     std::u16string      _keyboard_id;
     std::u16string      _version_string;
-    // unused and deprecated
-    core::path           _folder_path;
     std::vector<option> _default_opts;
 
     void render();

From 26542576ee4af85b0461305a0cdb1ff3edacc252 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 22 Jan 2026 16:54:00 +0100
Subject: [PATCH 231/254] feat(web): address code review comments and fix build

---
 .../src/core-processor/coreKeyboardProcessor.ts | 17 +++++++----------
 .../coreKeyboardProcessor.tests.ts              |  3 ++-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index 75b11867171..fb670d23bb9 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -20,6 +20,11 @@ export class CoreKeyboardInterface implements KeyboardMinimalInterface {
   public activeKeyboard: Keyboard;
 }
 
+const lockNames = ['CAPS', 'NUM_LOCK', 'SCROLL_LOCK'] as const;
+const lockKeys = ['K_CAPS', 'K_NUMLOCK', 'K_SCROLL'] as const;
+const lockModifiers = [ModifierKeyConstants.CAPITALFLAG, ModifierKeyConstants.NUMLOCKFLAG, ModifierKeyConstants.SCROLLFLAG] as const;
+const noLockModifers = [ModifierKeyConstants.NOTCAPITALFLAG, ModifierKeyConstants.NOTNUMLOCKFLAG, ModifierKeyConstants.NOTSCROLLFLAG] as const;
+
 /**
  * Implements the core keyboard processing engine that interacts with the
  * shared Keyman Core component which handles .kmx keyboards.
@@ -332,7 +337,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     }
 
     if(keyEvent.isModifier) {
-      this.activeKeyboard.notify(keyEvent.Lcode, textStore, isKeyDown);
+      this.activeKeyboard.notify(keyEvent.Lcode, textStore, isKeyDown ? 1 : 0);
       // For eventual integration - we bypass an OSK update for physical keystrokes when in touch mode.
       if(!keyEvent.device.touchable) {
         return this._UpdateVKShift(keyEvent); // I2187
@@ -342,7 +347,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
     }
 
     if(keyEvent.LmodifierChange) {
-      this.activeKeyboard.notify(0, textStore, true);
+      this.activeKeyboard.notify(0, textStore, 1);
       if(!keyEvent.device.touchable) {
         this._UpdateVKShift(keyEvent);
       }
@@ -365,10 +370,6 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
   private _UpdateVKShift(e: KeyEvent): boolean {
     let keyShiftState=0;
 
-    const lockNames  = ['CAPS', 'NUM_LOCK', 'SCROLL_LOCK'] as const;
-    const lockKeys = ['K_CAPS', 'K_NUMLOCK', 'K_SCROLL'] as const;
-    const lockModifiers = [ModifierKeyConstants.CAPITALFLAG, ModifierKeyConstants.NUMLOCKFLAG, ModifierKeyConstants.SCROLLFLAG] as const;
-
     if(!this.activeKeyboard) {
       return true;
     }
@@ -414,10 +415,6 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
 
   // TODO-web-core: this could be shared with JsKeyboardProcessor
   private updateStates(): void {
-    const lockKeys = ['K_CAPS', 'K_NUMLOCK', 'K_SCROLL'] as const;
-    const lockModifiers = [ModifierKeyConstants.CAPITALFLAG, ModifierKeyConstants.NUMLOCKFLAG, ModifierKeyConstants.SCROLLFLAG] as const;
-    const noLockModifers = [ModifierKeyConstants.NOTCAPITALFLAG, ModifierKeyConstants.NOTNUMLOCKFLAG, ModifierKeyConstants.NOTSCROLLFLAG] as const;
-
     for (let i = 0; i < lockKeys.length; i++) {
       const key = lockKeys[i];
       const flag = this.stateKeys[key];
diff --git a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
index 46c3659d42b..647c541aa7c 100644
--- a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
+++ b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
@@ -6,7 +6,8 @@ import { assert } from 'chai';
 import sinon from 'sinon';
 import { KM_Core, km_core_context, km_core_keyboard, km_core_state, KM_CORE_CT, KM_CORE_STATUS, km_core_context_items } from 'keyman/engine/core-adapter';
 import { coreurl, loadKeyboardBlob } from '../loadKeyboardHelper.js';
-import { Codes, Deadkey, DeviceSpec, KeyEvent, KMXKeyboard, SyntheticTextStore } from 'keyman/engine/keyboard';
+import { DeviceSpec } from 'keyman/common/web-utils';
+import { Codes, Deadkey, KeyEvent, KMXKeyboard, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { CoreKeyboardProcessor } from 'keyman/engine/core-processor';
 
 describe('CoreKeyboardProcessor', function () {

From 7f110d15c51b40cc62acdf137845bd4dc03508d6 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 22 Jan 2026 17:14:01 +0100
Subject: [PATCH 232/254] feat(web): fix build

---
 .../engine/src/core-processor/coreKeyboardProcessor.ts   | 2 +-
 web/src/engine/src/main/headless/inputProcessor.ts       | 2 +-
 .../engine/core-processor/coreKeyboardProcessor.tests.ts | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index bdbd6d45423..968c66d7d56 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -45,7 +45,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
    * @param {VariableStoreSerializer}  storeSerializer  Optional serializer for variable stores.
    * @returns {Promise<void>} A promise that resolves when initialization is complete.
    */
-  public async init(basePath: string, storeSerializer?: VariableStoreSerializer): Promise<void> {
+  public async init(basePath: string, storeSerializer: VariableStoreSerializer): Promise<void> {
     await KM_Core.createCoreProcessor(basePath);
     this._keyboardInterface = new CoreKeyboardInterface(storeSerializer);
   }
diff --git a/web/src/engine/src/main/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
index 230b4b91b2e..e1fb20f07df 100644
--- a/web/src/engine/src/main/headless/inputProcessor.ts
+++ b/web/src/engine/src/main/headless/inputProcessor.ts
@@ -65,7 +65,7 @@ export class InputProcessor {
     this._languageProcessor = new LanguageProcessor(predictiveWorkerFactory, this.contextCache);
   }
 
-  public async init(paths: PathConfiguration, storeSerializer?: VariableStoreSerializer): Promise<void> {
+  public async init(paths: PathConfiguration, storeSerializer: VariableStoreSerializer): Promise<void> {
     await this.coreKbdProcessor.init(paths.basePath, storeSerializer);
   }
 
diff --git a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
index 647c541aa7c..7c4e3690fe5 100644
--- a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
+++ b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
@@ -9,6 +9,7 @@ import { coreurl, loadKeyboardBlob } from '../loadKeyboardHelper.js';
 import { DeviceSpec } from 'keyman/common/web-utils';
 import { Codes, Deadkey, KeyEvent, KMXKeyboard, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { CoreKeyboardProcessor } from 'keyman/engine/core-processor';
+import { VariableStoreCookieSerializer } from 'keyman/engine/main';
 
 describe('CoreKeyboardProcessor', function () {
   const loadKeyboard = function (name: string): km_core_keyboard {
@@ -48,7 +49,7 @@ describe('CoreKeyboardProcessor', function () {
   describe('saveMarkersToTextStore', function () {
     beforeEach(async function () {
       coreProcessor = new CoreKeyboardProcessor();
-      await coreProcessor.init(coreurl);
+      await coreProcessor.init(coreurl, new VariableStoreCookieSerializer());
       state = createState('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
       context = KM_Core.instance.state_context(state);
       sandbox = sinon.createSandbox();
@@ -209,7 +210,7 @@ describe('CoreKeyboardProcessor', function () {
   describe('applyContextFromTextStore', function () {
     beforeEach(async function () {
       coreProcessor = new CoreKeyboardProcessor();
-      await coreProcessor.init(coreurl);
+      await coreProcessor.init(coreurl, new VariableStoreCookieSerializer());
       state = createState('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
       context = KM_Core.instance.state_context(state);
     });
@@ -492,7 +493,7 @@ describe('CoreKeyboardProcessor', function () {
 
     beforeEach(async function () {
       coreProcessor = new CoreKeyboardProcessor();
-      await coreProcessor.init(coreurl);
+      await coreProcessor.init(coreurl, new VariableStoreCookieSerializer());
       state = createState('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
       context = KM_Core.instance.state_context(state);
       sandbox = sinon.createSandbox();
@@ -540,7 +541,7 @@ describe('CoreKeyboardProcessor', function () {
 
     beforeEach(async function () {
       coreProcessor = new CoreKeyboardProcessor();
-      await coreProcessor.init(coreurl);
+      await coreProcessor.init(coreurl, new VariableStoreCookieSerializer());
       state = createState('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
       context = KM_Core.instance.state_context(state);
       sandbox = sinon.createSandbox();

From fd2a43de95fc38626e4a4a03a23870f9650120ca Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
Date: Mon, 26 Jan 2026 08:49:20 +0100
Subject: [PATCH 233/254] Update
 web/src/test/auto/headless/engine/loadKeyboardHelper.ts

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 web/src/test/auto/headless/engine/loadKeyboardHelper.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/src/test/auto/headless/engine/loadKeyboardHelper.ts b/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
index 935651792af..fa1be9f2768 100644
--- a/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
+++ b/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
@@ -5,7 +5,11 @@
 import fs from 'node:fs';
 import { pathToFileURL } from 'node:url';
 
-const KEYMAN_ROOT = process.env['KEYMAN_ROOT'] ?? '.';
+import { fileURLToPath } from 'node:url';
+import { dirname } from 'node:path';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const KEYMAN_ROOT = process.env['KEYMAN_ROOT'] ?? (__dirname + '/../../../../../../');
 export const coreurl = pathToFileURL(`${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core`).toString();
 
 export function loadKeyboardBlob(filename: string) {

From e2b31c488b05adf3aacb610c677c66345c69392c Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 22 Jan 2026 20:39:07 +0100
Subject: [PATCH 234/254] maint(web): re-add engine .js tests

PR #15093 merged multiple engine modules into one. However, in doing so
we lost the .js tests and ran only the .ts ones. This change re-adds the
.js tests and fixes them where the code diverged since then.

Other changes:
- rename `queryEngine.ts` to `cloudQueryEngine.ts` to match the class name
- remove unused `keyboard-storage/cloud/index.ts`
- expose `CLOUD_TIMEOUT_ERR` and `CLOUD_STUB_REGISTRATION_ERR` as
  `unitTestEndpoints`
- add `test/resources` to exports in `web/package.json`. This was necessary
  because the compiled .ts test files are under `web/build` whereas the
  .js test files are under `web/src` and so the relative paths in imports
  no longer work. Also fix the imports in test files.
- apply fix from #15477 if KEYMAN_ROOT is not set

I'm not happy to put the compiled files under
`web/src/test/auto/resources/build`, but that's the only way I got it
to work. If I put the compiled files in `web/build/test/resources` it
couldn't find the types for `promise-status-async`.

Also, running the .js tests succeeded but then creating the coverage
report failed. I was not able to find the reason or a fix for that. As a
hack to work around this problem we check the number of failed tests
instead of relying on the exit code of the test.

Follows: #15093
Test-bot: skip
---
 web/common.inc.sh                             |   6 +-
 web/package.json                              |   4 +
 web/src/engine/build.sh                       |  28 +++-
 .../{queryEngine.ts => cloudQueryEngine.ts}   |   0
 .../src/keyboard-storage/cloud/index.ts       |   2 -
 .../src/keyboard-storage/domCloudRequester.ts |   2 +-
 web/src/engine/src/keyboard-storage/index.ts  |  11 +-
 .../prediction/predictionContext.tests.js     |  16 +-
 .../engine/js-processor/basic-engine.tests.js |   8 +-
 .../engine/js-processor/basic-init.tests.js   |   3 +-
 .../js-processor/bundled-module.tests.js      |  24 +--
 .../engine/js-processor/chirality.tests.js    |   8 +-
 .../engine/js-processor/deadkeys.tests.js     |   8 +-
 .../js-processor/engine/context.tests.js      |   3 +-
 .../engine/notany_context.tests.js            |   2 +-
 .../js-processor/engine/stores.tests.js       |   5 +-
 .../engine/unmatched_final_group.tests.js     |  10 +-
 .../engine/js-processor/kbdInterface.tests.ts |   2 +-
 .../non-positional-rules.tests.js             |   2 +-
 ...ests.js => specialized-backspace.tests.ts} | 150 +++++++++++-------
 .../js-processor/transcriptions.tests.js      |   6 +-
 .../keyboard-storage/cloudQueries.tests.js    |   4 +-
 .../keyboardRequisitioner.tests.js            |  15 +-
 .../keyboard-storage/keyboardStub.tests.js    |   2 +-
 .../nodeCloudRequester.tests.js               |   2 +-
 .../stubAndKeyboardCache.tests.js             |   2 +-
 .../engine/keyboard/keyboard-loading.tests.js |   2 +-
 .../engine/keyboard/keyboard.tests.ts         |   2 +-
 .../keyboard/keyboardLoaderBase.tests.ts      |   2 +-
 .../main/headless/inputProcessor.tests.js     |  24 +--
 .../main/headless/languageProcessor.tests.js  |   6 +-
 .../gestures/gestureMatcher.tests.ts          |   5 +-
 .../gestures/gestureSequence.tests.ts         |   3 +-
 .../gestures/matcherSelector.tests.ts         |   3 +-
 .../gestures/pathMatcher.tests.ts             |   2 +-
 .../gestures/touchpointCoordinator.tests.ts   |   4 +-
 web/src/test/auto/resources/index.ts          |   6 +
 .../resources/loader/node-keyboard-loader.ts  |   1 -
 .../resources/loader/nodeCloudRequester.ts    |  15 +-
 .../auto/resources/loader/tsconfig.node.json  |  13 --
 .../resources/simulateMultiSourceInput.ts     |   4 +-
 web/src/test/auto/resources/tsconfig.json     |  18 +++
 web/src/test/auto/tsconfig.json               |   3 +-
 43 files changed, 262 insertions(+), 176 deletions(-)
 rename web/src/engine/src/keyboard-storage/cloud/{queryEngine.ts => cloudQueryEngine.ts} (100%)
 delete mode 100644 web/src/engine/src/keyboard-storage/cloud/index.ts
 rename web/src/test/auto/headless/engine/js-processor/{specialized-backspace.tests.js => specialized-backspace.tests.ts} (77%)
 create mode 100644 web/src/test/auto/resources/index.ts
 delete mode 100644 web/src/test/auto/resources/loader/node-keyboard-loader.ts
 delete mode 100644 web/src/test/auto/resources/loader/tsconfig.node.json
 create mode 100644 web/src/test/auto/resources/tsconfig.json

diff --git a/web/common.inc.sh b/web/common.inc.sh
index b4a3c47d7eb..2c7ee35fd86 100644
--- a/web/common.inc.sh
+++ b/web/common.inc.sh
@@ -17,7 +17,7 @@
 #   compile engine/main
 # ```
 function compile() {
-  if [ $# -lt 1 ]; then
+  if [[ $# -lt 1 ]]; then
     builder_die "Scripting error: insufficient argument count!"
   fi
 
@@ -27,10 +27,10 @@ function compile() {
   local SRC_DIR=${2:-"${KEYMAN_ROOT}/web/src"}
   local BUILD_DIR=${3:-"${KEYMAN_ROOT}/web/build"}
 
-  tsc -b "${SRC_DIR}/$COMPILE_TARGET"
+  tsc -b "${SRC_DIR}/${COMPILE_TARGET}"
 
   # So... tsc does declaration-bundling on its own pretty well, at least for local development.
-  tsc --emitDeclarationOnly --outFile "${BUILD_DIR}/$COMPILE_TARGET/lib/index.d.ts" -p "${SRC_DIR}/$COMPILE_TARGET"
+  tsc --emitDeclarationOnly --outFile "${BUILD_DIR}/${COMPILE_TARGET}/lib/index.d.ts" -p "${SRC_DIR}/${COMPILE_TARGET}"
 }
 
 function _copy_dir_if_exists() {
diff --git a/web/package.json b/web/package.json
index 219b2ddac95..887eeed27d0 100644
--- a/web/package.json
+++ b/web/package.json
@@ -81,6 +81,10 @@
     "./tools/testing/test-utils": {
       "types": "./build/tools/testing/test-utils/obj/index.d.ts",
       "import": "./build/tools/testing/test-utils/obj/index.js"
+    },
+    "./test/resources": {
+      "types": "./src/test/auto/resources/build/index.d.ts",
+      "import": "./src/test/auto/resources/build/index.js"
     }
   },
   "imports": {
diff --git a/web/src/engine/build.sh b/web/src/engine/build.sh
index 2b5f6380b18..328d6a4a5d6 100755
--- a/web/src/engine/build.sh
+++ b/web/src/engine/build.sh
@@ -68,11 +68,35 @@ do_build () {
   node src/osk/validate-gesture-specs.js
 }
 
-builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/engine"
+run_tests() {
+  local OUTPUT_FILE FAILURE_COUNT
+  # Remove stale coverage data
+  rm -rf "${KEYMAN_ROOT}/web/build/coverage/raw/engine"
+
+  # Unfortunately we get an error from the coverage report generation:
+  # "TypeError [ERR_INVALID_URL_SCHEME]: The URL must be of scheme file"
+  # The following lines ignore the exit code and instead check the number
+  # of failed tests from the output.
+  set +e
+  OUTPUT_FILE=$(mktemp)
+  test-headless engine "" 2>&1 | tee "${OUTPUT_FILE}"
+  set -e
+
+  FAILURE_COUNT=$(grep ' failing' "${OUTPUT_FILE}" | xargs | cut -f 1 -d' ')
+  rm "${OUTPUT_FILE}"
+  builder_echo "(The 'TypeError [ERR_INVALID_URL_SCHEME]: The URL must be of scheme file' is expected)"
+  if ((FAILURE_COUNT > 0)); then
+    builder_die "Headless engine tests failed (.js tests)"
+  fi
+
+  test-headless-typescript engine
+}
+
+builder_run_action clean rm -rf "${KEYMAN_ROOT}/web/build/engine"
 builder_run_child_actions clean
 builder_run_action configure node_select_version_and_npm_ci
 builder_run_child_actions configure
 builder_run_child_actions build
 builder_run_action build do_build
-builder_run_action test test-headless-typescript engine
+builder_run_action test  run_tests
 builder_run_child_actions test
\ No newline at end of file
diff --git a/web/src/engine/src/keyboard-storage/cloud/queryEngine.ts b/web/src/engine/src/keyboard-storage/cloud/cloudQueryEngine.ts
similarity index 100%
rename from web/src/engine/src/keyboard-storage/cloud/queryEngine.ts
rename to web/src/engine/src/keyboard-storage/cloud/cloudQueryEngine.ts
diff --git a/web/src/engine/src/keyboard-storage/cloud/index.ts b/web/src/engine/src/keyboard-storage/cloud/index.ts
deleted file mode 100644
index 2ab752bcded..00000000000
--- a/web/src/engine/src/keyboard-storage/cloud/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { CloudQueryResult, CloudQueryEngine as QueryEngine } from './queryEngine.js';
-export { CloudRequesterInterface as RequesterInterface } from './requesterInterface.js';
diff --git a/web/src/engine/src/keyboard-storage/domCloudRequester.ts b/web/src/engine/src/keyboard-storage/domCloudRequester.ts
index 85ab4cd73e1..6d13b43cfde 100644
--- a/web/src/engine/src/keyboard-storage/domCloudRequester.ts
+++ b/web/src/engine/src/keyboard-storage/domCloudRequester.ts
@@ -1,6 +1,6 @@
 import { ManagedPromise } from 'keyman/common/web-utils';
 import { CloudRequesterInterface } from './cloud/requesterInterface.js';
-import { CLOUD_MALFORMED_OBJECT_ERR, CLOUD_TIMEOUT_ERR, CLOUD_STUB_REGISTRATION_ERR } from './cloud/queryEngine.js';
+import { CLOUD_MALFORMED_OBJECT_ERR, CLOUD_TIMEOUT_ERR, CLOUD_STUB_REGISTRATION_ERR } from './cloud/cloudQueryEngine.js';
 
 export class DOMCloudRequester implements CloudRequesterInterface {
   private readonly fileLocal: boolean;
diff --git a/web/src/engine/src/keyboard-storage/index.ts b/web/src/engine/src/keyboard-storage/index.ts
index 7f83893de2c..e6e3b7b9909 100644
--- a/web/src/engine/src/keyboard-storage/index.ts
+++ b/web/src/engine/src/keyboard-storage/index.ts
@@ -8,8 +8,15 @@ export {
   REGION_CODES
 } from './keyboardStub.js';
 export { StubAndKeyboardCache, toPrefixedKeyboardId, toUnprefixedKeyboardId } from './stubAndKeyboardCache.js';
-export { CloudQueryResult, CloudQueryEngine } from './cloud/queryEngine.js';
+export { CloudQueryResult, CloudQueryEngine } from './cloud/cloudQueryEngine.js';
 export { CloudRequesterInterface } from './cloud/requesterInterface.js';
 export { KeyboardRequisitioner } from './keyboardRequisitioner.js';
 export { ModelCache } from './modelCache.js';
-export { DOMCloudRequester } from './domCloudRequester.js';
\ No newline at end of file
+export { DOMCloudRequester } from './domCloudRequester.js';
+
+import { CLOUD_TIMEOUT_ERR, CLOUD_STUB_REGISTRATION_ERR } from './cloud/cloudQueryEngine.js';
+
+export const unitTestEndpoints = {
+  CLOUD_TIMEOUT_ERR,
+  CLOUD_STUB_REGISTRATION_ERR
+};
diff --git a/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js b/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
index e5bf59b2cde..6beca50f82e 100644
--- a/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
+++ b/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
@@ -3,8 +3,8 @@ import sinon from 'sinon';
 
 import { LanguageProcessor, TranscriptionCache } from 'keyman/engine/main';
 import { PredictionContext } from 'keyman/engine/interfaces';
-import { Worker as LMWorker } from "@keymanapp/lexical-model-layer/node";
-import { DeviceSpec, SyntheticTextStore } from 'keyman/engine/keyboard';
+import { NodeWorker } from "@keymanapp/lexical-model-layer/node";
+import { SyntheticTextStore } from 'keyman/engine/keyboard';
 
 function compileDummyModel(suggestionSets) {
   return `
@@ -66,7 +66,7 @@ describe("PredictionContext", () => {
   let langProcessor;
 
   beforeEach(function() {
-    langProcessor = new LanguageProcessor(LMWorker, new TranscriptionCache());
+    langProcessor = new LanguageProcessor(NodeWorker, new TranscriptionCache());
   });
 
   afterEach(function() {
@@ -83,7 +83,7 @@ describe("PredictionContext", () => {
 
     let textStore = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
     const initialTextStore = SyntheticTextStore.from(textStore);
-    const promise = predictiveContext.setCurrentTarget(textStore);
+    const promise = predictiveContext.setCurrentTextStore(textStore);
 
     // Initial predictive state:  no suggestions.  context.initializeState() has not yet been called.
     assert.equal(updateFake.callCount, 1);
@@ -122,7 +122,7 @@ describe("PredictionContext", () => {
 
     let textStore = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
     const initialTextStore = SyntheticTextStore.from(textStore);
-    const promise = predictiveContext.setCurrentTarget(textStore);
+    const promise = predictiveContext.setCurrentTextStore(textStore);
 
     // Initial predictive state:  no suggestions.  context.initializeState() has not yet been called.
     assert.equal(updateFake.callCount, 1);
@@ -181,7 +181,7 @@ describe("PredictionContext", () => {
     const predictiveContext = new PredictionContext(langProcessor, dummiedGetLayer);
 
     let textStore = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
-    const initialSuggestions = await predictiveContext.setCurrentTarget(textStore);
+    const initialSuggestions = await predictiveContext.setCurrentTextStore(textStore);
 
     let updateFake = sinon.fake();
     predictiveContext.on('update', updateFake);
@@ -206,7 +206,7 @@ describe("PredictionContext", () => {
 
     let textState = new SyntheticTextStore("appl", 4); // "appl|", with '|' as the caret position.
 
-    await predictiveContext.setCurrentTarget(textState);
+    await predictiveContext.setCurrentTextStore(textState);
 
     let updateFake = sinon.fake();
     predictiveContext.on('update', updateFake);
@@ -274,7 +274,7 @@ describe("PredictionContext", () => {
 
     // Test setup - return to the state at the end of the prior-defined unit test ('suggestion application...')
 
-    await predictiveContext.setCurrentTarget(textState);
+    await predictiveContext.setCurrentTextStore(textState);
 
     // This is the point in time that a reversion operation will rewind the context to.
     const revertBaseTextState = SyntheticTextStore.from(textState);
diff --git a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
index 08bec6f4368..40d6b6797b8 100644
--- a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
@@ -7,11 +7,15 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+import { NodeKeyboardLoader } from 'keyman/test/resources';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
 import { env } from 'node:process';
-const KEYMAN_ROOT = env.KEYMAN_ROOT;
+import { fileURLToPath } from 'node:url';
+import { dirname } from 'node:path';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const KEYMAN_ROOT = env.KEYMAN_ROOT ?? (__dirname + '/../../../../../../../');
 
 describe('Engine - Basic Simulation', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/basic_lao_simulation.json'));
diff --git a/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js b/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
index 63fdeb9536a..29d6fb02de5 100644
--- a/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/basic-init.tests.js
@@ -4,8 +4,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { JSKeyboardProcessor } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
-import { DEFAULT_PROCESSOR_INIT_OPTIONS } from '../../../resources/defaultProcessorInitOptions.js';
+import { DEFAULT_PROCESSOR_INIT_OPTIONS, NodeKeyboardLoader } from 'keyman/test/resources';
 
 global.keyman = {}; // So that keyboard-based checks against the global `keyman` succeed.
                     // 10.0+ dependent keyboards, like khmer_angkor, will otherwise fail to load.
diff --git a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
index a70cc14991a..40b78362ed8 100644
--- a/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/bundled-module.tests.js
@@ -1,14 +1,14 @@
 import { assert } from "chai";
-import { DEFAULT_PROCESSOR_INIT_OPTIONS } from '../../../resources/defaultProcessorInitOptions.js';
-import * as JSProcessorModule from "keyman/engine/js-processor";
-import * as KeyboardModule from "keyman/engine/keyboard";
-const KMWString = KeyboardModule.KMWString;
+import { DEFAULT_PROCESSOR_INIT_OPTIONS } from 'keyman/test/resources';
+import { JSKeyboardProcessor } from "keyman/engine/js-processor";
+import { JSKeyboard, SyntheticTextStore } from "keyman/engine/keyboard";
+import { KMWString, Version } from 'keyman/common/web-utils';
 
 // A few small tests to ensure that the ES Module bundle was successfully constructed and is usable.
 
-var toSupplementaryPairString = function(code){
-  var H = Math.floor((code - 0x10000) / 0x400) + 0xD800;
-  var L = (code - 0x10000) % 0x400 + 0xDC00;
+const toSupplementaryPairString = function(code){
+  const H = Math.floor((code - 0x10000) / 0x400) + 0xD800;
+  const L = (code - 0x10000) % 0x400 + 0xDC00;
 
   return String.fromCharCode(H, L);
 }
@@ -18,7 +18,7 @@ let u = toSupplementaryPairString;
 describe('Bundled ES Module for js-processor', function() {
   describe('JSKeyboardProcessor', function () {
     it('should initialize without errors', function () {
-      let kp = new JSProcessorModule.JSKeyboardProcessor(null, DEFAULT_PROCESSOR_INIT_OPTIONS);
+      let kp = new JSKeyboardProcessor(null, DEFAULT_PROCESSOR_INIT_OPTIONS);
       assert.isNotNull(kp);
     });
   });
@@ -28,21 +28,21 @@ describe('Bundled ES Module for js-processor', function() {
 describe('Bundled ES Module for keyboard', function () {
   describe('Keyboard', function () {
     it('should initialize without errors', function () {
-      let kp = new KeyboardModule.JSKeyboard();
+      let kp = new JSKeyboard();
       assert.isNotNull(kp);
     });
   });
 
   describe("Imported `utils`", function () {
     it("should include `utils` package's Version class", () => {
-      let v16 = new KeyboardModule.Version([16, 1]);
+      let v16 = new Version([16, 1]);
       assert.equal(v16.toString(), "16.1");
     });
   });
 
   describe('SyntheticTextStore', () => {
     it('basic functionality test', () => {
-      let textStore = new KeyboardModule.SyntheticTextStore("aple", 2);  // ap | le
+      let textStore = new SyntheticTextStore("aple", 2);  // ap | le
       textStore.insertTextBeforeCaret('p');
       assert.equal(textStore.getText(), "apple");
     });
@@ -50,7 +50,7 @@ describe('Bundled ES Module for keyboard', function () {
     it('smp test', () => {
       KMWString.enableSupplementaryPlane(true); // Declared & defined in web-utils.
       try {
-        let textStore = new KeyboardModule.SyntheticTextStore(u(0x1d5ba) + u(0x1d5c9) + u(0x1d5c5) + u(0x1d5be), 2);  // ap | le
+        let textStore = new SyntheticTextStore(u(0x1d5ba) + u(0x1d5c9) + u(0x1d5c5) + u(0x1d5be), 2);  // ap | le
         textStore.insertTextBeforeCaret(u(0x1d5c9));
         assert.equal(textStore.getText(), u(0x1d5ba) + u(0x1d5c9) + u(0x1d5c9) + u(0x1d5c5) + u(0x1d5be));
       } finally {
diff --git a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
index 1c7b48cdcc7..f99428c4134 100644
--- a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
@@ -6,12 +6,16 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+import { NodeKeyboardLoader } from 'keyman/test/resources';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
 import { env } from 'node:process';
-const KEYMAN_ROOT = env.KEYMAN_ROOT;
+import { fileURLToPath } from 'node:url';
+import { dirname } from 'node:path';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const KEYMAN_ROOT = env.KEYMAN_ROOT ?? (__dirname + '/../../../../../../../');
 
 describe('Engine - Chirality', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/chirality.json'));
diff --git a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
index 15bb2e824f6..e02fb1adaf7 100644
--- a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
@@ -6,11 +6,15 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+import { NodeKeyboardLoader } from 'keyman/test/resources';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
 import { env } from 'node:process';
-const KEYMAN_ROOT = env.KEYMAN_ROOT;
+import { fileURLToPath } from 'node:url';
+import { dirname } from 'node:path';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const KEYMAN_ROOT = env.KEYMAN_ROOT ?? (__dirname + '/../../../../../../../');
 
 describe('Engine - Deadkeys', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/deadkeys.json'));
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
index 0105eb4d95f..fa61b3feb38 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
@@ -5,8 +5,7 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
-import { DEFAULT_PROCESSOR_INIT_OPTIONS } from '../../../resources/defaultProcessorInitOptions.js';
+import { DEFAULT_PROCESSOR_INIT_OPTIONS, NodeKeyboardLoader } from 'keyman/test/resources';
 
 import { NodeProctor, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
 
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
index 4676860f2f2..edcbbd6492f 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
@@ -5,7 +5,7 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+import { NodeKeyboardLoader } from 'keyman/test/resources';
 import { NodeProctor, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
 
 const device = {
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
index ebf2c976000..eeb976a0964 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/stores.tests.js
@@ -1,8 +1,9 @@
 import { assert } from 'chai';
 
-import { JSKeyboard, KMWString } from 'keyman/engine/keyboard';
+import { KMWString } from 'keyman/common/web-utils';
+import { JSKeyboard } from 'keyman/engine/keyboard';
 import { JSKeyboardProcessor } from 'keyman/engine/js-processor';
-import { DEFAULT_PROCESSOR_INIT_OPTIONS } from '../../../resources/defaultProcessorInitOptions.js';
+import { DEFAULT_PROCESSOR_INIT_OPTIONS } from 'keyman/test/resources';
 
 let device = {
   formFactor: 'desktop',
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
index 61fd93c3e0a..d558d898303 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
@@ -6,18 +6,22 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+import { NodeKeyboardLoader } from 'keyman/test/resources';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
 import { env } from 'node:process';
-const KEYMAN_ROOT = env.KEYMAN_ROOT;
+import { fileURLToPath } from 'node:url';
+import { dirname } from 'node:path';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const KEYMAN_ROOT = env.KEYMAN_ROOT ?? (__dirname + '/../../../../../../../../');
 
 describe('Engine - Unmatched Final Groups', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/ghp_enter.json'));
   // Common test suite setup.
   let testSuite = new KeyboardTest(JSON.parse(testJSONtext));
 
-  var keyboardWithHarness;
+  let keyboardWithHarness;
   let device = {
     formFactor: 'desktop',
     OS: 'windows',
diff --git a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
index a1cf76ca7aa..872697cc125 100644
--- a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
+++ b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
@@ -6,7 +6,7 @@ const require = createRequire(import.meta.url);
 import { DeviceSpec } from 'keyman/common/web-utils';
 import { JSKeyboard, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+import { NodeKeyboardLoader } from 'keyman/test/resources';
 
 describe('Headless keyboard loading', function () {
   const laoPath = require.resolve('@keymanapp/common-test-resources/keyboards/lao_2008_basic.js');
diff --git a/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js b/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
index 9a11fc686fe..53620b8b090 100644
--- a/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
@@ -6,7 +6,7 @@ const require = createRequire(import.meta.url);
 
 import { Codes, KeyEvent, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+import { NodeKeyboardLoader } from 'keyman/test/resources';
 
 // Compare and contrast the unit tests here with those for app/browser key-event unit testing
 // in the hardware-event-processing set; the output objects there should have the same format
diff --git a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.ts
similarity index 77%
rename from web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
rename to web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.ts
index 4357cf59689..581b1810e00 100644
--- a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.ts
@@ -3,12 +3,11 @@ import { assert } from 'chai';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import { KMWString } from 'keyman/common/web-utils';
-import { Codes, KeyEvent, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
+import { DeviceSpec, KMWString } from 'keyman/common/web-utils';
+import { Codes, DefaultOutputRules, JSKeyboard, KeyEvent, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+import { NodeKeyboardLoader } from 'keyman/test/resources';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
-import { DEFAULT_PROCESSOR_INIT_OPTIONS } from '../../../resources/defaultProcessorInitOptions.js';
 
 
 const TEST_DEVICE = {
@@ -16,45 +15,56 @@ const TEST_DEVICE = {
   OS: 'windows',
   browser: 'native',
   touchable: false
-}
+} as DeviceSpec;
 
 // Basic scaffolding necessary to use special, locally-defined test keyboards.
-const COMMON_KBD_SCRIPT_PROPS = new (function (){
-  this.KMINVER="10.0";
+class CommonKbdScriptProps {
+  KMINVER = "10.0";
   // this.KV left empty - we aren't doing layout stuff for this test, so it's "fine".
   // - also this.KV.KLS
   // - also this.KV.BK
-  this.KH='';
-  this.KM=0;
-  this.KBVER="0.0.1";
-  this.KMBM=ModifierKeyConstants.K_SHIFTFLAG /* 0x0010 */;
-  this.gs=function(t,e) {
-    return this.g_main(t,e);
-  };
-})();
+  KH = '';
+  KM = 0;
+  KBVER = "0.0.1";
+  KMBM = ModifierKeyConstants.K_SHIFTFLAG /* 0x0010 */;
+  gs(t: any, e: any) {
+    return (this as any).g_main(t, e);
+  }
+}
+
+const COMMON_KBD_SCRIPT_PROPS = new CommonKbdScriptProps();
 
-const DUMMIED_KEYS_KEYBOARD_SCRIPT = function keyboard_core () {
+const DUMMIED_KEYS_KEYBOARD_SCRIPT = function keyboard_core (this: any) {
   Object.assign(this, COMMON_KBD_SCRIPT_PROPS);
 
   this.KI="Keyboard_dummied_keys";
   this.KN="Dummied Keys";
-  this.g_main=function(t,e) {
+  this.g_main=function(t:any, e:any) {
     // All keys match but do nothing.
     return 1;
   }
+  this.gs=function(t:any, e:any) {
+    return this.g_main(t, e);
+  }
 }
 
-const DOUBLED_BKSP_KEYBOARD_SCRIPT = function keyboard_core () {
+const DOUBLED_BKSP_KEYBOARD_SCRIPT = function keyboard_core (this: any) {
   Object.assign(this, COMMON_KBD_SCRIPT_PROPS);
 
   this.KI="Keyboard_doubled_backspace";
   this.KN="Doubled Backspace";
-  this.g_main=function(t,e) {
-    var k=KeymanWeb;
+  this.KO=function(count: number, t: any, output: string) {
+    // Delete 'count' characters from the text store and output the replacement
+    t.deleteCharsBeforeCaret(count);
+    if(output) {
+      t.insertTextBeforeCaret(output);
+    }
+  };
+  this.g_main=function(t: { getTextBeforeCaret: () => string; }, e: { Lcode: number; }) {
     // Standard compiled keyboards do not directly use any methods on `t`.
     if(e.Lcode == Codes.keyCodes.K_BKSP && KMWString.length(t.getTextBeforeCaret()) >= 2){
       // If the context has at least two characters, delete two.
-      k.KO(2, t, '')
+      this.KO(2, t, '')
       // Our rule matched, so signal that.
       return 1;
     } else {
@@ -62,22 +72,26 @@ const DOUBLED_BKSP_KEYBOARD_SCRIPT = function keyboard_core () {
       return 0;
     }
   }
+  this.gs=function(t:any, e:any) {
+    return this.g_main(t, e);
+  }
 }
 
 describe('Engine - specialized backspace handling', function() {
   const ipaPath = require.resolve('@keymanapp/common-test-resources/keyboards/sil_ipa.js');
   const angkorPath = require.resolve('@keymanapp/common-test-resources/keyboards/khmer_angkor.js');
 
-  let device = {
+  const device = {
     formFactor: 'desktop',
     OS: 'windows',
-    browser: 'native'
-  }
+    browser: 'native',
+    touchable: false
+  } as DeviceSpec;
 
-  let ipaWithHarness;
-  let angkorWithHarness;
-  let dummiedWithHarness;
-  let bksp2xWithHarness;
+  let ipaWithHarness: JSKeyboardInterface;
+  let angkorWithHarness: JSKeyboardInterface;
+  let dummiedWithHarness: JSKeyboardInterface;
+  let bksp2xWithHarness: JSKeyboardInterface;
 
   before(async () => {
     // -- START: Standard keyboard unit test loading boilerplate --
@@ -89,7 +103,7 @@ describe('Engine - specialized backspace handling', function() {
     // This part provides extra assurance that the keyboard properly loaded.
     assert.equal(keyboard.id, "Keyboard_sil_ipa");
 
-    harness.activeKeyboard = keyboard;
+    harness.activeKeyboard = keyboard as JSKeyboard;
     ipaWithHarness = harness;
 
     // --------------
@@ -103,7 +117,7 @@ describe('Engine - specialized backspace handling', function() {
     // This part provides extra assurance that the keyboard properly loaded.
     assert.equal(keyboard.id, "Keyboard_khmer_angkor");
 
-    harness.activeKeyboard = keyboard;
+    harness.activeKeyboard = keyboard as JSKeyboard;
     angkorWithHarness = harness;
 
     // --------------
@@ -111,7 +125,7 @@ describe('Engine - specialized backspace handling', function() {
     harness = new JSKeyboardInterface(globalThis, MinimalKeymanGlobal);
     harness.install();
     // Sets the keyboard as the harness's "loaded" keyboard, but not "active".
-    harness.KR(new DUMMIED_KEYS_KEYBOARD_SCRIPT());
+    harness.KR(new (DUMMIED_KEYS_KEYBOARD_SCRIPT as any)());
     harness.activeKeyboard = harness.loadedKeyboard;
     assert.isOk(harness.activeKeyboard);
     dummiedWithHarness = harness;
@@ -121,27 +135,29 @@ describe('Engine - specialized backspace handling', function() {
     harness = new JSKeyboardInterface(globalThis, MinimalKeymanGlobal);
     harness.install();
     // Sets the keyboard as the harness's "loaded" keyboard, but not "active".
-    harness.KR(new DOUBLED_BKSP_KEYBOARD_SCRIPT());
+    harness.KR(new (DOUBLED_BKSP_KEYBOARD_SCRIPT as any)());
     harness.activeKeyboard = harness.loadedKeyboard;
     assert.isOk(harness.activeKeyboard);
     bksp2xWithHarness = harness;
   });
 
   it('empty context, positional keyboard', () => {
-    let contextSource = new SyntheticTextStore('');
-    let event = new KeyEvent({
+    const contextSource = new SyntheticTextStore('');
+    const event = new KeyEvent({
       Lcode: Codes.keyCodes.K_BKSP,
       Lmodifiers: 0,
       Lstates: ModifierKeyConstants.NOTCAPITALFLAG | ModifierKeyConstants.NOTNUMLOCKFLAG | ModifierKeyConstants.NOTSCROLLFLAG,
       LisVirtualKey: true,
       kName: '',
       vkCode: Codes.keyCodes.K_BKSP,
-      device: device
+      device
     });
 
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
-      keyboardInterface: angkorWithHarness
-    }, DEFAULT_PROCESSOR_INIT_OPTIONS);
+      baseLayout: 'us',
+      keyboardInterface: angkorWithHarness,
+      defaultOutputRules: new DefaultOutputRules()
+    });
     const result = processor.processKeystroke(event, contextSource);
 
     assert.isTrue(result.triggerKeyDefault);
@@ -156,8 +172,8 @@ describe('Engine - specialized backspace handling', function() {
   });
 
   it("empty context, positional keyboard, outputless-key that's not BKSP", () => {
-    let contextSource = new SyntheticTextStore('');
-    let event = new KeyEvent({
+    const contextSource = new SyntheticTextStore('');
+    const event = new KeyEvent({
       Lcode: Codes.keyCodes.K_A,
       Lmodifiers: 0,
       Lstates: ModifierKeyConstants.NOTCAPITALFLAG | ModifierKeyConstants.NOTNUMLOCKFLAG | ModifierKeyConstants.NOTSCROLLFLAG,
@@ -171,8 +187,10 @@ describe('Engine - specialized backspace handling', function() {
     // We want to ensure error cases without output, on null context, don't act
     // like backspaces.
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
-      keyboardInterface: dummiedWithHarness
-    }, DEFAULT_PROCESSOR_INIT_OPTIONS);
+      baseLayout: 'us',
+      keyboardInterface: dummiedWithHarness,
+      defaultOutputRules: new DefaultOutputRules()
+    });
     const result = processor.processKeystroke(event, contextSource);
 
     // Did match a keyboard rule.
@@ -189,10 +207,10 @@ describe('Engine - specialized backspace handling', function() {
   });
 
   it('empty context, positional keyboard, but text is selected', () => {
-    let contextSource = new SyntheticTextStore('selected text', 0);
+    const contextSource = new SyntheticTextStore('selected text', 0);
     contextSource.setSelection(0, KMWString.length(contextSource.getText()));
 
-    let event = new KeyEvent({
+    const event = new KeyEvent({
       Lcode: Codes.keyCodes.K_BKSP,
       Lmodifiers: 0,
       Lstates: ModifierKeyConstants.NOTCAPITALFLAG | ModifierKeyConstants.NOTNUMLOCKFLAG | ModifierKeyConstants.NOTSCROLLFLAG,
@@ -203,8 +221,10 @@ describe('Engine - specialized backspace handling', function() {
     });
 
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
-      keyboardInterface: angkorWithHarness
-    }, DEFAULT_PROCESSOR_INIT_OPTIONS);
+      baseLayout: 'us',
+      keyboardInterface: angkorWithHarness,
+      defaultOutputRules: new DefaultOutputRules()
+    });
     const result = processor.processKeystroke(event, contextSource);
 
     assert.isFalse(result.triggerKeyDefault);
@@ -226,8 +246,8 @@ describe('Engine - specialized backspace handling', function() {
   });
 
   it('empty left-context, positional keyboard', () => {
-    let contextSource = new SyntheticTextStore('post-caret text', 0);
-    let event = new KeyEvent({
+    const contextSource = new SyntheticTextStore('post-caret text', 0);
+    const event = new KeyEvent({
       Lcode: Codes.keyCodes.K_BKSP,
       Lmodifiers: 0,
       Lstates: ModifierKeyConstants.NOTCAPITALFLAG | ModifierKeyConstants.NOTNUMLOCKFLAG | ModifierKeyConstants.NOTSCROLLFLAG,
@@ -238,8 +258,10 @@ describe('Engine - specialized backspace handling', function() {
     });
 
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
-      keyboardInterface: angkorWithHarness
-    }, DEFAULT_PROCESSOR_INIT_OPTIONS);
+      baseLayout: 'us',
+      keyboardInterface: angkorWithHarness,
+      defaultOutputRules: new DefaultOutputRules()
+    });
     const result = processor.processKeystroke(event, contextSource);
 
     assert.isTrue(result.triggerKeyDefault);
@@ -254,8 +276,8 @@ describe('Engine - specialized backspace handling', function() {
   });
 
   it('empty context, mnemonic keyboard', () => {
-    let contextSource = new SyntheticTextStore('');
-    let event = new KeyEvent({
+    const contextSource = new SyntheticTextStore('');
+    const event = new KeyEvent({
       Lcode: Codes.keyCodes.K_BKSP,
       Lmodifiers: 0,
       Lstates: ModifierKeyConstants.NOTCAPITALFLAG | ModifierKeyConstants.NOTNUMLOCKFLAG | ModifierKeyConstants.NOTSCROLLFLAG,
@@ -266,8 +288,10 @@ describe('Engine - specialized backspace handling', function() {
     });
 
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
-      keyboardInterface: ipaWithHarness
-    }, DEFAULT_PROCESSOR_INIT_OPTIONS);
+      baseLayout: 'us',
+      keyboardInterface: ipaWithHarness,
+      defaultOutputRules: new DefaultOutputRules()
+    });
     const result = processor.processKeystroke(event, contextSource);
 
     assert.isTrue(result.triggerKeyDefault);
@@ -282,8 +306,8 @@ describe('Engine - specialized backspace handling', function() {
   });
 
   it('final empty context, positional keyboard, rule-handled BKSP', () => {
-    let contextSource = new SyntheticTextStore('abc', 2);
-    let event = new KeyEvent({
+    const contextSource = new SyntheticTextStore('abc', 2);
+    const event = new KeyEvent({
       Lcode: Codes.keyCodes.K_BKSP,
       Lmodifiers: 0,
       Lstates: ModifierKeyConstants.NOTCAPITALFLAG | ModifierKeyConstants.NOTNUMLOCKFLAG | ModifierKeyConstants.NOTSCROLLFLAG,
@@ -297,8 +321,10 @@ describe('Engine - specialized backspace handling', function() {
     // context exists.
 
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
-      keyboardInterface: bksp2xWithHarness
-    }, DEFAULT_PROCESSOR_INIT_OPTIONS);
+      baseLayout: 'us',
+      keyboardInterface: bksp2xWithHarness,
+      defaultOutputRules: new DefaultOutputRules()
+    });
     const result = processor.processKeystroke(event, contextSource);
 
     // Did match a keyboard rule.
@@ -317,8 +343,8 @@ describe('Engine - specialized backspace handling', function() {
 
   // Special case:  BKSP rule-matches with empty left-context.
   it("empty context, positional keyboard, outputless BKSP rule", () => {
-    let contextSource = new SyntheticTextStore('');
-    let event = new KeyEvent({
+    const contextSource = new SyntheticTextStore('');
+    const event = new KeyEvent({
       Lcode: Codes.keyCodes.K_BKSP,
       Lmodifiers: 0,
       Lstates: ModifierKeyConstants.NOTCAPITALFLAG | ModifierKeyConstants.NOTNUMLOCKFLAG | ModifierKeyConstants.NOTSCROLLFLAG,
@@ -332,8 +358,10 @@ describe('Engine - specialized backspace handling', function() {
     // We want to ensure error cases without output, on null context, don't act
     // like backspaces.
     const processor = new JSKeyboardProcessor(TEST_DEVICE, {
-      keyboardInterface: dummiedWithHarness
-    }, DEFAULT_PROCESSOR_INIT_OPTIONS);
+      baseLayout: 'us',
+      keyboardInterface: dummiedWithHarness,
+      defaultOutputRules: new DefaultOutputRules()
+    });
     const result = processor.processKeystroke(event, contextSource);
 
     assert.isFalse(result.triggerKeyDefault);
diff --git a/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js b/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js
index 6275d800612..ab1403f2fa6 100644
--- a/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/transcriptions.tests.js
@@ -175,8 +175,8 @@ describe("Transcriptions and Transforms", function() {
     it("handles context-free single-char output rules", function() {
       // We have other texts validating SyntheticTextStores; by using them as our base 'element', this unit test file
       // could eventually run in 'headless' mode.
-      const textStore = new SyntheticTextStore("apple");
-      const originalTextStore = SyntheticTextStore.from(textStore);
+      let textStore = new SyntheticTextStore("apple");
+      let originalTextStore = SyntheticTextStore.from(textStore);
       textStore.insertTextBeforeCaret("s");
 
       /* It's not exactly black box, but presently we don't NEED the keyEvent object for the method to work.
@@ -441,7 +441,7 @@ but not himself.`;  // Sheev Palpatine, in the Star Wars prequels.
       const originalTextStore = SyntheticTextStore.from(textStore);
       textStore.clearSelection();
 
-      const transform = textStore.textStore(originalTextStore);
+      const transform = textStore.buildTransformFrom(originalTextStore);
       assert.deepEqual(transform, {
         insert: '',
         deleteLeft: 0,
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js
index 7892178dfc0..2033794572f 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js
@@ -2,9 +2,9 @@ import { assert } from 'chai';
 import sinon from 'sinon';
 
 import { ManagedPromise } from 'keyman/common/web-utils';
-import { CloudQueryEngine, StubAndKeyboardCache, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage';
+import { CloudQueryEngine, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage';
 import { PathConfiguration } from 'keyman/engine/interfaces';
-import NodeCloudRequester from '../../../resources/loader/nodeCloudRequester.js';
+import { NodeCloudRequester } from 'keyman/test/resources';
 
 import path from 'path';
 import { fileURLToPath } from 'url';
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js
index ee93c0eb99f..5d740b7c1c4 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js
@@ -2,14 +2,11 @@ import { assert } from 'chai';
 import sinon from 'sinon';
 import fs from 'fs';
 
-import { KeyboardHarness, ManagedPromise, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
-import {
-  KeyboardRequisitioner,
-  toPrefixedKeyboardId as prefixed
-} from 'keyman/engine/keyboard-storage';
+import { ManagedPromise } from 'keyman/common/web-utils';
+import { KeyboardHarness, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
+import { NodeKeyboardLoader, NodeCloudRequester } from 'keyman/test/resources';
+import { KeyboardRequisitioner, toPrefixedKeyboardId } from 'keyman/engine/keyboard-storage';
 import { PathConfiguration } from 'keyman/engine/interfaces';
-import NodeCloudRequester from '../../../resources/loader/nodeCloudRequester.js';
 
 import path from 'path';
 import { fileURLToPath } from 'url';
@@ -197,7 +194,7 @@ describe("KeyboardRequisitioner", () => {
 
         assert.equal(stubs.length, 2);
         for(let stub of stubs) {
-          assert.equal(stub.KI, prefixed('sil_euro_latin'));
+          assert.equal(stub.KI, toPrefixedKeyboardId('sil_euro_latin'));
           assert.equal(stub.KN, "EuroLatin (SIL)");
         }
 
@@ -216,7 +213,7 @@ describe("KeyboardRequisitioner", () => {
 
         assert.equal(stubs.length, 278);
         for(let stub of stubs) {
-          assert.equal(stub.KI, prefixed('sil_cameroon_azerty'));
+          assert.equal(stub.KI, toPrefixedKeyboardId('sil_cameroon_azerty'));
           assert.equal(stub.KN, "Cameroon AZERTY");
         }
 
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js
index 96b67828922..40a3f17827d 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js
@@ -2,7 +2,7 @@ import { assert } from 'chai';
 import sinon from 'sinon';
 
 import { KeyboardStub } from 'keyman/engine/keyboard-storage';
-import NodeCloudRequester from '../../../resources/loader/nodeCloudRequester.js';
+import { NodeCloudRequester } from 'keyman/test/resources';
 
 import path from 'path';
 import { fileURLToPath } from 'url';
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js
index 468906b1fc6..7659495da34 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 import sinon from 'sinon';
 
-import NodeCloudRequester from '../../../resources/loader/nodeCloudRequester.js';
+import { NodeCloudRequester } from 'keyman/test/resources';
 
 import path from 'path';
 import { fileURLToPath } from 'url';
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/stubAndKeyboardCache.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/stubAndKeyboardCache.tests.js
index 9b120d01e63..106c76b202e 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/stubAndKeyboardCache.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/stubAndKeyboardCache.tests.js
@@ -4,7 +4,7 @@ import fs from 'fs';
 
 import { KeyboardStub, StubAndKeyboardCache } from 'keyman/engine/keyboard-storage';
 
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+import { NodeKeyboardLoader } from 'keyman/test/resources';
 import { KeyboardHarness, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 
 import path from 'path';
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js b/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
index e4c206d5f50..62a145f392f 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
@@ -5,7 +5,7 @@ const require = createRequire(import.meta.url);
 
 import { KeyboardHarness, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+import { NodeKeyboardLoader } from 'keyman/test/resources';
 
 describe('Headless keyboard loading', function() {
   const laoPath = require.resolve('@keymanapp/common-test-resources/keyboards/lao_2008_basic.js');
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
index aae762bc703..ddd4e9e2e40 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
@@ -5,7 +5,7 @@ const require = createRequire(import.meta.url);
 
 import { DeviceSpec } from 'keyman/common/web-utils';
 import { KeyboardHarness, MinimalKeymanGlobal, JSKeyboard } from 'keyman/engine/keyboard';
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+import { NodeKeyboardLoader } from 'keyman/test/resources';
 
 
 describe('Keyboard tests', function () {
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
index a5d4cad68d2..62b0e7319bd 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
@@ -6,7 +6,7 @@ const require = createRequire(import.meta.url);
 import { DeviceSpec } from 'keyman/common/web-utils';
 import { KeyboardHarness, MinimalKeymanGlobal, KeyboardDownloadError, InvalidKeyboardError, JSKeyboard, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+import { NodeKeyboardLoader } from 'keyman/test/resources';
 import { assertThrowsAsync, assertThrows } from 'keyman/tools/testing/test-utils';
 
 describe('Headless keyboard loading', function() {
diff --git a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
index c871be3b0fb..85a5c262462 100644
--- a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
@@ -6,11 +6,11 @@ const require = createRequire(import.meta.url);
 
 import { InputProcessor } from 'keyman/engine/main';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
-import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+import { DefaultOutputRules, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
+import { DEFAULT_PROCESSOR_INIT_OPTIONS, NodeKeyboardLoader } from 'keyman/test/resources';
 import { KeyboardTest } from '@keymanapp/recorder-core';
 
-import { Worker } from '@keymanapp/lexical-model-layer/node';
+import { NodeWorker } from '@keymanapp/lexical-model-layer/node';
 import * as utils from 'keyman/common/web-utils';
 const KMWString = utils.KMWString;
 
@@ -31,7 +31,7 @@ KMWString.enableSupplementaryPlane(false);
 describe('InputProcessor', function() {
   describe('[[constructor]]', function () {
     it('should initialize without errors', function () {
-      let core = new InputProcessor(device);
+      let core = new InputProcessor(device, null, DEFAULT_PROCESSOR_INIT_OPTIONS);
       assert.isNotNull(core);
     });
 
@@ -40,7 +40,11 @@ describe('InputProcessor', function() {
       try {
         // Can construct without the second parameter; if so, the final assertion - .mayPredict
         // will be invalidated.  (No worker, no ability to predict.)
-        core = new InputProcessor(device, Worker);
+        core = new InputProcessor(device, NodeWorker, {
+          baseLayout: 'us',
+          keyboardInterface: new JSKeyboardInterface({}, null, null),
+          defaultOutputRules: new DefaultOutputRules()
+        });
 
         assert.isOk(core.keyboardProcessor);
         assert.isDefined(core.keyboardProcessor.contextDevice);
@@ -103,7 +107,7 @@ describe('InputProcessor', function() {
     describe('without fat-fingering', function() {
       it('with minimal context (no fat-fingers)', function() {
         this.timeout(32); // ms
-        let core = new InputProcessor(device);
+        let core = new InputProcessor(device, null, DEFAULT_PROCESSOR_INIT_OPTIONS);
         let context = new SyntheticTextStore("", 0);
 
         core.keyboardProcessor.keyboardInterface = keyboardWithHarness;
@@ -123,7 +127,7 @@ describe('InputProcessor', function() {
         this.timeout(500);                // 500 ms, excluding text import.
                                           // These often run on VMs, so we'll be a bit generous.
 
-        let core = new InputProcessor(device);  // I mean, it IS long context, and time
+        let core = new InputProcessor(device, null, DEFAULT_PROCESSOR_INIT_OPTIONS);  // I mean, it IS long context, and time
                                           // thresholding is disabled within Node.
 
         core.keyboardProcessor.keyboardInterface = keyboardWithHarness;
@@ -140,7 +144,7 @@ describe('InputProcessor', function() {
     describe('with fat-fingering', function() {
       it('with minimal context (with fat-fingers)', function() {
         this.timeout(32); // ms
-        let core = new InputProcessor(device);
+        let core = new InputProcessor(device, null, DEFAULT_PROCESSOR_INIT_OPTIONS);
         let context = new SyntheticTextStore("", 0);
 
         core.keyboardProcessor.keyboardInterface = keyboardWithHarness;
@@ -164,7 +168,7 @@ describe('InputProcessor', function() {
                                           // Keep at the same 'order of magnitude' as the
                                           // 'without fat-fingers' test.
 
-        let core = new InputProcessor(device);  // It IS long context, and time
+        let core = new InputProcessor(device, null, DEFAULT_PROCESSOR_INIT_OPTIONS);  // It IS long context, and time
                                           // thresholding is disabled within Node.
 
         core.keyboardProcessor.keyboardInterface = keyboardWithHarness;
@@ -201,7 +205,7 @@ describe('InputProcessor', function() {
     for (let testSet of testDefinitions.inputTestSets[0]['testSet']) {
       it(testSet.msg ?? 'test', function() {
         this.timeout(32); // ms
-        let core = new InputProcessor(device);
+        let core = new InputProcessor(device, null, DEFAULT_PROCESSOR_INIT_OPTIONS);
         let context = new SyntheticTextStore("", 0);
 
         core.keyboardProcessor.keyboardInterface = keyboardWithHarness;
diff --git a/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
index a8b524f6b2e..13f6458c6c3 100644
--- a/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
@@ -13,7 +13,11 @@ import path from 'path';
 import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers';
 
 import { env } from 'node:process';
-const KEYMAN_ROOT = env.KEYMAN_ROOT;
+import { fileURLToPath } from 'node:url';
+import { dirname } from 'node:path';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const KEYMAN_ROOT = env.KEYMAN_ROOT ?? (__dirname + '/../../../../../../../../');
 
 // Required initialization setup.
 global.keyman = {}; // So that keyboard-based checks against the global `keyman` succeed.
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureMatcher.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureMatcher.tests.ts
index a06ae76657d..4211c4573a5 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureMatcher.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureMatcher.tests.ts
@@ -2,14 +2,13 @@ import { assert } from 'chai'
 import sinon from 'sinon';
 
 import * as PromiseStatusModule from 'promise-status-async';
-const PromiseStatuses     = PromiseStatusModule.PromiseStatuses;
-import { assertingPromiseStatus as promiseStatus } from '../../../../../resources/assertingPromiseStatus.js';
+const PromiseStatuses = PromiseStatusModule.PromiseStatuses;
 
 import { InputSample, gestures, GestureDebugPath } from 'keyman/engine/gesture-processor';
 
 import { TouchpathTurtle } from '#gesture-tools';
 
-import { simulateMultiSourceMatcherInput } from "../../../../../resources/simulateMultiSourceInput.js";
+import { assertingPromiseStatus as promiseStatus, simulateMultiSourceMatcherInput } from 'keyman/test/resources';
 
 import {
   FlickEndModel,
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureSequence.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureSequence.tests.ts
index 2b0fbd32ded..8460a640f6a 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureSequence.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/gestureSequence.tests.ts
@@ -2,7 +2,6 @@ import { assert } from 'chai'
 import sinon from 'sinon';
 
 import * as PromiseStatusModule from 'promise-status-async';
-import { assertingPromiseStatus as promiseStatus } from '../../../../../resources/assertingPromiseStatus.js';
 
 import { GestureModelDefs, buildGestureMatchInspector, gestures } from 'keyman/engine/gesture-processor';
 const { matchers } = gestures;
@@ -19,7 +18,7 @@ const modelSetForAction = gestures.matchers.modelSetForAction;
 import { HeadlessInputEngine, TouchpathTurtle } from '#gesture-tools';
 import { ManagedPromise, timedPromise } from 'keyman/common/web-utils';
 
-import { assertGestureSequence, SequenceAssertion } from "../../../../../resources/sequenceAssertions.js";
+import { assertingPromiseStatus as promiseStatus, assertGestureSequence, SequenceAssertion } from 'keyman/test/resources';
 
 import {
   LongpressModel,
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/matcherSelector.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/matcherSelector.tests.ts
index 9ed3b846a07..51c69d8f5c3 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/matcherSelector.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/matcherSelector.tests.ts
@@ -3,9 +3,8 @@ import sinon from 'sinon';
 
 import * as PromiseStatusModule from 'promise-status-async';
 const PromiseStatuses     = PromiseStatusModule.PromiseStatuses;
-import { assertingPromiseStatus as promiseStatus } from '../../../../../resources/assertingPromiseStatus.js';
 
-import { simulateMultiSourceMatcherInput, simulateSelectorInput } from "../../../../../resources/simulateMultiSourceInput.js";
+import { assertingPromiseStatus as promiseStatus, simulateMultiSourceMatcherInput, simulateSelectorInput } from 'keyman/test/resources';
 
 import { timedPromise } from 'keyman/common/web-utils';
 import { gestures } from 'keyman/engine/gesture-processor';
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/pathMatcher.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/pathMatcher.tests.ts
index 703057edb1e..c9ad7bdef54 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/pathMatcher.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/pathMatcher.tests.ts
@@ -3,7 +3,7 @@ import sinon from 'sinon';
 
 import * as PromiseStatusModule from 'promise-status-async';
 const PromiseStatuses     = PromiseStatusModule.PromiseStatuses;
-import { assertingPromiseStatus as promiseStatus } from '../../../../../resources/assertingPromiseStatus.js';
+import { assertingPromiseStatus as promiseStatus } from 'keyman/test/resources';
 
 import { InputSample, GestureSource, gestures, CumulativePathStats } from 'keyman/engine/gesture-processor';
 import { timedPromise } from 'keyman/common/web-utils';
diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts
index 0deb01224cf..a37a27871a6 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts
@@ -2,7 +2,7 @@ import { assert } from 'chai'
 import sinon from 'sinon';
 
 import * as PromiseStatusModule from 'promise-status-async';
-import { assertingPromiseStatus as promiseStatus } from '../../../../../resources/assertingPromiseStatus.js';
+import { assertingPromiseStatus as promiseStatus, assertGestureSequence, SequenceAssertion } from 'keyman/test/resources';
 
 import { GestureModelDefs, GestureSource, gestures, TouchpointCoordinator } from 'keyman/engine/gesture-processor';
 const { matchers } = gestures;
@@ -14,8 +14,6 @@ type GestureSequence<Type> = gestures.matchers.GestureSequence<Type>;
 import { HeadlessInputEngine, TouchpathTurtle } from '#gesture-tools';
 import { ManagedPromise, timedPromise } from 'keyman/common/web-utils';
 
-import { assertGestureSequence, SequenceAssertion } from "../../../../../resources/sequenceAssertions.js";
-
 import {
   LongpressModel,
   ModipressEndModel,
diff --git a/web/src/test/auto/resources/index.ts b/web/src/test/auto/resources/index.ts
new file mode 100644
index 00000000000..8c176d04b3a
--- /dev/null
+++ b/web/src/test/auto/resources/index.ts
@@ -0,0 +1,6 @@
+export { assertingPromiseStatus } from './assertingPromiseStatus.js';
+export { DEFAULT_PROCESSOR_INIT_OPTIONS } from './defaultProcessorInitOptions.js';
+export { NodeKeyboardLoader } from './loader/nodeKeyboardLoader.js';
+export { NodeCloudRequester } from './loader/nodeCloudRequester.js';
+export { StageReportAssertion, SequenceAssertion, assertGestureSequence } from './sequenceAssertions.js';
+export { simulateMultiSourceMatcherInput, simulateSelectorInput } from './simulateMultiSourceInput.js';
\ No newline at end of file
diff --git a/web/src/test/auto/resources/loader/node-keyboard-loader.ts b/web/src/test/auto/resources/loader/node-keyboard-loader.ts
deleted file mode 100644
index 9630e113b01..00000000000
--- a/web/src/test/auto/resources/loader/node-keyboard-loader.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './nodeKeyboardLoader.js';
\ No newline at end of file
diff --git a/web/src/test/auto/resources/loader/nodeCloudRequester.ts b/web/src/test/auto/resources/loader/nodeCloudRequester.ts
index cd287eb407b..2e654971f38 100644
--- a/web/src/test/auto/resources/loader/nodeCloudRequester.ts
+++ b/web/src/test/auto/resources/loader/nodeCloudRequester.ts
@@ -1,17 +1,16 @@
 import { ManagedPromise } from 'keyman/common/web-utils';
-import { CloudRequesterInterface } from '../../../../engine/src/keyboard-storage/cloud/requesterInterface.js';
 import {
-  CLOUD_TIMEOUT_ERR,
-  CLOUD_STUB_REGISTRATION_ERR,
+  CloudRequesterInterface,
   CloudQueryResult,
-  CloudQueryEngine
-} from '../../../../engine/src/keyboard-storage/cloud/queryEngine.js';
+  CloudQueryEngine,
+  unitTestEndpoints
+} from 'keyman/engine/keyboard-storage';
 
 import fs from 'node:fs';
 import https from 'node:https';
 import vm from 'node:vm';
 
-export default class NodeCloudRequester implements CloudRequesterInterface {
+export class NodeCloudRequester implements CloudRequesterInterface {
   private static QUERY_SEED = 1;
   private readonly fileLocal: boolean;
 
@@ -34,7 +33,7 @@ export default class NodeCloudRequester implements CloudRequesterInterface {
 
     // Set callback timer
     const timeoutObj = setTimeout(() => {
-      promise.reject(new Error(CLOUD_TIMEOUT_ERR));
+      promise.reject(new Error(unitTestEndpoints.CLOUD_TIMEOUT_ERR));
     }, 10000);
 
     const queryId = NodeCloudRequester.QUERY_SEED++;
@@ -56,7 +55,7 @@ export default class NodeCloudRequester implements CloudRequesterInterface {
       });
 
       if(!promise.isResolved) {
-        promise.reject(new Error(CLOUD_STUB_REGISTRATION_ERR));
+        promise.reject(new Error(unitTestEndpoints.CLOUD_STUB_REGISTRATION_ERR));
       }
     }
 
diff --git a/web/src/test/auto/resources/loader/tsconfig.node.json b/web/src/test/auto/resources/loader/tsconfig.node.json
deleted file mode 100644
index 0f657843ac3..00000000000
--- a/web/src/test/auto/resources/loader/tsconfig.node.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../../../../../../tsconfig.base.json",
-  "compilerOptions": {
-    "types": [ "node" ],
-    "outDir": "../../../../../../build/engine/keyboard/obj/keyboards/loaders/",
-    "tsBuildInfoFile": "../../../../../../build/engine/keyboard/obj/keyboards/loaders/tsconfig.node.tsbuildinfo",
-    "rootDir": "."
-  },
-  "references": [
-    { "path": "../../../tsconfig.json" }
-  ],
-  "include": ["node-keyboard-loader.ts", "nodeKeyboardLoader.ts"],
-}
diff --git a/web/src/test/auto/resources/simulateMultiSourceInput.ts b/web/src/test/auto/resources/simulateMultiSourceInput.ts
index cf7c2516cdc..452cec92856 100644
--- a/web/src/test/auto/resources/simulateMultiSourceInput.ts
+++ b/web/src/test/auto/resources/simulateMultiSourceInput.ts
@@ -247,7 +247,7 @@ function simulateMultiSourceInput<OutputType, Type>(
 
   // -------
 
-  let flattenedSpecs = processedSetup.map(
+  const flattenedSpecs = processedSetup.map(
     (entry) => entry.sourceSpecs
   ).reduce((constructingArray, entries) => constructingArray.concat(entries), []);
 
@@ -365,7 +365,7 @@ export function simulateSelectorInput<Type>(
   selectorPromise: Promise<MatcherSelector<Type>>,
   executor: () => Promise<void>
 } {
-  let inputClone = [].concat(input);
+  const inputClone = [].concat(input);
 
   // We NEED the sequences specified to be in chronological order of their start.
   // We'll just check if it's done properly out-of-the-gate - by sorting a clone, then comparing.
diff --git a/web/src/test/auto/resources/tsconfig.json b/web/src/test/auto/resources/tsconfig.json
new file mode 100644
index 00000000000..7ed8bfc57e6
--- /dev/null
+++ b/web/src/test/auto/resources/tsconfig.json
@@ -0,0 +1,18 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "build/",
+    "rootDir": ".",
+    "tsBuildInfoFile": "build/tsconfig.tsbuildinfo",
+    "skipLibCheck": true,
+    "noEmitOnError": false
+  },
+
+  "include": [ "*.ts", "loader/*.ts", "@types/*.d.ts" ],
+  "exclude": [ "node_modules" ],
+
+  "references": [
+    { "path": "../../../common/web-utils" },
+    { "path": "../../../engine" },
+  ]
+}
diff --git a/web/src/test/auto/tsconfig.json b/web/src/test/auto/tsconfig.json
index 506b0610d46..75f6a5d17a5 100644
--- a/web/src/test/auto/tsconfig.json
+++ b/web/src/test/auto/tsconfig.json
@@ -11,11 +11,12 @@
     "dom/**/*.ts",
     "headless/**/*.ts",
     "integrated/**/*.ts",
-    "resources/**/*.ts",
+    "resources/@types/*.d.ts",
     "predictive-text/**/*.ts",
   ],
 
   "references": [
     { "path": "../../engine" },
+    { "path": "resources" }
   ]
 }

From 84aedb861660e1f4ee1f4773f6330dd3fcd21017 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 26 Jan 2026 17:56:28 +0100
Subject: [PATCH 235/254] =?UTF-8?q?refactor(web):=20rename=20`keyboard.tes?=
 =?UTF-8?q?ts.ts`=20=E2=86=92=20`jskeyboard.tests.ts`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test-bot: skip
---
 docs/builder.md                                        |  3 ---
 .../{keyboard.tests.ts => jskeyboard.tests.ts}         | 10 ++++++----
 2 files changed, 6 insertions(+), 7 deletions(-)
 rename web/src/test/auto/headless/engine/keyboard/{keyboard.tests.ts => jskeyboard.tests.ts} (83%)

diff --git a/docs/builder.md b/docs/builder.md
index 7c609aff272..efd24d08c7f 100644
--- a/docs/builder.md
+++ b/docs/builder.md
@@ -1257,9 +1257,6 @@ fi
 
 Runs eslint, builds tests, and then runs tests with mocha + c8 (coverage)
 
-**Note:** this is currently hosted in shellHelperFunctions.sh, but will
-be moved to builder.typescript.inc.sh in the future.
-
 ### Usage
 
 ```bash
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts b/web/src/test/auto/headless/engine/keyboard/jskeyboard.tests.ts
similarity index 83%
rename from web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
rename to web/src/test/auto/headless/engine/keyboard/jskeyboard.tests.ts
index aae762bc703..485ed7a6038 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboard.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/jskeyboard.tests.ts
@@ -8,7 +8,7 @@ import { KeyboardHarness, MinimalKeymanGlobal, JSKeyboard } from 'keyman/engine/
 import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
 
 
-describe('Keyboard tests', function () {
+describe('JSKeyboard tests', function () {
   const khmerPath = require.resolve('@keymanapp/common-test-resources/keyboards/khmer_angkor.js');
 
   it('accurately determines layout properties', async () => {
@@ -16,19 +16,21 @@ describe('Keyboard tests', function () {
     const harness = new KeyboardHarness({}, MinimalKeymanGlobal);
     const keyboardLoader = new NodeKeyboardLoader(harness);
     const keyboard = await keyboardLoader.loadKeyboardFromPath(khmerPath);
-    const km_keyboard = keyboard as JSKeyboard;
+    const jsKeyboard = keyboard as JSKeyboard;
     // --  END:  Standard Recorder-based unit test loading boilerplate --
 
+    assert.isFalse(jsKeyboard.isRTL);
+
     // `khmer_angkor` - supports longpresses, but not flicks or multitaps.
 
     // Phone supports longpress if the keyboard supports it.
-    const mobileLayout = km_keyboard.layout(DeviceSpec.FormFactor.Phone);
+    const mobileLayout = jsKeyboard.layout(DeviceSpec.FormFactor.Phone);
     assert.isTrue(mobileLayout.hasLongpresses);
     assert.isFalse(mobileLayout.hasFlicks);
     assert.isFalse(mobileLayout.hasMultitaps);
 
     // Desktop doesn't support longpress even if the keyboard supports it.
-    const desktopLayout = km_keyboard.layout(DeviceSpec.FormFactor.Desktop);
+    const desktopLayout = jsKeyboard.layout(DeviceSpec.FormFactor.Desktop);
     assert.isFalse(desktopLayout.hasLongpresses);
     assert.isFalse(desktopLayout.hasFlicks);
     assert.isFalse(desktopLayout.hasMultitaps);

From 4992268b775c68ff189233526abc3050d4e94c53 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 27 Jan 2026 13:02:22 +0100
Subject: [PATCH 236/254] feat(web): add unit test for RTL

This change stubs out `KMXKeyboard.isRTL` and adds a unit test for RTL
with .js and  .kmx (currently skipped) keyboards. Also change some code
to use `Keyboard` instead of `JSKeyboard` and stub out additional methods.

The RTL functionality will have to be completed when the necessary
extensions to the Core API are implemented (#15482).

Fixes: #15288
Test-bot: skip
---
 web/src/app/browser/src/contextManager.ts     |  5 +-
 web/src/app/webview/src/contextManager.ts     |  4 +-
 web/src/engine/src/keyboard/keyEvent.ts       |  6 +--
 .../src/keyboard/keyboards/kmxKeyboard.ts     | 50 ++++++++++++++++++-
 web/src/engine/src/osk/banner/banner.ts       |  4 +-
 .../engine/src/osk/banner/bannerController.ts |  6 +--
 .../engine/src/osk/banner/suggestionBanner.ts |  4 +-
 .../src/osk/keyboard-layout/oskLayerGroup.ts  |  4 +-
 web/src/engine/src/osk/visualKeyboard.ts      |  7 +--
 .../engine/keyboard/jskeyboard.tests.ts       | 11 ++++
 .../engine/keyboard/kmxkeyboard.tests.ts      | 23 +++++++++
 11 files changed, 103 insertions(+), 21 deletions(-)
 create mode 100644 web/src/test/auto/headless/engine/keyboard/kmxkeyboard.tests.ts

diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index 30729b34dfb..33e58f48891 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -1,4 +1,4 @@
-import { JSKeyboard, type Keyboard, KeyboardScriptError } from 'keyman/engine/keyboard';
+import { type Keyboard, KeyboardScriptError } from 'keyman/engine/keyboard';
 import { type KeyboardStub } from 'keyman/engine/keyboard-storage';
 import { CookieSerializer } from 'keyman/engine/dom-utils';
 import { textStoreForEvent, textStoreForElement, PageContextAttachment } from 'keyman/engine/attachment';
@@ -28,8 +28,7 @@ export interface KeyboardCookie {
  * @param       {Keyboard}    activeKeyboard  The active keyboard
  */
 function _SetTargDir(Ptarg: HTMLElement, activeKeyboard: Keyboard) {
-  // TODO-web-core: we need to support RTL in Core. Means supporting km_core_keyboard_get_named_attr(KMX.KMXFile.TSS_KMW_RTL) (#15288)
-  const elDir = activeKeyboard instanceof JSKeyboard && activeKeyboard?.isRTL ? 'rtl' : 'ltr';
+  const elDir = activeKeyboard?.isRTL ? 'rtl' : 'ltr';
 
   if(Ptarg) {
     if(Ptarg instanceof Ptarg.ownerDocument.defaultView.HTMLInputElement
diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts
index 5b9fffd5ebd..971c207a50a 100644
--- a/web/src/app/webview/src/contextManager.ts
+++ b/web/src/app/webview/src/contextManager.ts
@@ -121,7 +121,7 @@ export class ContextManager extends ContextManagerBase<WebviewConfiguration> {
   // yet to be modularized at this time, though.)
   private _hostTextStore: HostTextStore;
 
-  private _activeKeyboard: {keyboard: JSKeyboard, metadata: KeyboardStub};
+  private _activeKeyboard: {keyboard: Keyboard, metadata: KeyboardStub};
 
   constructor(engineConfig: WebviewConfiguration) {
     super(engineConfig);
@@ -141,7 +141,7 @@ export class ContextManager extends ContextManagerBase<WebviewConfiguration> {
     return this._activeKeyboard;
   }
 
-  activateKeyboardForTextStore(kbd: { keyboard: JSKeyboard, metadata: KeyboardStub }, textStore: TextStore) {
+  activateKeyboardForTextStore(kbd: { keyboard: Keyboard, metadata: KeyboardStub }, textStore: TextStore) {
     // `textStore` is irrelevant for `app/webview`, as it'll only ever use 'global' keyboard settings.
 
     // Clone the object to prevent accidental by-reference changes.
diff --git a/web/src/engine/src/keyboard/keyEvent.ts b/web/src/engine/src/keyboard/keyEvent.ts
index d4e39c54167..c261f0f9720 100644
--- a/web/src/engine/src/keyboard/keyEvent.ts
+++ b/web/src/engine/src/keyboard/keyEvent.ts
@@ -6,12 +6,12 @@
 // a key event.  The most straightforward way to integrate Web OSK events on other platforms is to have
 // other platforms recognize and utilize this type.
 
-import { type JSKeyboard } from "./keyboards/jsKeyboard.js";
 import { type DeviceSpec } from "keyman/common/web-utils";
 
 import { Codes } from './codes.js';
 import { DefaultOutputRules } from "./defaultOutputRules.js";
 import { ActiveKeyBase } from './keyboards/activeLayout.js';
+import { type Keyboard } from "./keyboards/keyboardLoaderBase.js";
 
 // Represents a probability distribution over a keyboard's keys.
 // Defined here to avoid compilation issues.
@@ -44,7 +44,7 @@ export interface KeyEventSpec {
    * guarantee that the keyboard instance known to the handler has not changed during JS execution
    * since the user's interaction that raised the event.
    */
-  srcKeyboard?: JSKeyboard;
+  srcKeyboard?: Keyboard;
 
   // Holds a generated fat-finger distribution (when appropriate)
   keyDistribution?: KeyDistribution;
@@ -85,7 +85,7 @@ export class KeyEvent implements KeyEventSpec {
    * guarantee that the keyboard instance known to the handler has not changed during JS execution
    * since the user's interaction that raised the event.
    */
-  srcKeyboard?: JSKeyboard;
+  srcKeyboard?: Keyboard;
 
   // Holds relevant event properties leading to construction of this KeyEvent.
   source?: any; // Technically, KeyEvent|MouseEvent|Touch - but those are DOM types that must be kept out of headless mode.
diff --git a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
index 3a7b8a43e79..76d1e844ffe 100644
--- a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
@@ -3,7 +3,7 @@ import {
   KM_Core, km_core_keyboard, KM_CORE_KMX_ENV,
   KM_CORE_OPTION_SCOPE, km_core_state, KM_CORE_STATUS
 } from 'keyman/engine/core-adapter';
-import { ActiveKey, ActiveSubKey } from './activeLayout.js';
+import { ActiveKey, ActiveLayout, ActiveSubKey } from './activeLayout.js';
 import { StateKeyMap } from './stateKeyMap.js';
 import { KeyEvent } from '../keyEvent.js';
 import { TextStore } from '../textStore.js';
@@ -113,4 +113,52 @@ export class KMXKeyboard {
     // TODO: implement for IMX (cf #2239 and #7928)
   }
 
+  /**
+   * Indicates whether the keyboard layout is designed for right-to-left scripts.
+   * This can be used by consumers to adjust UI layout and text direction for RTL keyboards.
+   *
+   * @returns {boolean}  True if the keyboard is right-to-left, otherwise false.
+   */
+  public get isRTL(): boolean {
+    // TODO-embed-osk-in-kmx: Hook up with Core API (#15482)
+    return false;
+  }
+
+  /**
+   * Returns an ActiveLayout object representing the keyboard's layout for this
+   * form factor.  May return null if a custom desktop "help" OSK is defined,
+   * as with sil_euro_latin.
+   *
+   * In such cases, please use either `helpText` or `insertHelpHTML` instead.
+   * @param formFactor {string} The desired form factor for the layout.
+   */
+  public layout(formFactor: DeviceSpec.FormFactor): ActiveLayout {
+    // TODO-embed-osk-in-kmx: Implement this method (#15290)
+    return null;
+  }
+
+  /**
+   * Indicates whether the keyboard's desktop layout should be used for the
+   * specified device.
+   *
+   * @param device {DeviceSpec} The device specification to check
+   * @returns {boolean} True if the desktop layout should be used for
+   * this device, otherwise false.
+   */
+  public usesDesktopLayoutOnDevice(device: DeviceSpec): boolean {
+    // TODO-embed-osk-in-kmx: Implement this method (#15290)
+    return true;
+  }
+
+  /**
+   * CSS styling for the on-screen keyboard.
+   *
+   * @returns {string} CSS style string for the OSK
+   */
+  public get oskStyling(): string {
+    // TODO-embed-osk-in-kmx: Implement this method (#15290)
+    return '';
+  }
+
+
 }
diff --git a/web/src/engine/src/osk/banner/banner.ts b/web/src/engine/src/osk/banner/banner.ts
index 83054af7aea..43ab370356f 100644
--- a/web/src/engine/src/osk/banner/banner.ts
+++ b/web/src/engine/src/osk/banner/banner.ts
@@ -1,4 +1,4 @@
-import { JSKeyboard, KeyboardProperties } from 'keyman/engine/keyboard';
+import { Keyboard, KeyboardProperties } from 'keyman/engine/keyboard';
 import { createUnselectableElement } from 'keyman/engine/dom-utils';
 
 // Base class for a banner above the keyboard in the OSK
@@ -98,7 +98,7 @@ export abstract class Banner {
    * @param keyboard
    * @param keyboardProperties
    */
-  public configureForKeyboard(keyboard: JSKeyboard, keyboardProperties: KeyboardProperties) { }
+  public configureForKeyboard(keyboard: Keyboard, keyboardProperties: KeyboardProperties) { }
 
   public readonly refreshLayout?: () => void;
 
diff --git a/web/src/engine/src/osk/banner/bannerController.ts b/web/src/engine/src/osk/banner/bannerController.ts
index 672937ca684..08d3854c354 100644
--- a/web/src/engine/src/osk/banner/bannerController.ts
+++ b/web/src/engine/src/osk/banner/bannerController.ts
@@ -6,7 +6,7 @@ import { BannerView } from './bannerView.js';
 import { Banner } from './banner.js';
 import { BlankBanner } from './blankBanner.js';
 import { HTMLBanner } from './htmlBanner.js';
-import { JSKeyboard, KeyboardProperties } from 'keyman/engine/keyboard';
+import { Keyboard, KeyboardProperties } from 'keyman/engine/keyboard';
 
 export class BannerController {
   private container: BannerView;
@@ -17,7 +17,7 @@ export class BannerController {
 
   private _inactiveBanner: Banner;
 
-  private keyboard: JSKeyboard;
+  private keyboard: Keyboard;
   private keyboardStub: KeyboardProperties;
 
   /**
@@ -105,7 +105,7 @@ export class BannerController {
    * @param keyboard
    * @param keyboardProperties
    */
-  public configureForKeyboard(keyboard: JSKeyboard, keyboardProperties: KeyboardProperties) {
+  public configureForKeyboard(keyboard: Keyboard, keyboardProperties: KeyboardProperties) {
     this.keyboard = keyboard;
     this.keyboardStub = keyboardProperties;
 
diff --git a/web/src/engine/src/osk/banner/suggestionBanner.ts b/web/src/engine/src/osk/banner/suggestionBanner.ts
index 2efd91e2bed..979244d89c9 100644
--- a/web/src/engine/src/osk/banner/suggestionBanner.ts
+++ b/web/src/engine/src/osk/banner/suggestionBanner.ts
@@ -14,7 +14,7 @@ import {
 import { BANNER_GESTURE_SET } from './bannerGestureSet.js';
 
 import { DeviceSpec, timedPromise } from 'keyman/common/web-utils';
-import { JSKeyboard, KeyboardProperties } from 'keyman/engine/keyboard';
+import { Keyboard, KeyboardProperties } from 'keyman/engine/keyboard';
 import { Banner } from './banner.js';
 import { ParsedLengthStyle } from '../lengthStyle.js';
 import { getFontSizeStyle } from '../fontSizeUtils.js';
@@ -694,7 +694,7 @@ export class SuggestionBanner extends Banner {
     return result;
   }
 
-  public configureForKeyboard(keyboard: JSKeyboard, keyboardProperties: KeyboardProperties) {
+  public configureForKeyboard(keyboard: Keyboard, keyboardProperties: KeyboardProperties) {
     const rtl = keyboard.isRTL;
 
     // Removes all previous children.  (.replaceChildren requires Chrome for Android 86.)
diff --git a/web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts b/web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts
index 1b0733ea293..b791848346d 100644
--- a/web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts
+++ b/web/src/engine/src/osk/keyboard-layout/oskLayerGroup.ts
@@ -1,4 +1,4 @@
-import { JSKeyboard, ActiveLayout, ButtonClasses } from 'keyman/engine/keyboard';
+import { Keyboard, ActiveLayout, ButtonClasses } from 'keyman/engine/keyboard';
 import { type DeviceSpec } from 'keyman/common/web-utils';
 
 import { InputSample } from 'keyman/engine/gesture-processor';
@@ -25,7 +25,7 @@ export class OSKLayerGroup {
   private _activeLayerId: string = 'default';
   private _heightPadding: number;
 
-  public constructor(vkbd: VisualKeyboard, keyboard: JSKeyboard, formFactor: DeviceSpec.FormFactor) {
+  public constructor(vkbd: VisualKeyboard, keyboard: Keyboard, formFactor: DeviceSpec.FormFactor) {
     const layout = keyboard.layout(formFactor);
     this.spec = layout;
     this.vkbd = vkbd;
diff --git a/web/src/engine/src/osk/visualKeyboard.ts b/web/src/engine/src/osk/visualKeyboard.ts
index 76126579676..6cdaf3ad646 100644
--- a/web/src/engine/src/osk/visualKeyboard.ts
+++ b/web/src/engine/src/osk/visualKeyboard.ts
@@ -6,6 +6,7 @@ import {
   ActiveLayout,
   ActiveSubKey,
   JSKeyboard,
+  Keyboard,
   KeyboardProperties,
   KeyDistribution,
   KeyEvent,
@@ -86,7 +87,7 @@ export interface VisualKeyboardConfiguration extends CommonConfiguration {
   /**
    * The Keyman keyboard on which to base the on-screen keyboard being represented.
    */
-  keyboard: JSKeyboard,
+  keyboard: Keyboard,
 
   /**
    * Metadata about the keyboard, such as relevant fonts, display name, and language code.
@@ -241,7 +242,7 @@ export class VisualKeyboard extends EventEmitter<EventMap> implements KeyboardVi
   public deferLayout: boolean;
 
   // The keyboard object corresponding to this VisualKeyboard.
-  public readonly layoutKeyboard: JSKeyboard;
+  public readonly layoutKeyboard: Keyboard;
   public readonly layoutKeyboardProperties: KeyboardProperties;
 
   get layerId(): string {
@@ -336,7 +337,7 @@ export class VisualKeyboard extends EventEmitter<EventMap> implements KeyboardVi
     }
 
     // Override font if specified by keyboard
-    if ('font' in layout) {
+    if (layout && 'font' in layout) {
       this.fontFamily = layout['font'];
     } else {
       this.fontFamily = '';
diff --git a/web/src/test/auto/headless/engine/keyboard/jskeyboard.tests.ts b/web/src/test/auto/headless/engine/keyboard/jskeyboard.tests.ts
index 485ed7a6038..9db44430010 100644
--- a/web/src/test/auto/headless/engine/keyboard/jskeyboard.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/jskeyboard.tests.ts
@@ -35,4 +35,15 @@ describe('JSKeyboard tests', function () {
     assert.isFalse(desktopLayout.hasFlicks);
     assert.isFalse(desktopLayout.hasMultitaps);
   });
+
+  it('supports RTL layouts', async () => {
+    const rtlPath = require.resolve('../../../../../../common/test/keyboards/baseline/k_0108___rtl.js');
+    // -- START: Standard Recorder-based unit test loading boilerplate --
+    const harness = new KeyboardHarness({}, MinimalKeymanGlobal);
+    const keyboardLoader = new NodeKeyboardLoader(harness);
+    const keyboard = await keyboardLoader.loadKeyboardFromPath(rtlPath);
+    // --  END:  Standard Recorder-based unit test loading boilerplate --
+
+    assert.isTrue(keyboard.isRTL);
+  });
 });
diff --git a/web/src/test/auto/headless/engine/keyboard/kmxkeyboard.tests.ts b/web/src/test/auto/headless/engine/keyboard/kmxkeyboard.tests.ts
new file mode 100644
index 00000000000..691257ba646
--- /dev/null
+++ b/web/src/test/auto/headless/engine/keyboard/kmxkeyboard.tests.ts
@@ -0,0 +1,23 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import { assert } from 'chai';
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+import { KeyboardHarness, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
+import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader.js';
+
+describe('KMXKeyboard tests', function () {
+  // TODO-embed-osk-in-kmx: Enable when hooking up with RTL Core API (#15482)
+  it.skip('supports RTL layouts', async () => {
+    const rtlPath = require.resolve('../../../../../../common/test/keyboards/baseline/k_0108___rtl.kmx');
+    // -- START: Standard Recorder-based unit test loading boilerplate --
+    const harness = new KeyboardHarness({}, MinimalKeymanGlobal);
+    const keyboardLoader = new NodeKeyboardLoader(harness);
+    const keyboard = await keyboardLoader.loadKeyboardFromPath(rtlPath);
+    // --  END:  Standard Recorder-based unit test loading boilerplate --
+
+    assert.isTrue(keyboard.isRTL);
+  });
+});

From 933361a520cdbb60ebca9e639b21cea614075c56 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 29 Jan 2026 14:51:39 +0100
Subject: [PATCH 237/254] feat(web): add and use RTL test keyboard

Build-bot: skip:all, build:web
Test-bot: skip
---
 common/test/resources/keyboards/test_rtl.js   |  48 ++++++++++++++++++
 common/test/resources/keyboards/test_rtl.kmn  |  11 ++++
 common/test/resources/keyboards/test_rtl.kmx  | Bin 0 -> 404 bytes
 .../engine/keyboard/jskeyboard.tests.ts       |   2 +-
 .../engine/keyboard/kmxkeyboard.tests.ts      |   2 +-
 5 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 common/test/resources/keyboards/test_rtl.js
 create mode 100644 common/test/resources/keyboards/test_rtl.kmn
 create mode 100644 common/test/resources/keyboards/test_rtl.kmx

diff --git a/common/test/resources/keyboards/test_rtl.js b/common/test/resources/keyboards/test_rtl.js
new file mode 100644
index 00000000000..9ec0d156a35
--- /dev/null
+++ b/common/test/resources/keyboards/test_rtl.js
@@ -0,0 +1,48 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_test_rtl());
+}
+function Keyboard_test_rtl()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_test_rtl";
+  this.KN ="RTL Keyboard";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.KRTL=1;
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_Main_0(t,e);
+  };
+  this.g_Main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_A /* 0x41 */)) {
+      if(1){
+        r=m=1;   // Line 10
+        k.KDC(0,t);
+        k.KO(-1,t,"ش");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_B /* 0x42 */)) {
+      if(1){
+        r=m=1;   // Line 11
+        k.KDC(0,t);
+        k.KO(-1,t,"ال");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/resources/keyboards/test_rtl.kmn b/common/test/resources/keyboards/test_rtl.kmn
new file mode 100644
index 00000000000..52efb684c53
--- /dev/null
+++ b/common/test/resources/keyboards/test_rtl.kmn
@@ -0,0 +1,11 @@
+store(&NAME) 'RTL Keyboard'
+
+store(&version) '10.0'
+store(&KMW_RTL) '1'
+
+begin Unicode > use(Main)
+
+group(Main) using keys
+
++ [K_A] > 'ش'
++ [K_B] > 'ال'
diff --git a/common/test/resources/keyboards/test_rtl.kmx b/common/test/resources/keyboards/test_rtl.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..3571b6aa43cda069dd2d811d2a0045a7c76f04c5
GIT binary patch
literal 404
zcmZvYF>AtL5Qg74*wD$Lwseuw#YIX2Lg{8(>7tX(;3PyWRA@~}rNuwsAWkKJz@ONq
zLl=GS^FuOt@ZS5}eRmf~Z<svmRN6FtYa#+m#0fI)peJBUfQKmjVBL2L{M_>&e&P8a
zw_6q=JK-L64PSb0!DpT$_))oDlxj|%=t|$3!mm(|&O-0J&8WImU+7JlKJc8L)ww>|
z$lOe<JKZQkv2KyEoXWSPffDr(Ul_BUa%aM9?6z$yb~<*C2aN*D`>0@6-uv2q<C4Y-
SJ(PND>L1juTC-X0I^O~MI4RKp

literal 0
HcmV?d00001

diff --git a/web/src/test/auto/headless/engine/keyboard/jskeyboard.tests.ts b/web/src/test/auto/headless/engine/keyboard/jskeyboard.tests.ts
index 9db44430010..3d498a4787d 100644
--- a/web/src/test/auto/headless/engine/keyboard/jskeyboard.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/jskeyboard.tests.ts
@@ -37,7 +37,7 @@ describe('JSKeyboard tests', function () {
   });
 
   it('supports RTL layouts', async () => {
-    const rtlPath = require.resolve('../../../../../../common/test/keyboards/baseline/k_0108___rtl.js');
+    const rtlPath = require.resolve('@keymanapp/common-test-resources/keyboards/test_rtl.js');
     // -- START: Standard Recorder-based unit test loading boilerplate --
     const harness = new KeyboardHarness({}, MinimalKeymanGlobal);
     const keyboardLoader = new NodeKeyboardLoader(harness);
diff --git a/web/src/test/auto/headless/engine/keyboard/kmxkeyboard.tests.ts b/web/src/test/auto/headless/engine/keyboard/kmxkeyboard.tests.ts
index 691257ba646..47be8ee0ec7 100644
--- a/web/src/test/auto/headless/engine/keyboard/kmxkeyboard.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/kmxkeyboard.tests.ts
@@ -11,7 +11,7 @@ import { NodeKeyboardLoader } from '../../../resources/loader/nodeKeyboardLoader
 describe('KMXKeyboard tests', function () {
   // TODO-embed-osk-in-kmx: Enable when hooking up with RTL Core API (#15482)
   it.skip('supports RTL layouts', async () => {
-    const rtlPath = require.resolve('../../../../../../common/test/keyboards/baseline/k_0108___rtl.kmx');
+    const rtlPath = require.resolve('@keymanapp/common-test-resources/keyboards/test_rtl.kmx');
     // -- START: Standard Recorder-based unit test loading boilerplate --
     const harness = new KeyboardHarness({}, MinimalKeymanGlobal);
     const keyboardLoader = new NodeKeyboardLoader(harness);

From 7f1b925633abc494b375b612816cbd728bd74735 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 13 Feb 2026 11:44:33 +0100
Subject: [PATCH 238/254] chore(web): fix buggy merge

---
 .../gestures/touchpointCoordinator.tests.ts               | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts
index cb7ae07fec2..ff1584ddb56 100644
--- a/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts
+++ b/web/src/test/auto/headless/engine/osk/gesture-processor/gestures/touchpointCoordinator.tests.ts
@@ -4,15 +4,7 @@ import * as PromiseStatusModule from 'promise-status-async';
 import { PROMISE_PENDING } from 'promise-status-async';
 
 import { GestureModelDefs, GestureSource, gestures, TouchpointCoordinator } from 'keyman/engine/gesture-processor';
-const { matchers } = gestures;
-
-// Huh... gotta do BOTH here?  One for constructor use, the other for generic-parameter use?
-const { GestureSequence } = matchers;
-type GestureSequence<Type> = gestures.matchers.GestureSequence<Type>;
-
-import { HeadlessInputEngine, TouchpathTurtle } from '#gesture-tools';
 import { ManagedPromise, timedPromise } from 'keyman/common/web-utils';
-
 import { HeadlessInputEngine, TouchpathTurtle } from '#gesture-tools';
 import { assertingPromiseStatus as promiseStatus } from '#test-resources/assertingPromiseStatus.js';
 import { assertGestureSequence, SequenceAssertion } from "#test-resources/sequenceAssertions.js";

From 0af3a2a89d5f44e05f9df03b7235857b519b9b58 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 13 Feb 2026 12:08:35 +0100
Subject: [PATCH 239/254] chore(core): update API `changes.md` document

Turns out we have a document for the API changes, in addition to the
release notes. That document got overlooked so far. This change now
updates that doc with the API changes that happened since v17.

Build-bot: skip
Test-bot: skip
Follow-up-of: #15471
Follow-up-of: #12769
---
 core/docs/api/changes.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/docs/api/changes.md b/core/docs/api/changes.md
index e5736494abc..f7f250f3376 100644
--- a/core/docs/api/changes.md
+++ b/core/docs/api/changes.md
@@ -2,6 +2,17 @@
 title: Changes - Keyman Core API
 ---
 
+## Changes between 18.0 and 19.0
+
+* Removed deprecated `km_core_keyboard_attrs.folder_path`
+
+## Changes between 17.0 and 18.0
+
+* Replaced `km_core_keyboard_load` with `km_core_keyboard_load_from_blob`.
+  Keyboard loading is now done in the engine, and the content of the
+  keyboard passed to Core as a blob.
+* Deprecated `km_core_keyboard_attrs.folder_path`
+
 ## Changes between 16.0 and 17.0
 
 * The namespace identifier has changed from `km_kbp_` to `km_core_`.
@@ -61,4 +72,4 @@ title: Changes - Keyman Core API
 [km_core_event_flags]: processor#km_core_event_flags "km_core_event_flags enum"
 [km_core_process_event]: processor#km_core_process_event "km_core_process_event function"
 [km_core_event]: processor#km_core_event "km_core_event function"
-[km_core_event_code]: processor#km_core_event_code "km_core_event_code enum"
\ No newline at end of file
+[km_core_event_code]: processor#km_core_event_code "km_core_event_code enum"

From 2c3b03c78ba7e2abd0459ddaff844a529444a9b7 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Mon, 16 Mar 2026 16:29:51 +0100
Subject: [PATCH 240/254] maint(web): use gosh to execute web server in e2e
 tests

Fixes: #15758
Test-bot: skip
---
 web/src/test/auto/e2e/playwright.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/test/auto/e2e/playwright.config.ts b/web/src/test/auto/e2e/playwright.config.ts
index b81e89ffe4b..e522323c131 100644
--- a/web/src/test/auto/e2e/playwright.config.ts
+++ b/web/src/test/auto/e2e/playwright.config.ts
@@ -76,7 +76,7 @@ export default defineConfig({
 
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: `${KEYMAN_ROOT}/web/build.sh start`,
+    command: `"${KEYMAN_ROOT}/node_modules/.bin/gosh" "${KEYMAN_ROOT}/web/build.sh start"`,
     url: 'http://localhost:3000',
     reuseExistingServer: !process.env.KEYMAN_IS_CI_BUILD,
   },

From 59a12fd2cb6249fdc125fefce7e75c13c19e9feb Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Mon, 16 Mar 2026 17:00:43 +0100
Subject: [PATCH 241/254] maint(web): downgrade playwright to 1.46.1

Failing builds on webkit tests on Ubuntu, going back to 'known good'
version for now.
---
 package-lock.json | 50 +++++++++++++++++++++++------------------------
 package.json      |  2 +-
 web/package.json  |  2 +-
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e1e83f62b1a..de8f8c7aafd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -65,7 +65,7 @@
         "eslint-plugin-n": "^15.7.0",
         "eslint-plugin-promise": "^6.1.1",
         "mocha": "^11.2.2",
-        "playwright": "^1.46.1",
+        "playwright": "1.46.1",
         "sinon": "^17.0.1",
         "source-map-support": "^0.5.21",
         "tslib": "^2.5.2",
@@ -2522,22 +2522,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/@playwright/test": {
-      "version": "1.58.2",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.2.tgz",
-      "integrity": "sha512-akea+6bHYBBfA9uQqSYmlJXn61cTa+jbO87xVLCWbTqbWadRVmhxlXATaOjOgcBaWU4ePo0wB41KMFv3o35IXA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "playwright": "1.58.2"
-      },
-      "bin": {
-        "playwright": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@puppeteer/browsers": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
@@ -11304,13 +11288,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.58.2",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.2.tgz",
-      "integrity": "sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A==",
+      "version": "1.46.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.46.1.tgz",
+      "integrity": "sha512-oPcr1yqoXLCkgKtD5eNUPLiN40rYEM39odNpIb6VE6S7/15gJmA1NzVv6zJYusV0e7tzvkU/utBFNa/Kpxmwng==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.58.2"
+        "playwright-core": "1.46.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -11323,9 +11307,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.58.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.2.tgz",
-      "integrity": "sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg==",
+      "version": "1.46.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.46.1.tgz",
+      "integrity": "sha512-h9LqIQaAv+CYvWzsZ+h3RsrqCStkBHlgo6/TJlFst3cOTlLghBQlJwPOZKQJTKNaD3QIB7aAVQ+gfWbN3NXB7A==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -14036,7 +14020,7 @@
       },
       "devDependencies": {
         "@keymanapp/resources-gosh": "*",
-        "@playwright/test": "^1.46.1",
+        "@playwright/test": "1.46.1",
         "@sentry/cli": "^2.31.0",
         "@zip.js/zip.js": "^2.7.32",
         "c8": "^7.12.0",
@@ -14046,6 +14030,22 @@
         "tsx": "^4.19.0"
       }
     },
+    "web/node_modules/@playwright/test": {
+      "version": "1.46.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.46.1.tgz",
+      "integrity": "sha512-Fq6SwLujA/DOIvNC2EL/SojJnkKf/rAwJ//APpJJHRyMi1PdKrY3Az+4XNQ51N4RTbItbIByQ0jgd1tayq1aeA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright": "1.46.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "web/src/engine/common/web-utils": {
       "name": "@keymanapp/web-utils",
       "dev": true,
diff --git a/package.json b/package.json
index ec091a6e780..5bd890e1b3b 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "eslint-plugin-n": "^15.7.0",
     "eslint-plugin-promise": "^6.1.1",
     "mocha": "^11.2.2",
-    "playwright": "^1.46.1",
+    "playwright": "1.46.1",
     "sinon": "^17.0.1",
     "source-map-support": "^0.5.21",
     "tslib": "^2.5.2",
diff --git a/web/package.json b/web/package.json
index cd3fed00e29..f60aaef7c0f 100644
--- a/web/package.json
+++ b/web/package.json
@@ -105,7 +105,7 @@
   "homepage": "https://github.com/keymanapp/keyman#readme",
   "devDependencies": {
     "@keymanapp/resources-gosh": "*",
-    "@playwright/test": "^1.46.1",
+    "@playwright/test": "1.46.1",
     "@sentry/cli": "^2.31.0",
     "@zip.js/zip.js": "^2.7.32",
     "c8": "^7.12.0",

From 1d9b8cc883026619a0a437b0991b2ab1fe729439 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 29 Jan 2026 15:41:58 +0100
Subject: [PATCH 242/254] maint(web): address code review comments

- inline consts so that we don't have to export them for unit testing
- create `getKeymanRoot` and `getWebTestResourcesPath` helper functions
  to DRY out the code
- run `languageProcessortests.js` without coverage to prevent a failure
  creating the coverage report.
---
 package-lock.json                             | 155 ------------------
 web/common.inc.sh                             |  20 ++-
 web/src/engine/build.sh                       |  33 ++--
 .../cloud/cloudQueryEngine.ts                 |  13 +-
 .../src/keyboard-storage/domCloudRequester.ts |   8 +-
 web/src/engine/src/keyboard-storage/index.ts  |   7 -
 .../engine/js-processor/basic-engine.tests.js |   9 +-
 .../engine/js-processor/chirality.tests.js    |   9 +-
 .../engine/js-processor/deadkeys.tests.js     |   9 +-
 .../engine/unmatched_final_group.tests.js     |   8 +-
 .../keyboard-storage/cloudQueries.tests.js    |  16 +-
 .../keyboardRequisitioner.tests.js            |  22 +--
 .../keyboard-storage/keyboardStub.tests.js    |  10 +-
 .../nodeCloudRequester.tests.js               |  14 +-
 .../headless/engine/loadKeyboardHelper.ts     |   6 +-
 .../main/headless/languageProcessor.tests.js  |  10 +-
 web/src/test/auto/resources/index.ts          |  14 +-
 .../resources/loader/nodeCloudRequester.ts    |   7 +-
 18 files changed, 82 insertions(+), 288 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a0c99d2e6a1..514e17774ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1360,19 +1360,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "0.3.9"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@esbuild/netbsd-arm64": {
       "version": "0.25.0",
       "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.0.tgz",
@@ -1652,17 +1639,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.9",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
     "node_modules/@keymanapp/auto-history-action": {
       "resolved": "resources/build/version",
       "link": true
@@ -3272,34 +3248,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@tsconfig/node10": {
-      "version": "1.0.8",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@tsconfig/node12": {
-      "version": "1.0.9",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@tsconfig/node14": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@tsconfig/node16": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/@types/accepts": {
       "version": "1.3.7",
       "resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.7.tgz",
@@ -4552,16 +4500,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/agent-base": {
       "version": "6.0.2",
       "dev": true,
@@ -4741,13 +4679,6 @@
       "integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==",
       "license": "MIT"
     },
-    "node_modules/arg": {
-      "version": "4.1.3",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "dev": true,
@@ -5911,13 +5842,6 @@
       "version": "1.0.3",
       "license": "MIT"
     },
-    "node_modules/create-require": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -9920,13 +9844,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/make-fetch-happen": {
       "version": "13.0.1",
       "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
@@ -13020,61 +12937,6 @@
         "typescript": ">=4.2.0"
       }
     },
-    "node_modules/ts-node": {
-      "version": "10.9.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
-      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@cspotcode/source-map-support": "^0.8.0",
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.2",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "v8-compile-cache-lib": "^3.0.1",
-        "yn": "3.1.1"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-cwd": "dist/bin-cwd.js",
-        "ts-node-esm": "dist/bin-esm.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
-      },
-      "peerDependencies": {
-        "@swc/core": ">=1.2.50",
-        "@swc/wasm": ">=1.2.50",
-        "@types/node": "*",
-        "typescript": ">=2.7"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/wasm": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ts-node/node_modules/diff": {
-      "version": "4.0.2",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
     "node_modules/tsc-watch": {
       "version": "4.6.2",
       "dev": true,
@@ -13458,13 +13320,6 @@
         "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/v8-compile-cache-lib": {
-      "version": "3.0.1",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/v8-to-istanbul": {
       "version": "9.0.1",
       "dev": true,
@@ -13922,16 +13777,6 @@
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/yn": {
-      "version": "3.1.1",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "dev": true,
diff --git a/web/common.inc.sh b/web/common.inc.sh
index 2c7ee35fd86..2d222bc34c6 100644
--- a/web/common.inc.sh
+++ b/web/common.inc.sh
@@ -88,17 +88,19 @@ function prepare() {
 #   test-headless engine/osk
 # ```
 function test-headless() {
-  TEST_FOLDER=$1
-  TEST_BASE="${KEYMAN_ROOT}/web/src/test/auto/headless/"
-  TEST_EXTENSIONS=${2:-}
-  if [[ ! -z "${2:-}" ]]; then
+  local TEST_FOLDER=$1
+  local TEST_BASE="${KEYMAN_ROOT}/web/src/test/auto/headless/"
+  local TEST_EXTENSIONS=${2:-}
+  shift $(( $# < 2 ? $# : 2 ))
+
+  if [[ ! -z "${TEST_EXTENSIONS}" ]]; then
     TEST_BASE="${KEYMAN_ROOT}/web/build/test/headless/"
 
     # Ensure the compiled tests are available.
     tsc --project "${KEYMAN_ROOT}/web/src/test/auto/tsconfig.json"
   fi
 
-  TEST_OPTS=()
+  local TEST_OPTS=()
   if builder_is_running_on_teamcity; then
     TEST_OPTS+=(--reporter "${KEYMAN_ROOT}/common/test/resources/mocha-teamcity-reporter/teamcity.cjs" --reporter-options parentFlowId="unit_tests")
     echo "##teamcity[flowStarted flowId='unit_tests']"
@@ -108,10 +110,14 @@ function test-headless() {
     TEST_OPTS+=(--extension "${TEST_EXTENSIONS}")
   fi
 
-  builder_echo '> ' mocha --recursive "${TEST_BASE}${TEST_FOLDER}" "${TEST_OPTS[@]}"
-  if [[ -e .c8rc.json ]]; then
+  # Add any remaining arguments directly to Mocha.
+  TEST_OPTS+=("$@")
+
+  if [[ -e .c8rc.json && -z "${SKIP_C8:-}" ]]; then
+    builder_echo '> ' c8 mocha --recursive "${TEST_BASE}${TEST_FOLDER}" "${TEST_OPTS[@]}"
     c8 mocha --recursive "${TEST_BASE}${TEST_FOLDER}" "${TEST_OPTS[@]}"
   else
+    builder_echo '> ' mocha --recursive "${TEST_BASE}${TEST_FOLDER}" "${TEST_OPTS[@]}"
     mocha --recursive "${TEST_BASE}${TEST_FOLDER}" "${TEST_OPTS[@]}"
   fi
 
diff --git a/web/src/engine/build.sh b/web/src/engine/build.sh
index 328d6a4a5d6..aa496e3eb60 100755
--- a/web/src/engine/build.sh
+++ b/web/src/engine/build.sh
@@ -69,26 +69,21 @@ do_build () {
 }
 
 run_tests() {
-  local OUTPUT_FILE FAILURE_COUNT
-  # Remove stale coverage data
-  rm -rf "${KEYMAN_ROOT}/web/build/coverage/raw/engine"
-
-  # Unfortunately we get an error from the coverage report generation:
+  # Run javascript tests
+  #
+  # Trying to run languageProcessor.tests.js with c8 coverage fails with:
   # "TypeError [ERR_INVALID_URL_SCHEME]: The URL must be of scheme file"
-  # The following lines ignore the exit code and instead check the number
-  # of failed tests from the output.
-  set +e
-  OUTPUT_FILE=$(mktemp)
-  test-headless engine "" 2>&1 | tee "${OUTPUT_FILE}"
-  set -e
-
-  FAILURE_COUNT=$(grep ' failing' "${OUTPUT_FILE}" | xargs | cut -f 1 -d' ')
-  rm "${OUTPUT_FILE}"
-  builder_echo "(The 'TypeError [ERR_INVALID_URL_SCHEME]: The URL must be of scheme file' is expected)"
-  if ((FAILURE_COUNT > 0)); then
-    builder_die "Headless engine tests failed (.js tests)"
-  fi
-
+  # when c8 tries to create a report from the raw coverage data. The reason
+  # is a URL starting with `data:text/javascript` coming from
+  # `web/src/engine/predictive-text/worker-main/src/node/mappedWorker.ts`.
+  #
+  # So we first run all javascript tests except languageProcessor.tests.js
+  # with coverage, and then in a second step run languageProcessor.tests.js
+  # without coverage.
+  test-headless engine "" "--exclude" "**/languageProcessor.tests.js"
+  SKIP_C8=1 test-headless engine/main/headless/languageProcessor.tests.js
+
+  # Run typescript tests
   test-headless-typescript engine
 }
 
diff --git a/web/src/engine/src/keyboard-storage/cloud/cloudQueryEngine.ts b/web/src/engine/src/keyboard-storage/cloud/cloudQueryEngine.ts
index b6ec76df07e..7f71681fb16 100644
--- a/web/src/engine/src/keyboard-storage/cloud/cloudQueryEngine.ts
+++ b/web/src/engine/src/keyboard-storage/cloud/cloudQueryEngine.ts
@@ -7,15 +7,6 @@ import { LanguageAPIPropertySpec } from 'keyman/engine/keyboard';
 import { CloudRequesterInterface } from './requesterInterface.js';
 import { ManagedPromise, Version } from 'keyman/common/web-utils';
 
-// For when the API call straight-up times out.
-export const CLOUD_TIMEOUT_ERR = "The Cloud API request timed out.";
-// Currently cannot distinguish between "no matching keyboard" and other script-load errors.
-export const CLOUD_MALFORMED_OBJECT_ERR = "Could not find a keyboard with that ID.";
-// Represents unspecified errors that occur when registering the results of a successful API call.
-export const CLOUD_STUB_REGISTRATION_ERR = "The Cloud API failed to find an appropriate keyboard.";
-// Represents custom, specified KMW errors that occur when registering the results of a successful API call.
-export const CLOUD_REGISTRATION_ERR = "Error occurred while registering keyboards: ";
-
 export const MISSING_KEYBOARD = function(kbdid: string) {
   return kbdid + ' keyboard not found.';
 }
@@ -139,7 +130,7 @@ export class CloudQueryEngine extends EventEmitter<EventMap> {
     try {
       result = this._registerCore(x);
     } catch(err) {
-      result = new Error(CLOUD_REGISTRATION_ERR + err);
+      result = new Error(`Error occurred while registering keyboards: ${err}`);
     }
 
     if(!promiseid) {
@@ -199,7 +190,7 @@ export class CloudQueryEngine extends EventEmitter<EventMap> {
 
     // Ignore callback unless the context is defined
     if(typeof(options) == 'undefined' || typeof(options['context']) == 'undefined') {
-      return new Error(CLOUD_MALFORMED_OBJECT_ERR);
+      return new Error('Could not find a keyboard with that ID.');
     }
 
     // Register each keyboard for the specified language codes
diff --git a/web/src/engine/src/keyboard-storage/domCloudRequester.ts b/web/src/engine/src/keyboard-storage/domCloudRequester.ts
index 6d13b43cfde..d97b31687a5 100644
--- a/web/src/engine/src/keyboard-storage/domCloudRequester.ts
+++ b/web/src/engine/src/keyboard-storage/domCloudRequester.ts
@@ -1,6 +1,5 @@
 import { ManagedPromise } from 'keyman/common/web-utils';
 import { CloudRequesterInterface } from './cloud/requesterInterface.js';
-import { CLOUD_MALFORMED_OBJECT_ERR, CLOUD_TIMEOUT_ERR, CLOUD_STUB_REGISTRATION_ERR } from './cloud/cloudQueryEngine.js';
 
 export class DOMCloudRequester implements CloudRequesterInterface {
   private readonly fileLocal: boolean;
@@ -14,7 +13,7 @@ export class DOMCloudRequester implements CloudRequesterInterface {
 
     // Set callback timer
     const timeoutID = window.setTimeout(() => {
-      promise.reject(new Error(CLOUD_TIMEOUT_ERR));
+      promise.reject(new Error('The Cloud API request timed out.'));
     }, 10000);
 
     const tFlag='&timerid='+ timeoutID;
@@ -28,7 +27,7 @@ export class DOMCloudRequester implements CloudRequesterInterface {
       // script does not ever call `register`.  Also provides default handling
       // should `register` fail to report results/failure correctly.
       if(!promise.isResolved) {
-        promise.reject(new Error(CLOUD_STUB_REGISTRATION_ERR));
+        promise.reject(new Error('The Cloud API failed to find an appropriate keyboard.'));
       }
     };
 
@@ -42,7 +41,8 @@ export class DOMCloudRequester implements CloudRequesterInterface {
                         lineno?: number, colno?: number, error?: Error) => {
       window.clearTimeout(timeoutID);
 
-      let msg = CLOUD_MALFORMED_OBJECT_ERR;
+      // Currently cannot distinguish between "no matching keyboard" and other script-load errors.
+      let msg = 'Could not find a keyboard with that ID.';
       if(error) {
         msg = msg + ": " + error.message;
       }
diff --git a/web/src/engine/src/keyboard-storage/index.ts b/web/src/engine/src/keyboard-storage/index.ts
index e6e3b7b9909..86d52c699dd 100644
--- a/web/src/engine/src/keyboard-storage/index.ts
+++ b/web/src/engine/src/keyboard-storage/index.ts
@@ -13,10 +13,3 @@ export { CloudRequesterInterface } from './cloud/requesterInterface.js';
 export { KeyboardRequisitioner } from './keyboardRequisitioner.js';
 export { ModelCache } from './modelCache.js';
 export { DOMCloudRequester } from './domCloudRequester.js';
-
-import { CLOUD_TIMEOUT_ERR, CLOUD_STUB_REGISTRATION_ERR } from './cloud/cloudQueryEngine.js';
-
-export const unitTestEndpoints = {
-  CLOUD_TIMEOUT_ERR,
-  CLOUD_STUB_REGISTRATION_ERR
-};
diff --git a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
index 40d6b6797b8..8283cda2189 100644
--- a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
@@ -7,15 +7,10 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/test/resources';
+import { NodeKeyboardLoader, getKeymanRoot } from 'keyman/test/resources';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
-import { env } from 'node:process';
-import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const KEYMAN_ROOT = env.KEYMAN_ROOT ?? (__dirname + '/../../../../../../../');
+const KEYMAN_ROOT = getKeymanRoot();
 
 describe('Engine - Basic Simulation', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/basic_lao_simulation.json'));
diff --git a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
index f99428c4134..9522d4411af 100644
--- a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
@@ -6,16 +6,11 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/test/resources';
+import { NodeKeyboardLoader, getKeymanRoot } from 'keyman/test/resources';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
-import { env } from 'node:process';
-import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const KEYMAN_ROOT = env.KEYMAN_ROOT ?? (__dirname + '/../../../../../../../');
+const KEYMAN_ROOT = getKeymanRoot();
 
 describe('Engine - Chirality', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/chirality.json'));
diff --git a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
index e02fb1adaf7..3a244f69e25 100644
--- a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
@@ -6,15 +6,10 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/test/resources';
+import { NodeKeyboardLoader, getKeymanRoot } from 'keyman/test/resources';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
-import { env } from 'node:process';
-import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const KEYMAN_ROOT = env.KEYMAN_ROOT ?? (__dirname + '/../../../../../../../');
+const KEYMAN_ROOT = getKeymanRoot();
 
 describe('Engine - Deadkeys', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/deadkeys.json'));
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
index d558d898303..5cd9f4c51a6 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
@@ -6,15 +6,11 @@ const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
-import { NodeKeyboardLoader } from 'keyman/test/resources';
+import { NodeKeyboardLoader, getKeymanRoot } from 'keyman/test/resources';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
-import { env } from 'node:process';
-import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const KEYMAN_ROOT = env.KEYMAN_ROOT ?? (__dirname + '/../../../../../../../../');
+const KEYMAN_ROOT = getKeymanRoot();
 
 describe('Engine - Unmatched Final Groups', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/ghp_enter.json'));
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js
index 2033794572f..84bd27b6e51 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js
@@ -4,13 +4,7 @@ import sinon from 'sinon';
 import { ManagedPromise } from 'keyman/common/web-utils';
 import { CloudQueryEngine, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage';
 import { PathConfiguration } from 'keyman/engine/interfaces';
-import { NodeCloudRequester } from 'keyman/test/resources';
-
-import path from 'path';
-import { fileURLToPath } from 'url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+import { NodeCloudRequester, getWebTestResourcesPath } from 'keyman/test/resources';
 
 const pathConfig = new PathConfiguration({
   root: '',
@@ -159,7 +153,7 @@ describe("Cloud-query interface", () => {
 
   describe('Stub fetching', () => {
     it('sil_euro_latin@no,sv', async () => {
-      const querier = mockQuery(`${__dirname}/../../../resources/query-mock-results/sil_euro_latin@no_sv.js.fixture`);
+      const querier = mockQuery(`${getWebTestResourcesPath()}/query-mock-results/sil_euro_latin@no_sv.js.fixture`);
       const promise = querier.fetchCloudStubs(['sil_euro_latin@no', 'sil_euro_latin@sv']);
 
       const stubs = await promise;
@@ -176,7 +170,7 @@ describe("Cloud-query interface", () => {
     });
 
     it('sil_cameroon_azerty', async () => {
-      const querier = mockQuery(`${__dirname}/../../../resources/query-mock-results/sil_cameroon_azerty.js.fixture`);
+      const querier = mockQuery(`${getWebTestResourcesPath()}/query-mock-results/sil_cameroon_azerty.js.fixture`);
       const promise = querier.fetchCloudStubs(['sil_cameroon_azerty']);
 
       const stubs = await promise;
@@ -192,7 +186,7 @@ describe("Cloud-query interface", () => {
     });
 
     it('@dz', async () => {
-      const querier = mockQuery(`${__dirname}/../../../resources/query-mock-results/@dz.js.fixture`);
+      const querier = mockQuery(`${getWebTestResourcesPath()}/query-mock-results/@dz.js.fixture`);
       const promise = querier.fetchCloudStubs(['@dz']);
 
       const stubs = await promise;
@@ -209,7 +203,7 @@ describe("Cloud-query interface", () => {
   });
 
   it('language list fetching', async () => {
-    const querier = mockQuery(`${__dirname}/../../../resources/query-mock-results/languages.js.fixture`);
+    const querier = mockQuery(`${getWebTestResourcesPath()}/query-mock-results/languages.js.fixture`);
     const promise = querier.languageListPromise;
 
     const langList = await promise;
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js
index 5d740b7c1c4..8b408f7c169 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js
@@ -4,15 +4,11 @@ import fs from 'fs';
 
 import { ManagedPromise } from 'keyman/common/web-utils';
 import { KeyboardHarness, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { NodeKeyboardLoader, NodeCloudRequester } from 'keyman/test/resources';
+import { NodeKeyboardLoader, NodeCloudRequester, getWebTestResourcesPath } from 'keyman/test/resources';
 import { KeyboardRequisitioner, toPrefixedKeyboardId } from 'keyman/engine/keyboard-storage';
 import { PathConfiguration } from 'keyman/engine/interfaces';
 
 import path from 'path';
-import { fileURLToPath } from 'url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
 
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
@@ -157,7 +153,7 @@ describe("KeyboardRequisitioner", () => {
       });
 
       it('drops requests for already fetched stubs', async () => {
-        let setupDB = mockedSetup(`${__dirname}/../../../resources/query-mock-results/sil_euro_latin@no_sv.js.fixture`);
+        let setupDB = mockedSetup(`${getWebTestResourcesPath()}/query-mock-results/sil_euro_latin@no_sv.js.fixture`);
         let promise = setupDB.addKeyboardArray(['sil_euro_latin@no,sv']);
 
         const setupStubs = await promise;
@@ -187,7 +183,7 @@ describe("KeyboardRequisitioner", () => {
 
     describe('Stub fetching', () => {
       it('sil_euro_latin@no,sv', async () => {
-        const keyboardRequisitioner = mockedSetup(`${__dirname}/../../../resources/query-mock-results/sil_euro_latin@no_sv.js.fixture`);
+        const keyboardRequisitioner = mockedSetup(`${getWebTestResourcesPath()}/query-mock-results/sil_euro_latin@no_sv.js.fixture`);
         const promise = keyboardRequisitioner.addKeyboardArray(['sil_euro_latin@no,sv']);
 
         const stubs = await promise;
@@ -206,7 +202,7 @@ describe("KeyboardRequisitioner", () => {
       });
 
       it('sil_cameroon_azerty', async () => {
-        const keyboardRequisitioner = mockedSetup(`${__dirname}/../../../resources/query-mock-results/sil_cameroon_azerty.js.fixture`);
+        const keyboardRequisitioner = mockedSetup(`${getWebTestResourcesPath()}/query-mock-results/sil_cameroon_azerty.js.fixture`);
         const promise = keyboardRequisitioner.addKeyboardArray(['sil_cameroon_azerty']);
 
         const stubs = await promise;
@@ -224,7 +220,7 @@ describe("KeyboardRequisitioner", () => {
       });
 
       it('@dz', async () => {
-        const keyboardRequisitioner = mockedSetup(`${__dirname}/../../../resources/query-mock-results/@dz.js.fixture`);
+        const keyboardRequisitioner = mockedSetup(`${getWebTestResourcesPath()}/query-mock-results/@dz.js.fixture`);
         const promise = keyboardRequisitioner.addKeyboardArray(['@dz']);
 
         const stubs = await promise;
@@ -241,12 +237,12 @@ describe("KeyboardRequisitioner", () => {
       });
 
       it('drops requests for already fetched stubs', async () => {
-        let setupDB = mockedSetup(`${__dirname}/../../../resources/query-mock-results/sil_euro_latin@no_sv.js.fixture`);
+        let setupDB = mockedSetup(`${getWebTestResourcesPath()}/query-mock-results/sil_euro_latin@no_sv.js.fixture`);
         let promise = setupDB.addKeyboardArray(['sil_euro_latin@no,sv']);
 
         const setupStubs = await promise;
 
-        const precachedRequisitioner = mockedSetup(`${__dirname}/../../../resources/query-mock-results/@dz.js.fixture`);
+        const precachedRequisitioner = mockedSetup(`${getWebTestResourcesPath()}/query-mock-results/@dz.js.fixture`);
         // Pre-load our 'setup' stubs into the query manager class before running the query.
         for(let stub of setupStubs) {
           precachedRequisitioner.cache.addStub(stub);
@@ -268,7 +264,7 @@ describe("KeyboardRequisitioner", () => {
 
   describe('addLanguageKeyboards', function() {
     it('awaits the language list fetch + constructs a query for the requested language', async () => {
-      const keyboardRequisitioner = mockedSetup(`${__dirname}/../../../resources/query-mock-results/languages.js.fixture`);
+      const keyboardRequisitioner = mockedSetup(`${getWebTestResourcesPath()}/query-mock-results/languages.js.fixture`);
       const mockedRequester = keyboardRequisitioner.cloudQueryEngine.requestEngine;
       const originalRequest = mockedRequester.request;
       let swapFake = sinon.fake((query) => {
@@ -304,7 +300,7 @@ describe("KeyboardRequisitioner", () => {
     // https://api.keyman.com/cloud/4.0/keyboards?jsonp=keyman.register&languageidtype=bcp47&version=17.0&keyboardid=khmer_angkor&timerid=49.
     //
     // The edits are minimal and notated within the fixture file.
-    const keyboardRequisitioner = mockedSetup(`${__dirname}/../../../resources/query-mock-results/khmer_angkor.hand-edited.js.fixture`);
+    const keyboardRequisitioner = mockedSetup(`${getWebTestResourcesPath()}/query-mock-results/khmer_angkor.hand-edited.js.fixture`);
 
     const cache = keyboardRequisitioner.cache;
     const [stub] = await keyboardRequisitioner.addKeyboardArray(['khmer_angkor']);
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js
index 40a3f17827d..90af0886d5f 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js
@@ -2,13 +2,7 @@ import { assert } from 'chai';
 import sinon from 'sinon';
 
 import { KeyboardStub } from 'keyman/engine/keyboard-storage';
-import { NodeCloudRequester } from 'keyman/test/resources';
-
-import path from 'path';
-import { fileURLToPath } from 'url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+import { NodeCloudRequester, getWebTestResourcesPath } from 'keyman/test/resources';
 
 describe("KeyboardStub", () => {
   function performMockedRequest(mockedResultsFile) {
@@ -81,7 +75,7 @@ describe("KeyboardStub", () => {
   });
 
   it('merge(): barebones stub + fetched sil_euro_latin@no', async () => {
-    const query = performMockedRequest(`${__dirname}/../../../resources/query-mock-results/sil_euro_latin@no_sv.js.fixture`);
+    const query = performMockedRequest(`${getWebTestResourcesPath()}/query-mock-results/sil_euro_latin@no_sv.js.fixture`);
     await query.promise;
 
     assert.isTrue(query.mockedRegister.called);
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js
index 7659495da34..07172489bf5 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js
@@ -1,13 +1,7 @@
 import { assert } from 'chai';
 import sinon from 'sinon';
 
-import { NodeCloudRequester } from 'keyman/test/resources';
-
-import path from 'path';
-import { fileURLToPath } from 'url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+import { NodeCloudRequester, getWebTestResourcesPath } from 'keyman/test/resources';
 
 describe("Mocked cloud query results in headless mode ('canary' testing)", () => {
   function performMockedRequest(mockedResultsFile) {
@@ -38,7 +32,7 @@ describe("Mocked cloud query results in headless mode ('canary' testing)", () =>
   }
 
   it('sil_euro_latin@no,sv', async () => {
-    const query = performMockedRequest(`${__dirname}/../../../resources/query-mock-results/sil_euro_latin@no_sv.js.fixture`);
+    const query = performMockedRequest(`${getWebTestResourcesPath()}/query-mock-results/sil_euro_latin@no_sv.js.fixture`);
     await query.promise;
 
     assert.isTrue(query.mockedRegister.called);
@@ -58,7 +52,7 @@ describe("Mocked cloud query results in headless mode ('canary' testing)", () =>
   });
 
   it('sil_cameroon_azerty', async () => {
-    const query = performMockedRequest(`${__dirname}/../../../resources/query-mock-results/sil_cameroon_azerty.js.fixture`);
+    const query = performMockedRequest(`${getWebTestResourcesPath()}/query-mock-results/sil_cameroon_azerty.js.fixture`);
     await query.promise;
 
     assert.isTrue(query.mockedRegister.called);
@@ -75,7 +69,7 @@ describe("Mocked cloud query results in headless mode ('canary' testing)", () =>
   });
 
   it('@dz', async () => {
-    const query = performMockedRequest(`${__dirname}/../../../resources/query-mock-results/@dz.js.fixture`);
+    const query = performMockedRequest(`${getWebTestResourcesPath()}/query-mock-results/@dz.js.fixture`);
     await query.promise;
 
     assert.isTrue(query.mockedRegister.called);
diff --git a/web/src/test/auto/headless/engine/loadKeyboardHelper.ts b/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
index fa1be9f2768..49dd8ea7896 100644
--- a/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
+++ b/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
@@ -4,12 +4,10 @@
 
 import fs from 'node:fs';
 import { pathToFileURL } from 'node:url';
+import { getKeymanRoot } from 'keyman/test/resources';
 
-import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
+const KEYMAN_ROOT = getKeymanRoot();
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const KEYMAN_ROOT = process.env['KEYMAN_ROOT'] ?? (__dirname + '/../../../../../../');
 export const coreurl = pathToFileURL(`${KEYMAN_ROOT}/web/build/engine/obj/core-adapter/import/core`).toString();
 
 export function loadKeyboardBlob(filename: string) {
diff --git a/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
index 13f6458c6c3..ff63e99fb20 100644
--- a/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
@@ -1,5 +1,6 @@
 import { assert } from 'chai';
 
+import path from 'path';
 import { LanguageProcessor, TranscriptionCache } from 'keyman/engine/main';
 import { SourcemappedWorker as LMWorker } from "@keymanapp/lexical-model-layer/node";
 import { SyntheticTextStore } from 'keyman/engine/keyboard';
@@ -9,15 +10,10 @@ import { SyntheticTextStore } from 'keyman/engine/keyboard';
  */
 
 import { LexicalModelCompiler } from '@keymanapp/kmc-model';
-import path from 'path';
 import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers';
+import { getKeymanRoot } from 'keyman/test/resources';
 
-import { env } from 'node:process';
-import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const KEYMAN_ROOT = env.KEYMAN_ROOT ?? (__dirname + '/../../../../../../../../');
+const KEYMAN_ROOT = getKeymanRoot();
 
 // Required initialization setup.
 global.keyman = {}; // So that keyboard-based checks against the global `keyman` succeed.
diff --git a/web/src/test/auto/resources/index.ts b/web/src/test/auto/resources/index.ts
index 8c176d04b3a..f95209c3864 100644
--- a/web/src/test/auto/resources/index.ts
+++ b/web/src/test/auto/resources/index.ts
@@ -3,4 +3,16 @@ export { DEFAULT_PROCESSOR_INIT_OPTIONS } from './defaultProcessorInitOptions.js
 export { NodeKeyboardLoader } from './loader/nodeKeyboardLoader.js';
 export { NodeCloudRequester } from './loader/nodeCloudRequester.js';
 export { StageReportAssertion, SequenceAssertion, assertGestureSequence } from './sequenceAssertions.js';
-export { simulateMultiSourceMatcherInput, simulateSelectorInput } from './simulateMultiSourceInput.js';
\ No newline at end of file
+export { simulateMultiSourceMatcherInput, simulateSelectorInput } from './simulateMultiSourceInput.js';
+
+import { fileURLToPath } from 'node:url';
+import { dirname } from 'node:path';
+
+export function getKeymanRoot(): string {
+  const __dirname = dirname(fileURLToPath(import.meta.url));
+  return process.env['KEYMAN_ROOT'] ?? (__dirname + '/../../../../../../');
+}
+
+export function getWebTestResourcesPath(): string {
+  return getKeymanRoot() + '/web/src/test/auto/resources';
+}
diff --git a/web/src/test/auto/resources/loader/nodeCloudRequester.ts b/web/src/test/auto/resources/loader/nodeCloudRequester.ts
index 2e654971f38..676749fea68 100644
--- a/web/src/test/auto/resources/loader/nodeCloudRequester.ts
+++ b/web/src/test/auto/resources/loader/nodeCloudRequester.ts
@@ -2,8 +2,7 @@ import { ManagedPromise } from 'keyman/common/web-utils';
 import {
   CloudRequesterInterface,
   CloudQueryResult,
-  CloudQueryEngine,
-  unitTestEndpoints
+  CloudQueryEngine
 } from 'keyman/engine/keyboard-storage';
 
 import fs from 'node:fs';
@@ -33,7 +32,7 @@ export class NodeCloudRequester implements CloudRequesterInterface {
 
     // Set callback timer
     const timeoutObj = setTimeout(() => {
-      promise.reject(new Error(unitTestEndpoints.CLOUD_TIMEOUT_ERR));
+      promise.reject(new Error('The Cloud API request timed out.'));
     }, 10000);
 
     const queryId = NodeCloudRequester.QUERY_SEED++;
@@ -55,7 +54,7 @@ export class NodeCloudRequester implements CloudRequesterInterface {
       });
 
       if(!promise.isResolved) {
-        promise.reject(new Error(unitTestEndpoints.CLOUD_STUB_REGISTRATION_ERR));
+        promise.reject(new Error('The Cloud API failed to find an appropriate keyboard.'));
       }
     }
 

From 06f7f22cd0e2b2bd529a1341c26206841639cc62 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 23 Mar 2026 15:08:30 +0100
Subject: [PATCH 243/254] maint(web): address more code review comments

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 .../src/keyboard-storage/cloud/cloudQueryEngine.ts  | 13 +++++++++++--
 .../src/keyboard-storage/domCloudRequester.ts       |  8 ++++----
 web/src/test/auto/resources/index.ts                |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/web/src/engine/src/keyboard-storage/cloud/cloudQueryEngine.ts b/web/src/engine/src/keyboard-storage/cloud/cloudQueryEngine.ts
index 7f71681fb16..b6ec76df07e 100644
--- a/web/src/engine/src/keyboard-storage/cloud/cloudQueryEngine.ts
+++ b/web/src/engine/src/keyboard-storage/cloud/cloudQueryEngine.ts
@@ -7,6 +7,15 @@ import { LanguageAPIPropertySpec } from 'keyman/engine/keyboard';
 import { CloudRequesterInterface } from './requesterInterface.js';
 import { ManagedPromise, Version } from 'keyman/common/web-utils';
 
+// For when the API call straight-up times out.
+export const CLOUD_TIMEOUT_ERR = "The Cloud API request timed out.";
+// Currently cannot distinguish between "no matching keyboard" and other script-load errors.
+export const CLOUD_MALFORMED_OBJECT_ERR = "Could not find a keyboard with that ID.";
+// Represents unspecified errors that occur when registering the results of a successful API call.
+export const CLOUD_STUB_REGISTRATION_ERR = "The Cloud API failed to find an appropriate keyboard.";
+// Represents custom, specified KMW errors that occur when registering the results of a successful API call.
+export const CLOUD_REGISTRATION_ERR = "Error occurred while registering keyboards: ";
+
 export const MISSING_KEYBOARD = function(kbdid: string) {
   return kbdid + ' keyboard not found.';
 }
@@ -130,7 +139,7 @@ export class CloudQueryEngine extends EventEmitter<EventMap> {
     try {
       result = this._registerCore(x);
     } catch(err) {
-      result = new Error(`Error occurred while registering keyboards: ${err}`);
+      result = new Error(CLOUD_REGISTRATION_ERR + err);
     }
 
     if(!promiseid) {
@@ -190,7 +199,7 @@ export class CloudQueryEngine extends EventEmitter<EventMap> {
 
     // Ignore callback unless the context is defined
     if(typeof(options) == 'undefined' || typeof(options['context']) == 'undefined') {
-      return new Error('Could not find a keyboard with that ID.');
+      return new Error(CLOUD_MALFORMED_OBJECT_ERR);
     }
 
     // Register each keyboard for the specified language codes
diff --git a/web/src/engine/src/keyboard-storage/domCloudRequester.ts b/web/src/engine/src/keyboard-storage/domCloudRequester.ts
index d97b31687a5..6d13b43cfde 100644
--- a/web/src/engine/src/keyboard-storage/domCloudRequester.ts
+++ b/web/src/engine/src/keyboard-storage/domCloudRequester.ts
@@ -1,5 +1,6 @@
 import { ManagedPromise } from 'keyman/common/web-utils';
 import { CloudRequesterInterface } from './cloud/requesterInterface.js';
+import { CLOUD_MALFORMED_OBJECT_ERR, CLOUD_TIMEOUT_ERR, CLOUD_STUB_REGISTRATION_ERR } from './cloud/cloudQueryEngine.js';
 
 export class DOMCloudRequester implements CloudRequesterInterface {
   private readonly fileLocal: boolean;
@@ -13,7 +14,7 @@ export class DOMCloudRequester implements CloudRequesterInterface {
 
     // Set callback timer
     const timeoutID = window.setTimeout(() => {
-      promise.reject(new Error('The Cloud API request timed out.'));
+      promise.reject(new Error(CLOUD_TIMEOUT_ERR));
     }, 10000);
 
     const tFlag='&timerid='+ timeoutID;
@@ -27,7 +28,7 @@ export class DOMCloudRequester implements CloudRequesterInterface {
       // script does not ever call `register`.  Also provides default handling
       // should `register` fail to report results/failure correctly.
       if(!promise.isResolved) {
-        promise.reject(new Error('The Cloud API failed to find an appropriate keyboard.'));
+        promise.reject(new Error(CLOUD_STUB_REGISTRATION_ERR));
       }
     };
 
@@ -41,8 +42,7 @@ export class DOMCloudRequester implements CloudRequesterInterface {
                         lineno?: number, colno?: number, error?: Error) => {
       window.clearTimeout(timeoutID);
 
-      // Currently cannot distinguish between "no matching keyboard" and other script-load errors.
-      let msg = 'Could not find a keyboard with that ID.';
+      let msg = CLOUD_MALFORMED_OBJECT_ERR;
       if(error) {
         msg = msg + ": " + error.message;
       }
diff --git a/web/src/test/auto/resources/index.ts b/web/src/test/auto/resources/index.ts
index f95209c3864..2e2425b6c48 100644
--- a/web/src/test/auto/resources/index.ts
+++ b/web/src/test/auto/resources/index.ts
@@ -10,7 +10,7 @@ import { dirname } from 'node:path';
 
 export function getKeymanRoot(): string {
   const __dirname = dirname(fileURLToPath(import.meta.url));
-  return process.env['KEYMAN_ROOT'] ?? (__dirname + '/../../../../../../');
+  return __dirname + '/../../../../../../';
 }
 
 export function getWebTestResourcesPath(): string {

From bbad49015491ea260a8458f4e0947709a51f24ac Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 23 Mar 2026 15:40:21 +0100
Subject: [PATCH 244/254] maint(web): cleanup imports

For the files touched in this PR:

- fix the order of the imports according to style guide
- use `node:` prefix for node modules
- add header
---
 .../keyboard-storage/cloud/cloudQueryEngine.ts  |  9 ++++++---
 .../src/keyboard-storage/domCloudRequester.ts   |  6 +++++-
 .../engine/js-processor/basic-engine.tests.js   | 14 ++++++++------
 .../engine/js-processor/chirality.tests.js      | 15 +++++++++------
 .../engine/js-processor/deadkeys.tests.js       |  9 ++++++---
 .../engine/unmatched_final_group.tests.js       | 14 ++++++++------
 .../keyboard-storage/cloudQueries.tests.js      |  5 ++++-
 .../keyboardRequisitioner.tests.js              | 15 +++++++++------
 .../keyboard-storage/keyboardStub.tests.js      |  3 +++
 .../nodeCloudRequester.tests.js                 |  3 +++
 .../auto/headless/engine/loadKeyboardHelper.ts  |  1 +
 .../main/headless/languageProcessor.tests.js    | 17 +++++++++--------
 web/src/test/auto/resources/index.ts            |  9 ++++++---
 .../auto/resources/loader/nodeCloudRequester.ts | 15 +++++++++------
 14 files changed, 86 insertions(+), 49 deletions(-)

diff --git a/web/src/engine/src/keyboard-storage/cloud/cloudQueryEngine.ts b/web/src/engine/src/keyboard-storage/cloud/cloudQueryEngine.ts
index b6ec76df07e..f640a4046a3 100644
--- a/web/src/engine/src/keyboard-storage/cloud/cloudQueryEngine.ts
+++ b/web/src/engine/src/keyboard-storage/cloud/cloudQueryEngine.ts
@@ -1,11 +1,14 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
 import { EventEmitter } from 'eventemitter3';
 
+import { ManagedPromise, Version } from 'keyman/common/web-utils';
 import { PathConfiguration } from 'keyman/engine/interfaces';
-
-import { KeyboardStub, ErrorStub, KeyboardAPISpec } from '../keyboardStub.js';
 import { LanguageAPIPropertySpec } from 'keyman/engine/keyboard';
+
+import { ErrorStub, KeyboardAPISpec, KeyboardStub } from '../keyboardStub.js';
 import { CloudRequesterInterface } from './requesterInterface.js';
-import { ManagedPromise, Version } from 'keyman/common/web-utils';
 
 // For when the API call straight-up times out.
 export const CLOUD_TIMEOUT_ERR = "The Cloud API request timed out.";
diff --git a/web/src/engine/src/keyboard-storage/domCloudRequester.ts b/web/src/engine/src/keyboard-storage/domCloudRequester.ts
index 6d13b43cfde..79d0fcd5bfa 100644
--- a/web/src/engine/src/keyboard-storage/domCloudRequester.ts
+++ b/web/src/engine/src/keyboard-storage/domCloudRequester.ts
@@ -1,6 +1,10 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
 import { ManagedPromise } from 'keyman/common/web-utils';
+
+import { CLOUD_MALFORMED_OBJECT_ERR, CLOUD_STUB_REGISTRATION_ERR, CLOUD_TIMEOUT_ERR } from './cloud/cloudQueryEngine.js';
 import { CloudRequesterInterface } from './cloud/requesterInterface.js';
-import { CLOUD_MALFORMED_OBJECT_ERR, CLOUD_TIMEOUT_ERR, CLOUD_STUB_REGISTRATION_ERR } from './cloud/cloudQueryEngine.js';
 
 export class DOMCloudRequester implements CloudRequesterInterface {
   private readonly fileLocal: boolean;
diff --git a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
index 8283cda2189..5e801458e98 100644
--- a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
@@ -1,15 +1,17 @@
-import { assert } from 'chai';
-import fs from 'fs';
-
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import fs from 'node:fs';
 
+import { assert } from 'chai';
 import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
 
-import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
+import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
+import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { NodeKeyboardLoader, getKeymanRoot } from 'keyman/test/resources';
-import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
+const require = createRequire(import.meta.url);
 const KEYMAN_ROOT = getKeymanRoot();
 
 describe('Engine - Basic Simulation', function() {
diff --git a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
index 9522d4411af..263b0d1d944 100644
--- a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
@@ -1,15 +1,18 @@
-import { assert } from 'chai';
-import fs from 'fs';
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import fs from 'node:fs';
 
+import { assert } from 'chai';
 import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
 
-import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
+import { ModifierKeyConstants } from '@keymanapp/common-types';
+import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
+import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { NodeKeyboardLoader, getKeymanRoot } from 'keyman/test/resources';
-import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
-import { ModifierKeyConstants } from '@keymanapp/common-types';
 
+const require = createRequire(import.meta.url);
 const KEYMAN_ROOT = getKeymanRoot();
 
 describe('Engine - Chirality', function() {
diff --git a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
index 3a244f69e25..367f0c9759a 100644
--- a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
@@ -1,14 +1,17 @@
-import { assert } from 'chai';
-import fs from 'fs';
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import fs from 'node:fs';
 
+import { assert } from 'chai';
 import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
 
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader, getKeymanRoot } from 'keyman/test/resources';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
+const require = createRequire(import.meta.url);
 const KEYMAN_ROOT = getKeymanRoot();
 
 describe('Engine - Deadkeys', function() {
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
index 5cd9f4c51a6..57d4acc2a77 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
@@ -1,15 +1,17 @@
-import { assert } from 'chai';
-import fs from 'fs';
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import fs from 'node:fs';
 
+import { assert } from 'chai';
 import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
 
-import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
+import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
+import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { NodeKeyboardLoader, getKeymanRoot } from 'keyman/test/resources';
-import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
-
 
+const require = createRequire(import.meta.url);
 const KEYMAN_ROOT = getKeymanRoot();
 
 describe('Engine - Unmatched Final Groups', function() {
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js
index 84bd27b6e51..015ee3c3dad 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/cloudQueries.tests.js
@@ -1,9 +1,12 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
 import { assert } from 'chai';
 import sinon from 'sinon';
 
 import { ManagedPromise } from 'keyman/common/web-utils';
-import { CloudQueryEngine, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage';
 import { PathConfiguration } from 'keyman/engine/interfaces';
+import { CloudQueryEngine, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage';
 import { NodeCloudRequester, getWebTestResourcesPath } from 'keyman/test/resources';
 
 const pathConfig = new PathConfiguration({
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js
index 8b408f7c169..ddcaed3a826 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/keyboardRequisitioner.tests.js
@@ -1,16 +1,19 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import fs from 'node:fs';
+import path from 'node:path';
+
 import { assert } from 'chai';
+import { createRequire } from 'module';
 import sinon from 'sinon';
-import fs from 'fs';
 
 import { ManagedPromise } from 'keyman/common/web-utils';
+import { PathConfiguration } from 'keyman/engine/interfaces';
 import { KeyboardHarness, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
-import { NodeKeyboardLoader, NodeCloudRequester, getWebTestResourcesPath } from 'keyman/test/resources';
 import { KeyboardRequisitioner, toPrefixedKeyboardId } from 'keyman/engine/keyboard-storage';
-import { PathConfiguration } from 'keyman/engine/interfaces';
-
-import path from 'path';
+import { NodeCloudRequester, NodeKeyboardLoader, getWebTestResourcesPath } from 'keyman/test/resources';
 
-import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 let commonResourcesPackage = '@keymanapp/common-test-resources';
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js
index 90af0886d5f..8aa19fcfd46 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/keyboardStub.tests.js
@@ -1,3 +1,6 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
 import { assert } from 'chai';
 import sinon from 'sinon';
 
diff --git a/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js b/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js
index 07172489bf5..7f31ffe70a4 100644
--- a/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard-storage/nodeCloudRequester.tests.js
@@ -1,3 +1,6 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
 import { assert } from 'chai';
 import sinon from 'sinon';
 
diff --git a/web/src/test/auto/headless/engine/loadKeyboardHelper.ts b/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
index 49dd8ea7896..5d1dc8b8387 100644
--- a/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
+++ b/web/src/test/auto/headless/engine/loadKeyboardHelper.ts
@@ -4,6 +4,7 @@
 
 import fs from 'node:fs';
 import { pathToFileURL } from 'node:url';
+
 import { getKeymanRoot } from 'keyman/test/resources';
 
 const KEYMAN_ROOT = getKeymanRoot();
diff --git a/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
index 05c4ffcb299..33752796491 100644
--- a/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
@@ -1,16 +1,17 @@
-import { assert } from 'chai';
-
-import path from 'path';
-import { LanguageProcessor, TranscriptionCache } from 'keyman/engine/main';
-import { SourcemappedWorker as LMWorker } from "@keymanapp/lexical-model-layer/node";
-import { SyntheticTextStore } from 'keyman/engine/keyboard';
-
 /*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
  * Unit tests for the Dummy prediction model.
  */
+import path from 'node:path';
+
+import { assert } from 'chai';
 
-import { LexicalModelCompiler } from '@keymanapp/kmc-model';
 import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers';
+import { LexicalModelCompiler } from '@keymanapp/kmc-model';
+import { SourcemappedWorker as LMWorker } from "@keymanapp/lexical-model-layer/node";
+import { SyntheticTextStore } from 'keyman/engine/keyboard';
+import { LanguageProcessor, TranscriptionCache } from 'keyman/engine/main';
 import { getKeymanRoot } from 'keyman/test/resources';
 
 const KEYMAN_ROOT = getKeymanRoot();
diff --git a/web/src/test/auto/resources/index.ts b/web/src/test/auto/resources/index.ts
index 2e2425b6c48..7a770a9f3df 100644
--- a/web/src/test/auto/resources/index.ts
+++ b/web/src/test/auto/resources/index.ts
@@ -1,12 +1,15 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
 export { assertingPromiseStatus } from './assertingPromiseStatus.js';
 export { DEFAULT_PROCESSOR_INIT_OPTIONS } from './defaultProcessorInitOptions.js';
-export { NodeKeyboardLoader } from './loader/nodeKeyboardLoader.js';
 export { NodeCloudRequester } from './loader/nodeCloudRequester.js';
-export { StageReportAssertion, SequenceAssertion, assertGestureSequence } from './sequenceAssertions.js';
+export { NodeKeyboardLoader } from './loader/nodeKeyboardLoader.js';
+export { assertGestureSequence, SequenceAssertion, StageReportAssertion } from './sequenceAssertions.js';
 export { simulateMultiSourceMatcherInput, simulateSelectorInput } from './simulateMultiSourceInput.js';
 
-import { fileURLToPath } from 'node:url';
 import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
 
 export function getKeymanRoot(): string {
   const __dirname = dirname(fileURLToPath(import.meta.url));
diff --git a/web/src/test/auto/resources/loader/nodeCloudRequester.ts b/web/src/test/auto/resources/loader/nodeCloudRequester.ts
index 676749fea68..d7f63b393d6 100644
--- a/web/src/test/auto/resources/loader/nodeCloudRequester.ts
+++ b/web/src/test/auto/resources/loader/nodeCloudRequester.ts
@@ -1,14 +1,17 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import fs from 'node:fs';
+import https from 'node:https';
+import vm from 'node:vm';
+
 import { ManagedPromise } from 'keyman/common/web-utils';
 import {
-  CloudRequesterInterface,
+  CloudQueryEngine,
   CloudQueryResult,
-  CloudQueryEngine
+  CloudRequesterInterface
 } from 'keyman/engine/keyboard-storage';
 
-import fs from 'node:fs';
-import https from 'node:https';
-import vm from 'node:vm';
-
 export class NodeCloudRequester implements CloudRequesterInterface {
   private static QUERY_SEED = 1;
   private readonly fileLocal: boolean;

From a5c09f40a189be98c1e8bbbbdf7ab267c93ccce2 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 27 Mar 2026 10:52:34 +0100
Subject: [PATCH 245/254] chore(core): fixup test keyboard paths

---
 .../tests/unit/km_core_process_event.tests.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/tests/unit/km_core_process_event.tests.cpp b/core/tests/unit/km_core_process_event.tests.cpp
index 67b84760b31..489526b8c0c 100644
--- a/core/tests/unit/km_core_process_event.tests.cpp
+++ b/core/tests/unit/km_core_process_event.tests.cpp
@@ -109,7 +109,7 @@ const TestData values[] = {
   //--------------------------------------------------------------------
   // KMN
   // Key with rule
-  {"KMN_VKey_A", "kmx/k_005___nul_with_initial_context.kmx", KM_CORE_VKEY_A, 0, u"x", true,
+  {"KMN_VKey_A", "kmx/k_0002___nul_with_initial_context.kmx", KM_CORE_VKEY_A, 0, u"x", true,
     { // KeyDown
       {KM_CORE_IT_CHAR, { 0, }, {'d'}},
       {KM_CORE_IT_END}
@@ -119,7 +119,7 @@ const TestData values[] = {
       {KM_CORE_IT_END}
     }
   },
-  {"KMN_Ctrl_VKey_A", "kmx/k_005___nul_with_initial_context.kmx", KM_CORE_VKEY_A, KM_CORE_MODIFIER_LCTRL, u"x", true,
+  {"KMN_Ctrl_VKey_A", "kmx/k_0002___nul_with_initial_context.kmx", KM_CORE_VKEY_A, KM_CORE_MODIFIER_LCTRL, u"x", true,
     { // KeyDown
       {KM_CORE_IT_INVALIDATE_CONTEXT, { 0, }, {0}},
       {KM_CORE_IT_EMIT_KEYSTROKE, { 0, }, {0}},
@@ -131,7 +131,7 @@ const TestData values[] = {
     }
   },
   // Key without rule
-  {"KMN_VKey_X", "kmx/k_005___nul_with_initial_context.kmx", KM_CORE_VKEY_X, 0, u"x", true,
+  {"KMN_VKey_X", "kmx/k_0002___nul_with_initial_context.kmx", KM_CORE_VKEY_X, 0, u"x", true,
     { // KeyDown
       {KM_CORE_IT_CHAR, { 0, }, {'x'}},
       {KM_CORE_IT_END}
@@ -141,7 +141,7 @@ const TestData values[] = {
       {KM_CORE_IT_END}
     }
   },
-  {"KMN_Ctrl_VKey_X", "kmx/k_005___nul_with_initial_context.kmx", KM_CORE_VKEY_X, KM_CORE_MODIFIER_LCTRL, u"x", true,
+  {"KMN_Ctrl_VKey_X", "kmx/k_0002___nul_with_initial_context.kmx", KM_CORE_VKEY_X, KM_CORE_MODIFIER_LCTRL, u"x", true,
     { // KeyDown
       {KM_CORE_IT_INVALIDATE_CONTEXT, { 0, }, {0}},
       {KM_CORE_IT_EMIT_KEYSTROKE, { 0, }, {0}},
@@ -153,7 +153,7 @@ const TestData values[] = {
     }
   },
   // Frame key without rule
-  {"KMN_VKey_Enter", "kmx/k_000___null_keyboard.kmx", KM_CORE_VKEY_ENTER, 0, u"x", false,
+  {"KMN_VKey_Enter", "kmx/k_0000___null_keyboard.kmx", KM_CORE_VKEY_ENTER, 0, u"x", false,
     { // KeyDown
       {KM_CORE_IT_INVALIDATE_CONTEXT, { 0, }, {0}},
       {KM_CORE_IT_EMIT_KEYSTROKE, { 0, }, {0}},
@@ -178,7 +178,7 @@ const TestData values[] = {
   //   }
   // },
   // Backspace (without context)
-  {"KMN_VKey_Backspace_NoCtxt", "kmx/k_000___null_keyboard.kmx", KM_CORE_VKEY_BKSP, 0, NULL, false,
+  {"KMN_VKey_Backspace_NoCtxt", "kmx/k_0000___null_keyboard.kmx", KM_CORE_VKEY_BKSP, 0, NULL, false,
     { // KeyDown
       {KM_CORE_IT_INVALIDATE_CONTEXT, { 0, }, {0}},
       {KM_CORE_IT_EMIT_KEYSTROKE, { 0, }, {0}},
@@ -190,7 +190,7 @@ const TestData values[] = {
     }
   },
   // Ctrl+Backspace (with context)
-  {"KMN_Ctrl_VKey_Backspace_Ctxt", "kmx/k_000___null_keyboard.kmx", KM_CORE_VKEY_BKSP, KM_CORE_MODIFIER_LCTRL, u"x", true,
+  {"KMN_Ctrl_VKey_Backspace_Ctxt", "kmx/k_0000___null_keyboard.kmx", KM_CORE_VKEY_BKSP, KM_CORE_MODIFIER_LCTRL, u"x", true,
     { // KeyDown
       {KM_CORE_IT_INVALIDATE_CONTEXT, { 0, }, {0}},
       {KM_CORE_IT_EMIT_KEYSTROKE, { 0, }, {0}},
@@ -202,7 +202,7 @@ const TestData values[] = {
     }
   },
   // Ctrl+Backspace (no context)
-  {"KMN_Ctrl_VKey_Backspace_NoCtxt", "kmx/k_000___null_keyboard.kmx", KM_CORE_VKEY_BKSP, KM_CORE_MODIFIER_LCTRL, NULL, false,
+  {"KMN_Ctrl_VKey_Backspace_NoCtxt", "kmx/k_0000___null_keyboard.kmx", KM_CORE_VKEY_BKSP, KM_CORE_MODIFIER_LCTRL, NULL, false,
     { // KeyDown
       {KM_CORE_IT_INVALIDATE_CONTEXT, { 0, }, {0}},
       {KM_CORE_IT_EMIT_KEYSTROKE, { 0, }, {0}},
@@ -214,7 +214,7 @@ const TestData values[] = {
     }
   },
   // Modifier frame key
-  {"KMN_VKey_Shift", "kmx/k_000___null_keyboard.kmx", KM_CORE_VKEY_SHIFT, 0, u"x", false,
+  {"KMN_VKey_Shift", "kmx/k_0000___null_keyboard.kmx", KM_CORE_VKEY_SHIFT, 0, u"x", false,
     { // KeyDown
       {KM_CORE_IT_END}
     },

From 115ab18d71fdb51a6714325f6a68ded1bdf6658b Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 16 Apr 2026 22:07:58 +0200
Subject: [PATCH 246/254] refactor(web): add abstract `Keyboard` base class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also rename `JSKeyboardData` → `KeyboardData`.

Test-bot: skip
---
 web/src/app/browser/src/keymanEngine.ts       | 14 ++-
 .../src/js-processor/jsKeyboardInterface.ts   | 25 +++---
 .../src/js-processor/jsKeyboardProcessor.ts   |  2 +-
 .../keyboard-storage/stubAndKeyboardCache.ts  | 19 ++--
 web/src/engine/src/keyboard/index.ts          |  3 +-
 web/src/engine/src/keyboard/keyEvent.ts       |  2 +-
 .../src/keyboard/keyboards/jsKeyboard.ts      |  4 +-
 .../engine/src/keyboard/keyboards/keyboard.ts | 89 +++++++++++++++++++
 .../src/keyboard/keyboards/keyboardHarness.ts |  4 +-
 .../keyboard/keyboards/keyboardLoaderBase.ts  |  7 +-
 .../keyboards/keyboardMinimalInterface.ts     |  2 +-
 .../keyboard/keyboards/keyboardProcessor.ts   |  2 +-
 .../src/keyboard/keyboards/kmxKeyboard.ts     | 21 ++++-
 .../keyboards/loaders/domKeyboardLoader.ts    |  4 +-
 .../src/main/headless/inputProcessor.ts       |  4 +-
 web/src/engine/src/main/keymanEngineBase.ts   |  4 +-
 web/src/engine/src/osk/components/titleBar.ts |  4 +-
 web/src/engine/src/osk/index.ts               |  2 +-
 web/src/engine/src/osk/views/oskView.ts       | 13 +--
 web/src/engine/src/osk/visualKeyboard.ts      |  2 +-
 web/src/test/auto/dom/kbdLoader.ts            | 10 +--
 .../coreKeyboardProcessor.tests.ts            |  4 +-
 .../specialized-backspace.tests.ts            |  6 +-
 .../resources/loader/nodeKeyboardLoader.ts    |  4 +-
 24 files changed, 180 insertions(+), 71 deletions(-)
 create mode 100644 web/src/engine/src/keyboard/keyboards/keyboard.ts

diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 6e9f8ebe331..b9663ca3747 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -689,18 +689,14 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
     argFormFactor?: DeviceSpec.FormFactor,
     argLayerId?: string
   ): HTMLElement {
-    let PKbd: Keyboard = null;
+    const PKbd = (PInternalName != null ? this.keyboardRequisitioner.cache.getKeyboard(PInternalName) : null) || this.core.activeKeyboard;
 
-    if(PInternalName != null) {
-      PKbd = this.keyboardRequisitioner.cache.getKeyboard(PInternalName);
-    }
-
-    PKbd = PKbd || this.core.activeKeyboard;
     if (PKbd instanceof KMXKeyboard) {
-      // TODO-web-core: implement for KMX keyboards (epic/embed-osk-in-kmx)
+      // TODO-embed-osk-in-kmx: implement for KMX keyboards
       return null;
     }
-    const Pstub = this.keyboardRequisitioner.cache.getStub(PKbd);
+    const jsKbd = PKbd as JSKeyboard;
+    const Pstub = this.keyboardRequisitioner.cache.getStub(jsKbd);
 
     // help.keyman.com will set this function in place to specify the desired
     // dimensions for the documentation-keyboards, so we'll give it priority.  One of those
@@ -712,7 +708,7 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
     const targetHeight = (typeof getOskHeight == 'function' ? getOskHeight() : null) || this.osk.computedHeight || 200;
 
     return VisualKeyboard.buildDocumentationKeyboard(
-      PKbd,
+      jsKbd,
       Pstub,
       this.config.paths,
       argFormFactor,
diff --git a/web/src/engine/src/js-processor/jsKeyboardInterface.ts b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
index 5fac53a76e5..67b6a0a68f7 100644
--- a/web/src/engine/src/js-processor/jsKeyboardInterface.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
@@ -10,6 +10,7 @@ import { ModifierKeyConstants } from '@keymanapp/common-types';
 import {
   Codes,
   JSKeyboard,
+  Keyboard,
   KeyboardHarness,
   KeyboardKeymanGlobal,
   KeyMapping,
@@ -194,11 +195,15 @@ export class JSKeyboardInterface extends KeyboardHarness {
   _AnyIndices:  number[] = [];    // AnyIndex - array of any/index match indices
 
   // Must be accessible to some of the keyboard API methods.
-  activeKeyboard: JSKeyboard;
+  activeKeyboard: Keyboard;
   activeDevice: DeviceSpec;
 
   variableStoreSerializer: VariableStoreSerializer;
 
+  private get activeJSKeyboard(): JSKeyboard {
+    return this.activeKeyboard as JSKeyboard;
+  }
+
   // A 'reference point' that debug keyboards may use to access KMW's code constants.
   public get Codes(): typeof Codes {
     return Codes;
@@ -569,7 +574,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
     let retVal = false; // I3318
     let keyCode = (e.Lcode == 173 ? 189 : e.Lcode);  //I3555 (Firefox hyphen issue)
 
-    const bitmask = this.activeKeyboard.modifierBitmask;
+    const bitmask = this.activeJSKeyboard.modifierBitmask;
     const modifierBitmask = bitmask & Codes.modifierBitmasks["ALL"];
     const stateBitmask = bitmask & Codes.stateBitmasks["ALL"];
 
@@ -649,7 +654,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
 
   _ExplodeStore(store: KeyboardStore): ComplexKeyboardStore {
     if(typeof(store) == 'string') {
-      const cachedStores = this.activeKeyboard.explodedStores;
+      const cachedStores = this.activeJSKeyboard.explodedStores;
 
       // Is the result cached?
       if(cachedStores[store]) {
@@ -1005,7 +1010,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
     if(!this.activeKeyboard) {
       throw "No active keyboard for keystroke processing!";
     }
-    return this.process(this.activeKeyboard.processNewContextEvent.bind(this.activeKeyboard), textStore, keystroke, true);
+    return this.process(this.activeJSKeyboard.processNewContextEvent.bind(this.activeKeyboard), textStore, keystroke, true);
   }
 
   /**
@@ -1020,7 +1025,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
     if(!this.activeKeyboard) {
       throw "No active keyboard for keystroke processing!";
     }
-    return this.process(this.activeKeyboard.processPostKeystroke.bind(this.activeKeyboard), textStore, keystroke, true);
+    return this.process(this.activeJSKeyboard.processPostKeystroke.bind(this.activeKeyboard), textStore, keystroke, true);
   }
 
   /**
@@ -1035,7 +1040,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
     if(!this.activeKeyboard) {
       throw "No active keyboard for keystroke processing!";
     }
-    return this.process(this.activeKeyboard.process.bind(this.activeKeyboard), textStore, keystroke, false);
+    return this.process(this.activeJSKeyboard.process.bind(this.activeKeyboard), textStore, keystroke, false);
   }
 
   private process(callee: (textStore: TextStore, keystroke: KeyEvent) => boolean, textStore: TextStore, keystroke: KeyEvent, readonly: boolean): ProcessorAction {
@@ -1057,7 +1062,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
     const preInput = SyntheticTextStore.from(textStore, true);
 
     // Capture the initial state of any variable stores
-    const cachedVariableStores = this.activeKeyboard.variableStores;
+    const cachedVariableStores = this.activeJSKeyboard.variableStores;
 
     // Establishes the results object, allowing corresponding commands to set values here as appropriate.
     this.ruleBehavior = new ProcessorAction();
@@ -1077,8 +1082,8 @@ export class JSKeyboardInterface extends KeyboardHarness {
     // We always backup the changes to variable stores to the ProcessorAction, to
     // be applied during finalization, then restore them to the cached initial
     // values to avoid side-effects with predictive text mocks.
-    this.ruleBehavior.variableStores = this.activeKeyboard.variableStores;
-    this.activeKeyboard.variableStores = cachedVariableStores;
+    this.ruleBehavior.variableStores = this.activeJSKeyboard.variableStores;
+    this.activeJSKeyboard.variableStores = cachedVariableStores;
 
     // `matched` refers to whether or not the FINAL rule (from any group) matched, rather than
     // whether or not ANY rule matched.  If the final rule doesn't match, we trigger the key's
@@ -1104,7 +1109,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    *               keyboard
    */
   applyVariableStores(stores: VariableStoreDictionary): void {
-    this.activeKeyboard.variableStores = stores;
+    this.activeJSKeyboard.variableStores = stores;
   }
 
   /**
diff --git a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
index 757819fb195..3eb5a7ab36a 100644
--- a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
@@ -68,7 +68,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
   }
 
   public get activeKeyboard(): JSKeyboard {
-    return this.keyboardInterface.activeKeyboard;
+    return this.keyboardInterface.activeKeyboard as JSKeyboard;
   }
 
   public set activeKeyboard(keyboard: JSKeyboard) {
diff --git a/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts b/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
index 1537a8cc523..98c4a237b1f 100644
--- a/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
+++ b/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
@@ -1,4 +1,4 @@
-import { type Keyboard, JSKeyboard, KeyboardLoaderBase as KeyboardLoader, KMXKeyboard } from "keyman/engine/keyboard";
+import { Keyboard, JSKeyboard, KeyboardLoaderBase as KeyboardLoader, KMXKeyboard } from "keyman/engine/keyboard";
 import { EventEmitter } from "eventemitter3";
 
 import { KeyboardStub } from "./keyboardStub.js";
@@ -152,7 +152,7 @@ export class StubAndKeyboardCache extends EventEmitter<EventMap> {
     keyboardID = toPrefixedKeyboardId(keyboardID);
 
     const cachedEntry = this.keyboardTable[keyboardID];
-    if(cachedEntry instanceof JSKeyboard) {
+    if(cachedEntry instanceof Keyboard) {
       return Promise.resolve(cachedEntry);
     } else if(cachedEntry instanceof Promise) {
       return cachedEntry;
@@ -172,6 +172,7 @@ export class StubAndKeyboardCache extends EventEmitter<EventMap> {
 
     promise.then((kbd) => {
       // Overrides the built-in ID in case of keyboard namespacing.
+      // TODO-web-core: what do we have to do for KMX keyboards here?
       if (kbd instanceof JSKeyboard) {
         kbd.scriptObject["KI"] = keyboardID;
       }
@@ -197,12 +198,12 @@ export class StubAndKeyboardCache extends EventEmitter<EventMap> {
   }
 
   getStub(keyboardID: string, languageID: string): KeyboardStub;
-  getStub(keyboard: JSKeyboard, languageID?: string): KeyboardStub;
-  getStub(arg0: string | JSKeyboard, arg1?: string): KeyboardStub {
+  getStub(keyboard: Keyboard, languageID?: string): KeyboardStub;
+  getStub(arg0: string | Keyboard, arg1?: string): KeyboardStub {
     let keyboardID: string;
     const languageID = arg1 || '---';
 
-    if(arg0 instanceof JSKeyboard) {
+    if(arg0 instanceof Keyboard) {
       keyboardID = arg0.id;
     } else {
       keyboardID = arg0;
@@ -229,12 +230,12 @@ export class StubAndKeyboardCache extends EventEmitter<EventMap> {
   /**
    * Removes all metadata (stubs) associated with a specific keyboard from the cache, optionally
    * removing the cached keyboard as well.
-   * @param keyboard Either the keyboard ID or `JSKeyboard` instance
-   * @param purge If `true`, will also purge the `JSKeyboard` instance itself from the cache.
+   * @param keyboard Either the keyboard ID or `Keyboard` instance
+   * @param purge If `true`, will also purge the `Keyboard` instance itself from the cache.
    *              If `false`, only forgets the metadata (stubs).
    */
-  forgetKeyboard(keyboard: string | JSKeyboard, purge: boolean = false) {
-    const id: string = (keyboard instanceof JSKeyboard) ? keyboard.id : toPrefixedKeyboardId(keyboard);
+  forgetKeyboard(keyboard: string | Keyboard, purge: boolean = false) {
+    const id: string = (keyboard instanceof Keyboard) ? keyboard.id : toPrefixedKeyboardId(keyboard);
 
     if(this.stubSetTable[id]) {
       delete this.stubSetTable[id];
diff --git a/web/src/engine/src/keyboard/index.ts b/web/src/engine/src/keyboard/index.ts
index c292f112660..e858a20f524 100644
--- a/web/src/engine/src/keyboard/index.ts
+++ b/web/src/engine/src/keyboard/index.ts
@@ -1,10 +1,11 @@
 export { ActiveKeyBase, ActiveKey, ActiveSubKey, ActiveRow, ActiveLayer, ActiveLayout } from "./keyboards/activeLayout.js";
 export { ButtonClass, ButtonClasses, LayoutLayer, LayoutFormFactor, LayoutRow, LayoutKey, LayoutSubKey, Layouts } from "./keyboards/defaultLayouts.js";
 export { JSKeyboard, LayoutState } from "./keyboards/jsKeyboard.js";
+export { Keyboard } from './keyboards/keyboard.js';
 export { KeyboardMinimalInterface } from './keyboards/keyboardMinimalInterface.js';
 export { KMXKeyboard } from './keyboards/kmxKeyboard.js';
 export { KeyboardHarness, KeyboardKeymanGlobal, MinimalCodesInterface, MinimalKeymanGlobal } from "./keyboards/keyboardHarness.js";
-export { NotifyEventCode, Keyboard, KeyboardLoaderBase } from "./keyboards/keyboardLoaderBase.js";
+export { NotifyEventCode, KeyboardLoaderBase } from "./keyboards/keyboardLoaderBase.js";
 export { KeyboardLoadErrorBuilder, KeyboardMissingError, KeyboardScriptError, KeyboardDownloadError, InvalidKeyboardError } from './keyboards/keyboardLoadError.js'
 export { BeepHandler, EventMap, KeyboardProcessor } from "./keyboards/keyboardProcessor.js";
 export {
diff --git a/web/src/engine/src/keyboard/keyEvent.ts b/web/src/engine/src/keyboard/keyEvent.ts
index c261f0f9720..fb5830e4592 100644
--- a/web/src/engine/src/keyboard/keyEvent.ts
+++ b/web/src/engine/src/keyboard/keyEvent.ts
@@ -11,7 +11,7 @@ import { type DeviceSpec } from "keyman/common/web-utils";
 import { Codes } from './codes.js';
 import { DefaultOutputRules } from "./defaultOutputRules.js";
 import { ActiveKeyBase } from './keyboards/activeLayout.js';
-import { type Keyboard } from "./keyboards/keyboardLoaderBase.js";
+import { type Keyboard } from "./keyboards/keyboard.js";
 
 // Represents a probability distribution over a keyboard's keys.
 // Defined here to avoid compilation issues.
diff --git a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
index 5fd6e06530b..629f7422bd0 100644
--- a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
@@ -15,6 +15,7 @@ type TouchLayoutSpec = TouchLayout.TouchLayoutPlatform & { isDefault?: boolean};
 import { Version, DeviceSpec } from "keyman/common/web-utils";
 import { StateKeyMap } from "./stateKeyMap.js";
 import { NotifyEventCode } from './keyboardLoaderBase.js';
+import { Keyboard } from './keyboard.js';
 
 /**
  * Stores preprocessed properties of a keyboard for quick retrieval later.
@@ -49,7 +50,7 @@ type KmwKeyboardObject = KeyboardObject & {
  * and keyboard-centered functionality in an object-oriented way without modifying the
  * wrapped keyboard itself.
  */
-export class JSKeyboard {
+export class JSKeyboard extends Keyboard {
   public static DEFAULT_SCRIPT_OBJECT: KmwKeyboardObject = {
     'gs': function(textStore: TextStore, keystroke: KeyEvent) { return false; }, // no matching rules; rely on defaultRuleOutput entirely
     'KI': '', // The currently-existing default keyboard ID; we already have checks that focus against this.
@@ -68,6 +69,7 @@ export class JSKeyboard {
   private layoutStates: {[layout: string]: LayoutState};
 
   constructor(keyboardScript: any) {
+    super();
     if(keyboardScript) {
       this.scriptObject = keyboardScript;
     } else {
diff --git a/web/src/engine/src/keyboard/keyboards/keyboard.ts b/web/src/engine/src/keyboard/keyboards/keyboard.ts
new file mode 100644
index 00000000000..8b1d5ebe309
--- /dev/null
+++ b/web/src/engine/src/keyboard/keyboards/keyboard.ts
@@ -0,0 +1,89 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import { DeviceSpec } from 'keyman/common/web-utils';
+import { ActiveKey, ActiveLayout, ActiveSubKey } from './activeLayout.js';
+import { StateKeyMap } from './stateKeyMap.js';
+import { KeyEvent } from '../keyEvent.js';
+import { TextStore } from '../textStore.js';
+import { NotifyEventCode } from './keyboardLoaderBase.js';
+
+/**
+ * Abstract base class for Keyman keyboards, providing common interface
+ * for JSKeyboard and KMXKeyboard.
+ */
+export abstract class Keyboard {
+  /**
+   * Unique identifier for the keyboard.
+   */
+  abstract get id(): string;
+
+  /**
+   * Gets the name of the keyboard.
+   */
+  abstract get name(): string;
+
+  /**
+   * Version string of the keyboard.
+   */
+  abstract get version(): string;
+
+  /**
+   * Indicates whether the keyboard uses mnemonic layout.
+   */
+  abstract get isMnemonic(): boolean;
+
+  /**
+   * Indicates whether the keyboard is chiral (distinguishes left/right modifiers).
+   */
+  abstract get isChiral(): boolean;
+
+  /**
+   * Indicates whether the keyboard emulates AltGr.
+   */
+  abstract get emulatesAltGr(): boolean;
+
+  /**
+   * Indicates whether the keyboard is right-to-left.
+   */
+  abstract get isRTL(): boolean;
+
+  /**
+   * true if this keyboard uses a (legacy) pick list (Chinese, Japanese, Korean, etc.)
+   */
+  abstract get isCJK(): boolean;
+
+  /**
+   * CSS styling for the on-screen keyboard.
+   */
+  abstract get oskStyling(): string;
+
+  /**
+   * Returns an ActiveLayout object representing the keyboard's layout for this form factor.
+   * May return null if a custom desktop "help" OSK is defined.
+   * @param formFactor The desired form factor for the layout.
+   */
+  abstract layout(formFactor: DeviceSpec.FormFactor): ActiveLayout;
+
+  /**
+   * Indicates whether the keyboard's desktop layout should be used for the specified device.
+   * @param device The device specification to check.
+   */
+  abstract usesDesktopLayoutOnDevice(device: DeviceSpec): boolean;
+
+  /**
+   * Notifies keyboard of keystroke or other event.
+   * @param eventCode Event code (16-18: Shift, Control or Alt), or 0 for focus.
+   * @param textStore Text store.
+   * @param data 1 for KeyDown or FocusReceived, 0 for KeyUp or FocusLost.
+   */
+  abstract notify(eventCode: NotifyEventCode, textStore: TextStore, data: number): void;
+
+  /**
+   * Constructs a KeyEvent from an ActiveKey or ActiveSubKey.
+   * @param key The key to construct the event for.
+   * @param device The device specification.
+   * @param stateKeys The current state of modifier keys.
+   */
+  abstract constructKeyEvent(key: ActiveKey | ActiveSubKey, device: DeviceSpec, stateKeys: StateKeyMap): KeyEvent;
+}
\ No newline at end of file
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardHarness.ts b/web/src/engine/src/keyboard/keyboards/keyboardHarness.ts
index c952dff5502..77f34354fac 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardHarness.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardHarness.ts
@@ -1,6 +1,7 @@
 import { JSKeyboard } from "./jsKeyboard.js";
 import { Codes } from "../codes.js";
 import { DeviceSpec } from 'keyman/common/web-utils';
+import { Keyboard } from './keyboard.js';
 
 /**
  * Defines members of the top-level `keyman` global object necessary to guarantee
@@ -64,7 +65,7 @@ export class KeyboardHarness {
   /**
    * This field serves as the receptacle for a successfully-loaded Keyboard.
    */
-  public loadedKeyboard: JSKeyboard = null;
+  public loadedKeyboard: Keyboard = null;
 
   /**
    * Keyman keyboards register themselves into the Keyman Engine for Web by directly
@@ -85,6 +86,7 @@ export class KeyboardHarness {
       throw new Error("Unexpected state:  the most-recently loaded keyboard field was not properly reset.");
     }
     this.loadedKeyboard = new JSKeyboard(scriptObject);
+    // TODO-web-core: do we have to do something similar for KMX keyboards?
   }
 
   // Is evaluated on script-load for some keyboards using variable stores.
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts b/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
index 07c07882201..d5cdb436f7a 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
@@ -1,10 +1,10 @@
 import { KM_Core, KM_CORE_STATUS } from 'keyman/engine/core-adapter';
-import { JSKeyboard } from "./jsKeyboard.js";
 import { KMXKeyboard } from './kmxKeyboard.js';
 import { KeyboardHarness } from "./keyboardHarness.js";
 import { KeyboardProperties } from "./keyboardProperties.js";
 import { KeyboardLoadErrorBuilder, StubBasedErrorBuilder, UriBasedErrorBuilder } from './keyboardLoadError.js';
 import { Codes } from '../codes.js';
+import { Keyboard } from './keyboard.js';
 
 export enum NotifyEventCode {
   FocusEvent = 0,
@@ -14,7 +14,6 @@ export enum NotifyEventCode {
 };
 
 export type KeyboardStub = KeyboardProperties & { filename: string };
-export type Keyboard = JSKeyboard | KMXKeyboard;
 
 export abstract class KeyboardLoaderBase {
   private _harness: KeyboardHarness;
@@ -63,7 +62,7 @@ export abstract class KeyboardLoaderBase {
       const name = this.extractIdFromUrl(uri);
       const result = KM_Core.instance.keyboard_load_from_blob(name, byteArray);
       if (result.status == KM_CORE_STATUS.OK) {
-        return new KMXKeyboard(result.object);
+        return new KMXKeyboard(name, result.object);
       }
       throw errorBuilder.invalidKeyboard(new Error(`Loading KMX keyboard from ${uri} failed with status ${result.status}`));
     }
@@ -86,5 +85,5 @@ export abstract class KeyboardLoaderBase {
 
   protected abstract loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Uint8Array>;
 
-  protected abstract loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<JSKeyboard>;
+  protected abstract loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard>;
 }
\ No newline at end of file
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardMinimalInterface.ts b/web/src/engine/src/keyboard/keyboards/keyboardMinimalInterface.ts
index 7960b0708b3..a130160527e 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardMinimalInterface.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardMinimalInterface.ts
@@ -1,5 +1,5 @@
 import { VariableStoreSerializer } from '../variableStore.js';
-import { Keyboard } from './keyboardLoaderBase.js';
+import { Keyboard } from './keyboard.js';
 
 export interface KeyboardMinimalInterface {
   activeKeyboard: Keyboard;
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts b/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts
index 6b906fbfec8..3d29673c808 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardProcessor.ts
@@ -5,7 +5,7 @@ import { EventEmitter } from 'eventemitter3';
 import { DeviceSpec } from 'keyman/common/web-utils';
 import { KeyEvent } from '../keyEvent.js';
 import { type MutableSystemStore } from "../systemStore.js";
-import { Keyboard } from './keyboardLoaderBase.js';
+import { Keyboard } from './keyboard.js';
 import { KeyboardMinimalInterface } from './keyboardMinimalInterface.js';
 import { ProcessorAction } from './processorAction.js';
 import { StateKeyMap } from './stateKeyMap.js';
diff --git a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
index 76d1e844ffe..46a9a82ea78 100644
--- a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
@@ -8,14 +8,16 @@ import { StateKeyMap } from './stateKeyMap.js';
 import { KeyEvent } from '../keyEvent.js';
 import { TextStore } from '../textStore.js';
 import { NotifyEventCode } from './keyboardLoaderBase.js';
+import { Keyboard } from './keyboard.js';
 
 /**
  * Acts as a wrapper class for KMX(+) Keyman keyboards
  */
-export class KMXKeyboard {
-  private _state: km_core_state;
+export class KMXKeyboard extends Keyboard {
+  private _state: km_core_state | null = null;
 
-  public constructor(private _keyboard: km_core_keyboard) {
+  public constructor(private _name: string, private _keyboard: km_core_keyboard) {
+    super();
     const environment_opts =
       [
         {
@@ -77,6 +79,10 @@ export class KMXKeyboard {
     return id;
   }
 
+  public get name(): string {
+    return this._name;
+  }
+
   public get keyboard(): km_core_keyboard {
     return this._keyboard;
   }
@@ -124,6 +130,15 @@ export class KMXKeyboard {
     return false;
   }
 
+  /**
+   * Returns always false because (legacy) pick lists (Chinese, Japanese, Korean, etc.)
+   * are not supported when using KMX keyboards.
+   */
+  public get isCJK(): boolean {
+    // always return false
+    return false;
+  }
+
   /**
    * Returns an ActiveLayout object representing the keyboard's layout for this
    * form factor.  May return null if a custom desktop "help" OSK is defined,
diff --git a/web/src/engine/src/keyboard/keyboards/loaders/domKeyboardLoader.ts b/web/src/engine/src/keyboard/keyboards/loaders/domKeyboardLoader.ts
index 7f1b0dcfddd..6b961ac831a 100644
--- a/web/src/engine/src/keyboard/keyboards/loaders/domKeyboardLoader.ts
+++ b/web/src/engine/src/keyboard/keyboards/loaders/domKeyboardLoader.ts
@@ -2,7 +2,7 @@
 
 ///<reference lib="dom" />
 
-import { JSKeyboard } from '../jsKeyboard.js';
+import { Keyboard } from '../keyboard.js';
 import { KeyboardHarness, MinimalKeymanGlobal } from '../keyboardHarness.js';
 import { KeyboardLoaderBase } from '../keyboardLoaderBase.js';
 import { KeyboardLoadErrorBuilder } from '../keyboardLoadError.js';
@@ -54,7 +54,7 @@ export class DOMKeyboardLoader extends KeyboardLoaderBase {
     return new Uint8Array(buffer);
   }
 
-  protected async loadKeyboardFromScript(script: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<JSKeyboard> {
+  protected async loadKeyboardFromScript(script: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
     try {
       this.evalScriptInContext(script, this.harness._jsGlobal);
     } catch (e) {
diff --git a/web/src/engine/src/main/headless/inputProcessor.ts b/web/src/engine/src/main/headless/inputProcessor.ts
index b6edf65da0a..983dc1bdcf0 100644
--- a/web/src/engine/src/main/headless/inputProcessor.ts
+++ b/web/src/engine/src/main/headless/inputProcessor.ts
@@ -9,14 +9,14 @@ import { CoreKeyboardProcessor } from 'keyman/engine/core-processor';
 
 import {
   Codes,
-  JSKeyboard, // TODO-web-core: huh? why is this here
+  JSKeyboard, // required to be able to distinguish between JS and Core kbd processor
+  Keyboard,
   KeyboardMinimalInterface,
   SyntheticTextStore,
   TextStore,
   ProcessorAction,
   SystemStoreIDs,
   type Alternate,
-  type Keyboard,
   type KeyEvent,
   KeyboardProcessor,
   VariableStoreSerializer
diff --git a/web/src/engine/src/main/keymanEngineBase.ts b/web/src/engine/src/main/keymanEngineBase.ts
index d862162328c..bdb43e05ead 100644
--- a/web/src/engine/src/main/keymanEngineBase.ts
+++ b/web/src/engine/src/main/keymanEngineBase.ts
@@ -3,7 +3,7 @@ import { ProcessorInitOptions } from 'keyman/engine/js-processor';
 import { DOMKeyboardLoader } from "keyman/engine/keyboard";
 import { WorkerFactory } from "@keymanapp/lexical-model-layer/web"
 import { InputProcessor } from './headless/inputProcessor.js';
-import { OSKView, JSKeyboardData } from "keyman/engine/osk";
+import { OSKView, KeyboardData } from "keyman/engine/osk";
 import { KeyboardRequisitioner, ModelCache, toUnprefixedKeyboardId, DOMCloudRequester } from "keyman/engine/keyboard-storage";
 import { ModelSpec, PredictionContext } from "keyman/engine/interfaces";
 
@@ -386,7 +386,7 @@ export class KeymanEngineBase<
     this.core.keyboardProcessor.contextDevice = value?.targetDevice ?? this.config.softDevice;
     if(value) {
       // Don't build an OSK if no keyboard is available yet; avoid the extra flash.
-      if (this.contextManager.activeKeyboard && this.contextManager.activeKeyboard instanceof JSKeyboardData) { // TODO-embed-osk-in-kmx: add support for OSK for KMX keyboards
+      if (this.contextManager.activeKeyboard && this.contextManager.activeKeyboard instanceof KeyboardData) { // TODO-embed-osk-in-kmx: add support for OSK for KMX keyboards
         value.activeKeyboard = this.contextManager.activeKeyboard;
       }
       value.on('keyevent', this.keyEventListener);
diff --git a/web/src/engine/src/osk/components/titleBar.ts b/web/src/engine/src/osk/components/titleBar.ts
index f7b76bf3437..1c262dc57ef 100644
--- a/web/src/engine/src/osk/components/titleBar.ts
+++ b/web/src/engine/src/osk/components/titleBar.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'eventemitter3';
 
-import { JSKeyboard } from 'keyman/engine/keyboard';
+import { Keyboard } from 'keyman/engine/keyboard';
 
 import { OSKViewComponent } from './oskViewComponent.interface.js';
 import { ParsedLengthStyle } from '../lengthStyle.js';
@@ -102,7 +102,7 @@ export class TitleBar extends EventEmitter<EventMap, TitleBar> implements OSKVie
     this._caption.innerHTML = str;
   }
 
-  public setTitleFromKeyboard(keyboard: JSKeyboard) {
+  public setTitleFromKeyboard(keyboard: Keyboard) {
     const title = "<span style='font-weight:bold'>" + keyboard?.name + '</span>';  // I1972  // I2186
     this._caption.innerHTML = title;
   }
diff --git a/web/src/engine/src/osk/index.ts b/web/src/engine/src/osk/index.ts
index 292ea9938cd..cfb6f21c2c3 100644
--- a/web/src/engine/src/osk/index.ts
+++ b/web/src/engine/src/osk/index.ts
@@ -2,7 +2,7 @@
 export { DeviceSpec } from 'keyman/common/web-utils';
 export { Codes, JSKeyboard, KeyboardProperties, SpacebarText } from 'keyman/engine/keyboard';
 
-export { OSKView, JSKeyboardData } from './views/oskView.js';
+export { OSKView, KeyboardData } from './views/oskView.js';
 export { FloatingOSKView, FloatingOSKViewConfiguration } from './views/floatingOskView.js';
 export { AnchoredOSKView } from './views/anchoredOskView.js';
 export { InlinedOSKView } from './views/inlinedOskView.js';
diff --git a/web/src/engine/src/osk/views/oskView.ts b/web/src/engine/src/osk/views/oskView.ts
index 85804452f8a..ba898caf0fd 100644
--- a/web/src/engine/src/osk/views/oskView.ts
+++ b/web/src/engine/src/osk/views/oskView.ts
@@ -14,6 +14,7 @@ import { DeviceSpec, ManagedPromise } from 'keyman/common/web-utils';
 import {
   Codes,
   JSKeyboard,
+  Keyboard,
   KeyboardProperties,
   type MinimalCodesInterface,
   type MutableSystemStore, type SystemStoreMutationHandler,
@@ -58,8 +59,8 @@ export interface LegacyOSKEventMap {
   }): void;
 }
 
-export class JSKeyboardData {
-  keyboard: JSKeyboard;
+export class KeyboardData {
+  keyboard: Keyboard;
   metadata: KeyboardProperties;
 };
 
@@ -172,7 +173,7 @@ export abstract class OSKView
   private _boxBaseTouchStart:       (e: TouchEvent) => boolean;
   private _boxBaseTouchEventCancel: (e: TouchEvent) => boolean;
 
-  private keyboardData: JSKeyboardData;
+  private keyboardData: KeyboardData;
 
   /**
    * Provides the current parameterization for timings and distances used by
@@ -553,11 +554,11 @@ export abstract class OSKView
     }
   }
 
-  public get activeKeyboard(): JSKeyboardData {
+  public get activeKeyboard(): KeyboardData {
     return this.keyboardData;
   }
 
-  public set activeKeyboard(keyboardData: JSKeyboardData) {
+  public set activeKeyboard(keyboardData: KeyboardData) {
     this.keyboardData = keyboardData;
     this.loadActiveKeyboard();
 
@@ -765,7 +766,7 @@ export abstract class OSKView
 
     // Create new ones for the new, incoming kbd.
     this.kbdStyleSheetManager = new StylesheetManager(this._Box, this.config.doCacheBusting || false);
-    const kbdView = this.keyboardView = this._GenerateKeyboardView(this.keyboardData?.keyboard, this.keyboardData?.metadata);
+    const kbdView = this.keyboardView = this._GenerateKeyboardView(this.keyboardData?.keyboard as JSKeyboard, this.keyboardData?.metadata);
 
     // Perform the replacement.
     this._Box.replaceChild(kbdView.element, oldKbd.element);
diff --git a/web/src/engine/src/osk/visualKeyboard.ts b/web/src/engine/src/osk/visualKeyboard.ts
index 6cdaf3ad646..3faa214a4b7 100644
--- a/web/src/engine/src/osk/visualKeyboard.ts
+++ b/web/src/engine/src/osk/visualKeyboard.ts
@@ -1356,7 +1356,7 @@ export class VisualKeyboard extends EventEmitter<EventMap> implements KeyboardVi
    *  @return {Object}                            DIV object with filled keyboard layer content
    */
   static buildDocumentationKeyboard(
-    PKbd: JSKeyboard,
+    PKbd: JSKeyboard, // TODO-web-core: do we have to do anything for KMX keyboards?
     kbdProperties: KeyboardProperties,
     pathConfig: OSKResourcePathConfiguration,
     argFormFactor: DeviceSpec.FormFactor,
diff --git a/web/src/test/auto/dom/kbdLoader.ts b/web/src/test/auto/dom/kbdLoader.ts
index 3e43ab7ff7b..cf555842628 100644
--- a/web/src/test/auto/dom/kbdLoader.ts
+++ b/web/src/test/auto/dom/kbdLoader.ts
@@ -1,9 +1,7 @@
 import {
-  DOMKeyboardLoader
-} from 'keyman/engine/keyboard';
-
-import {
+  DOMKeyboardLoader,
   JSKeyboard,
+  Keyboard,
   KeyboardProperties,
   MinimalKeymanGlobal
 } from 'keyman/engine/keyboard';
@@ -18,13 +16,13 @@ export function loadKeyboardFromPath(path: string) {
 }
 
 export type KeyboardMap = {
-  [key: string]: KeyboardInfoPair & { keyboard: JSKeyboard }
+  [key: string]: KeyboardInfoPair & { keyboard: Keyboard }
 };
 
 export function loadKeyboardsFromStubs(apiStubs: any, baseDir: string) {
   baseDir = baseDir || './';
   const keyboards: KeyboardMap = {};
-  let priorPromise: Promise<void | JSKeyboard> = Promise.resolve();
+  let priorPromise: Promise<void | Keyboard> = Promise.resolve();
   for(const stub of apiStubs) {
     // We are keeping this strictly sequential because we don't have sandboxed
     // loading yet; lack of sandboxing means that all loading keyboards compete
diff --git a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
index 7c4e3690fe5..f3ca77f8fce 100644
--- a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
+++ b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
@@ -520,7 +520,7 @@ describe('CoreKeyboardProcessor', function () {
         keyEvent.source = { type: eventType };
 
         const coreKeyboard = loadKeyboard('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
-        const kmxKeyboard = new KMXKeyboard(coreKeyboard);
+        const kmxKeyboard = new KMXKeyboard('test_8568_deadkeys', coreKeyboard);
         sandbox.replaceGetter(coreProcessor, 'activeKeyboard', () => { return kmxKeyboard; });
         // We return a non-ok value just so that we can return early from
         // processKeyStroke()
@@ -546,7 +546,7 @@ describe('CoreKeyboardProcessor', function () {
       context = KM_Core.instance.state_context(state);
       sandbox = sinon.createSandbox();
       const coreKeyboard = loadKeyboard('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
-      coreProcessor.activeKeyboard = new KMXKeyboard(coreKeyboard);
+      coreProcessor.activeKeyboard = new KMXKeyboard('test_8568_deadkeys', coreKeyboard);
     });
 
     afterEach(() => {
diff --git a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.ts b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.ts
index 581b1810e00..dca0ca37f8e 100644
--- a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.ts
+++ b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.ts
@@ -4,7 +4,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { DeviceSpec, KMWString } from 'keyman/common/web-utils';
-import { Codes, DefaultOutputRules, JSKeyboard, KeyEvent, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
+import { Codes, DefaultOutputRules, KeyEvent, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/test/resources';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
@@ -103,7 +103,7 @@ describe('Engine - specialized backspace handling', function() {
     // This part provides extra assurance that the keyboard properly loaded.
     assert.equal(keyboard.id, "Keyboard_sil_ipa");
 
-    harness.activeKeyboard = keyboard as JSKeyboard;
+    harness.activeKeyboard = keyboard;
     ipaWithHarness = harness;
 
     // --------------
@@ -117,7 +117,7 @@ describe('Engine - specialized backspace handling', function() {
     // This part provides extra assurance that the keyboard properly loaded.
     assert.equal(keyboard.id, "Keyboard_khmer_angkor");
 
-    harness.activeKeyboard = keyboard as JSKeyboard;
+    harness.activeKeyboard = keyboard;
     angkorWithHarness = harness;
 
     // --------------
diff --git a/web/src/test/auto/resources/loader/nodeKeyboardLoader.ts b/web/src/test/auto/resources/loader/nodeKeyboardLoader.ts
index ee737eb206c..c9079e11656 100644
--- a/web/src/test/auto/resources/loader/nodeKeyboardLoader.ts
+++ b/web/src/test/auto/resources/loader/nodeKeyboardLoader.ts
@@ -3,7 +3,7 @@ import { readFile } from 'node:fs/promises';
 
 import { globalObject } from 'keyman/common/web-utils';
 
-import { JSKeyboard, KeyboardHarness, MinimalKeymanGlobal, KeyboardLoaderBase, KeyboardLoadErrorBuilder } from 'keyman/engine/keyboard';
+import { Keyboard, KeyboardHarness, MinimalKeymanGlobal, KeyboardLoaderBase, KeyboardLoadErrorBuilder } from 'keyman/engine/keyboard';
 
 export class NodeKeyboardLoader extends KeyboardLoaderBase {
   constructor()
@@ -38,7 +38,7 @@ export class NodeKeyboardLoader extends KeyboardLoaderBase {
     return Uint8Array.from(buffer);
   }
 
-  protected async loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<JSKeyboard> {
+  protected async loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise<Keyboard> {
     let script;
     try {
       script = new vm.Script(scriptSrc);

From d93fc5aa7e94b2c63017525fdddc8162f76ce2d3 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 17 Apr 2026 10:05:33 +0200
Subject: [PATCH 247/254] refactor(web): output id in console error of
 playwright TC reporter

---
 common/test/resources/playwright-TC-reporter.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/test/resources/playwright-TC-reporter.ts b/common/test/resources/playwright-TC-reporter.ts
index 8cbc0967e78..84f3eede0d0 100644
--- a/common/test/resources/playwright-TC-reporter.ts
+++ b/common/test/resources/playwright-TC-reporter.ts
@@ -172,7 +172,7 @@ class TestNode {
     if (TestNode.Nodes.size > 0) {
       console.error(`Still have ${TestNode.Nodes.size} nodes hanging around`);
       for (const [id, node] of Array.from(TestNode.Nodes.entries())) {
-        console.error(`Remaining node title: '${node.suiteOrTest.title}'`);
+        console.error(`Remaining node title: '${node.suiteOrTest.title}' (id: '${id}')`);
       }
     }
   }

From 7df5b94cc204c6d4c2d618c70a509001082190b9 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 17 Apr 2026 12:07:25 +0200
Subject: [PATCH 248/254] refactor(web): simplify `VariableStore` type

Remove the unnecessary nested set patterns for `VariableStore` and
rename the type to `VariableStores` to match its actual use.
---
 .../src/js-processor/jsKeyboardInterface.ts   |  24 ++--
 .../src/js-processor/jsKeyboardProcessor.ts   |   4 +-
 web/src/engine/src/keyboard/index.ts          |   2 +-
 .../src/keyboard/keyboards/jsKeyboard.ts      |   8 +-
 .../src/keyboard/keyboards/processorAction.ts |   6 +-
 web/src/engine/src/keyboard/variableStore.ts  |   7 +-
 .../src/main/variableStoreCookieSerializer.ts |  39 ++-----
 .../variableStoreCookieSerializer.tests.ts    | 107 ++++--------------
 8 files changed, 55 insertions(+), 142 deletions(-)

diff --git a/web/src/engine/src/js-processor/jsKeyboardInterface.ts b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
index 19f564d9d74..b7a378f0549 100644
--- a/web/src/engine/src/js-processor/jsKeyboardInterface.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
@@ -21,7 +21,7 @@ import {
   type Deadkey,
   type KeyEvent,
   type TextStore,
-  VariableStore,
+  VariableStores,
   VariableStoreSerializer,
 } from "keyman/engine/keyboard";
 import { PlatformSystemStore } from './platformSystemStore.js';
@@ -924,10 +924,10 @@ export class JSKeyboardInterface extends KeyboardHarness {
   }
 
   /**
-   * Load an option store value from a cookie or default value
+   * Load a variable store value from a cookie or default value
    *
    * @param       {string}      kbdName     keyboard internal name
-   * @param       {string}      storeName   store (option) name, embedded in cookie name
+   * @param       {string}      storeName   variable store name, embedded in cookie name
    * @param       {string}      dfltValue   default value
    * @return      {string}                  current or default option value
    *
@@ -938,41 +938,37 @@ export class JSKeyboardInterface extends KeyboardHarness {
     this.resetContextCache();
     if(this.variableStoreSerializer) {
       const cValue = this.variableStoreSerializer.loadStore(kbdName, storeName);
-      return cValue[storeName] || dfltValue;
+      return cValue ?? dfltValue;
     } else {
       return dfltValue;
     }
   }
 
   /**
-   * Save an option store value to a cookie
+   * Save a variable store value to a cookie
    *
    * @param       {string}      storeName   store (option) name, embedded in cookie name
-   * @param       {string}      optValue    option value to save
+   * @param       {string}      storeValue  store value to save
    * @return      {boolean}                 true if save successful
    *
    * Note that a keyboard will freely manipulate the value of its variable stores on the
    * script object within its own code.  This function's use is merely to _persist_ that
    * value across sessions, providing a custom user default for later uses of the keyboard.
    */
-  saveStore(storeName:string, optValue:string): boolean {
+  saveStore(storeName:string, storeValue:string): boolean {
     this.resetContextCache();
     const kbd=this.activeKeyboard;
     if(!kbd || typeof kbd.id == 'undefined' || kbd.id == '') {
       return false;
     }
 
-    // And the lookup under that entry looks for the value under the store name, again.
-    const valueObj: VariableStore = {};
-    valueObj[storeName] = optValue;
-
     // Null-check in case of invocation during unit-test
     if(this.ruleBehavior) {
-      this.ruleBehavior.saveStore[storeName] = valueObj;
+      this.ruleBehavior.saveStores[storeName] = storeValue;
     } else {
       // We're in a unit-test environment, directly invoking this method from outside of a keyboard.
       // In this case, we should immediately commit the change.
-      this.variableStoreSerializer.saveStore(this.activeKeyboard.id, storeName, valueObj);
+      this.variableStoreSerializer.saveStore(this.activeKeyboard.id, storeName, storeValue);
     }
     return true;
   }
@@ -1102,7 +1098,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
    * @param stores A dictionary of stores which should be found in the
    *               keyboard
    */
-  applyVariableStores(stores: VariableStore): void {
+  applyVariableStores(stores: VariableStores): void {
     this.activeKeyboard.variableStores = stores;
   }
 
diff --git a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
index a42ecc70673..839a7e53ce5 100644
--- a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
@@ -631,8 +631,8 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
     this.keyboardInterface.applyVariableStores(data.variableStores);
 
     if (this.keyboardInterface.variableStoreSerializer) {
-      for (const storeID in data.saveStore) {
-        this.keyboardInterface.variableStoreSerializer.saveStore(this.activeKeyboard.id, storeID, data.saveStore[storeID]);
+      for (const storeID in data.saveStores) {
+        this.keyboardInterface.variableStoreSerializer.saveStore(this.activeKeyboard.id, storeID, data.saveStores[storeID]);
       }
     }
 
diff --git a/web/src/engine/src/keyboard/index.ts b/web/src/engine/src/keyboard/index.ts
index ac4f70a4055..122bafacd0d 100644
--- a/web/src/engine/src/keyboard/index.ts
+++ b/web/src/engine/src/keyboard/index.ts
@@ -30,7 +30,7 @@ export { EmulationKeystrokes, LogMessages, DefaultRules } from "./defaultRules.j
 export { type KeyDistribution, KeyEventSpec, KeyEvent } from "./keyEvent.js";
 export { KeyMapping } from "./keyMapping.js";
 export { type SystemStoreMutationHandler, MutableSystemStore, SystemStore, SystemStoreIDs, type SystemStoreDictionary } from "./systemStore.js";
-export { type VariableStore, VariableStoreSerializer } from "./variableStore.js";
+export { type VariableStores, VariableStoreSerializer } from "./variableStore.js";
 
 export { DOMKeyboardLoader } from './keyboards/loaders/domKeyboardLoader.js';
 export { SyntheticTextStore } from "./syntheticTextStore.js";
diff --git a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
index 78eeaf53876..49bb4bc1df7 100644
--- a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
@@ -4,7 +4,7 @@ import { ActiveKey, ActiveLayout, ActiveSubKey } from "./activeLayout.js";
 import { KeyEvent } from "../keyEvent.js";
 import { type TextStore } from "../textStore.js";
 import { KeymanWebKeyboard, ModifierKeyConstants, TouchLayout } from "@keymanapp/common-types";
-import { VariableStore } from "../variableStore.js";
+import { VariableStores } from "../variableStore.js";
 
 import ComplexKeyboardStore = KeymanWebKeyboard.ComplexKeyboardStore;
 import KeyboardObject = KeymanWebKeyboard.KeyboardObject;
@@ -120,9 +120,9 @@ export class JSKeyboard {
    *
    * @returns an object with each property referencing a variable store
    */
-  get variableStores(): VariableStore {
+  get variableStores(): VariableStores {
     const storeNames = this.scriptObject['KVS'];
-    let values: VariableStore = {};
+    let values: VariableStores = {};
     if(Array.isArray(storeNames)) {
       for(let store of storeNames) {
         values[store] = this.scriptObject[store];
@@ -139,7 +139,7 @@ export class JSKeyboard {
    *
    * @param values  name-value pairs for each store value
    */
-  set variableStores(values: VariableStore) {
+  set variableStores(values: VariableStores) {
     const storeNames = this.scriptObject['KVS'];
     if(Array.isArray(storeNames)) {
       for(let store of storeNames) {
diff --git a/web/src/engine/src/keyboard/keyboards/processorAction.ts b/web/src/engine/src/keyboard/keyboards/processorAction.ts
index 12e9c8bca21..314f2a0d7fa 100644
--- a/web/src/engine/src/keyboard/keyboards/processorAction.ts
+++ b/web/src/engine/src/keyboard/keyboards/processorAction.ts
@@ -3,7 +3,7 @@
  */
 import { LexicalModelTypes } from '@keymanapp/common-types';
 import { Transcription } from './transcription.js';
-import { VariableStore } from '../variableStore.js';
+import { VariableStores } from '../variableStore.js';
 import { SystemStoreDictionary } from '../systemStore.js';
 
 /**
@@ -29,12 +29,12 @@ export class ProcessorAction {
   /**
    * A set of variable stores with save requests triggered by the matched keyboard rule
    */
-  saveStore: {[name: string]: VariableStore} = {};
+  saveStores: VariableStores = {};
 
   /**
    * A set of variable stores with possible changes to be applied during finalization.
    */
-  variableStores: VariableStore = {};
+  variableStores: VariableStores = {};
 
   /**
    * Denotes a non-output default behavior; this should be evaluated later, against the true keystroke.
diff --git a/web/src/engine/src/keyboard/variableStore.ts b/web/src/engine/src/keyboard/variableStore.ts
index 09c80c500e9..8d78c19da88 100644
--- a/web/src/engine/src/keyboard/variableStore.ts
+++ b/web/src/engine/src/keyboard/variableStore.ts
@@ -4,10 +4,9 @@
  * Definitions for variable stores (see kmn reference)
  */
 
-export type VariableStore = { [name: string]: string; };
+export type VariableStores = { [name: string]: string; };
 
 export interface VariableStoreSerializer {
-  loadStore(keyboardID: string, storeName: string): VariableStore;
-  saveStore(keyboardID: string, storeName: string, storeMap: VariableStore): void;
-  findStores(keyboardID: string): VariableStore[];
+  loadStore(keyboardID: string, storeName: string): string;
+  saveStore(keyboardID: string, storeName: string, storeValue: string): void;
 }
diff --git a/web/src/engine/src/main/variableStoreCookieSerializer.ts b/web/src/engine/src/main/variableStoreCookieSerializer.ts
index b0772fb05b7..c17e29140cf 100644
--- a/web/src/engine/src/main/variableStoreCookieSerializer.ts
+++ b/web/src/engine/src/main/variableStoreCookieSerializer.ts
@@ -1,39 +1,22 @@
-import { VariableStore, VariableStoreSerializer } from 'keyman/engine/keyboard';
+import { VariableStores, VariableStoreSerializer } from 'keyman/engine/keyboard';
 import { CookieSerializer } from "keyman/engine/dom-utils";
 
-// While there's little reason we couldn't store all of a keyboard's store values within
-// the same cookie... that's not what we had implemented in the last pre-es-module version
-// of KeymanWeb.  We're keeping this transformation _very_ straightforward.
-//
-// Also of note:  there's nothing we can do to allow TS to provide type-checking of
-// dynamic property names; they'd have to be known at compile time to facilitate
-// strict type checking.
-
 export class VariableStoreCookieSerializer implements VariableStoreSerializer {
   private getStoreCookieName(keyboardID: string, storeName: string): string {
     return `KeymanWeb_${keyboardID}_Option_${storeName}`;
   }
 
-  public loadStore(keyboardID: string, storeName: string): VariableStore {
-    const storeCookieSerializer = new CookieSerializer<VariableStore>(this.getStoreCookieName(keyboardID, storeName));
-    return storeCookieSerializer.load(decodeURIComponent);
-  }
-
-  public saveStore(keyboardID: string, storeName: string, storeMap: VariableStore) {
-    const storeCookieSerializer = new CookieSerializer<VariableStore>(this.getStoreCookieName(keyboardID, storeName));
-    storeCookieSerializer.save(storeMap, encodeURIComponent);
+  public loadStore(keyboardID: string, storeName: string): string {
+    // Note, for historical reasons, we pass a VariableStores object into the
+    // cookie serializer but expect only a single value to be loaded
+    const storeCookieSerializer = new CookieSerializer<VariableStores>(this.getStoreCookieName(keyboardID, storeName));
+    return storeCookieSerializer.load(decodeURIComponent)[storeName];
   }
 
-  /**
-   * Find all variable stores associated with a given keyboard.
-   *
-   * @param {string}  keyboardID  The keyboard ID whose variable stores are to be found.
-   *
-   * @returns An array of VariableStore objects found for the keyboard.
-   */
-  public findStores(keyboardID: string): VariableStore[] {
-    const pattern = new RegExp(`^${this.getStoreCookieName(keyboardID, '')}`);
-    const matching = CookieSerializer.loadAllMatching<VariableStore>(pattern, decodeURIComponent);
-    return matching.map(m => m.value);
+  public saveStore(keyboardID: string, storeName: string, storeValue: string) {
+    // Note, for historical reasons, we pass a VariableStores object into the
+    // cookie serializer but save only a single value
+    const storeCookieSerializer = new CookieSerializer<VariableStores>(this.getStoreCookieName(keyboardID, storeName));
+    storeCookieSerializer.save({[storeName]: storeValue}, encodeURIComponent);
   }
 }
\ No newline at end of file
diff --git a/web/src/test/auto/dom/cases/main/variableStoreCookieSerializer.tests.ts b/web/src/test/auto/dom/cases/main/variableStoreCookieSerializer.tests.ts
index 1730e7c1013..7666616f557 100644
--- a/web/src/test/auto/dom/cases/main/variableStoreCookieSerializer.tests.ts
+++ b/web/src/test/auto/dom/cases/main/variableStoreCookieSerializer.tests.ts
@@ -2,91 +2,69 @@
  * Keyman is copyright (C) SIL Global. MIT License.
  */
 import { assert } from 'chai';
-import { VariableStore } from 'keyman/engine/keyboard';
 import { VariableStoreCookieSerializer } from 'keyman/engine/main';
 
-describe('VariableStoreCookieSerializer', () => {
-  describe('saveStore and loadStore', () => {
+describe('VariableStoreCookieSerializer', function() {
+  describe('saveStore and loadStore', function() {
     const keyboardID = 'test-keyboard';
     const storeName = 'testStore';
     const cookieName = `KeymanWeb_${keyboardID}_Option_${storeName}`;
 
-    afterEach(async () => {
+    afterEach(function() {
       document.cookie = `${cookieName}=; max-age=0`;
     });
 
-    it('should save and load a simple store with string values', () => {
+    it('should save and load a simple store with string value', function() {
       // Arrange
       const serializer = new VariableStoreCookieSerializer();
-      const storeData: VariableStore = {
-        option1: 'value1',
-        option2: 'value2',
-        option3: 'value3'
-      };
 
       // Act
-      serializer.saveStore(keyboardID, storeName, storeData);
+      serializer.saveStore(keyboardID, storeName, 'value1');
       const loaded = serializer.loadStore(keyboardID, storeName);
 
       // Assert
-      assert.deepEqual(loaded, storeData, 'loaded store should match saved store');
+      assert.equal(loaded, 'value1', 'loaded store should match saved store');
     });
 
-    it('should save and load a store with empty values', () => {
+    it('should save and load a store with empty value', function() {
       // Arrange
       const serializer = new VariableStoreCookieSerializer();
-      const storeData: VariableStore = {
-        option1: '',
-        option2: 'value',
-        option3: ''
-      };
 
       // Act
-      serializer.saveStore(keyboardID, storeName, storeData);
+      serializer.saveStore(keyboardID, storeName, '');
       const loaded = serializer.loadStore(keyboardID, storeName);
 
       // Assert
-      assert.deepEqual(loaded, storeData, 'empty string values should be preserved');
+      assert.equal(loaded, '', 'empty string values should be preserved');
     });
 
-    it('should save and load a store with special characters', () => {
-      // Arrange
+    it('should save and load a store with special characters', function() {
+      // Arrange  `
       const serializer = new VariableStoreCookieSerializer();
-      const storeData: VariableStore = {
-        encoded: 'value:with;special&chars=',
-        emoji: '⭐'
-      };
+      const encoded = 'value:with;special&chars=';
 
       // Act
-      serializer.saveStore(keyboardID, storeName, storeData);
+      serializer.saveStore(keyboardID, storeName, encoded);
       const loaded = serializer.loadStore(keyboardID, storeName);
 
       // Assert
-      assert.deepEqual(loaded, storeData, 'special characters should be properly encoded/decoded');
+      assert.equal(loaded, encoded, 'special characters should be properly encoded/decoded');
     });
 
-    it('should handle multiple stores for the same keyboard independently', () => {
+    it('should save and load a store with non-BMP characters', function() {
       // Arrange
       const serializer = new VariableStoreCookieSerializer();
-      const store1Data: VariableStore = { option: 'store1value' };
-      const store2Data: VariableStore = { option: 'store2value' };
+      const emoji = '⭐';
 
       // Act
-      serializer.saveStore(keyboardID, 'store1', store1Data);
-      serializer.saveStore(keyboardID, 'store2', store2Data);
-      const loaded1 = serializer.loadStore(keyboardID, 'store1');
-      const loaded2 = serializer.loadStore(keyboardID, 'store2');
+      serializer.saveStore(keyboardID, storeName, emoji);
+      const loaded = serializer.loadStore(keyboardID, storeName);
 
       // Assert
-      assert.deepEqual(loaded1, store1Data, 'first store should be independent');
-      assert.deepEqual(loaded2, store2Data, 'second store should be independent');
-
-      // Cleanup
-      document.cookie = `KeymanWeb_${keyboardID}_Option_store1=; max-age=0`;
-      document.cookie = `KeymanWeb_${keyboardID}_Option_store2=; max-age=0`;
+      assert.equal(loaded, emoji, 'special characters should be properly encoded/decoded');
     });
 
-    it('should return empty object for non-existent store', () => {
+    it('should return undefined for non-existent store', function() {
       // Arrange
       const serializer = new VariableStoreCookieSerializer();
 
@@ -94,51 +72,8 @@ describe('VariableStoreCookieSerializer', () => {
       const loaded = serializer.loadStore(keyboardID, 'nonexistent');
 
       // Assert
-      assert.deepEqual(loaded, {}, 'non-existent store should return empty object');
+      assert.isUndefined(loaded, 'non-existent store should return undefined');
     });
   });
 
-  describe('findStores', () => {
-    it('should return an empty array when no stores exist for a keyboardID', () => {
-
-      // Arrange
-      const serializer = new VariableStoreCookieSerializer();
-      const keyboardID = 'test-keyboard';
-      const expected: VariableStore[] = [];
-
-      // Act
-      const result = serializer.findStores(keyboardID);
-
-      // Assert
-      assert.deepEqual(result, expected, 'result should be an empty array');
-      assert.isTrue(Array.isArray(result), 'result should be an array');
-      assert.strictEqual(result.length, 0, 'result array length should be 0');
-    });
-
-    it('should return store for keyboard', () => {
-      // Arrange
-      const serializer = new VariableStoreCookieSerializer();
-      const storeData1: VariableStore = {
-        option1: 'value1',
-        option2: 'value2',
-        option3: 'value3'
-      };
-      serializer.saveStore('test-keyboard', 'storeName', storeData1);
-      const storeData2: VariableStore = {
-        settingA: 'A',
-        settingB: 'B'
-      };
-      serializer.saveStore('another-keyboard', 'anotherStore', storeData2);
-
-      // Act
-      const stores = serializer.findStores('test-keyboard');
-
-      // Assert
-      assert.deepEqual(stores, [storeData1], 'stores should match saved store');
-
-      // Cleanup
-      document.cookie = `KeymanWeb_test-keyboard_Option_storeName=; max-age=0`;
-    });
-
-  });
 });

From 2cffc57eb14ec9bfee9b839c43f7f883127800a1 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 17 Apr 2026 12:59:04 +0200
Subject: [PATCH 249/254] chore(web): cleanup variable store interfaces for
 web-core

---
 .../engine/src/core-processor/coreKeyboardInterface.ts | 10 ++++++----
 .../engine/src/core-processor/coreKeyboardProcessor.ts |  5 +----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/web/src/engine/src/core-processor/coreKeyboardInterface.ts b/web/src/engine/src/core-processor/coreKeyboardInterface.ts
index f2203e53ad5..fbee9956e55 100644
--- a/web/src/engine/src/core-processor/coreKeyboardInterface.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardInterface.ts
@@ -1,9 +1,8 @@
 /*
  * Keyman is copyright (C) SIL Global. MIT License.
  */
-import { KM_Core, km_core_option_item, KM_CORE_OPTION_SCOPE } from 'keyman/engine/core-adapter';
+import { KM_Core, km_core_option_item } from 'keyman/engine/core-adapter';
 import { KeyboardMinimalInterface, Keyboard, VariableStoreSerializer, KMXKeyboard } from 'keyman/engine/keyboard';
-import { toPrefixedKeyboardId } from 'keyman/engine/keyboard-storage';
 
 export class CoreKeyboardInterface implements KeyboardMinimalInterface {
   private _activeKeyboard: Keyboard;
@@ -26,8 +25,11 @@ export class CoreKeyboardInterface implements KeyboardMinimalInterface {
 
 
   private loadSerializedOptions(keyboard: Keyboard): km_core_option_item[] {
-    const stores = this.variableStoreSerializer.findStores(toPrefixedKeyboardId(keyboard.id));
+    // TODO-WEB-CORE: use km_core_keyboard_get_attrs to get list of all variable
+    // store names and then iterate through those rather than reading from
+    // cookie props
     const options: km_core_option_item[] = [];
+    /*const stores = this.variableStoreSerializer.findStores(toPrefixedKeyboardId(keyboard.id));
     for (const store of stores) {
       for (const key in store) {
         if (store.hasOwnProperty(key)) {
@@ -39,7 +41,7 @@ export class CoreKeyboardInterface implements KeyboardMinimalInterface {
           options.push(item);
         }
       }
-    }
+    }*/
     return options;
   }
 }
diff --git a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
index 968c66d7d56..429a83f5ed3 100644
--- a/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
+++ b/web/src/engine/src/core-processor/coreKeyboardProcessor.ts
@@ -11,7 +11,6 @@ import {
   StateKeyMap,
   Deadkey,
   Codes,
-  VariableStore,
   VariableStoreSerializer
 } from "keyman/engine/keyboard";
 import { KM_CORE_EVENT_FLAG, KM_CORE_OPTION_SCOPE } from '../core-adapter/KM_Core.js';
@@ -316,9 +315,7 @@ export class CoreKeyboardProcessor extends EventEmitter<EventMap> implements Key
           console.error(`Unsupported option scope: ${option.scope}`);
           continue;
         }
-        const valueObj: VariableStore = {};
-        valueObj[option.key] = option.value;
-        this.keyboardInterface.variableStoreSerializer.saveStore(toPrefixedKeyboardId(this.activeKeyboard.id), option.key, valueObj);
+        this.keyboardInterface.variableStoreSerializer.saveStore(toPrefixedKeyboardId(this.activeKeyboard.id), option.key, option.value);
       }
     }
   }

From 6677c2b198f3269aa5e607c8a3955fb23b37cc0f Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 17 Apr 2026 14:49:10 +0200
Subject: [PATCH 250/254] refactor(web): address code review comments

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 .../src/js-processor/jsKeyboardInterface.ts   |  2 +-
 .../src/js-processor/jsKeyboardProcessor.ts   |  2 +-
 .../keyboard-storage/stubAndKeyboardCache.ts  | 12 ++++----
 .../src/keyboard/keyboards/jsKeyboard.ts      |  3 +-
 .../engine/src/keyboard/keyboards/keyboard.ts | 30 +++++++++----------
 .../keyboard/keyboards/keyboardLoaderBase.ts  |  2 +-
 .../src/keyboard/keyboards/kmxKeyboard.ts     |  8 ++---
 web/src/engine/src/osk/views/oskView.ts       |  2 +-
 .../coreKeyboardProcessor.tests.ts            |  4 +--
 9 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/web/src/engine/src/js-processor/jsKeyboardInterface.ts b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
index 67b6a0a68f7..28605620ee3 100644
--- a/web/src/engine/src/js-processor/jsKeyboardInterface.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
@@ -200,7 +200,7 @@ export class JSKeyboardInterface extends KeyboardHarness {
 
   variableStoreSerializer: VariableStoreSerializer;
 
-  private get activeJSKeyboard(): JSKeyboard {
+  public get activeJSKeyboard(): JSKeyboard {
     return this.activeKeyboard as JSKeyboard;
   }
 
diff --git a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
index 3eb5a7ab36a..1ea885c6631 100644
--- a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
@@ -68,7 +68,7 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
   }
 
   public get activeKeyboard(): JSKeyboard {
-    return this.keyboardInterface.activeKeyboard as JSKeyboard;
+    return this.keyboardInterface.activeJSKeyboard;
   }
 
   public set activeKeyboard(keyboard: JSKeyboard) {
diff --git a/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts b/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
index 98c4a237b1f..1c9117a4334 100644
--- a/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
+++ b/web/src/engine/src/keyboard-storage/stubAndKeyboardCache.ts
@@ -152,10 +152,10 @@ export class StubAndKeyboardCache extends EventEmitter<EventMap> {
     keyboardID = toPrefixedKeyboardId(keyboardID);
 
     const cachedEntry = this.keyboardTable[keyboardID];
-    if(cachedEntry instanceof Keyboard) {
-      return Promise.resolve(cachedEntry);
-    } else if(cachedEntry instanceof Promise) {
+    if(cachedEntry instanceof Promise) {
       return cachedEntry;
+    } else if(cachedEntry) {
+      return Promise.resolve(cachedEntry);
     }
 
     const stub = this.getStub(keyboardID, null);
@@ -203,10 +203,10 @@ export class StubAndKeyboardCache extends EventEmitter<EventMap> {
     let keyboardID: string;
     const languageID = arg1 || '---';
 
-    if(arg0 instanceof Keyboard) {
+    if (arg0 instanceof JSKeyboard || arg0 instanceof KMXKeyboard) {
       keyboardID = arg0.id;
     } else {
-      keyboardID = arg0;
+      keyboardID = arg0 as string;
     }
 
     if(keyboardID) {
@@ -235,7 +235,7 @@ export class StubAndKeyboardCache extends EventEmitter<EventMap> {
    *              If `false`, only forgets the metadata (stubs).
    */
   forgetKeyboard(keyboard: string | Keyboard, purge: boolean = false) {
-    const id: string = (keyboard instanceof Keyboard) ? keyboard.id : toPrefixedKeyboardId(keyboard);
+    const id: string = (keyboard instanceof JSKeyboard || keyboard instanceof KMXKeyboard) ? keyboard.id : toPrefixedKeyboardId(keyboard as string);
 
     if(this.stubSetTable[id]) {
       delete this.stubSetTable[id];
diff --git a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
index 629f7422bd0..4c0291bccff 100644
--- a/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/jsKeyboard.ts
@@ -50,7 +50,7 @@ type KmwKeyboardObject = KeyboardObject & {
  * and keyboard-centered functionality in an object-oriented way without modifying the
  * wrapped keyboard itself.
  */
-export class JSKeyboard extends Keyboard {
+export class JSKeyboard implements Keyboard {
   public static DEFAULT_SCRIPT_OBJECT: KmwKeyboardObject = {
     'gs': function(textStore: TextStore, keystroke: KeyEvent) { return false; }, // no matching rules; rely on defaultRuleOutput entirely
     'KI': '', // The currently-existing default keyboard ID; we already have checks that focus against this.
@@ -69,7 +69,6 @@ export class JSKeyboard extends Keyboard {
   private layoutStates: {[layout: string]: LayoutState};
 
   constructor(keyboardScript: any) {
-    super();
     if(keyboardScript) {
       this.scriptObject = keyboardScript;
     } else {
diff --git a/web/src/engine/src/keyboard/keyboards/keyboard.ts b/web/src/engine/src/keyboard/keyboards/keyboard.ts
index 8b1d5ebe309..46947b2e3fe 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboard.ts
@@ -9,67 +9,67 @@ import { TextStore } from '../textStore.js';
 import { NotifyEventCode } from './keyboardLoaderBase.js';
 
 /**
- * Abstract base class for Keyman keyboards, providing common interface
+ * Interface for Keyman keyboards, providing common interface
  * for JSKeyboard and KMXKeyboard.
  */
-export abstract class Keyboard {
+export interface Keyboard {
   /**
    * Unique identifier for the keyboard.
    */
-  abstract get id(): string;
+  get id(): string;
 
   /**
    * Gets the name of the keyboard.
    */
-  abstract get name(): string;
+  get name(): string;
 
   /**
    * Version string of the keyboard.
    */
-  abstract get version(): string;
+  get version(): string;
 
   /**
    * Indicates whether the keyboard uses mnemonic layout.
    */
-  abstract get isMnemonic(): boolean;
+  get isMnemonic(): boolean;
 
   /**
    * Indicates whether the keyboard is chiral (distinguishes left/right modifiers).
    */
-  abstract get isChiral(): boolean;
+  get isChiral(): boolean;
 
   /**
    * Indicates whether the keyboard emulates AltGr.
    */
-  abstract get emulatesAltGr(): boolean;
+  get emulatesAltGr(): boolean;
 
   /**
    * Indicates whether the keyboard is right-to-left.
    */
-  abstract get isRTL(): boolean;
+  get isRTL(): boolean;
 
   /**
    * true if this keyboard uses a (legacy) pick list (Chinese, Japanese, Korean, etc.)
    */
-  abstract get isCJK(): boolean;
+  get isCJK(): boolean;
 
   /**
    * CSS styling for the on-screen keyboard.
    */
-  abstract get oskStyling(): string;
+  get oskStyling(): string;
 
   /**
    * Returns an ActiveLayout object representing the keyboard's layout for this form factor.
    * May return null if a custom desktop "help" OSK is defined.
    * @param formFactor The desired form factor for the layout.
    */
-  abstract layout(formFactor: DeviceSpec.FormFactor): ActiveLayout;
+  layout(formFactor: DeviceSpec.FormFactor): ActiveLayout;
 
   /**
    * Indicates whether the keyboard's desktop layout should be used for the specified device.
    * @param device The device specification to check.
    */
-  abstract usesDesktopLayoutOnDevice(device: DeviceSpec): boolean;
+  usesDesktopLayoutOnDevice(device: DeviceSpec): boolean;
 
   /**
    * Notifies keyboard of keystroke or other event.
@@ -77,7 +77,7 @@ export abstract class Keyboard {
    * @param textStore Text store.
    * @param data 1 for KeyDown or FocusReceived, 0 for KeyUp or FocusLost.
    */
-  abstract notify(eventCode: NotifyEventCode, textStore: TextStore, data: number): void;
+  notify(eventCode: NotifyEventCode, textStore: TextStore, data: number): void;
 
   /**
    * Constructs a KeyEvent from an ActiveKey or ActiveSubKey.
@@ -85,5 +85,5 @@ export abstract class Keyboard {
    * @param device The device specification.
    * @param stateKeys The current state of modifier keys.
    */
-  abstract constructKeyEvent(key: ActiveKey | ActiveSubKey, device: DeviceSpec, stateKeys: StateKeyMap): KeyEvent;
+  constructKeyEvent(key: ActiveKey | ActiveSubKey, device: DeviceSpec, stateKeys: StateKeyMap): KeyEvent;
 }
\ No newline at end of file
diff --git a/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts b/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
index d5cdb436f7a..2236d696535 100644
--- a/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
+++ b/web/src/engine/src/keyboard/keyboards/keyboardLoaderBase.ts
@@ -62,7 +62,7 @@ export abstract class KeyboardLoaderBase {
       const name = this.extractIdFromUrl(uri);
       const result = KM_Core.instance.keyboard_load_from_blob(name, byteArray);
       if (result.status == KM_CORE_STATUS.OK) {
-        return new KMXKeyboard(name, result.object);
+        return new KMXKeyboard(result.object);
       }
       throw errorBuilder.invalidKeyboard(new Error(`Loading KMX keyboard from ${uri} failed with status ${result.status}`));
     }
diff --git a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
index 46a9a82ea78..dfce5943a7d 100644
--- a/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
+++ b/web/src/engine/src/keyboard/keyboards/kmxKeyboard.ts
@@ -13,11 +13,10 @@ import { Keyboard } from './keyboard.js';
 /**
  * Acts as a wrapper class for KMX(+) Keyman keyboards
  */
-export class KMXKeyboard extends Keyboard {
+export class KMXKeyboard implements Keyboard {
   private _state: km_core_state | null = null;
 
-  public constructor(private _name: string, private _keyboard: km_core_keyboard) {
-    super();
+  public constructor(private _keyboard: km_core_keyboard) {
     const environment_opts =
       [
         {
@@ -80,7 +79,8 @@ export class KMXKeyboard extends Keyboard {
   }
 
   public get name(): string {
-    return this._name;
+    // TODO-WEB-CORE: get keyboard name from Core API (to be implemented)
+    return this.id;
   }
 
   public get keyboard(): km_core_keyboard {
diff --git a/web/src/engine/src/osk/views/oskView.ts b/web/src/engine/src/osk/views/oskView.ts
index ba898caf0fd..962d943557b 100644
--- a/web/src/engine/src/osk/views/oskView.ts
+++ b/web/src/engine/src/osk/views/oskView.ts
@@ -766,7 +766,7 @@ export abstract class OSKView
 
     // Create new ones for the new, incoming kbd.
     this.kbdStyleSheetManager = new StylesheetManager(this._Box, this.config.doCacheBusting || false);
-    const kbdView = this.keyboardView = this._GenerateKeyboardView(this.keyboardData?.keyboard as JSKeyboard, this.keyboardData?.metadata);
+    const kbdView = this.keyboardView = this._GenerateKeyboardView(this.keyboardData?.keyboard as JSKeyboard, this.keyboardData?.metadata); // TODO-EMBED-OSK-IN-KMX: implement for KMXKeyboard
 
     // Perform the replacement.
     this._Box.replaceChild(kbdView.element, oldKbd.element);
diff --git a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
index f3ca77f8fce..7c4e3690fe5 100644
--- a/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
+++ b/web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
@@ -520,7 +520,7 @@ describe('CoreKeyboardProcessor', function () {
         keyEvent.source = { type: eventType };
 
         const coreKeyboard = loadKeyboard('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
-        const kmxKeyboard = new KMXKeyboard('test_8568_deadkeys', coreKeyboard);
+        const kmxKeyboard = new KMXKeyboard(coreKeyboard);
         sandbox.replaceGetter(coreProcessor, 'activeKeyboard', () => { return kmxKeyboard; });
         // We return a non-ok value just so that we can return early from
         // processKeyStroke()
@@ -546,7 +546,7 @@ describe('CoreKeyboardProcessor', function () {
       context = KM_Core.instance.state_context(state);
       sandbox = sinon.createSandbox();
       const coreKeyboard = loadKeyboard('/common/test/resources/keyboards/test_8568_deadkeys.kmx');
-      coreProcessor.activeKeyboard = new KMXKeyboard('test_8568_deadkeys', coreKeyboard);
+      coreProcessor.activeKeyboard = new KMXKeyboard(coreKeyboard);
     });
 
     afterEach(() => {

From 50139a0ebdc8440fce417467cb6f664882f48e11 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 17 Apr 2026 15:36:11 +0200
Subject: [PATCH 251/254] refactor(web): eliminate nullable
 variableStoreSerializer code paths

To reduce the number of possible failure cases within KeymanWeb,
require variableStoreSerializer to always be initialized. This impacts
only unit tests in practice. There remains a unit test special case in
the variable store code itself which needs to be removed in the future.

Create a mock VariableStoreTestSerializer class so that unit tests can
run without impacting state or requiring cookies. (We should leverage
this in future tests to verify that variable stores are saved
correctly.)

Establish keyman/test/headless-resources, so that we can include shared
resources such as VariableStoreTestSerializer without creating a
dependency on either DOM or Node.
---
 web/package.json                              |  4 ++++
 .../src/js-processor/jsKeyboardInterface.ts   | 20 +++++++++----------
 .../src/js-processor/jsKeyboardProcessor.ts   |  7 ++-----
 .../cases/keyboard/domKeyboardLoader.tests.ts |  9 +++++----
 web/src/test/auto/dom/kbdLoader.ts            |  3 ++-
 .../test/auto/e2e/baseline/baseline.tests.ts  |  7 +++++++
 web/src/test/auto/e2e/playwright.config.ts    |  2 +-
 web/src/test/auto/headless-resources/index.ts |  5 +++++
 .../auto/headless-resources/tsconfig.json     | 18 +++++++++++++++++
 .../variableStoreTestSerializer.ts            | 20 +++++++++++++++++++
 .../engine/js-processor/basic-engine.tests.js |  3 ++-
 .../engine/js-processor/chirality.tests.js    |  3 ++-
 .../engine/js-processor/deadkeys.tests.js     |  3 ++-
 .../js-processor/engine/context.tests.js      |  3 ++-
 .../engine/notany_context.tests.js            |  3 ++-
 .../engine/unmatched_final_group.tests.js     |  3 ++-
 .../engine/js-processor/kbdInterface.tests.ts |  9 +++++----
 .../non-positional-rules.tests.js             |  5 +++--
 .../specialized-backspace.tests.ts            |  9 +++++----
 .../engine/keyboard/keyboard-loading.tests.js |  3 ++-
 .../keyboard/keyboardLoaderBase.tests.ts      | 11 +++++-----
 .../main/headless/inputProcessor.tests.js     |  7 ++++---
 .../resources/defaultProcessorInitOptions.ts  |  3 ++-
 web/src/test/auto/tsconfig.json               |  3 ++-
 24 files changed, 115 insertions(+), 48 deletions(-)
 create mode 100644 web/src/test/auto/headless-resources/index.ts
 create mode 100644 web/src/test/auto/headless-resources/tsconfig.json
 create mode 100644 web/src/test/auto/headless-resources/variableStoreTestSerializer.ts

diff --git a/web/package.json b/web/package.json
index 4c2ea67d840..712a8558a2e 100644
--- a/web/package.json
+++ b/web/package.json
@@ -85,6 +85,10 @@
     "./test/resources": {
       "types": "./src/test/auto/resources/build/index.d.ts",
       "import": "./src/test/auto/resources/build/index.js"
+    },
+    "./test/headless-resources": {
+      "types": "./src/test/auto/headless-resources/build/index.d.ts",
+      "import": "./src/test/auto/headless-resources/build/index.js"
     }
   },
   "imports": {
diff --git a/web/src/engine/src/js-processor/jsKeyboardInterface.ts b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
index 82b48e84686..3185fbd3c17 100644
--- a/web/src/engine/src/js-processor/jsKeyboardInterface.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardInterface.ts
@@ -196,14 +196,12 @@ export class JSKeyboardInterface extends KeyboardHarness {
   activeKeyboard: JSKeyboard;
   activeDevice: DeviceSpec;
 
-  variableStoreSerializer: VariableStoreSerializer;
-
   // A 'reference point' that debug keyboards may use to access KMW's code constants.
   public get Codes(): typeof Codes {
     return Codes;
   }
 
-  constructor(_jsGlobal: any, keymanGlobal: KeyboardKeymanGlobal, variableStoreSerializer: VariableStoreSerializer = null) {
+  constructor(_jsGlobal: any, keymanGlobal: KeyboardKeymanGlobal, public readonly variableStoreSerializer: VariableStoreSerializer) {
     super(_jsGlobal, keymanGlobal);
 
     this.systemStores = {};
@@ -213,7 +211,9 @@ export class JSKeyboardInterface extends KeyboardHarness {
     this.systemStores[SystemStoreIDs.TSS_NEWLAYER] = new MutableSystemStore(SystemStoreIDs.TSS_NEWLAYER, '');
     this.systemStores[SystemStoreIDs.TSS_OLDLAYER] = new MutableSystemStore(SystemStoreIDs.TSS_OLDLAYER, '');
 
-    this.variableStoreSerializer = variableStoreSerializer;
+    if(!variableStoreSerializer) {
+      throw new Error('variableStoreSerializer is required');
+    }
   }
 
   /**
@@ -936,12 +936,8 @@ export class JSKeyboardInterface extends KeyboardHarness {
    */
   loadStore(kbdName: string, storeName:string, dfltValue:string): string {
     this.resetContextCache();
-    if(this.variableStoreSerializer) {
-      const cValue = this.variableStoreSerializer.loadStore(kbdName, storeName);
-      return cValue ?? dfltValue;
-    } else {
-      return dfltValue;
-    }
+    const cValue = this.variableStoreSerializer.loadStore(kbdName, storeName);
+    return cValue ?? dfltValue;
   }
 
   /**
@@ -962,6 +958,10 @@ export class JSKeyboardInterface extends KeyboardHarness {
       return false;
     }
 
+    // TODO-WEB-CORE: this.ruleBehavior should be mocked in unit tests; we
+    // should not have code here that behaves differently in a unit test
+    // environment
+
     // Null-check in case of invocation during unit-test
     if(this.ruleBehavior) {
       this.ruleBehavior.saveStores[storeName] = storeValue;
diff --git a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
index 0e657571eab..4f154a5b645 100644
--- a/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
+++ b/web/src/engine/src/js-processor/jsKeyboardProcessor.ts
@@ -25,7 +25,6 @@ import { ProcessorInitOptions } from './processorInitOptions.js';
 export type LogMessageHandler = (str: string) => void;
 
 export class JSKeyboardProcessor extends EventEmitter<EventMap> implements KeyboardProcessor {
-
   // Tracks the simulated value for supported state keys, allowing the OSK to mirror a physical keyboard for them.
   // Using the exact keyCode name from the Codes definitions will allow for certain optimizations elsewhere in the code.
   public stateKeys = {
@@ -617,10 +616,8 @@ export class JSKeyboardProcessor extends EventEmitter<EventMap> implements Keybo
 
     this.keyboardInterface.applyVariableStores(data.variableStores);
 
-    if (this.keyboardInterface.variableStoreSerializer) {
-      for (const storeID in data.saveStores) {
-        this.keyboardInterface.variableStoreSerializer.saveStore(this.activeKeyboard.id, storeID, data.saveStores[storeID]);
-      }
+    for (const storeID in data.saveStores) {
+      this.keyboardInterface.variableStoreSerializer.saveStore(this.activeKeyboard.id, storeID, data.saveStores[storeID]);
     }
 
     if (data.triggersDefaultCommand) {
diff --git a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
index 8f5cafc5290..e9ea8fe8c0e 100644
--- a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
+++ b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts
@@ -5,6 +5,7 @@ import { DeviceSpec } from 'keyman/common/web-utils';
 import { KeyboardHarness, JSKeyboard, MinimalKeymanGlobal, KeyboardKeymanGlobal, KeyboardDownloadError, KeyboardScriptError, Keyboard, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { assertThrowsAsync } from 'keyman/tools/testing/test-utils';
+import { VariableStoreTestSerializer } from 'keyman/test/headless-resources';
 
 declare let window: typeof globalThis;
 // KeymanEngine from the web/ folder... when available.
@@ -27,7 +28,7 @@ describe('Keyboard loading in DOM', function() {
   })
 
   it('throws error when keyboard does not exist', async () => {
-    const harness = new JSKeyboardInterface(window, MinimalKeymanGlobal);
+    const harness = new JSKeyboardInterface(window, MinimalKeymanGlobal, new VariableStoreTestSerializer());
     const keyboardLoader = new DOMKeyboardLoader(harness);
     const nonExisting = '/does/not/exist.js';
 
@@ -36,7 +37,7 @@ describe('Keyboard loading in DOM', function() {
   });
 
   it('throws error when keyboard is invalid', async () => {
-    const harness = new JSKeyboardInterface(window, MinimalKeymanGlobal);
+    const harness = new JSKeyboardInterface(window, MinimalKeymanGlobal, new VariableStoreTestSerializer());
     const keyboardLoader = new DOMKeyboardLoader(harness);
     const nonKeyboardPath = '/common/test/resources/index.mjs';
 
@@ -65,7 +66,7 @@ describe('Keyboard loading in DOM', function() {
   });
 
   it('`window`, enabled rule processing', async () => {
-    const jsHarness = new JSKeyboardInterface(window, MinimalKeymanGlobal);
+    const jsHarness = new JSKeyboardInterface(window, MinimalKeymanGlobal, new VariableStoreTestSerializer());
     const keyboardLoader = new DOMKeyboardLoader(jsHarness);
     const keyboard: Keyboard = await keyboardLoader.loadKeyboardFromPath('/common/test/resources/keyboards/khmer_angkor.js');
     const jsKeyboard = keyboard as JSKeyboard;
@@ -97,7 +98,7 @@ describe('Keyboard loading in DOM', function() {
   });
 
   it('load keyboards successfully in parallel without side effects', async () => {
-    let jsHarness = new JSKeyboardInterface(window, MinimalKeymanGlobal);
+    let jsHarness = new JSKeyboardInterface(window, MinimalKeymanGlobal, new VariableStoreTestSerializer());
     let keyboardLoader = new DOMKeyboardLoader(jsHarness);
 
     // Preload a keyboard and make it active.
diff --git a/web/src/test/auto/dom/kbdLoader.ts b/web/src/test/auto/dom/kbdLoader.ts
index 3e43ab7ff7b..3d838f0e3a0 100644
--- a/web/src/test/auto/dom/kbdLoader.ts
+++ b/web/src/test/auto/dom/kbdLoader.ts
@@ -10,8 +10,9 @@ import {
 
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { KeyboardInfoPair } from 'keyman/engine/main';
+import { VariableStoreTestSerializer } from 'keyman/test/headless-resources';
 
-const loader = new DOMKeyboardLoader(new JSKeyboardInterface(window, MinimalKeymanGlobal));
+const loader = new DOMKeyboardLoader(new JSKeyboardInterface(window, MinimalKeymanGlobal, new VariableStoreTestSerializer()));
 
 export function loadKeyboardFromPath(path: string) {
   return loader.loadKeyboardFromPath(path);
diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.ts b/web/src/test/auto/e2e/baseline/baseline.tests.ts
index 527099e6c3a..72e58629461 100644
--- a/web/src/test/auto/e2e/baseline/baseline.tests.ts
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.ts
@@ -47,6 +47,13 @@ const testsToFix = {
     'k_0202___alt.kmn',
     'k_0203___generic_ctrlalt.kmn',
     'k_0400___groups_and_virtual_keys.kmn', // kmx only
+    'k_0501___options_with_preset.kmn', // variable stores initialization work to do with keyboard_attrs
+    'k_0503___options_with_save_and_preset.kmn', // variable stores initialization work to do with keyboard_attrs
+    'k_0504___options_with_reset.kmn', // variable stores initialization work to do with keyboard_attrs
+    'k_0505___options_double_set_reset.kmn', // variable stores initialization work to do with keyboard_attrs
+    'k_0506___options_double_set_staged.kmn', // variable stores initialization work to do with keyboard_attrs
+    'k_0507___options___double_reset_staged.kmn', // variable stores initialization work to do with keyboard_attrs
+    'k_0508___options___double_reset.kmn', // variable stores initialization work to do with keyboard_attrs
     'k_0600___system_stores.kmn',
     'k_0601___system_stores_2.kmn',
     'k_0700___caps_lock.kmn',
diff --git a/web/src/test/auto/e2e/playwright.config.ts b/web/src/test/auto/e2e/playwright.config.ts
index e522323c131..ad20aa9c157 100644
--- a/web/src/test/auto/e2e/playwright.config.ts
+++ b/web/src/test/auto/e2e/playwright.config.ts
@@ -76,7 +76,7 @@ export default defineConfig({
 
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: `"${KEYMAN_ROOT}/node_modules/.bin/gosh" "${KEYMAN_ROOT}/web/build.sh start"`,
+    command: `"${KEYMAN_ROOT}/node_modules/.bin/gosh" "../../../../build.sh start"`,
     url: 'http://localhost:3000',
     reuseExistingServer: !process.env.KEYMAN_IS_CI_BUILD,
   },
diff --git a/web/src/test/auto/headless-resources/index.ts b/web/src/test/auto/headless-resources/index.ts
new file mode 100644
index 00000000000..8580a676292
--- /dev/null
+++ b/web/src/test/auto/headless-resources/index.ts
@@ -0,0 +1,5 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+export { VariableStoreTestSerializer } from './variableStoreTestSerializer.js';
+
diff --git a/web/src/test/auto/headless-resources/tsconfig.json b/web/src/test/auto/headless-resources/tsconfig.json
new file mode 100644
index 00000000000..30ada6b9e4f
--- /dev/null
+++ b/web/src/test/auto/headless-resources/tsconfig.json
@@ -0,0 +1,18 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "build/",
+    "rootDir": ".",
+    "tsBuildInfoFile": "build/tsconfig.tsbuildinfo",
+    "skipLibCheck": true,
+    "noEmitOnError": false
+  },
+
+  "include": [ "*.ts" ],
+  "exclude": [ "node_modules" ],
+
+  "references": [
+    { "path": "../../../common/web-utils" },
+    { "path": "../../../engine" },
+  ]
+}
diff --git a/web/src/test/auto/headless-resources/variableStoreTestSerializer.ts b/web/src/test/auto/headless-resources/variableStoreTestSerializer.ts
new file mode 100644
index 00000000000..1a7c3622138
--- /dev/null
+++ b/web/src/test/auto/headless-resources/variableStoreTestSerializer.ts
@@ -0,0 +1,20 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ */
+import { VariableStoreSerializer } from "keyman/engine/keyboard";
+
+export class VariableStoreTestSerializer implements VariableStoreSerializer {
+  private stores: {[name: string]: string} = {};
+
+  private getStoreName(keyboardID: string, storeName: string): string {
+    return `KeymanWeb_${keyboardID}_Option_${storeName}`;
+  }
+
+  loadStore(keyboardID: string, storeName: string): string {
+    return this.stores[this.getStoreName(keyboardID, storeName)] ?? '';
+  }
+
+  saveStore(keyboardID: string, storeName: string, storeValue: string): void {
+    this.stores[this.getStoreName(keyboardID, storeName)] = storeValue;
+  }
+}
diff --git a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
index 5e801458e98..3553f76e831 100644
--- a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
@@ -10,6 +10,7 @@ import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { NodeKeyboardLoader, getKeymanRoot } from 'keyman/test/resources';
+import { VariableStoreTestSerializer } from 'keyman/test/headless-resources';
 
 const require = createRequire(import.meta.url);
 const KEYMAN_ROOT = getKeymanRoot();
@@ -29,7 +30,7 @@ describe('Engine - Basic Simulation', function() {
 
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
-    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
+    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer()));
     let keyboard = await keyboardLoader.loadKeyboardFromPath(KEYMAN_ROOT + '/common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
diff --git a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
index 263b0d1d944..664d854d8ce 100644
--- a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
@@ -11,6 +11,7 @@ import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { NodeKeyboardLoader, getKeymanRoot } from 'keyman/test/resources';
+import { VariableStoreTestSerializer } from 'keyman/test/headless-resources';
 
 const require = createRequire(import.meta.url);
 const KEYMAN_ROOT = getKeymanRoot();
@@ -30,7 +31,7 @@ describe('Engine - Chirality', function() {
 
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
-    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
+    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer()));
     let keyboard = await keyboardLoader.loadKeyboardFromPath(KEYMAN_ROOT + '/common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
diff --git a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
index 367f0c9759a..fb854abdaeb 100644
--- a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
@@ -9,6 +9,7 @@ import { createRequire } from 'module';
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader, getKeymanRoot } from 'keyman/test/resources';
+import { VariableStoreTestSerializer } from 'keyman/test/headless-resources';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
 const require = createRequire(import.meta.url);
@@ -29,7 +30,7 @@ describe('Engine - Deadkeys', function() {
 
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
-    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
+    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer()));
     let keyboard = await keyboardLoader.loadKeyboardFromPath(KEYMAN_ROOT + '/common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
index fa61b3feb38..668b1b89622 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/context.tests.js
@@ -6,6 +6,7 @@ const require = createRequire(import.meta.url);
 import { MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 import { DEFAULT_PROCESSOR_INIT_OPTIONS, NodeKeyboardLoader } from 'keyman/test/resources';
+import { VariableStoreTestSerializer } from 'keyman/test/headless-resources';
 
 import { NodeProctor, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
 
@@ -1101,7 +1102,7 @@ var NOTANY_NUL_RULE_SET = [ NOTANY_NUL_TEST_1, NOTANY_NUL_TEST_2, NOTANY_NUL_TES
 
 describe('Engine - Context Matching', function() {
   before(async function() {
-    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
+    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer()));
     const keyboard = await keyboardLoader.loadKeyboardFromPath(require.resolve('@keymanapp/common-test-resources/keyboards/test_simple_deadkeys.js'));
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
index edcbbd6492f..b7a1d3cfd02 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/notany_context.tests.js
@@ -6,6 +6,7 @@ const require = createRequire(import.meta.url);
 import { MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/test/resources';
+import { VariableStoreTestSerializer } from 'keyman/test/headless-resources';
 import { NodeProctor, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
 
 const device = {
@@ -52,7 +53,7 @@ function runStringRuleSet(input, output) {
 
 describe('Engine - notany() and context()', function() {
   before(async function() {
-    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
+    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer()));
     const keyboard = await keyboardLoader.loadKeyboardFromPath(require.resolve('@keymanapp/common-test-resources/keyboards/test_917.js'));
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
index 57d4acc2a77..8ed6b1da5b5 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
@@ -10,6 +10,7 @@ import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { NodeKeyboardLoader, getKeymanRoot } from 'keyman/test/resources';
+import { VariableStoreTestSerializer } from 'keyman/test/headless-resources';
 
 const require = createRequire(import.meta.url);
 const KEYMAN_ROOT = getKeymanRoot();
@@ -28,7 +29,7 @@ describe('Engine - Unmatched Final Groups', function() {
 
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
-    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
+    let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer()));
     const keyboard = await keyboardLoader.loadKeyboardFromPath(KEYMAN_ROOT + '/common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
diff --git a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
index 872697cc125..32dbbc188ce 100644
--- a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
+++ b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts
@@ -7,6 +7,7 @@ import { DeviceSpec } from 'keyman/common/web-utils';
 import { JSKeyboard, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/test/resources';
+import { VariableStoreTestSerializer } from 'keyman/test/headless-resources';
 
 describe('Headless keyboard loading', function () {
   const laoPath = require.resolve('@keymanapp/common-test-resources/keyboards/lao_2008_basic.js');
@@ -25,7 +26,7 @@ describe('Headless keyboard loading', function () {
   describe('Full harness loading', () => {
     it('successfully loads', async function () {
       // -- START: Standard Recorder-based unit test loading boilerplate --
-      const jsHarness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
+      const jsHarness = new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer());
       const keyboardLoader = new NodeKeyboardLoader(jsHarness);
       const keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
       jsHarness.activeKeyboard = keyboard as JSKeyboard;
@@ -37,7 +38,7 @@ describe('Headless keyboard loading', function () {
 
     it('can evaluate rules', async function () {
       // -- START: Standard Recorder-based unit test loading boilerplate --
-      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
+      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer());
       const keyboardLoader = new NodeKeyboardLoader(harness);
       const keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
       harness.activeKeyboard = keyboard as JSKeyboard;
@@ -48,7 +49,7 @@ describe('Headless keyboard loading', function () {
     });
 
     it('does not change the active kehboard', async function () {
-      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
+      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer());
       const keyboardLoader = new NodeKeyboardLoader(harness);
       const lao_keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
       assert.isNotOk(harness.activeKeyboard);
@@ -68,7 +69,7 @@ describe('Headless keyboard loading', function () {
     it('throws distinct errors', async function () {
       const invalidPath = 'totally_invalid_path.js';
 
-      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
+      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer());
       const keyboardLoader = new NodeKeyboardLoader(harness);
       let missingError;
       try {
diff --git a/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js b/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
index 53620b8b090..4f261cd867e 100644
--- a/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/non-positional-rules.tests.js
@@ -7,6 +7,7 @@ const require = createRequire(import.meta.url);
 import { Codes, KeyEvent, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/test/resources';
+import { VariableStoreTestSerializer } from 'keyman/test/headless-resources';
 
 // Compare and contrast the unit tests here with those for app/browser key-event unit testing
 // in the hardware-event-processing set; the output objects there should have the same format
@@ -27,7 +28,7 @@ describe('Engine - rule processing', function() {
 
     before(async () => {
       // -- START: Standard keyboard unit test loading boilerplate --
-      let harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
+      let harness = new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer());
       let keyboardLoader = new NodeKeyboardLoader(harness);
       let keyboard = await keyboardLoader.loadKeyboardFromPath(ipaPath);
       // --  END:  Standard keyboard unit test loading boilerplate --
@@ -106,7 +107,7 @@ describe('Engine - rule processing', function() {
 
     before(async () => {
       // -- START: Standard keyboard unit test loading boilerplate --
-      let harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
+      let harness = new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer());
       let keyboardLoader = new NodeKeyboardLoader(harness);
       let keyboard = await keyboardLoader.loadKeyboardFromPath(armenianPath);
       // --  END:  Standard keyboard unit test loading boilerplate --
diff --git a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.ts b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.ts
index 581b1810e00..8a8c5268ed7 100644
--- a/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.ts
+++ b/web/src/test/auto/headless/engine/js-processor/specialized-backspace.tests.ts
@@ -7,6 +7,7 @@ import { DeviceSpec, KMWString } from 'keyman/common/web-utils';
 import { Codes, DefaultOutputRules, JSKeyboard, KeyEvent, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface, JSKeyboardProcessor } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/test/resources';
+import { VariableStoreTestSerializer } from 'keyman/test/headless-resources';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
 
@@ -95,7 +96,7 @@ describe('Engine - specialized backspace handling', function() {
 
   before(async () => {
     // -- START: Standard keyboard unit test loading boilerplate --
-    let harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
+    let harness = new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer());
     let keyboardLoader = new NodeKeyboardLoader(harness);
     let keyboard = await keyboardLoader.loadKeyboardFromPath(ipaPath);
     // --  END:  Standard keyboard unit test loading boilerplate --
@@ -109,7 +110,7 @@ describe('Engine - specialized backspace handling', function() {
     // --------------
 
     // -- START: Standard keyboard unit test loading boilerplate --
-    harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
+    harness = new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer());
     keyboardLoader = new NodeKeyboardLoader(harness);
     keyboard = await keyboardLoader.loadKeyboardFromPath(angkorPath);
     // --  END:  Standard keyboard unit test loading boilerplate --
@@ -122,7 +123,7 @@ describe('Engine - specialized backspace handling', function() {
 
     // --------------
 
-    harness = new JSKeyboardInterface(globalThis, MinimalKeymanGlobal);
+    harness = new JSKeyboardInterface(globalThis, MinimalKeymanGlobal, new VariableStoreTestSerializer());
     harness.install();
     // Sets the keyboard as the harness's "loaded" keyboard, but not "active".
     harness.KR(new (DUMMIED_KEYS_KEYBOARD_SCRIPT as any)());
@@ -132,7 +133,7 @@ describe('Engine - specialized backspace handling', function() {
 
     // --------------
 
-    harness = new JSKeyboardInterface(globalThis, MinimalKeymanGlobal);
+    harness = new JSKeyboardInterface(globalThis, MinimalKeymanGlobal, new VariableStoreTestSerializer());
     harness.install();
     // Sets the keyboard as the harness's "loaded" keyboard, but not "active".
     harness.KR(new (DOUBLED_BKSP_KEYBOARD_SCRIPT as any)());
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js b/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
index 62a145f392f..b4265392277 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
+++ b/web/src/test/auto/headless/engine/keyboard/keyboard-loading.tests.js
@@ -6,6 +6,7 @@ const require = createRequire(import.meta.url);
 import { KeyboardHarness, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/test/resources';
+import { VariableStoreTestSerializer } from 'keyman/test/headless-resources';
 
 describe('Headless keyboard loading', function() {
   const laoPath = require.resolve('@keymanapp/common-test-resources/keyboards/lao_2008_basic.js');
@@ -58,7 +59,7 @@ describe('Headless keyboard loading', function() {
 
       // Runs a blank KeyEvent through the keyboard's rule processing...
       // but via separate harness configured with a different captured global.
-      let ruleHarness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
+      let ruleHarness = new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer());
       ruleHarness.activeKeyboard = keyboard;
       try {
         ruleHarness.processKeystroke(new SyntheticTextStore(), keyboard.constructNullKeyEvent(device));
diff --git a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
index 62b0e7319bd..94b9400a80a 100644
--- a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
+++ b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts
@@ -7,6 +7,7 @@ import { DeviceSpec } from 'keyman/common/web-utils';
 import { KeyboardHarness, MinimalKeymanGlobal, KeyboardDownloadError, InvalidKeyboardError, JSKeyboard, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/test/resources';
+import { VariableStoreTestSerializer } from 'keyman/test/headless-resources';
 import { assertThrowsAsync, assertThrows } from 'keyman/tools/testing/test-utils';
 
 describe('Headless keyboard loading', function() {
@@ -26,7 +27,7 @@ describe('Headless keyboard loading', function() {
   describe('Minimal harness loading', () => {
     it('successfully loads a single keyboard from filesystem', async ()  => {
       // -- START: Standard Recorder-based unit test loading boilerplate --
-      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
+      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer());
       const keyboardLoader = new NodeKeyboardLoader(harness);
       const keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath);
       // --  END:  Standard Recorder-based unit test loading boilerplate --
@@ -42,7 +43,7 @@ describe('Headless keyboard loading', function() {
     });
 
     it('throws error when keyboard does not exist', async () => {
-      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
+      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer());
       const keyboardLoader = new NodeKeyboardLoader(harness);
 
       await assertThrowsAsync(async () => await keyboardLoader.loadKeyboardFromPath(nonExisting),
@@ -50,7 +51,7 @@ describe('Headless keyboard loading', function() {
     });
 
     it('throws error when keyboard is invalid', async () => {
-      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
+      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer());
       const keyboardLoader = new NodeKeyboardLoader(harness);
 
       await assertThrowsAsync(async () => await keyboardLoader.loadKeyboardFromPath(nonKeyboardPath),
@@ -59,7 +60,7 @@ describe('Headless keyboard loading', function() {
 
     it('successfully loads (has variable stores)', async () => {
       // -- START: Standard Recorder-based unit test loading boilerplate --
-      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
+      const harness = new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer());
       const keyboardLoader = new NodeKeyboardLoader(harness);
       const keyboard = await keyboardLoader.loadKeyboardFromPath(ipaPath);
       // --  END:  Standard Recorder-based unit test loading boilerplate --
@@ -83,7 +84,7 @@ describe('Headless keyboard loading', function() {
       // This shows an important detail: the 'global' object is effectively
       // closure-captured. (Similar constraints may occur when experimenting with
       // 'sandboxed' keyboard loading in the DOM!)
-      const ruleHarness = new JSKeyboardInterface({}, MinimalKeymanGlobal);
+      const ruleHarness = new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer());
       ruleHarness.activeKeyboard = keyboard as JSKeyboard;
       assertThrows(() => ruleHarness.processKeystroke(new SyntheticTextStore(), (keyboard as JSKeyboard).constructNullKeyEvent(device)), 'k.KKM is not a function');
     });
diff --git a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
index 85a5c262462..9beae4b281d 100644
--- a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
@@ -8,6 +8,7 @@ import { InputProcessor } from 'keyman/engine/main';
 import { JSKeyboardInterface } from 'keyman/engine/js-processor';
 import { DefaultOutputRules, MinimalKeymanGlobal, SyntheticTextStore } from 'keyman/engine/keyboard';
 import { DEFAULT_PROCESSOR_INIT_OPTIONS, NodeKeyboardLoader } from 'keyman/test/resources';
+import { VariableStoreTestSerializer } from 'keyman/test/headless-resources';
 import { KeyboardTest } from '@keymanapp/recorder-core';
 
 import { NodeWorker } from '@keymanapp/lexical-model-layer/node';
@@ -42,7 +43,7 @@ describe('InputProcessor', function() {
         // will be invalidated.  (No worker, no ability to predict.)
         core = new InputProcessor(device, NodeWorker, {
           baseLayout: 'us',
-          keyboardInterface: new JSKeyboardInterface({}, null, null),
+          keyboardInterface: new JSKeyboardInterface({}, null, new VariableStoreTestSerializer()),
           defaultOutputRules: new DefaultOutputRules()
         });
 
@@ -98,7 +99,7 @@ describe('InputProcessor', function() {
       }
 
       // Load the keyboard.
-      let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
+      let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer()));
       const keyboard = await keyboardLoader.loadKeyboardFromPath(require.resolve('@keymanapp/common-test-resources/keyboards/test_chirality.js'));
       keyboardWithHarness = keyboardLoader.harness;
       keyboardWithHarness.activeKeyboard = keyboard;
@@ -193,7 +194,7 @@ describe('InputProcessor', function() {
 
     before(async function () {
       // Load the keyboard.
-      let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
+      let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal, new VariableStoreTestSerializer()));
       const keyboard = await keyboardLoader.loadKeyboardFromPath(require.resolve('@keymanapp/common-test-resources/keyboards/test_8568_deadkeys.js'));
       keyboardWithHarness = keyboardLoader.harness;
       keyboardWithHarness.activeKeyboard = keyboard;
diff --git a/web/src/test/auto/resources/defaultProcessorInitOptions.ts b/web/src/test/auto/resources/defaultProcessorInitOptions.ts
index 92ce52a87f4..9b32208418a 100644
--- a/web/src/test/auto/resources/defaultProcessorInitOptions.ts
+++ b/web/src/test/auto/resources/defaultProcessorInitOptions.ts
@@ -5,9 +5,10 @@
 import { globalObject } from 'keyman/common/web-utils';
 import { JSKeyboardInterface, ProcessorInitOptions } from 'keyman/engine/js-processor';
 import { DefaultOutputRules, MinimalKeymanGlobal } from 'keyman/engine/keyboard';
+import { VariableStoreTestSerializer } from 'keyman/test/headless-resources';
 
 export const DEFAULT_PROCESSOR_INIT_OPTIONS = {
   baseLayout: 'us',
-  keyboardInterface:  new JSKeyboardInterface(globalObject(), MinimalKeymanGlobal),
+  keyboardInterface:  new JSKeyboardInterface(globalObject(), MinimalKeymanGlobal, new VariableStoreTestSerializer()),
   defaultOutputRules: new DefaultOutputRules()
 } as ProcessorInitOptions;
diff --git a/web/src/test/auto/tsconfig.json b/web/src/test/auto/tsconfig.json
index 75f6a5d17a5..ef780359c2e 100644
--- a/web/src/test/auto/tsconfig.json
+++ b/web/src/test/auto/tsconfig.json
@@ -17,6 +17,7 @@
 
   "references": [
     { "path": "../../engine" },
-    { "path": "resources" }
+    { "path": "resources" },
+    { "path": "headless-resources" },
   ]
 }

From b15f9548ef0835e8ac1479cf9acdec7dcb6ab722 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 17 Apr 2026 17:26:16 +0200
Subject: [PATCH 252/254] chore(web): add ref to headless-resources

---
 web/src/test/auto/resources/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/src/test/auto/resources/tsconfig.json b/web/src/test/auto/resources/tsconfig.json
index 7ed8bfc57e6..399a9988817 100644
--- a/web/src/test/auto/resources/tsconfig.json
+++ b/web/src/test/auto/resources/tsconfig.json
@@ -14,5 +14,6 @@
   "references": [
     { "path": "../../../common/web-utils" },
     { "path": "../../../engine" },
+    { "path": "../headless-resources" },
   ]
 }

From 39fba5e29c70bf2593a48b293a6a86ff9c4d4d92 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 27 May 2026 15:17:48 +0200
Subject: [PATCH 253/254] chore(core): fixup const cast

---
 core/src/km_core_processevent_api.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/km_core_processevent_api.cpp b/core/src/km_core_processevent_api.cpp
index b7f34c14e00..d37ca45518c 100644
--- a/core/src/km_core_processevent_api.cpp
+++ b/core/src/km_core_processevent_api.cpp
@@ -37,8 +37,8 @@ km_core_event(
       return KM_CORE_STATUS_INVALID_ARGUMENT;
   }
 
-  km_core_status status = <km_core_state*>(state)->processor().external_event(<km_core_state*>(state), event, data);
-  state->apply_actions_and_merge_app_context();
+  km_core_status status = const_cast<km_core_state*>(state)->processor().external_event(const_cast<km_core_state*>(state), event, data);
+  const_cast<km_core_state*>(state)->apply_actions_and_merge_app_context();
   return status;
 }
 

From 729c71d64db8011a5fda62a2cfcf3a36886bf776 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 28 May 2026 14:16:19 +0200
Subject: [PATCH 254/254] chore: minor cleanup prior to merge of web-core
 preflight

---
 common/web/sentry-manager/build.sh |   4 +-
 core/src/layout.hpp                | 185 -----------------------------
 core/src/meson.build               |   2 +-
 3 files changed, 3 insertions(+), 188 deletions(-)
 delete mode 100644 core/src/layout.hpp

diff --git a/common/web/sentry-manager/build.sh b/common/web/sentry-manager/build.sh
index 4e725290e49..b2bcea8d94f 100755
--- a/common/web/sentry-manager/build.sh
+++ b/common/web/sentry-manager/build.sh
@@ -11,7 +11,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_describe "Sentry error reporting module for embedded Keyman Engine for Web" \
   "@/common/tools/es-bundling" \
   "@/common/web/keyman-version" \
-  clean configure build
+  clean configure build test
 
 builder_describe_outputs \
   configure          /node_modules \
@@ -22,7 +22,7 @@ builder_parse "$@"
 # ---------------------------------------------------------------------------------
 
 function do_build() {
-  tsc --build "./tsconfig.json"
+  tsc --build
 
   node_es_bundle "${KEYMAN_ROOT}/common/web/sentry-manager/build/obj/src/index.js" \
     --out        "${KEYMAN_ROOT}/common/web/sentry-manager/build/lib/index.js" \
diff --git a/core/src/layout.hpp b/core/src/layout.hpp
deleted file mode 100644
index 2e3d2833b4a..00000000000
--- a/core/src/layout.hpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Keyman is copyright (C) SIL International. MIT License.
- *
- * Keyman Keyboard Processor API - On-Screen Keyboard Layout Interfaces
- */
-
-#pragma once
-
-#include <string>
-#include <map>
-#include <vector>
-
-#include "keyman_core_api.h"
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/**
- * Possible directions of a flick
- */
-enum keyboard_layout_flick_direction {
-  /** flick up (north) */
-  n = 0,
-  /** flick down (south) */
-  s = 1,
-  /** flick right (east) */
-  e = 2,
-  /** flick left (west) */
-  w = 3,
-  /** flick up-right (north-east) */
-  ne = 4,
-  /** flick up-left (north-west) */
-  nw = 5,
-  /** flick down-right (south-east) */
-  se = 6,
-  /** flick down-left (south-west) */
-  sw = 7
-};
-
-/**
- * key type like regular key, framekeys, deadkeys, blank, etc.
- */
-enum keyboard_layout_key_type {
-  /** regular key */
-  normal = 0,
-  /** A 'frame' key, such as Shift or Enter */
-  special = 1,
-  /** A 'frame' key, such as Shift or Enter, which is is active, such as
-   * the shift key on a shift layer */
-  specialActive = 2,
-  /** **KeymanWeb runtime private use:** a variant of `special` with the
-   *  keyboard font rather than 'KeymanwebOsk' font */
-  customSpecial = 3,
-  /** **KeymanWeb runtime private use:** a  variant of `specialActive` with the
-   *  keyboard font rather than 'KeymanwebOsk' font. */
-  customSpecialActive = 4,
-  /** A deadkey */
-  deadkey = 8,
-  /** A key which is rendered as a blank keycap, should block any interaction */
-  blank = 9,
-  /** Renders the key only as a gap or spacer, should block any interaction */
-  spacer = 10
-};
-
-/**
- * A key on a touch layout/on-screen keyboard
- */
-struct keyboard_layout_key {
-  /** key id */
-  std::u16string id;  // TODO-WEB-CORE: perhaps necessary for special keys, Enter, etc? or can we get that from virtualKey?
-  /** the virtual key code */
-  int virtualKey; // TODO-WEB-CORE: do we need this? both id and virtualKey? Or just one of them?
-  /** text to display on key cap */
-  std::u16string display;
-  /** hint e.g. for longpress */
-  std::u16string hint;
-  /** the type of key */
-  keyboard_layout_key_type type;
-
-  /**
-   * the modifier combination (not layer) that should be used in key events,
-   * for this key, overriding the layer that the key is a part of.
-   */
-  int modifiersOverride;
-  /** the next layer to switch to after this key is pressed */
-  std::u16string nextLayerId;
-
-  // touch layouts only
-
-  /** padding - space to the left of key (in what units?) */
-  int gap;
-  /** width of the key (in what units?) */
-  int width;
-
-  /** longpress keys, also known as subkeys */
-  std::vector<keyboard_layout_key> longpresses;
-  /** multitaps */
-  std::vector<keyboard_layout_key> multiTaps;
-  /** flicks */
-  std::map<keyboard_layout_flick_direction, keyboard_layout_key> flicks;
-};
-
-/**
- * a row of keys on a touch layout/on-screen keyboard
- */
-struct keyboard_layout_row {
-  /** row id */
-  int id; // TODO-WEB-CORE: do we need this? Web has it (`TouchLayoutRow`)
-  /** keys in this row */
-  std::vector<keyboard_layout_key> keys;
-};
-
-/**
- * a layer with rows of keys on a touch layout/on-screen keyboard
- */
-struct keyboard_layout_layer {
-  /** layer id */
-  std::u16string id;
-  /** layer modifiers */
-  // TODO-WEB-CORE: we added this during our discussion, but Web doesn't have it.
-  // Should be an enum if it's needed.
-  int modifiers;  //? 0 = default, n = shift, etc. -1 = unspecified?
-  /** rows in this layer */
-  std::vector<keyboard_layout_row> rows;
-};
-
-/**
- * layout specification for a specific platform like desktop, phone or tablet
- */
-struct keyboard_layout_platform {
-  /** platform form factor, e.g. 'iso', 'touch', 'ansi', ... (see ldml spec) */
-  std::u16string form;
-  /** width of screen for touch layout */
-  int minWidthMm;       // we don't have mobile vs tablet, instead use this
-  /** layers for this platform */
-  std::vector<keyboard_layout_layer> layers;
-
-  // TODO-WEB-CORE: Do we need these:
-  // Web additionally has:
-  // - font (should be in CSS; we have it in `keyboard_layout`)
-  // - fontsize (should be in CSS; we have it in `keyboard_layout`)
-  // - displayUnderlying
-  // - defaultHint ("none"|"dot"|"longpress"|"multitap"|"flick"|"flick-n"|"flick-ne"|
-  //               "flick-e"|"flick-se"|"flick-s"|"flick-sw"|"flick-w"|"flick-nw")
-};
-
-/**
- * On screen keyboard description consisting of specific layouts for different
- * form factors.
- */
-struct keyboard_layout {
-  /** layouts for different form factors */
-  std::vector<keyboard_layout_platform> platforms;
-  /** font face name to use for key caps*/
-  std::string fontFacename;
-  /** font size to use for key caps */
-  int fontSizeEm;  // TODO-WEB-CORE: em? px? something else?
-};
-
-
-/**
- * Get the on-screen keyboard layout for the specified keyboard.
- *
- * @param keyboard         [in]  The keyboard to get the layout for.
- * @param layout           [out] The on-screen keyboard layout.
- * @return km_core_status  `KM_CORE_STATUS_OK`: On success.
- *                         `KM_CORE_STATUS_INVALID_ARGUMENT`: If `keyboard` is not a valid keyboard or `layout` is null.
- */
-km_core_status
-keyboard_get_layout(
-  km_core_keyboard const* keyboard,
-  keyboard_layout**       layout
-);
-
-
-/**
- * Dispose the on-screen keyboard layout.
- */
-void
-keyboard_layout_dispose(keyboard_layout* layout);
-
-#if defined(__cplusplus)
-}
-#endif
diff --git a/core/src/meson.build b/core/src/meson.build
index 128d72b7f76..560a66fc32f 100644
--- a/core/src/meson.build
+++ b/core/src/meson.build
@@ -209,7 +209,7 @@ if cpp_compiler.get_id() == 'emscripten'
     name_suffix: 'mjs')
 
   if get_option('buildtype') == 'release'
-    # TODO: #12888
+    # TODO-WEB-CORE
     # Split debug symbols into separate wasm file for release builds only
     # as the release symbols will be uploaded to sentry
     # custom_target('core.wasm',