Merge pull request #12382 from keymanapp/refactor/web/12133_modelsTem…

…plates refactor(web): move `model/templates` to `web/src/engine/predictive/text` 🏗️
keymanapp · Sep 11, 2024 · fe63af0 · fe63af0
2 parents 431c151 + cc21dda
commit fe63af0
Show file tree

Hide file tree

Showing 29 changed files with 35 additions and 35 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -21,7 +21,7 @@ common/:
   - resources/**
 
 common/models/: common/models/**
-common/models/templates/: common/models/templates/**
+common/models/templates/: web/src/engine/predictive-text/templates/**
 common/models/wordbreakers/: common/models/wordbreakers/**
 
 common/resources/: resources/**

diff --git a/developer/src/kmc-model/build.sh b/developer/src/kmc-model/build.sh
@@ -11,7 +11,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_describe "Keyman kmc Lexical Model Compiler module" \
   "@/common/web/keyman-version" \
   "@/developer/src/common/web/test-helpers" \
-  "@/common/models/templates test" \
+  "@/web/src/engine/predictive-text/templates/ test" \
   "clean" \
   "configure" \
   "build" \

diff --git a/package-lock.json b/package-lock.json
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -27,7 +27,7 @@
     "paths": {
       "@keymanapp/common-types": ["./common/web/types/src/main"],
       "@keymanapp/keyman": ["./web" ],
-      "@keymanapp/models-templates": ["./common/models/templates"],
+      "@keymanapp/models-templates": ["./web/src/engine/predictive-text/templates/"],
       "@keymanapp/models-wordbreakers": ["./common/models/wordbreakers"],
       "@keymanapp/web-utils": ["./common/web/utils"],
       "@keymanapp/lm-message-types": ["./web/src/engine/predictive-text/types"],

diff --git a/tsconfig.json b/tsconfig.json
@@ -2,7 +2,7 @@
   "references": [
     { "path": "./core/include/ldml/tsconfig.json" },
 
-    { "path": "./common/models/templates/tsconfig.json" },
+    { "path": "./cweb/src/engine/predictive-text/templates/tsconfig.json" },
     { "path": "./common/models/wordbreakers/tsconfig.json" },
     { "path": "./common/tools/hextobin/" },
 

diff --git a/web/README.md b/web/README.md
@@ -87,7 +87,7 @@ graph TD;
     WebUtils["@keymanapp/web-utils<br>(/common/web/utils)"];
     KeyboardSpec---->WebUtils;
     Wordbreakers["@keymanapp/models-wordbreakers<br>(/common/models/wordbreakers)"];
-    Models["@keymanapp/models-templates<br>(/common/models/templates)"];
+    Models["@keymanapp/models-templates<br>(/web/src/engine/predictive-text/templates/)"];
     Models-->WebUtils;
     LMWorker["@keymanapp/lm-worker<br>(/web/src/engine/predictive-text/worker-thread)"];
     LMWorker-->Models;

diff --git a/common/models/templates/.c8rc.json → ...gine/predictive-text/templates/.c8rc.json b/common/models/templates/.c8rc.json → ...gine/predictive-text/templates/.c8rc.json
diff --git a/common/models/templates/.gitignore → ...gine/predictive-text/templates/.gitignore b/common/models/templates/.gitignore → ...gine/predictive-text/templates/.gitignore
diff --git a/common/models/templates/build.sh → ...engine/predictive-text/templates/build.sh b/common/models/templates/build.sh → ...engine/predictive-text/templates/build.sh
@@ -5,7 +5,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../resources/build/builder.inc.sh"
+. "$(dirname "$THIS_SCRIPT")/../../../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"

diff --git a/common/models/templates/package.json → ...ne/predictive-text/templates/package.json b/common/models/templates/package.json → ...ne/predictive-text/templates/package.json
diff --git a/common/models/templates/src/common.ts → ...e/predictive-text/templates/src/common.ts b/common/models/templates/src/common.ts → ...e/predictive-text/templates/src/common.ts
diff --git a/common/models/templates/src/index.ts → ...ne/predictive-text/templates/src/index.ts b/common/models/templates/src/index.ts → ...ne/predictive-text/templates/src/index.ts
diff --git a/...on/models/templates/src/quote-behavior.ts → ...tive-text/templates/src/quote-behavior.ts b/...on/models/templates/src/quote-behavior.ts → ...tive-text/templates/src/quote-behavior.ts
diff --git a/common/models/templates/src/tokenization.ts → ...ictive-text/templates/src/tokenization.ts b/common/models/templates/src/tokenization.ts → ...ictive-text/templates/src/tokenization.ts
diff --git a/common/models/templates/src/trie-model.ts → ...edictive-text/templates/src/trie-model.ts b/common/models/templates/src/trie-model.ts → ...edictive-text/templates/src/trie-model.ts
diff --git a/...els/templates/test/custom-breakers.def.js → ...ext/templates/test/custom-breakers.def.js b/...els/templates/test/custom-breakers.def.js → ...ext/templates/test/custom-breakers.def.js
diff --git a/...mplates/test/fixtures/tries/accented.json → ...mplates/test/fixtures/tries/accented.json b/...mplates/test/fixtures/tries/accented.json → ...mplates/test/fixtures/tries/accented.json
diff --git a/...tes/test/fixtures/tries/english-1000.json → ...tes/test/fixtures/tries/english-1000.json b/...tes/test/fixtures/tries/english-1000.json → ...tes/test/fixtures/tries/english-1000.json
diff --git a/...plates/test/fixtures/tries/smp-apple.json → ...plates/test/fixtures/tries/smp-apple.json b/...plates/test/fixtures/tries/smp-apple.json → ...plates/test/fixtures/tries/smp-apple.json
diff --git a/common/models/templates/test/helpers.js → ...predictive-text/templates/test/helpers.js b/common/models/templates/test/helpers.js → ...predictive-text/templates/test/helpers.js
diff --git a/common/models/templates/test/test-common.js → ...ictive-text/templates/test/test-common.js b/common/models/templates/test/test-common.js → ...ictive-text/templates/test/test-common.js
diff --git a/...els/templates/test/test-quote-behavior.js → ...ext/templates/test/test-quote-behavior.js b/...els/templates/test/test-quote-behavior.js → ...ext/templates/test/test-quote-behavior.js
diff --git a/...odels/templates/test/test-tokenization.js → ...-text/templates/test/test-tokenization.js b/...odels/templates/test/test-tokenization.js → ...-text/templates/test/test-tokenization.js
diff --git a/.../models/templates/test/test-trie-model.js → ...ve-text/templates/test/test-trie-model.js b/.../models/templates/test/test-trie-model.js → ...ve-text/templates/test/test-trie-model.js
diff --git a/...els/templates/test/test-trie-traversal.js → ...ext/templates/test/test-trie-traversal.js b/...els/templates/test/test-trie-traversal.js → ...ext/templates/test/test-trie-traversal.js
diff --git a/common/models/templates/tsconfig.json → ...e/predictive-text/templates/tsconfig.json b/common/models/templates/tsconfig.json → ...e/predictive-text/templates/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.kmw-worker-base.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "strict": true,
     "baseUrl": "./",
@@ -8,9 +8,9 @@
     "rootDir": "./src"
   },
   "references": [
-    { "path": "../../web/types" },
-    { "path": "../../web/utils" },
-    { "path": "../../models/wordbreakers" }
+    { "path": "../../../../../common/web/types" },
+    { "path": "../../../../../common/web/utils" },
+    { "path": "../../../../../common/models/wordbreakers" }
   ],
   "include": [
 	"src/**/*.ts"

