diff --git a/.github/labeler.yml b/.github/labeler.yml index ae455a6ca9..e634da4335 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -21,7 +21,6 @@ common/: - resources/** common/core/: common/core/** common/core/desktop/: common/core/desktop/** -common/core/web/: common/core/web/** common/models/: common/models/** common/models/types/: common/models/types/** diff --git a/android/KMEA/build.sh b/android/KMEA/build.sh index 06c3d7b16b..6db3a8efd3 100755 --- a/android/KMEA/build.sh +++ b/android/KMEA/build.sh @@ -147,7 +147,7 @@ if [ "$DO_COPY" = true ]; then cp $KMW_ROOT/release/$KMW_PATH/embedded/resources/osk/kmwosk.css $KMEA_ASSETS/kmwosk.css cp $KMW_ROOT/release/$KMW_PATH/embedded/resources/osk/keymanweb-osk.ttf $KMEA_ASSETS/keymanweb-osk.ttf - cp $KEYMAN_ROOT/common/core/web/tools/sentry-manager/build/index.js $KMEA_ASSETS/keyman-sentry.js + cp $KEYMAN_ROOT/common/web/sentry-manager/build/index.js $KMEA_ASSETS/keyman-sentry.js if [ $? -ne 0 ]; then die "ERROR: copying artifacts failed" diff --git a/common/models/templates/tsconfig.json b/common/models/templates/tsconfig.json index 07921a9928..8cc9c6af1c 100644 --- a/common/models/templates/tsconfig.json +++ b/common/models/templates/tsconfig.json @@ -9,7 +9,7 @@ "target": "es5", }, "references": [ - { "path": "../../core/web/utils" }, + { "path": "../../web/utils" }, { "path": "../types" } ], "include": [ diff --git a/common/predictive-text/tsconfig.json b/common/predictive-text/tsconfig.json index 753042860a..fc1d3f13ee 100644 --- a/common/predictive-text/tsconfig.json +++ b/common/predictive-text/tsconfig.json @@ -11,7 +11,7 @@ "lib": ["es6"] }, "references": [ - { "path": "../core/web/utils" }, + { "path": "../web/utils" }, { "path": "../web/es6-shim" }, { "path": "../models/types"}, { "path": "../models/wordbreakers"}, diff --git a/common/core/web/tests/resources/fixtures/eventTestConfig.html b/common/test/resources/fixtures/eventTestConfig.html similarity index 100% rename from common/core/web/tests/resources/fixtures/eventTestConfig.html rename to common/test/resources/fixtures/eventTestConfig.html diff --git a/common/core/web/tests/resources/fixtures/robustAttachment.html b/common/test/resources/fixtures/robustAttachment.html similarity index 100% rename from common/core/web/tests/resources/fixtures/robustAttachment.html rename to common/test/resources/fixtures/robustAttachment.html diff --git a/common/core/web/tests/resources/fixtures/singleInput.html b/common/test/resources/fixtures/singleInput.html similarity index 100% rename from common/core/web/tests/resources/fixtures/singleInput.html rename to common/test/resources/fixtures/singleInput.html diff --git a/common/core/web/tests/resources/fixtures/singleTextArea.html b/common/test/resources/fixtures/singleTextArea.html similarity index 100% rename from common/core/web/tests/resources/fixtures/singleTextArea.html rename to common/test/resources/fixtures/singleTextArea.html diff --git a/common/core/web/tests/resources/html/editableFrame.html b/common/test/resources/html/editableFrame.html similarity index 100% rename from common/core/web/tests/resources/html/editableFrame.html rename to common/test/resources/html/editableFrame.html diff --git a/common/core/web/tests/resources/html/iframe.html b/common/test/resources/html/iframe.html similarity index 100% rename from common/core/web/tests/resources/html/iframe.html rename to common/test/resources/html/iframe.html diff --git a/common/core/web/tests/resources/json/engine_tests/basic_lao_simulation.json b/common/test/resources/json/engine_tests/basic_lao_simulation.json similarity index 100% rename from common/core/web/tests/resources/json/engine_tests/basic_lao_simulation.json rename to common/test/resources/json/engine_tests/basic_lao_simulation.json diff --git a/common/core/web/tests/resources/json/engine_tests/chirality.json b/common/test/resources/json/engine_tests/chirality.json similarity index 100% rename from common/core/web/tests/resources/json/engine_tests/chirality.json rename to common/test/resources/json/engine_tests/chirality.json diff --git a/common/core/web/tests/resources/json/engine_tests/deadkeys.json b/common/test/resources/json/engine_tests/deadkeys.json similarity index 100% rename from common/core/web/tests/resources/json/engine_tests/deadkeys.json rename to common/test/resources/json/engine_tests/deadkeys.json diff --git a/common/core/web/tests/resources/json/engine_tests/ghp_enter.json b/common/test/resources/json/engine_tests/ghp_enter.json similarity index 100% rename from common/core/web/tests/resources/json/engine_tests/ghp_enter.json rename to common/test/resources/json/engine_tests/ghp_enter.json diff --git a/common/core/web/tests/resources/json/engine_tests/options_with_save_1.json b/common/test/resources/json/engine_tests/options_with_save_1.json similarity index 100% rename from common/core/web/tests/resources/json/engine_tests/options_with_save_1.json rename to common/test/resources/json/engine_tests/options_with_save_1.json diff --git a/common/core/web/tests/resources/json/engine_tests/options_with_save_2.json b/common/test/resources/json/engine_tests/options_with_save_2.json similarity index 100% rename from common/core/web/tests/resources/json/engine_tests/options_with_save_2.json rename to common/test/resources/json/engine_tests/options_with_save_2.json diff --git a/common/core/web/tests/resources/json/keyboards/galaxie_hebrew_positional.json b/common/test/resources/json/keyboards/galaxie_hebrew_positional.json similarity index 100% rename from common/core/web/tests/resources/json/keyboards/galaxie_hebrew_positional.json rename to common/test/resources/json/keyboards/galaxie_hebrew_positional.json diff --git a/common/core/web/tests/resources/json/keyboards/khmer_angkor.json b/common/test/resources/json/keyboards/khmer_angkor.json similarity index 100% rename from common/core/web/tests/resources/json/keyboards/khmer_angkor.json rename to common/test/resources/json/keyboards/khmer_angkor.json diff --git a/common/core/web/tests/resources/json/keyboards/lao_2008_basic.json b/common/test/resources/json/keyboards/lao_2008_basic.json similarity index 100% rename from common/core/web/tests/resources/json/keyboards/lao_2008_basic.json rename to common/test/resources/json/keyboards/lao_2008_basic.json diff --git a/common/core/web/tests/resources/json/keyboards/options_with_save.json b/common/test/resources/json/keyboards/options_with_save.json similarity index 100% rename from common/core/web/tests/resources/json/keyboards/options_with_save.json rename to common/test/resources/json/keyboards/options_with_save.json diff --git a/common/core/web/tests/resources/json/keyboards/test_chirality.json b/common/test/resources/json/keyboards/test_chirality.json similarity index 100% rename from common/core/web/tests/resources/json/keyboards/test_chirality.json rename to common/test/resources/json/keyboards/test_chirality.json diff --git a/common/core/web/tests/resources/json/keyboards/test_deadkeys.json b/common/test/resources/json/keyboards/test_deadkeys.json similarity index 100% rename from common/core/web/tests/resources/json/keyboards/test_deadkeys.json rename to common/test/resources/json/keyboards/test_deadkeys.json diff --git a/common/core/web/tests/resources/json/keyboards/test_simple_deadkeys.json b/common/test/resources/json/keyboards/test_simple_deadkeys.json similarity index 100% rename from common/core/web/tests/resources/json/keyboards/test_simple_deadkeys.json rename to common/test/resources/json/keyboards/test_simple_deadkeys.json diff --git a/common/core/web/tests/resources/json/keyboards/web_context_tests.json b/common/test/resources/json/keyboards/web_context_tests.json similarity index 100% rename from common/core/web/tests/resources/json/keyboards/web_context_tests.json rename to common/test/resources/json/keyboards/web_context_tests.json diff --git a/common/core/web/tests/resources/json/models/angle-punct-dummy.json b/common/test/resources/json/models/angle-punct-dummy.json similarity index 100% rename from common/core/web/tests/resources/json/models/angle-punct-dummy.json rename to common/test/resources/json/models/angle-punct-dummy.json diff --git a/common/core/web/tests/resources/json/models/quote-punct-dummy.json b/common/test/resources/json/models/quote-punct-dummy.json similarity index 100% rename from common/core/web/tests/resources/json/models/quote-punct-dummy.json rename to common/test/resources/json/models/quote-punct-dummy.json diff --git a/common/core/web/tests/resources/keyboards/.gitignore b/common/test/resources/keyboards/.gitignore similarity index 100% rename from common/core/web/tests/resources/keyboards/.gitignore rename to common/test/resources/keyboards/.gitignore diff --git a/common/core/web/tests/resources/keyboards/galaxie_hebrew_positional-2.2.js b/common/test/resources/keyboards/galaxie_hebrew_positional-2.2.js similarity index 100% rename from common/core/web/tests/resources/keyboards/galaxie_hebrew_positional-2.2.js rename to common/test/resources/keyboards/galaxie_hebrew_positional-2.2.js diff --git a/common/core/web/tests/resources/keyboards/khmer_angkor.js b/common/test/resources/keyboards/khmer_angkor.js similarity index 100% rename from common/core/web/tests/resources/keyboards/khmer_angkor.js rename to common/test/resources/keyboards/khmer_angkor.js diff --git a/common/core/web/tests/resources/keyboards/lao_2008_basic.js b/common/test/resources/keyboards/lao_2008_basic.js similarity index 100% rename from common/core/web/tests/resources/keyboards/lao_2008_basic.js rename to common/test/resources/keyboards/lao_2008_basic.js diff --git a/common/core/web/tests/resources/keyboards/options_with_save.js b/common/test/resources/keyboards/options_with_save.js similarity index 100% rename from common/core/web/tests/resources/keyboards/options_with_save.js rename to common/test/resources/keyboards/options_with_save.js diff --git a/common/core/web/tests/resources/keyboards/test_917.js b/common/test/resources/keyboards/test_917.js similarity index 100% rename from common/core/web/tests/resources/keyboards/test_917.js rename to common/test/resources/keyboards/test_917.js diff --git a/common/core/web/tests/resources/keyboards/test_917.kmn b/common/test/resources/keyboards/test_917.kmn similarity index 100% rename from common/core/web/tests/resources/keyboards/test_917.kmn rename to common/test/resources/keyboards/test_917.kmn diff --git a/common/core/web/tests/resources/keyboards/test_chirality.js b/common/test/resources/keyboards/test_chirality.js similarity index 100% rename from common/core/web/tests/resources/keyboards/test_chirality.js rename to common/test/resources/keyboards/test_chirality.js diff --git a/common/core/web/tests/resources/keyboards/test_chirality.kmn b/common/test/resources/keyboards/test_chirality.kmn similarity index 100% rename from common/core/web/tests/resources/keyboards/test_chirality.kmn rename to common/test/resources/keyboards/test_chirality.kmn diff --git a/common/core/web/tests/resources/keyboards/test_chirality.kmx b/common/test/resources/keyboards/test_chirality.kmx similarity index 100% rename from common/core/web/tests/resources/keyboards/test_chirality.kmx rename to common/test/resources/keyboards/test_chirality.kmx diff --git a/common/core/web/tests/resources/keyboards/test_chirality.kvk b/common/test/resources/keyboards/test_chirality.kvk similarity index 100% rename from common/core/web/tests/resources/keyboards/test_chirality.kvk rename to common/test/resources/keyboards/test_chirality.kvk diff --git a/common/core/web/tests/resources/keyboards/test_chirality.kvks b/common/test/resources/keyboards/test_chirality.kvks similarity index 100% rename from common/core/web/tests/resources/keyboards/test_chirality.kvks rename to common/test/resources/keyboards/test_chirality.kvks diff --git a/common/core/web/tests/resources/keyboards/test_deadkeys.js b/common/test/resources/keyboards/test_deadkeys.js similarity index 100% rename from common/core/web/tests/resources/keyboards/test_deadkeys.js rename to common/test/resources/keyboards/test_deadkeys.js diff --git a/common/core/web/tests/resources/keyboards/test_deadkeys.kmn b/common/test/resources/keyboards/test_deadkeys.kmn similarity index 100% rename from common/core/web/tests/resources/keyboards/test_deadkeys.kmn rename to common/test/resources/keyboards/test_deadkeys.kmn diff --git a/common/core/web/tests/resources/keyboards/test_deadkeys.kmx b/common/test/resources/keyboards/test_deadkeys.kmx similarity index 100% rename from common/core/web/tests/resources/keyboards/test_deadkeys.kmx rename to common/test/resources/keyboards/test_deadkeys.kmx diff --git a/common/core/web/tests/resources/keyboards/test_deadkeys.kvk b/common/test/resources/keyboards/test_deadkeys.kvk similarity index 100% rename from common/core/web/tests/resources/keyboards/test_deadkeys.kvk rename to common/test/resources/keyboards/test_deadkeys.kvk diff --git a/common/core/web/tests/resources/keyboards/test_deadkeys.kvks b/common/test/resources/keyboards/test_deadkeys.kvks similarity index 100% rename from common/core/web/tests/resources/keyboards/test_deadkeys.kvks rename to common/test/resources/keyboards/test_deadkeys.kvks diff --git a/common/core/web/tests/resources/keyboards/test_simple_deadkeys.js b/common/test/resources/keyboards/test_simple_deadkeys.js similarity index 100% rename from common/core/web/tests/resources/keyboards/test_simple_deadkeys.js rename to common/test/resources/keyboards/test_simple_deadkeys.js diff --git a/common/core/web/tests/resources/keyboards/test_simple_deadkeys.kmn b/common/test/resources/keyboards/test_simple_deadkeys.kmn similarity index 100% rename from common/core/web/tests/resources/keyboards/test_simple_deadkeys.kmn rename to common/test/resources/keyboards/test_simple_deadkeys.kmn diff --git a/common/core/web/tests/resources/keyboards/test_simple_deadkeys.kmx b/common/test/resources/keyboards/test_simple_deadkeys.kmx similarity index 100% rename from common/core/web/tests/resources/keyboards/test_simple_deadkeys.kmx rename to common/test/resources/keyboards/test_simple_deadkeys.kmx diff --git a/common/core/web/tests/resources/keyboards/unit_test_keyboards.kpj b/common/test/resources/keyboards/unit_test_keyboards.kpj similarity index 100% rename from common/core/web/tests/resources/keyboards/unit_test_keyboards.kpj rename to common/test/resources/keyboards/unit_test_keyboards.kpj diff --git a/common/core/web/tests/resources/keyboards/web_context_tests.js b/common/test/resources/keyboards/web_context_tests.js similarity index 100% rename from common/core/web/tests/resources/keyboards/web_context_tests.js rename to common/test/resources/keyboards/web_context_tests.js diff --git a/common/core/web/input-processor/.gitignore b/common/web/input-processor/.gitignore similarity index 100% rename from common/core/web/input-processor/.gitignore rename to common/web/input-processor/.gitignore diff --git a/common/core/web/input-processor/README.md b/common/web/input-processor/README.md similarity index 100% rename from common/core/web/input-processor/README.md rename to common/web/input-processor/README.md diff --git a/common/core/web/input-processor/package.json b/common/web/input-processor/package.json similarity index 100% rename from common/core/web/input-processor/package.json rename to common/web/input-processor/package.json diff --git a/common/core/web/input-processor/src/build.sh b/common/web/input-processor/src/build.sh similarity index 97% rename from common/core/web/input-processor/src/build.sh rename to common/web/input-processor/src/build.sh index b249af6bcb..2ae77f2012 100755 --- a/common/core/web/input-processor/src/build.sh +++ b/common/web/input-processor/src/build.sh @@ -63,7 +63,7 @@ if [ $BUILD_LMLAYER = true ]; then echo "" echo "Compiling the Language Modeling layer module..." ./build.sh $FLAGS || fail "Failed to compile the language modeling layer module." - cd ../core/web/input-processor/src + cd ../web/input-processor/src # TODO: Move this back to KMW's main build script. Consider it part of the dependency update. echo "Language Modeling layer compilation successful." echo "" @@ -84,6 +84,6 @@ fi # Compile web's `keyboard-processor` module. echo "Compiling Input Processor module..." -npm run tsc -- -b src/tsconfig.json || fail "Failed to compile the core/web/input-processor module." +npm run tsc -- -b src/tsconfig.json || fail "Failed to compile the web/input-processor module." echo "Input Processor module compilation successful." echo "" \ No newline at end of file diff --git a/common/core/web/input-processor/src/includes/events.ts b/common/web/input-processor/src/includes/events.ts similarity index 92% rename from common/core/web/input-processor/src/includes/events.ts rename to common/web/input-processor/src/includes/events.ts index c233f74a20..2893c0ccee 100644 --- a/common/core/web/input-processor/src/includes/events.ts +++ b/common/web/input-processor/src/includes/events.ts @@ -1,6 +1,6 @@ // Implements Node's EventEmitter class and related module components in a near // browser-compatible way. (Just requires a blank 'module' object on the window.) -/// +/// // Unfortunately, I can't get it to recognize type information properly // because we can't use require statements. So, a small-scale manual definition. diff --git a/common/core/web/input-processor/src/text/contextWindow.ts b/common/web/input-processor/src/text/contextWindow.ts similarity index 100% rename from common/core/web/input-processor/src/text/contextWindow.ts rename to common/web/input-processor/src/text/contextWindow.ts diff --git a/common/core/web/input-processor/src/text/inputProcessor.ts b/common/web/input-processor/src/text/inputProcessor.ts similarity index 100% rename from common/core/web/input-processor/src/text/inputProcessor.ts rename to common/web/input-processor/src/text/inputProcessor.ts diff --git a/common/core/web/input-processor/src/text/prediction/languageProcessor.ts b/common/web/input-processor/src/text/prediction/languageProcessor.ts similarity index 100% rename from common/core/web/input-processor/src/text/prediction/languageProcessor.ts rename to common/web/input-processor/src/text/prediction/languageProcessor.ts diff --git a/common/core/web/input-processor/src/tsconfig.json b/common/web/input-processor/src/tsconfig.json similarity index 62% rename from common/core/web/input-processor/src/tsconfig.json rename to common/web/input-processor/src/tsconfig.json index e0c103a04e..c004801951 100644 --- a/common/core/web/input-processor/src/tsconfig.json +++ b/common/web/input-processor/src/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../../tsconfig-base.json", + "extends": "../../../../tsconfig-base.json", "compilerOptions": { "allowJs": true, "module": "none", @@ -13,15 +13,15 @@ "outFile": "../build/index.js" }, "references": [ - { "path": "../../../../web/web-environment" }, + { "path": "../../web-environment" }, { "path": "../../utils" }, { "path": "../../keyboard-processor/src" }, - { "path": "../../../../predictive-text/browser.tsconfig.json" }, - { "path": "../../../../web/es6-shim" } + { "path": "../../../predictive-text/browser.tsconfig.json" }, + { "path": "../../es6-shim" } ], "include": ["./**/*.ts"], "files": [ "text/inputProcessor.ts", - "../../../../../node_modules/eventemitter3/index.js" + "../../../../node_modules/eventemitter3/index.js" ] } diff --git a/common/core/web/input-processor/test.sh b/common/web/input-processor/test.sh similarity index 85% rename from common/core/web/input-processor/test.sh rename to common/web/input-processor/test.sh index f9f1cf0a07..25f94025cc 100755 --- a/common/core/web/input-processor/test.sh +++ b/common/web/input-processor/test.sh @@ -1,18 +1,19 @@ #!/bin/bash -# We should work within the script's directory, not the one we were called in. -cd $(dirname "$BASH_SOURCE") - -WORKING_DIRECTORY=`pwd` +set -eu # Include useful testing resource functions ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(greadlink -f "${BASH_SOURCE[0]}" 2>/dev/null || readlink -f "${BASH_SOURCE[0]}")" -. "$(dirname "$THIS_SCRIPT")/../../../../resources/build/build-utils.sh" -. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" +. "$(dirname "$THIS_SCRIPT")/../../../resources/build/build-utils.sh" ## END STANDARD BUILD SCRIPT INCLUDE +. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" + +# We should work within the script's directory, not the one we were called in. +cd "$THIS_SCRIPT_PATH" + # A simple utility script to facilitate unit-testing for the LM Layer. # It's rigged to be callable by NPM to facilitate testing during development when in other folders. @@ -67,7 +68,7 @@ test-headless ( ) { # TODO: Poor Man's Modules until we support ES6 throughout PREPEND=./tests/cases/prepend.js - (cat ../../../web/web-environment/build/index.js; echo) > $PREPEND + (cat ../web-environment/build/index.js; echo) > $PREPEND (cat ../utils/build/index.js; echo) >> $PREPEND (cat ../keyboard-processor/build/index.js; echo) >> $PREPEND (cat ../input-processor/build/index.js; echo) >> $PREPEND @@ -76,12 +77,12 @@ test-headless ( ) { npm run mocha -- --recursive $FLAGS ./tests/cases/prepend.js PREPEND=./tests/cases/prepend.js - (cat ../../../web/web-environment/build/index.js; echo) > $PREPEND - (cat ../../../predictive-text/build/headless.js; echo) >> $PREPEND + (cat ../web-environment/build/index.js; echo) > $PREPEND + (cat ../../predictive-text/build/headless.js; echo) >> $PREPEND (cat ../utils/build/index.js; echo) >> $PREPEND (cat ../keyboard-processor/build/index.js; echo) >> $PREPEND (cat ../input-processor/build/index.js; echo) >> $PREPEND - (cat ../../../web/lm-worker/build/index.js; echo) >> $PREPEND + (cat ../lm-worker/build/index.js; echo) >> $PREPEND (cat tests/cases/languageProcessor.js; echo) >> $PREPEND npm run mocha -- --recursive $FLAGS ./tests/cases/prepend.js @@ -91,7 +92,7 @@ test-headless ( ) { if [ $FETCH_DEPS = true ]; then # First, run tests on the keyboard processor. - pushd "$KEYMAN_ROOT/common/core/web/keyboard-processor" + pushd "$KEYMAN_ROOT/common/web/keyboard-processor" ./test.sh -skip-package-install || fail "Tests failed by dependencies; aborting integration tests." popd fi diff --git a/common/core/web/input-processor/tests/cases/inputProcessor.js b/common/web/input-processor/tests/cases/inputProcessor.js similarity index 97% rename from common/core/web/input-processor/tests/cases/inputProcessor.js rename to common/web/input-processor/tests/cases/inputProcessor.js index 4fd7fde4b8..385cf3a695 100644 --- a/common/core/web/input-processor/tests/cases/inputProcessor.js +++ b/common/web/input-processor/tests/cases/inputProcessor.js @@ -36,7 +36,7 @@ describe('InputProcessor', function() { assert.isUndefined(core.activeModel); // Same for the model. // These checks are lifted from the keyboard-processor init checks found in - // common/core/web/keyboard-processor/tests/cases/basic-init.js. + // common/web/keyboard-processor/tests/cases/basic-init.js. assert.equal('us', core.keyboardProcessor.baseLayout, 'KeyboardProcessor 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"'); @@ -79,7 +79,7 @@ describe('InputProcessor', function() { // These two lines will load a keyboard from its file; headless-mode `registerKeyboard` will // automatically set the keyboard as active. - let kbdScript = new vm.Script(fs.readFileSync('../tests/resources/keyboards/test_chirality.js')); + let kbdScript = new vm.Script(fs.readFileSync('../../test/resources/keyboards/test_chirality.js')); kbdScript.runInThisContext(); keyboard = core.activeKeyboard; diff --git a/common/core/web/input-processor/tests/cases/languageProcessor.js b/common/web/input-processor/tests/cases/languageProcessor.js similarity index 97% rename from common/core/web/input-processor/tests/cases/languageProcessor.js rename to common/web/input-processor/tests/cases/languageProcessor.js index e777b5da89..e061781852 100644 --- a/common/core/web/input-processor/tests/cases/languageProcessor.js +++ b/common/web/input-processor/tests/cases/languageProcessor.js @@ -6,7 +6,7 @@ var vm = require("vm"); * Unit tests for the Dummy prediction model. */ -var LexicalModelCompiler = require('../../../../../../developer/js/dist/lexical-model-compiler/lexical-model-compiler').default; +var LexicalModelCompiler = require('../../../../../developer/js/dist/lexical-model-compiler/lexical-model-compiler').default; var path = require('path'); // Required initialization setup. @@ -30,7 +30,7 @@ describe('LanguageProcessor', function() { let languageProcessor = new LanguageProcessor(); // These checks are lifted from the keyboard-processor init checks found in - // common/core/web/keyboard-processor/tests/cases/basic-init.js. + // common/web/keyboard-processor/tests/cases/basic-init.js. assert.isUndefined(languageProcessor.lmEngine); assert.isUndefined(languageProcessor.activeModel); assert.isFalse(languageProcessor.isActive); @@ -46,7 +46,7 @@ describe('LanguageProcessor', function() { describe('.predict', function() { let compiler = new LexicalModelCompiler(); const MODEL_ID = 'example.qaa.trivial'; - const PATH = path.join(__dirname, '../../../../../../developer/js/tests/fixtures', MODEL_ID); + const PATH = path.join(__dirname, '../../../../../developer/js/tests/fixtures', MODEL_ID); describe('using angle brackets for quotes', function() { let modelCode = compiler.generateLexicalModelCode(MODEL_ID, { diff --git a/common/core/web/keyboard-processor/.gitignore b/common/web/keyboard-processor/.gitignore similarity index 100% rename from common/core/web/keyboard-processor/.gitignore rename to common/web/keyboard-processor/.gitignore diff --git a/common/core/web/keyboard-processor/README.md b/common/web/keyboard-processor/README.md similarity index 100% rename from common/core/web/keyboard-processor/README.md rename to common/web/keyboard-processor/README.md diff --git a/common/core/web/keyboard-processor/package.json b/common/web/keyboard-processor/package.json similarity index 100% rename from common/core/web/keyboard-processor/package.json rename to common/web/keyboard-processor/package.json diff --git a/common/core/web/keyboard-processor/src/build.sh b/common/web/keyboard-processor/src/build.sh similarity index 97% rename from common/core/web/keyboard-processor/src/build.sh rename to common/web/keyboard-processor/src/build.sh index 50a6c82f51..12927e49d6 100755 --- a/common/core/web/keyboard-processor/src/build.sh +++ b/common/web/keyboard-processor/src/build.sh @@ -48,4 +48,4 @@ if [ $FETCH_DEPS = true ]; then fi # Compile web's `keyboard-processor` module. -npm run tsc -- -b src/tsconfig.json || fail "Failed to compile the core/web/keyboard-processor module." +npm run tsc -- -b src/tsconfig.json || fail "Failed to compile the web/keyboard-processor module." diff --git a/common/core/web/keyboard-processor/src/keyboards/activeLayout.ts b/common/web/keyboard-processor/src/keyboards/activeLayout.ts similarity index 100% rename from common/core/web/keyboard-processor/src/keyboards/activeLayout.ts rename to common/web/keyboard-processor/src/keyboards/activeLayout.ts diff --git a/common/core/web/keyboard-processor/src/keyboards/defaultLayouts.ts b/common/web/keyboard-processor/src/keyboards/defaultLayouts.ts similarity index 100% rename from common/core/web/keyboard-processor/src/keyboards/defaultLayouts.ts rename to common/web/keyboard-processor/src/keyboards/defaultLayouts.ts diff --git a/common/core/web/keyboard-processor/src/keyboards/keyboard.ts b/common/web/keyboard-processor/src/keyboards/keyboard.ts similarity index 100% rename from common/core/web/keyboard-processor/src/keyboards/keyboard.ts rename to common/web/keyboard-processor/src/keyboards/keyboard.ts diff --git a/common/core/web/keyboard-processor/src/text/codes.ts b/common/web/keyboard-processor/src/text/codes.ts similarity index 100% rename from common/core/web/keyboard-processor/src/text/codes.ts rename to common/web/keyboard-processor/src/text/codes.ts diff --git a/common/core/web/keyboard-processor/src/text/deadkeys.ts b/common/web/keyboard-processor/src/text/deadkeys.ts similarity index 100% rename from common/core/web/keyboard-processor/src/text/deadkeys.ts rename to common/web/keyboard-processor/src/text/deadkeys.ts diff --git a/common/core/web/keyboard-processor/src/text/defaultOutput.ts b/common/web/keyboard-processor/src/text/defaultOutput.ts similarity index 100% rename from common/core/web/keyboard-processor/src/text/defaultOutput.ts rename to common/web/keyboard-processor/src/text/defaultOutput.ts diff --git a/common/core/web/keyboard-processor/src/text/kbdInterface.ts b/common/web/keyboard-processor/src/text/kbdInterface.ts similarity index 100% rename from common/core/web/keyboard-processor/src/text/kbdInterface.ts rename to common/web/keyboard-processor/src/text/kbdInterface.ts diff --git a/common/core/web/keyboard-processor/src/text/keyEvent.ts b/common/web/keyboard-processor/src/text/keyEvent.ts similarity index 100% rename from common/core/web/keyboard-processor/src/text/keyEvent.ts rename to common/web/keyboard-processor/src/text/keyEvent.ts diff --git a/common/core/web/keyboard-processor/src/text/keyMapping.ts b/common/web/keyboard-processor/src/text/keyMapping.ts similarity index 100% rename from common/core/web/keyboard-processor/src/text/keyMapping.ts rename to common/web/keyboard-processor/src/text/keyMapping.ts diff --git a/common/core/web/keyboard-processor/src/text/keyboardProcessor.ts b/common/web/keyboard-processor/src/text/keyboardProcessor.ts similarity index 100% rename from common/core/web/keyboard-processor/src/text/keyboardProcessor.ts rename to common/web/keyboard-processor/src/text/keyboardProcessor.ts diff --git a/common/core/web/keyboard-processor/src/text/outputTarget.ts b/common/web/keyboard-processor/src/text/outputTarget.ts similarity index 100% rename from common/core/web/keyboard-processor/src/text/outputTarget.ts rename to common/web/keyboard-processor/src/text/outputTarget.ts diff --git a/common/core/web/keyboard-processor/src/text/ruleBehavior.ts b/common/web/keyboard-processor/src/text/ruleBehavior.ts similarity index 100% rename from common/core/web/keyboard-processor/src/text/ruleBehavior.ts rename to common/web/keyboard-processor/src/text/ruleBehavior.ts diff --git a/common/core/web/keyboard-processor/src/text/systemStores.ts b/common/web/keyboard-processor/src/text/systemStores.ts similarity index 100% rename from common/core/web/keyboard-processor/src/text/systemStores.ts rename to common/web/keyboard-processor/src/text/systemStores.ts diff --git a/common/core/web/keyboard-processor/src/tsconfig.json b/common/web/keyboard-processor/src/tsconfig.json similarity index 65% rename from common/core/web/keyboard-processor/src/tsconfig.json rename to common/web/keyboard-processor/src/tsconfig.json index 4d4b015ab8..928c36fbcb 100644 --- a/common/core/web/keyboard-processor/src/tsconfig.json +++ b/common/web/keyboard-processor/src/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../../tsconfig-base.json", + "extends": "../../../../tsconfig-base.json", "compilerOptions": { "allowJs": true, "module": "none", @@ -14,9 +14,9 @@ "experimentalDecorators": true, }, "references": [ - { "path": "../../../../../common/models/types" }, - { "path": "../../../../../common/web/web-environment/" }, - { "path": "../../../../../common/core/web/utils/" } + { "path": "../../../models/types" }, + { "path": "../../web-environment/" }, + { "path": "../../utils/" } ], "include": ["./**/*.ts"], "files": ["text/outputTarget.ts", "text/keyboardProcessor.ts"] diff --git a/common/core/web/keyboard-processor/test.sh b/common/web/keyboard-processor/test.sh similarity index 85% rename from common/core/web/keyboard-processor/test.sh rename to common/web/keyboard-processor/test.sh index dafcd554df..f6c0f43aa2 100755 --- a/common/core/web/keyboard-processor/test.sh +++ b/common/web/keyboard-processor/test.sh @@ -1,16 +1,19 @@ #!/bin/bash -# We should work within the script's directory, not the one we were called in. -cd $(dirname "$BASH_SOURCE") +set -eu # Include useful testing resource functions ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(greadlink -f "${BASH_SOURCE[0]}" 2>/dev/null || readlink -f "${BASH_SOURCE[0]}")" -. "$(dirname "$THIS_SCRIPT")/../../../../resources/build/build-utils.sh" -. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" +. "$(dirname "$THIS_SCRIPT")/../../../resources/build/build-utils.sh" ## END STANDARD BUILD SCRIPT INCLUDE +. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" + +# We should work within the script's directory, not the one we were called in. +cd "$THIS_SCRIPT_PATH" + # A simple utility script to facilitate unit-testing for the LM Layer. # It's rigged to be callable by NPM to facilitate testing during development when in other folders. @@ -60,9 +63,9 @@ test-headless ( ) { rm -f $PREPEND for n in tests/cases/*.js; do echo $n - (cat ../../../web/web-environment/build/index.js; echo) > $PREPEND + (cat ../web-environment/build/index.js; echo) > $PREPEND (cat ../utils/build/index.js; echo) >> $PREPEND - (cat ../tools/recorder/build/nodeProctor/index.js; echo) >> $PREPEND + (cat ../recorder/build/nodeProctor/index.js; echo) >> $PREPEND (cat ../keyboard-processor/build/index.js; echo) >> $PREPEND (cat $n; echo) >> $PREPEND; npm run mocha -- --recursive $FLAGS $PREPEND || die @@ -74,9 +77,9 @@ test-headless ( ) { rm -f $PREPEND for n in tests/cases/engine/*.js; do echo $n - (cat ../../../web/web-environment/build/index.js; echo) > $PREPEND + (cat ../web-environment/build/index.js; echo) > $PREPEND (cat ../utils/build/index.js; echo) >> $PREPEND - (cat ../tools/recorder/build/nodeProctor/index.js; echo) >> $PREPEND + (cat ../recorder/build/nodeProctor/index.js; echo) >> $PREPEND (cat ../keyboard-processor/build/index.js; echo) >> $PREPEND (cat $n; echo) >> $PREPEND; npm run mocha -- --recursive $FLAGS $PREPEND || die @@ -88,7 +91,7 @@ test-headless ( ) { if [ $FETCH_DEPS = true ]; then # Build test dependency - pushd "$KEYMAN_ROOT/common/core/web/tools/recorder/src" + pushd "$KEYMAN_ROOT/common/web/recorder/src" ./build.sh -skip-package-install || fail "recorder-core compilation failed." popd fi diff --git a/common/core/web/keyboard-processor/tests/cases/basic-engine.js b/common/web/keyboard-processor/tests/cases/basic-engine.js similarity index 89% rename from common/core/web/keyboard-processor/tests/cases/basic-engine.js rename to common/web/keyboard-processor/tests/cases/basic-engine.js index 809d110d5c..0459aa5015 100644 --- a/common/core/web/keyboard-processor/tests/cases/basic-engine.js +++ b/common/web/keyboard-processor/tests/cases/basic-engine.js @@ -9,7 +9,7 @@ global.keyman = {}; String.kmwEnableSupplementaryPlane(false); describe('Engine - Basic Simulation', function() { - let testJSONtext = fs.readFileSync('../tests/resources/json/engine_tests/basic_lao_simulation.json'); + let testJSONtext = fs.readFileSync('../../test/resources/json/engine_tests/basic_lao_simulation.json'); // Common test suite setup. let testSuite = new KMWRecorder.KeyboardTest(JSON.parse(testJSONtext)); @@ -27,7 +27,7 @@ describe('Engine - Basic Simulation', function() { // These two lines will load a keyboard from its file; headless-mode `registerKeyboard` will // automatically set the keyboard as active. - var script = new vm.Script(fs.readFileSync('../tests/' + testSuite.keyboard.filename)); + var script = new vm.Script(fs.readFileSync('../../test/' + testSuite.keyboard.filename)); script.runInThisContext(); keyboard = kp.activeKeyboard; diff --git a/common/core/web/keyboard-processor/tests/cases/basic-init.js b/common/web/keyboard-processor/tests/cases/basic-init.js similarity index 94% rename from common/core/web/keyboard-processor/tests/cases/basic-init.js rename to common/web/keyboard-processor/tests/cases/basic-init.js index a789104362..9c19a90373 100644 --- a/common/core/web/keyboard-processor/tests/cases/basic-init.js +++ b/common/web/keyboard-processor/tests/cases/basic-init.js @@ -32,7 +32,7 @@ describe('KeyboardProcessor', function() { // These two lines will load a keyboard from its file; headless-mode `registerKeyboard` will // automatically set the keyboard as active. - var script = new vm.Script(fs.readFileSync('../tests/resources/keyboards/khmer_angkor.js')); + var script = new vm.Script(fs.readFileSync('../../test/resources/keyboards/khmer_angkor.js')); script.runInThisContext(); assert.isDefined(kp.activeKeyboard, 'Keyboard failed to register on script load'); diff --git a/common/core/web/keyboard-processor/tests/cases/chirality.js b/common/web/keyboard-processor/tests/cases/chirality.js similarity index 91% rename from common/core/web/keyboard-processor/tests/cases/chirality.js rename to common/web/keyboard-processor/tests/cases/chirality.js index c6406c9928..e8e5b48646 100644 --- a/common/core/web/keyboard-processor/tests/cases/chirality.js +++ b/common/web/keyboard-processor/tests/cases/chirality.js @@ -9,7 +9,7 @@ global.keyman = {}; String.kmwEnableSupplementaryPlane(false); describe('Engine - Chirality', function() { - let testJSONtext = fs.readFileSync('../tests/resources/json/engine_tests/chirality.json'); + let testJSONtext = fs.readFileSync('../../test/resources/json/engine_tests/chirality.json'); // Common test suite setup. let testSuite = new KMWRecorder.KeyboardTest(JSON.parse(testJSONtext)); @@ -27,7 +27,7 @@ describe('Engine - Chirality', function() { // These two lines will load a keyboard from its file; headless-mode `registerKeyboard` will // automatically set the keyboard as active. - var script = new vm.Script(fs.readFileSync('../tests/' + testSuite.keyboard.filename)); + var script = new vm.Script(fs.readFileSync('../../test/' + testSuite.keyboard.filename)); script.runInThisContext(); keyboard = kp.activeKeyboard; diff --git a/common/core/web/keyboard-processor/tests/cases/deadkeys.js b/common/web/keyboard-processor/tests/cases/deadkeys.js similarity index 90% rename from common/core/web/keyboard-processor/tests/cases/deadkeys.js rename to common/web/keyboard-processor/tests/cases/deadkeys.js index 939b704098..cfe83e2b00 100644 --- a/common/core/web/keyboard-processor/tests/cases/deadkeys.js +++ b/common/web/keyboard-processor/tests/cases/deadkeys.js @@ -10,7 +10,7 @@ global.com = com; String.kmwEnableSupplementaryPlane(false); describe('Engine - Deadkeys', function() { - let testJSONtext = fs.readFileSync('../tests/resources/json/engine_tests/deadkeys.json'); + let testJSONtext = fs.readFileSync('../../test/resources/json/engine_tests/deadkeys.json'); // Common test suite setup. let testSuite = new KMWRecorder.KeyboardTest(JSON.parse(testJSONtext)); @@ -28,7 +28,7 @@ describe('Engine - Deadkeys', function() { // These two lines will load a keyboard from its file; headless-mode `registerKeyboard` will // automatically set the keyboard as active. - var script = new vm.Script(fs.readFileSync('../tests/' + testSuite.keyboard.filename)); + var script = new vm.Script(fs.readFileSync('../../test/' + testSuite.keyboard.filename)); script.runInThisContext(); keyboard = kp.activeKeyboard; diff --git a/common/core/web/keyboard-processor/tests/cases/engine/context.js b/common/web/keyboard-processor/tests/cases/engine/context.js similarity index 99% rename from common/core/web/keyboard-processor/tests/cases/engine/context.js rename to common/web/keyboard-processor/tests/cases/engine/context.js index 65bc4336f2..91f2f703dc 100644 --- a/common/core/web/keyboard-processor/tests/cases/engine/context.js +++ b/common/web/keyboard-processor/tests/cases/engine/context.js @@ -987,7 +987,7 @@ describe('Engine - Context Matching', function() { // These two lines will load a keyboard from its file; headless-mode `registerKeyboard` will // automatically set the keyboard as active. - var script = new vm.Script(fs.readFileSync('../tests/resources/keyboards/test_simple_deadkeys.js')); + var script = new vm.Script(fs.readFileSync('../../test/resources/keyboards/test_simple_deadkeys.js')); script.runInThisContext(); keyboard = kp.activeKeyboard; diff --git a/common/core/web/keyboard-processor/tests/cases/engine/notany_context.js b/common/web/keyboard-processor/tests/cases/engine/notany_context.js similarity index 97% rename from common/core/web/keyboard-processor/tests/cases/engine/notany_context.js rename to common/web/keyboard-processor/tests/cases/engine/notany_context.js index 7db2d05fee..f03ec38e91 100644 --- a/common/core/web/keyboard-processor/tests/cases/engine/notany_context.js +++ b/common/web/keyboard-processor/tests/cases/engine/notany_context.js @@ -54,7 +54,7 @@ describe('Engine - notany() and context()', function() { // These two lines will load a keyboard from its file; headless-mode `registerKeyboard` will // automatically set the keyboard as active. - const script = new vm.Script(fs.readFileSync('../tests/resources/keyboards/test_917.js')); + const script = new vm.Script(fs.readFileSync('../../test/resources/keyboards/test_917.js')); script.runInThisContext(); keyboard = kp.activeKeyboard; diff --git a/common/core/web/keyboard-processor/tests/cases/engine/stores.js b/common/web/keyboard-processor/tests/cases/engine/stores.js similarity index 100% rename from common/core/web/keyboard-processor/tests/cases/engine/stores.js rename to common/web/keyboard-processor/tests/cases/engine/stores.js diff --git a/common/core/web/keyboard-processor/tests/cases/engine/unmatched_final_group.js b/common/web/keyboard-processor/tests/cases/engine/unmatched_final_group.js similarity index 88% rename from common/core/web/keyboard-processor/tests/cases/engine/unmatched_final_group.js rename to common/web/keyboard-processor/tests/cases/engine/unmatched_final_group.js index 30d126fcc5..84a7a309ac 100644 --- a/common/core/web/keyboard-processor/tests/cases/engine/unmatched_final_group.js +++ b/common/web/keyboard-processor/tests/cases/engine/unmatched_final_group.js @@ -9,7 +9,7 @@ global.keyman = {}; String.kmwEnableSupplementaryPlane(false); describe('Engine - Unmatched Final Groups', function() { - let testJSONtext = fs.readFileSync('../tests/resources/json/engine_tests/ghp_enter.json'); + let testJSONtext = fs.readFileSync('../../test/resources/json/engine_tests/ghp_enter.json'); // Common test suite setup. let testSuite = new KMWRecorder.KeyboardTest(JSON.parse(testJSONtext)); @@ -27,7 +27,7 @@ describe('Engine - Unmatched Final Groups', function() { // These two lines will load a keyboard from its file; headless-mode `registerKeyboard` will // automatically set the keyboard as active. - var script = new vm.Script(fs.readFileSync('../tests/' + testSuite.keyboard.filename)); + var script = new vm.Script(fs.readFileSync('../../test/' + testSuite.keyboard.filename)); script.runInThisContext(); keyboard = kp.activeKeyboard; diff --git a/common/core/web/keyboard-processor/tests/cases/transcriptions.js b/common/web/keyboard-processor/tests/cases/transcriptions.js similarity index 100% rename from common/core/web/keyboard-processor/tests/cases/transcriptions.js rename to common/web/keyboard-processor/tests/cases/transcriptions.js diff --git a/common/core/web/keyboard-processor/tests/cases/versions.js b/common/web/keyboard-processor/tests/cases/versions.js similarity index 100% rename from common/core/web/keyboard-processor/tests/cases/versions.js rename to common/web/keyboard-processor/tests/cases/versions.js diff --git a/common/web/lm-worker/tsconfig.json b/common/web/lm-worker/tsconfig.json index d52c92f634..8349dcb9e1 100644 --- a/common/web/lm-worker/tsconfig.json +++ b/common/web/lm-worker/tsconfig.json @@ -17,7 +17,7 @@ { "path": "../lm-message-types" }, // modules { "path": "../web-environment", "prepend": true }, - { "path": "../../core/web/utils", "prepend": true }, + { "path": "../utils", "prepend": true }, { "path": "../../models/templates", "prepend": true }, { "path": "../../models/wordbreakers", "prepend": true }, ], diff --git a/common/core/web/tools/recorder/.gitignore b/common/web/recorder/.gitignore similarity index 100% rename from common/core/web/tools/recorder/.gitignore rename to common/web/recorder/.gitignore diff --git a/common/core/web/tools/recorder/package.json b/common/web/recorder/package.json similarity index 100% rename from common/core/web/tools/recorder/package.json rename to common/web/recorder/package.json diff --git a/common/core/web/tools/recorder/src/build.sh b/common/web/recorder/src/build.sh similarity index 72% rename from common/core/web/tools/recorder/src/build.sh rename to common/web/recorder/src/build.sh index 87c4606f33..566d839726 100755 --- a/common/core/web/tools/recorder/src/build.sh +++ b/common/web/recorder/src/build.sh @@ -4,15 +4,16 @@ # - the Recorder module (for engine tests) # - the DOM module (for touch-alias and element-interface tests) +set -eu + ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(greadlink -f "${BASH_SOURCE[0]}" 2>/dev/null || readlink -f "${BASH_SOURCE[0]}")" -SCRIPT_DIR="$(dirname "$THIS_SCRIPT")" -KEYMAN_ROOT="$(dirname "$THIS_SCRIPT")/../../../../../.." -. "$KEYMAN_ROOT/resources/build/build-utils.sh" -. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" +. "$(dirname "$THIS_SCRIPT")/../../../../resources/build/build-utils.sh" ## END STANDARD BUILD SCRIPT INCLUDE +. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" + display_usage ( ) { echo "build.sh [-skip-package-install]" echo @@ -46,23 +47,12 @@ if [ $FETCH_DEPS = true ]; then verify_npm_setup fi -# Definition of global compile constants -OUTPUT_DIR="build" -OUTPUT="index.js" - -# Ensures that we rely first upon the local npm-based install of Typescript. -# (Facilitates automated setup for build agents.) -PATH="../node_modules/.bin:$PATH" - -compiler="npm run tsc --" -compilecmd="$compiler" - -$compilecmd --build "$SCRIPT_DIR/tsconfig.json" +npm run tsc -- --build "$THIS_SCRIPT_PATH/tsconfig.json" if [ $? -ne 0 ]; then fail "KeymanWeb recorder-core compilation failed." fi -$compilecmd --build "$SCRIPT_DIR/nodeProctor.tsconfig.json" +npm run tsc -- --build "$THIS_SCRIPT_PATH/nodeProctor.tsconfig.json" if [ $? -ne 0 ]; then fail "Node-based unit-test Proctor compilation failed." fi diff --git a/common/core/web/tools/recorder/src/index.ts b/common/web/recorder/src/index.ts similarity index 100% rename from common/core/web/tools/recorder/src/index.ts rename to common/web/recorder/src/index.ts diff --git a/common/core/web/tools/recorder/src/nodeProctor.ts b/common/web/recorder/src/nodeProctor.ts similarity index 100% rename from common/core/web/tools/recorder/src/nodeProctor.ts rename to common/web/recorder/src/nodeProctor.ts diff --git a/common/core/web/tools/recorder/src/nodeProctor.tsconfig.json b/common/web/recorder/src/nodeProctor.tsconfig.json similarity index 57% rename from common/core/web/tools/recorder/src/nodeProctor.tsconfig.json rename to common/web/recorder/src/nodeProctor.tsconfig.json index feac1719a8..b7cc8a7b7d 100644 --- a/common/core/web/tools/recorder/src/nodeProctor.tsconfig.json +++ b/common/web/recorder/src/nodeProctor.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../../../tsconfig-base.json", + "extends": "../../../../tsconfig-base.json", "compilerOptions": { "allowJs": true, @@ -20,9 +20,9 @@ ], "references": [ - { "path": "../../../../../web/web-environment" }, - { "path": "../../../../../core/web/utils" }, - { "path": "../../../../../core/web/keyboard-processor/src" }, - { "path": "../../../../../web/lm-message-types" } + { "path": "../../web-environment" }, + { "path": "../../utils" }, + { "path": "../../keyboard-processor/src" }, + { "path": "../../lm-message-types" } ] } diff --git a/common/core/web/tools/recorder/src/proctor.ts b/common/web/recorder/src/proctor.ts similarity index 100% rename from common/core/web/tools/recorder/src/proctor.ts rename to common/web/recorder/src/proctor.ts diff --git a/common/core/web/tools/recorder/src/tsconfig.json b/common/web/recorder/src/tsconfig.json similarity index 54% rename from common/core/web/tools/recorder/src/tsconfig.json rename to common/web/recorder/src/tsconfig.json index cbbd260e97..84da800e76 100644 --- a/common/core/web/tools/recorder/src/tsconfig.json +++ b/common/web/recorder/src/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../../../tsconfig-base.json", + "extends": "../../../../tsconfig-base.json", "compilerOptions": { "allowJs": true, @@ -19,9 +19,9 @@ ], "references": [ - { "path": "../../../../../web/web-environment" }, - { "path": "../../../../../core/web/utils" }, - { "path": "../../../../../core/web/keyboard-processor/src" }, - { "path": "../../../../../web/lm-message-types" } + { "path": "../../web-environment" }, + { "path": "../../utils" }, + { "path": "../../keyboard-processor/src" }, + { "path": "../../lm-message-types" } ] } diff --git a/common/core/web/tools/sentry-manager/.gitignore b/common/web/sentry-manager/.gitignore similarity index 100% rename from common/core/web/tools/sentry-manager/.gitignore rename to common/web/sentry-manager/.gitignore diff --git a/common/core/web/tools/sentry-manager/package.json b/common/web/sentry-manager/package.json similarity index 100% rename from common/core/web/tools/sentry-manager/package.json rename to common/web/sentry-manager/package.json diff --git a/common/core/web/tools/sentry-manager/src/build.sh b/common/web/sentry-manager/src/build.sh similarity index 63% rename from common/core/web/tools/sentry-manager/src/build.sh rename to common/web/sentry-manager/src/build.sh index d9f544ac28..cdac5dddfd 100755 --- a/common/core/web/tools/sentry-manager/src/build.sh +++ b/common/web/sentry-manager/src/build.sh @@ -1,17 +1,16 @@ #! /bin/bash # -# Compiles development-related KeymanWeb resources for use with developing/running tests. -# - the Recorder module (for engine tests) -# - the DOM module (for touch-alias and element-interface tests) +# Compiles sentry manager + +set -eu ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(greadlink -f "${BASH_SOURCE[0]}" 2>/dev/null || readlink -f "${BASH_SOURCE[0]}")" -. "$(dirname "$THIS_SCRIPT")/../../../../../../resources/build/build-utils.sh" -. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" +. "$(dirname "$THIS_SCRIPT")/../../../../resources/build/build-utils.sh" ## END STANDARD BUILD SCRIPT INCLUDE -SCRIPT_DIR="$(dirname "$THIS_SCRIPT")" +. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" display_usage ( ) { echo "build.sh [-skip-package-install]" @@ -46,18 +45,7 @@ if [ $FETCH_DEPS = true ]; then verify_npm_setup fi -# Definition of global compile constants -OUTPUT_DIR="build" -OUTPUT="index.js" - -# Ensures that we rely first upon the local npm-based install of Typescript. -# (Facilitates automated setup for build agents.) -PATH="../node_modules/.bin:$PATH" - -compiler="npm run tsc --" -compilecmd="$compiler" - -$compilecmd -p "$SCRIPT_DIR/tsconfig.json" +npm run tsc -- --build "$THIS_SCRIPT_PATH/tsconfig.json" if [ $? -ne 0 ]; then fail "Compilation of package for Sentry integration with KeymanWeb failed." fi \ No newline at end of file diff --git a/common/core/web/tools/sentry-manager/src/index.ts b/common/web/sentry-manager/src/index.ts similarity index 98% rename from common/core/web/tools/sentry-manager/src/index.ts rename to common/web/sentry-manager/src/index.ts index a2985dc0ef..f024dd0186 100644 --- a/common/core/web/tools/sentry-manager/src/index.ts +++ b/common/web/sentry-manager/src/index.ts @@ -1,4 +1,4 @@ -/// +/// namespace com.keyman { /** diff --git a/common/core/web/tools/sentry-manager/src/tsconfig.json b/common/web/sentry-manager/src/tsconfig.json similarity index 63% rename from common/core/web/tools/sentry-manager/src/tsconfig.json rename to common/web/sentry-manager/src/tsconfig.json index 144948897e..495a5ad50e 100644 --- a/common/core/web/tools/sentry-manager/src/tsconfig.json +++ b/common/web/sentry-manager/src/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../../../tsconfig-base.json", + "extends": "../../../../tsconfig-base.json", "compilerOptions": { "allowJs": true, "module": "none", @@ -11,11 +11,11 @@ "outFile": "../build/index.js" }, "references": [ - { "path": "../../../../../web/web-environment" } + { "path": "../../web-environment" } ], "include": [ - "../../../../../../node_modules/@sentry/browser/build/bundle.min.js", + "../../../../node_modules/@sentry/browser/build/bundle.min.js", ], "files": [ diff --git a/common/core/web/utils/.gitignore b/common/web/utils/.gitignore similarity index 100% rename from common/core/web/utils/.gitignore rename to common/web/utils/.gitignore diff --git a/common/core/web/utils/build.sh b/common/web/utils/build.sh similarity index 71% rename from common/core/web/utils/build.sh rename to common/web/utils/build.sh index 6d54c8bc12..101043706f 100755 --- a/common/core/web/utils/build.sh +++ b/common/web/utils/build.sh @@ -6,12 +6,11 @@ set -eu ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(greadlink -f "${BASH_SOURCE[0]}" 2>/dev/null || readlink -f "${BASH_SOURCE[0]}")" -SCRIPT_DIR="$(dirname "$THIS_SCRIPT")" -KEYMAN_ROOT="$(dirname "$THIS_SCRIPT")/../../../.." -. "$KEYMAN_ROOT/resources/build/build-utils.sh" -. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" +. "$(dirname "$THIS_SCRIPT")/../../../resources/build/build-utils.sh" ## END STANDARD BUILD SCRIPT INCLUDE +. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" + display_usage ( ) { echo "build.sh [-skip-package-install]" echo @@ -44,18 +43,7 @@ if [ "$FETCH_DEPS" = true ]; then verify_npm_setup fi -# Definition of global compile constants -OUTPUT_DIR="build" -OUTPUT="index.js" - -# Ensures that we rely first upon the local npm-based install of Typescript. -# (Facilitates automated setup for build agents.) -PATH="../node_modules/.bin:$PATH" - -compiler="npm run tsc --" -compilecmd="$compiler" - -$compilecmd -b "$SCRIPT_DIR/tsconfig.json" +npm run tsc -- --build "$THIS_SCRIPT_PATH/tsconfig.json" if [ $? -ne 0 ]; then fail "Utility-function package compilation failed." fi diff --git a/common/core/web/utils/package.json b/common/web/utils/package.json similarity index 100% rename from common/core/web/utils/package.json rename to common/web/utils/package.json diff --git a/common/core/web/utils/src/deepCopy.ts b/common/web/utils/src/deepCopy.ts similarity index 100% rename from common/core/web/utils/src/deepCopy.ts rename to common/web/utils/src/deepCopy.ts diff --git a/common/core/web/utils/src/deviceSpec.ts b/common/web/utils/src/deviceSpec.ts similarity index 100% rename from common/core/web/utils/src/deviceSpec.ts rename to common/web/utils/src/deviceSpec.ts diff --git a/common/core/web/utils/src/globalObject.ts b/common/web/utils/src/globalObject.ts similarity index 100% rename from common/core/web/utils/src/globalObject.ts rename to common/web/utils/src/globalObject.ts diff --git a/common/core/web/utils/src/index.ts b/common/web/utils/src/index.ts similarity index 100% rename from common/core/web/utils/src/index.ts rename to common/web/utils/src/index.ts diff --git a/common/core/web/utils/src/kmwstring.ts b/common/web/utils/src/kmwstring.ts similarity index 100% rename from common/core/web/utils/src/kmwstring.ts rename to common/web/utils/src/kmwstring.ts diff --git a/common/core/web/utils/src/version.ts b/common/web/utils/src/version.ts similarity index 100% rename from common/core/web/utils/src/version.ts rename to common/web/utils/src/version.ts diff --git a/common/core/web/utils/tsconfig.json b/common/web/utils/tsconfig.json similarity index 76% rename from common/core/web/utils/tsconfig.json rename to common/web/utils/tsconfig.json index 12451067fb..3f1734c0f6 100644 --- a/common/core/web/utils/tsconfig.json +++ b/common/web/utils/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../tsconfig-base.json", + "extends": "../../../tsconfig-base.json", "compilerOptions": { "allowJs": true, "module": "none", @@ -12,7 +12,7 @@ "outFile": "build/index.js" }, "references": [ - { "path": "../../../web/web-environment"} + { "path": "../web-environment"} ], "include": [ "src/*.ts" diff --git a/developer/js/bundle.sh b/developer/js/bundle.sh old mode 100644 new mode 100755 diff --git a/developer/server/postbuild.sh b/developer/server/postbuild.sh old mode 100644 new mode 100755 diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS index 1325c78164..73fbfe8832 100644 --- a/docs/CODEOWNERS +++ b/docs/CODEOWNERS @@ -7,12 +7,12 @@ /common/ @mcdurdin @jahorton /common/core/desktop/ @mcdurdin @jahorton -/common/core/web/ @jahorton @ermshiperete /common/lexical-model-types/ @jahorton @mcdurdin /common/models/ @jahorton @mcdurdin /common/predictive-text/ @jahorton @mcdurdin /common/schemas/ @mcdurdin @jahorton /common/test/ @mcdurdin @ermshiperete +/common/web/ @jahorton @ermshiperete @mcdurdin /developer/ @mcdurdin @darcywong00 /docs/ @mcdurdin @jahorton diff --git a/docs/build/linux-ubuntu.md b/docs/build/linux-ubuntu.md index 7f315dcc83..1f37021831 100644 --- a/docs/build/linux-ubuntu.md +++ b/docs/build/linux-ubuntu.md @@ -9,7 +9,7 @@ On Linux, you can build the following projects: * Keyman for Android * Keyman Core (wasm targets) -* Common/Web (aka common/core/web) +* Common/Web * KeymanWeb The following projects **cannot** be built on Linux: diff --git a/docs/build/macos.md b/docs/build/macos.md index 7870c8d04b..0f31607f80 100644 --- a/docs/build/macos.md +++ b/docs/build/macos.md @@ -14,7 +14,7 @@ On macOS, you can build the following projects: The following libraries can also be built: * Common/Core/Desktop (macOS, wasm targets) -* Common/Core/Web +* Common/Web The following projects **cannot** be built on macOS: diff --git a/docs/build/windows.md b/docs/build/windows.md index ba21302f57..f5ff728aab 100644 --- a/docs/build/windows.md +++ b/docs/build/windows.md @@ -12,7 +12,7 @@ On Windows, you can build the following projects: The following libraries can also be built: * Keyman Core (Windows, wasm targets) (aka common/core/desktop) -* Common/Web (aka common/core/web) +* Common/Web The following projects **cannot** be built on Windows: diff --git a/ios/kmbuild.sh b/ios/kmbuild.sh index 3033fa0a5e..ed3ee95d0f 100755 --- a/ios/kmbuild.sh +++ b/ios/kmbuild.sh @@ -185,7 +185,7 @@ update_bundle ( ) { rm "$base_dir/$BUNDLE_PATH/keyman.js.map" fi - cd "$KEYMAN_ROOT/common/core/web/tools/sentry-manager/build" + cd "$KEYMAN_ROOT/common/web/sentry-manager/build" cp index.js "$base_dir/$BUNDLE_PATH/keyman-sentry.js" diff --git a/linux/scripts/dist.sh b/linux/scripts/dist.sh index fd0770c613..b4974b366f 100755 --- a/linux/scripts/dist.sh +++ b/linux/scripts/dist.sh @@ -68,7 +68,7 @@ for proj in ${extra_projects}; do dpkg-source --tar-ignore=*~ --tar-ignore=.git --tar-ignore=.gitattributes \ --tar-ignore=.gitignore --tar-ignore=experiments --tar-ignore=debian \ --tar-ignore=.github --tar-ignore=.vscode --tar-ignore=android \ - --tar-ignore=common/core/web --tar-ignore=common/lexical-model-types \ + --tar-ignore=common/lexical-model-types \ --tar-ignore=common/models --tar-ignore=common/predictive-text \ --tar-ignore=common/test --tar-ignore=developer --tar-ignore=docs --tar-ignore=ios \ --tar-ignore=linux/keyman-config/buildtools/build-langtags.py --tar-ignore=__pycache__ \ diff --git a/package-lock.json b/package-lock.json index 52b12d5d6e..97b0d4066f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,11 +7,6 @@ "name": "root", "workspaces": [ "resources/gosh", - "common/core/web/input-processor", - "common/core/web/keyboard-processor", - "common/core/web/tools/recorder", - "common/core/web/tools/sentry-manager", - "common/core/web/utils", "developer/js", "developer/server", "common/models/*", @@ -29,6 +24,7 @@ }, "common/core/web/input-processor": { "name": "@keymanapp/input-processor", + "extraneous": true, "license": "MIT", "dependencies": { "@keymanapp/keyboard-processor": "*", @@ -51,6 +47,7 @@ }, "common/core/web/keyboard-processor": { "name": "@keymanapp/keyboard-processor", + "extraneous": true, "license": "MIT", "dependencies": { "@keymanapp/models-types": "*", @@ -69,6 +66,7 @@ }, "common/core/web/tools/recorder": { "name": "@keymanapp/recorder-core", + "extraneous": true, "license": "MIT", "dependencies": { "@keymanapp/keyboard-processor": "*", @@ -83,6 +81,7 @@ }, "common/core/web/tools/sentry-manager": { "name": "@keymanapp/web-sentry-manager", + "extraneous": true, "license": "MIT", "dependencies": { "@keymanapp/web-environment": "*", @@ -94,6 +93,7 @@ }, "common/core/web/utils": { "name": "@keymanapp/web-utils", + "extraneous": true, "license": "MIT", "devDependencies": { "@keymanapp/resources-gosh": "*", @@ -102,12 +102,6 @@ "typescript": "^4.5.4" } }, - "common/core/web/utils/node_modules/@types/node": { - "version": "14.18.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz", - "integrity": "sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==", - "dev": true - }, "common/models/templates": { "name": "@keymanapp/models-templates", "license": "MIT", @@ -224,6 +218,44 @@ }, "devDependencies": {} }, + "common/web/input-processor": { + "license": "MIT", + "dependencies": { + "@keymanapp/keyboard-processor": "*", + "@keymanapp/lexical-model-layer": "*", + "@keymanapp/models-types": "*", + "@keymanapp/web-environment": "*", + "@keymanapp/web-utils": "*", + "eventemitter3": "^4.0.0" + }, + "devDependencies": { + "@keymanapp/lexical-model-compiler": "*", + "@keymanapp/resources-gosh": "*", + "@types/node": "^11.9.4", + "chai": "^4.3.4", + "mocha": "^8.4.0", + "mocha-teamcity-reporter": "^4.0.0", + "ts-node": "^9.1.1", + "typescript": "^4.5.4" + } + }, + "common/web/keyboard-processor": { + "license": "MIT", + "dependencies": { + "@keymanapp/models-types": "*", + "@keymanapp/web-environment": "*", + "@keymanapp/web-utils": "*", + "@types/node": "^11.9.4" + }, + "devDependencies": { + "@keymanapp/resources-gosh": "*", + "chai": "^4.3.4", + "mocha": "^8.4.0", + "mocha-teamcity-reporter": "^4.0.0", + "ts-node": "^9.1.1", + "typescript": "^4.5.4" + } + }, "common/web/keyman-version": { "name": "@keymanapp/keyman-version", "hasInstallScript": true, @@ -284,7 +316,46 @@ "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==", "dev": true }, + "common/web/recorder": { + "license": "MIT", + "dependencies": { + "@keymanapp/keyboard-processor": "*", + "@keymanapp/models-types": "*", + "@keymanapp/web-environment": "*", + "@keymanapp/web-utils": "*", + "@types/node": "^11.9.4" + }, + "devDependencies": { + "typescript": "^4.5.4" + } + }, + "common/web/sentry-manager": { + "license": "MIT", + "dependencies": { + "@keymanapp/web-environment": "*", + "@sentry/browser": "^5.27.4" + }, + "devDependencies": { + "typescript": "^4.5.4" + } + }, + "common/web/utils": { + "license": "MIT", + "devDependencies": { + "@keymanapp/resources-gosh": "*", + "@keymanapp/web-environment": "*", + "@types/node": "^14.0.5", + "typescript": "^4.5.4" + } + }, + "common/web/utils/node_modules/@types/node": { + "version": "14.18.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.18.tgz", + "integrity": "sha512-B9EoJFjhqcQ9OmQrNorItO+OwEOORNn3S31WuiHvZY/dm9ajkB7AKD/8toessEtHHNL+58jofbq7hMMY9v4yig==", + "dev": true + }, "common/web/web-environment": { + "name": "@keymanapp/web-environment", "license": "MIT", "devDependencies": { "@keymanapp/resources-gosh": "*" @@ -754,11 +825,11 @@ "link": true }, "node_modules/@keymanapp/input-processor": { - "resolved": "common/core/web/input-processor", + "resolved": "common/web/input-processor", "link": true }, "node_modules/@keymanapp/keyboard-processor": { - "resolved": "common/core/web/keyboard-processor", + "resolved": "common/web/keyboard-processor", "link": true }, "node_modules/@keymanapp/keyman-version": { @@ -794,7 +865,7 @@ "link": true }, "node_modules/@keymanapp/recorder-core": { - "resolved": "common/core/web/tools/recorder", + "resolved": "common/web/recorder", "link": true }, "node_modules/@keymanapp/resources-gosh": { @@ -806,11 +877,11 @@ "link": true }, "node_modules/@keymanapp/web-sentry-manager": { - "resolved": "common/core/web/tools/sentry-manager", + "resolved": "common/web/sentry-manager", "link": true }, "node_modules/@keymanapp/web-utils": { - "resolved": "common/core/web/utils", + "resolved": "common/web/utils", "link": true }, "node_modules/@sentry/browser": { @@ -6456,7 +6527,7 @@ } }, "@keymanapp/input-processor": { - "version": "file:common/core/web/input-processor", + "version": "file:common/web/input-processor", "requires": { "@keymanapp/keyboard-processor": "*", "@keymanapp/lexical-model-compiler": "*", @@ -6475,7 +6546,7 @@ } }, "@keymanapp/keyboard-processor": { - "version": "file:common/core/web/keyboard-processor", + "version": "file:common/web/keyboard-processor", "requires": { "@keymanapp/models-types": "*", "@keymanapp/resources-gosh": "*", @@ -6728,7 +6799,7 @@ } }, "@keymanapp/recorder-core": { - "version": "file:common/core/web/tools/recorder", + "version": "file:common/web/recorder", "requires": { "@keymanapp/keyboard-processor": "*", "@keymanapp/models-types": "*", @@ -6748,7 +6819,7 @@ } }, "@keymanapp/web-sentry-manager": { - "version": "file:common/core/web/tools/sentry-manager", + "version": "file:common/web/sentry-manager", "requires": { "@keymanapp/web-environment": "*", "@sentry/browser": "^5.27.4", @@ -6756,7 +6827,7 @@ } }, "@keymanapp/web-utils": { - "version": "file:common/core/web/utils", + "version": "file:common/web/utils", "requires": { "@keymanapp/resources-gosh": "*", "@keymanapp/web-environment": "*", @@ -6765,9 +6836,9 @@ }, "dependencies": { "@types/node": { - "version": "14.18.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz", - "integrity": "sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==", + "version": "14.18.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.18.tgz", + "integrity": "sha512-B9EoJFjhqcQ9OmQrNorItO+OwEOORNn3S31WuiHvZY/dm9ajkB7AKD/8toessEtHHNL+58jofbq7hMMY9v4yig==", "dev": true } } diff --git a/package.json b/package.json index 2c3eb4d4e5..0a64512f42 100644 --- a/package.json +++ b/package.json @@ -11,11 +11,6 @@ "scripts": {}, "workspaces": [ "resources/gosh", - "common/core/web/input-processor", - "common/core/web/keyboard-processor", - "common/core/web/tools/recorder", - "common/core/web/tools/sentry-manager", - "common/core/web/utils", "developer/js", "developer/server", "common/models/*", diff --git a/resources/build/trigger-definitions.inc.sh b/resources/build/trigger-definitions.inc.sh index 380728ab37..d02f30a516 100644 --- a/resources/build/trigger-definitions.inc.sh +++ b/resources/build/trigger-definitions.inc.sh @@ -9,11 +9,11 @@ available_platforms=(android ios linux mac web windows) # e.g. android='common/models|common/predictive-text' # will expand into android='^(android|(oem/[^/]+/android)|common/models|common/predictive-text)' -watch_android='web|common/models|common/predictive-text|common/lexical-model-types|common/core/web' -watch_ios='web|common/models|common/predictive-text|common/lexical-model-types|common/core/web' +watch_android='web|common/models|common/predictive-text|common/lexical-model-types|common/web' +watch_ios='web|common/models|common/predictive-text|common/lexical-model-types|common/web' watch_linux='common/core/desktop' watch_mac='common/core/desktop' -watch_web='common/models|common/predictive-text|common/lexical-model-types|common/core/web' +watch_web='common/models|common/predictive-text|common/lexical-model-types|common/web' # Windows currently builds Developer and Desktop, so we need everything from common,developer,web watch_windows='common|developer|web' diff --git a/resources/gosh/gosh.js b/resources/gosh/gosh.js index e651791ab0..47a6900c16 100755 --- a/resources/gosh/gosh.js +++ b/resources/gosh/gosh.js @@ -19,7 +19,7 @@ "foo": "gosh ./foo.sh ..." } - For example, in common/core/web/utils/package.json, npm run build is defined as: + For example, in common/web/utils/package.json, npm run build is defined as: "build": "gosh ./build.sh -skip-package-install" diff --git a/tsconfig-base.json b/tsconfig-base.json index 0b3abb64c9..864bc214cf 100644 --- a/tsconfig-base.json +++ b/tsconfig-base.json @@ -11,12 +11,12 @@ "baseUrl": ".", "paths": { "@keymanapp/es6-shim": ["./common/web/es6-shim"], - "@keymanapp/input-processor": ["./common/core/web/input-processor/src"], - "@keymanapp/keyboard-processor": ["./common/core/web/keyboard-processor/src"], + "@keymanapp/input-processor": ["./common/web/input-processor/src"], + "@keymanapp/keyboard-processor": ["./common/web/keyboard-processor/src"], "@keymanapp/models-types": ["./common/models/types"], "@keymanapp/models-templates": ["./common/models/templates"], "@keymanapp/models-wordbreakers": ["./common/models/wordbreakers"], - "@keymanapp/utils": ["./common/core/web/utils"], + "@keymanapp/utils": ["./common/web/utils"], "@keymanapp/lm-message-types": ["./common/web/lm-message-types"], "@keymanapp/keyman-version": ["./common/web/keyman-version"], } diff --git a/tsconfig.json b/tsconfig.json index 1de1f68ec3..862d6aa6ca 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,12 +2,12 @@ "files": [], "include": [], "references": [ - { "path": "./common/core/web/input-processor/src/tsconfig.json" }, - { "path": "./common/core/web/keyboard-processor/src/tsconfig.json" }, - { "path": "./common/core/web/tools/recorder/src/nodeProctor.tsconfig.json" }, - { "path": "./common/core/web/tools/recorder/src/tsconfig.json" }, - { "path": "./common/core/web/tools/sentry-manager/src/tsconfig.json" }, - { "path": "./common/core/web/utils/tsconfig.json" }, + { "path": "./common/web/input-processor/src/tsconfig.json" }, + { "path": "./common/web/keyboard-processor/src/tsconfig.json" }, + { "path": "./common/web/recorder/src/nodeProctor.tsconfig.json" }, + { "path": "./common/web/recorder/src/tsconfig.json" }, + { "path": "./common/web/sentry-manager/src/tsconfig.json" }, + { "path": "./common/web/utils/tsconfig.json" }, { "path": "./common/models/templates/tsconfig.json" }, { "path": "./common/models/types/tsconfig.json" }, { "path": "./common/models/wordbreakers/tsconfig.json" }, diff --git a/web/bulk_rendering/tsconfig.json b/web/bulk_rendering/tsconfig.json index a024205c5d..66b1ceeced 100644 --- a/web/bulk_rendering/tsconfig.json +++ b/web/bulk_rendering/tsconfig.json @@ -17,7 +17,7 @@ ], "references": [ - { "path": "../../common/core/web/utils", "prepend": true }, + { "path": "../../common/web/utils", "prepend": true }, { "path": "../../common/web/web-environment", "prepend": true }, { "path": "../../common/web/es6-shim", "prepend": true }, { "path": "../../common/web/lm-message-types" }, diff --git a/web/source/build.sh b/web/source/build.sh index 067e92d99d..dd77c9567f 100755 --- a/web/source/build.sh +++ b/web/source/build.sh @@ -372,7 +372,7 @@ fi # Build the sentry-manager module - it's used in embedded contexts and on one testing page. #echo_heading "Compiling KeymanWeb's sentry-manager module..." - #pushd ../../common/core/web/tools/sentry-manager/src + #pushd ../../common/web/sentry-manager/src #./build.sh $CORE_FLAGS || fail "Failed to compile the sentry-manager module" #popd #echo_heading "sentry-manager module compiled successfully." @@ -382,7 +382,7 @@ fi #fi # Ensure that the Input Processor module compiles properly. - #cd ../../common/core/web/input-processor/src + #cd ../../common/web/input-processor/src #echo "" #echo_heading "Compiling local KeymanWeb dependencies..." #./build.sh $CORE_FLAGS || fail "Failed to compile KeymanWeb dependencies" diff --git a/web/source/tsconfig.dev_resources.json b/web/source/tsconfig.dev_resources.json index 4cc8f1ceb0..b4083c6c29 100644 --- a/web/source/tsconfig.dev_resources.json +++ b/web/source/tsconfig.dev_resources.json @@ -28,10 +28,10 @@ "references": [ { "path": "../../common/web/web-environment", "prepend": true }, - { "path": "../../common/core/web/utils", "prepend": true }, + { "path": "../../common/web/utils", "prepend": true }, { "path": "../../common/predictive-text/browser.tsconfig.json", "prepend": true }, - { "path": "../../common/core/web/input-processor/src", "prepend": true }, - { "path": "../../common/core/web/keyboard-processor/src", "prepend": true }, + { "path": "../../common/web/input-processor/src", "prepend": true }, + { "path": "../../common/web/keyboard-processor/src", "prepend": true }, { "path": "../../common/web/lm-message-types" } ] } diff --git a/web/source/tsconfig.embedded.json b/web/source/tsconfig.embedded.json index c71ce64cf1..d5c5610d63 100644 --- a/web/source/tsconfig.embedded.json +++ b/web/source/tsconfig.embedded.json @@ -28,10 +28,10 @@ "references": [ { "path": "../../common/web/web-environment", "prepend": true }, - { "path": "../../common/core/web/utils", "prepend": true }, + { "path": "../../common/web/utils", "prepend": true }, { "path": "../../common/predictive-text/browser.tsconfig.json", "prepend": true }, - { "path": "../../common/core/web/input-processor/src", "prepend": true }, - { "path": "../../common/core/web/keyboard-processor/src", "prepend": true }, + { "path": "../../common/web/input-processor/src", "prepend": true }, + { "path": "../../common/web/keyboard-processor/src", "prepend": true }, { "path": "../../common/web/es6-shim", "prepend": true }, { "path": "../../common/web/lm-message-types" }, ] diff --git a/web/source/tsconfig.json b/web/source/tsconfig.json index 4cd595ce56..dd725160c4 100644 --- a/web/source/tsconfig.json +++ b/web/source/tsconfig.json @@ -28,11 +28,11 @@ "references": [ { "path": "../../common/web/web-environment", "prepend": true }, - { "path": "../../common/core/web/utils", "prepend": true }, + { "path": "../../common/web/utils", "prepend": true }, { "path": "../../common/predictive-text/browser.tsconfig.json", "prepend": true }, //{ "path": "../../common/web/lm-worker", "prepend": true }, - { "path": "../../common/core/web/input-processor/src", "prepend": true }, - { "path": "../../common/core/web/keyboard-processor/src", "prepend": true }, + { "path": "../../common/web/input-processor/src", "prepend": true }, + { "path": "../../common/web/keyboard-processor/src", "prepend": true }, { "path": "../../common/web/es6-shim", "prepend": true }, { "path": "../../common/web/lm-message-types" } ] diff --git a/web/tools/recorder/build.sh b/web/tools/recorder/build.sh index efefa4018e..a25d6d8426 100755 --- a/web/tools/recorder/build.sh +++ b/web/tools/recorder/build.sh @@ -28,7 +28,7 @@ readonly ENGINE_TEST_OUTPUT # (Facilitates automated setup for build agents.) PATH="../../node_modules/.bin:$PATH" -pushd "$KEYMAN_ROOT/common/core/web/tools/recorder/src" +pushd "$KEYMAN_ROOT/common/web/recorder/src" ./build.sh -skip-package-install || fail "recorder-core compilation failed." popd diff --git a/web/tools/recorder/index.html b/web/tools/recorder/index.html index e61d5ac0c4..41de4fa9ec 100644 --- a/web/tools/recorder/index.html +++ b/web/tools/recorder/index.html @@ -58,7 +58,7 @@ // attachType: 'auto', // }); - + window.addEventListener("onload", function() { keyman.init({ @@ -67,7 +67,7 @@ document.getElementById("body").focus(); }); - + @@ -99,7 +99,7 @@ @@ -117,11 +117,11 @@