diff --git a/web/src/engine/predictive-text/worker-main/unit_tests/test.sh b/web/src/engine/predictive-text/worker-main/unit_tests/test.sh
@@ -51,10 +51,10 @@ if builder_start_action test:libraries; then
   echo "### Running $(builder_term common/models/wordbreakers) tests"
   "$KEYMAN_ROOT/common/models/wordbreakers/build.sh" test $TEST_OPTS
 
-  pushd "$KEYMAN_ROOT/common/models/templates"
+  pushd "$KEYMAN_ROOT/web/src/engine/predictive-text/templates/"
   echo
-  echo "### Running $(builder_term common/models/templates) tests"
-  "$KEYMAN_ROOT/common/models/templates/build.sh" test $TEST_OPTS
+  echo "### Running $(builder_term web/src/engine/predictive-text/templates/) tests"
+  "$KEYMAN_ROOT/web/src/engine/predictive-text/templates/build.sh" test $TEST_OPTS
   popd
 
   pushd "$KEYMAN_ROOT/web/src/engine/predictive-text/worker-thread"

diff --git a/web/src/engine/predictive-text/worker-thread/build.sh b/web/src/engine/predictive-text/worker-thread/build.sh
@@ -29,7 +29,7 @@ builder_describe \
   "@/common/web/keyman-version" \
   "@/common/web/es-bundling" \
   "@/common/models/wordbreakers" \
-  "@/common/models/templates" \
+  "@/web/src/engine/predictive-text/templates" \
   configure clean build test --ci
 
 builder_describe_outputs \

diff --git a/web/src/engine/predictive-text/worker-thread/tsconfig.json b/web/src/engine/predictive-text/worker-thread/tsconfig.json
@@ -23,7 +23,7 @@
     // modules
     { "path": "../../../../../common/web/keyman-version" },
     { "path": "../../../../../common/web/utils" },
-    { "path": "../../../../../common/models/templates" },
+    { "path": "../templates" },
     { "path": "../../../../../common/models/wordbreakers" },
   ],
   "include": [