Add a keyboard by keyboard name:

- +

Add a keyboard by BCP-47 language code:

- +

Add a keyboard by language name:

@@ -134,7 +134,7 @@

Keyboard Selection

Each defined test set should utilize the same keyboard.

-

Select a keyboard:

+

Select a keyboard:

Please ensure a copy of this keyboard's *.js resides at the specified location within the unit_tests/ folder.

@@ -142,7 +142,7 @@ - +
@@ -179,7 +179,7 @@ - +
@@ -192,7 +192,7 @@

Record input here:

-

You must click 'Set Sequence' to save any changes to an input sequence above +

You must click 'Set Sequence' to save any changes to an input sequence above before continuing input recording, or they will be lost upon new input.

diff --git a/web/tools/recorder/recorder_KeyboardScripts.js b/web/tools/recorder/recorder_KeyboardScripts.js index f738e0bf28..6f10d4836b 100644 --- a/web/tools/recorder/recorder_KeyboardScripts.js +++ b/web/tools/recorder/recorder_KeyboardScripts.js @@ -7,7 +7,7 @@ function loadKeyboards() { // // Both Firefox and Chrome don't like that it's not data: or http:/https: // and will consider the local files to be "remote resource[s]". - commonPrefix = "../../../common/core/web/tests/resources"; + commonPrefix = "../../../common/test/resources"; } var filePrefix = commonPrefix + "/json/keyboards/"; @@ -26,8 +26,8 @@ function loadKeyboards() { loadExistingStubs(preloadFiles); } -// Script to allow a user to add any keyboard to the keyboard menu -function addKeyboard(n) { +// Script to allow a user to add any keyboard to the keyboard menu +function addKeyboard(n) { var sKbd; switch(n) { case 1: @@ -55,8 +55,8 @@ function addKeyboard(n) { } // Add keyboard on Enter (as well as pressing button) -function clickOnEnter(e,id) { +function clickOnEnter(e,id) { e = e || window.event; - if(e.keyCode == 13) addKeyboard(id); + if(e.keyCode == 13) addKeyboard(id); } diff --git a/web/tools/recorder/tsconfig.json b/web/tools/recorder/tsconfig.json index ab01d02186..b7d62e8a93 100644 --- a/web/tools/recorder/tsconfig.json +++ b/web/tools/recorder/tsconfig.json @@ -17,10 +17,10 @@ "references": [ { "path": "../../../common/web/web-environment" }, - { "path": "../../../common/core/web/utils" }, - { "path": "../../../common/core/web/keyboard-processor/src" }, - { "path": "../../../common/core/web/input-processor/src" }, - { "path": "../../../common/core/web/tools/recorder/src" }, + { "path": "../../../common/web/utils" }, + { "path": "../../../common/web/keyboard-processor/src" }, + { "path": "../../../common/web/input-processor/src" }, + { "path": "../../../common/web/recorder/src" }, { "path": "../../../common/web/lm-message-types" } ] } diff --git a/web/unit_tests/base.conf.js b/web/unit_tests/base.conf.js index 686ef440e0..93da9eb456 100644 --- a/web/unit_tests/base.conf.js +++ b/web/unit_tests/base.conf.js @@ -39,15 +39,15 @@ module.exports = { files: [ 'web/unit_tests/modernizr.js', // A dependency-managed utility script that helps with browser feature detection. 'web/unit_tests/dev_resources.js', // Defines com.keyman.dom objects separate from KMW for unit testing. - 'common/core/web/tools/recorder/build/index.js', + 'common/web/recorder/build/index.js', 'web/unit_tests/recorder_InputEvents.js', // The object definitions used to generate/replicate key events for engine tests. // Includes KMW's Device class, which is used by test_utils below. 'web/unit_tests/test_init_check.js', // Ensures that tests will initialize properly 'web/unit_tests/test_utils.js', // A basic utility script useful for constructing tests 'web/unit_tests/cases/**/*.js', // Where the tests actually reside. - 'common/core/web/tests/resources/json/**/*.json', // Where pre-loaded JSON resides. - {pattern: 'common/core/web/tests/resources/fixtures/**/*.html', watched: true}, // HTML structures useful for testing. - {pattern: 'common/core/web/tests/resources/**/*.*', watched: true, served: true, included: false}, // General testing resources. + 'common/test/resources/json/**/*.json', // Where pre-loaded JSON resides. + {pattern: 'common/test/resources/fixtures/**/*.html', watched: true}, // HTML structures useful for testing. + {pattern: 'common/test/resources/**/*.*', watched: true, served: true, included: false}, // General testing resources. {pattern: 'web/release/unminified/web/**/*.css', watched: false, served: true, included: false}, // OSK resources {pattern: 'web/release/unminified/web/**/*.gif', watched: false, served: true, included: false}, // OSK resources {pattern: 'web/release/unminified/web/**/*.png', watched: false, served: true, included: false}, // OSK resources @@ -63,8 +63,8 @@ module.exports = { proxies: { "/source/": "/base/web/release/unminified/web/", - "/resources/": "/base/common/core/web/tests/resources/", - "/source/recorder_InputEvents.js.map": "/base/common/core/web/tests/recorder_InputEvents.js.map" + "/resources/": "/base/common/test/resources/", + "/source/recorder_InputEvents.js.map": "/base/common/tests/recorder_InputEvents.js.map" }, @@ -75,17 +75,17 @@ module.exports = { // preprocess matching files before serving them to the browser // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor preprocessors: { - 'common/core/web/tests/resources/fixtures/**/*.html' : ['html2js'], - 'common/core/web/tests/resources/json/**/*.json' : ['json_fixtures'] + 'common/test/resources/fixtures/**/*.html' : ['html2js'], + 'common/test/resources/json/**/*.json' : ['json_fixtures'] }, html2JsPreprocessor: { - stripPrefix: 'common/core/web/tests/resources/' + stripPrefix: 'common/test/resources/' }, // Settings to properly configure how JSON fixtures are automatically loaded by Karma. jsonFixturesPreprocessor: { - stripPrefix: 'common/core/web/tests/resources/json', + stripPrefix: 'common/test/resources/json', variableName: '__json__' }, diff --git a/web/unit_tests/test.sh b/web/unit_tests/test.sh index c4acc05235..be2076b3be 100755 --- a/web/unit_tests/test.sh +++ b/web/unit_tests/test.sh @@ -129,7 +129,7 @@ cd ../tools/recorder # Run our headless tests first. # First: Web-core tests. -pushd "$KEYMAN_ROOT/common/core/web/input-processor" +pushd "$KEYMAN_ROOT/common/web/input-processor" ./test.sh $HEADLESS_FLAGS || fail "Tests failed by dependencies; aborting integration tests." # Once done, now we run the integrated (KeymanWeb) tests. popd