Commit graph

1827 commits

Author SHA1 Message Date
Marc Durdin
3b5c38aa80 feat(developer): use new memory-based kmx compiler in analyze
* Also adds info messages for scanning.
2023-06-09 12:38:20 +07:00
Marc Durdin
fde428fb70 chore(developer): add logLevel to kmc
Tidies up silent vs quiet vs verbose by adding logLevel as an option.

* Notes that we need to consolidate all the various CompilerOptions
  interfaces before they get too much further out of hand.
* Cleans up a couple of other minor TODO items.
2023-06-09 10:23:06 +07:00
Marc Durdin
1670b3099f chore(developer): cleanup kmc-analyze build.sh 2023-06-09 10:20:54 +07:00
Marc Durdin
b06981fff8 chore(developer): fixup kmc-analyze call in kmc 2023-06-09 06:51:10 +07:00
Marc Durdin
915311c5fc chore(developer): fixup gosh ref 2023-06-09 06:03:28 +07:00
Marc Durdin
427c326682 chore(developer): cleanup kmc-analyze build and test 2023-06-09 05:20:25 +07:00
Marc Durdin
c02b271394 chore: cleanup unneeded changes 2023-06-08 15:17:09 +07:00
Marc Durdin
57d3a4617a chore: cleanup unneeded changes 2023-06-08 15:13:59 +07:00
Marc Durdin
f6e52270ed chore(developer): Merge branch 'feature-kmc-kmw' into feat/developer/kmc-analyze 2023-06-08 14:59:28 +07:00
Marc Durdin
1b4bce7f65 chore(developer): skip c8 test for kmc-kmw for now 2023-06-08 14:42:57 +07:00
Marc Durdin
d3e01f620b chore(developer): split CKF_KEYMANWEB for typescript compiler 2023-06-08 14:42:56 +07:00
Marc Durdin
02fef8ac18 chore(developer): use older pattern for row id
In order to match existing behaviour with the legacy KeymanWeb compiler,
we should use quoted numbers for row ids. This behaviour can probably be
changed over to the new model in the future, but for now this prevents
unit tests from causing us grief.
2023-06-08 14:42:56 +07:00
Marc Durdin
f111aedbe7 chore(developer): rollback temp kmcomp js build stub 2023-06-08 14:42:55 +07:00
Marc Durdin
6421a1f6f4
chore: Apply suggestions from code review
Co-authored-by: Joshua Horton <joshua_horton@sil.org>
2023-06-08 17:34:37 +10:00
Marc Durdin
ba12a063ae
Merge branch 'feature/kmc-kmw' into feat/typescript-keymanweb-compiler 2023-06-08 09:20:55 +10:00
Marc Durdin
483e43ca69 chore(developer): seed kmc-kmw 2023-06-08 06:17:18 +07:00
Marc Durdin
52a08ef21a
Merge pull request #8934 from keymanapp/chore/core/emscripten-location-tweaks
chore(core): look for emcc.py, not emcc
2023-06-07 12:17:35 +10:00
Marc Durdin
044a14f1d9 chore(core): look for emcc.py, not emcc
Relates to #8913.
2023-06-06 07:07:07 +07:00
Marc Durdin
eaf7a6b628 chore(developer): merge changed interfaces in compiler 2023-06-05 16:34:23 +07:00
Marc Durdin
91f985de03 chore(developer): cleanup build.sh 2023-06-05 16:33:38 +07:00
Marc Durdin
eab503a829 chore(developer): roll back CKF_KEYMANWEB_MODERN, not needed 2023-06-05 16:19:41 +07:00
Marc Durdin
9d85712039 chore(developer): rollback unneeded kmcomp changes 2023-06-05 16:10:57 +07:00
Marc Durdin
3f993bd651 chore: Merge branch 'master' into feat/typescript-keymanweb-compiler 2023-06-05 15:57:42 +07:00
Marc Durdin
18a3ef36bc chore(developer): ensure kmcmplib messages are all UTF-8
Fixes #8887.
2023-06-05 15:46:40 +07:00
Marc Durdin
e96cd3af11
Merge pull request #8915 from keymanapp/chore/developer/8888-long-line-test
chore(developer): verify long lines compile correctly
2023-06-04 21:15:46 +10:00
Marc Durdin
16675ef46b
chore: extend from test options in e2e test 2023-06-02 18:54:42 +10:00
Marc Durdin
0ec5c08b26 chore(common): move const url to class prop
We still have cjs modules that rely on the ldml-keyboard-xml-reader, and
this meant that an exported const was being calculated with an invalid
meta url, which crashed the cjs module require() call.
2023-06-02 12:28:13 +07:00
Marc Durdin
d7f22b186f chore(developer): verify long lines compile correctly
Fixes #8888.

Verifies that wrapped lines (ending in \) are handled correctly in
kmcmplib.
2023-06-02 12:01:58 +07:00
Marc Durdin
4e535832d8 chore: cleanup 2023-06-02 11:45:59 +07:00
Marc Durdin
b313272250 chore(common): remove url module ref from common/web/types
The url module is a node module. We need to move responsibility for
resolving the path of the LDML XML <import> statements out of
common/web/types, and into the ultimate consumer, so it's now surfaced
as an option, along with a helper constant that reports the
import.meta.url-relative base path of the standard imports that are
compiled into common/web/types.

This hopefully means we can use this module in both browser and node
contexts without trouble.
2023-06-02 11:38:17 +07:00
Marc Durdin
9a4345c736
Merge pull request #8908 from keymanapp/chore/developer/8885-error-check-loadFile-callback
chore(developer): loadFile callback error check and optimization
2023-06-02 13:21:04 +10:00
Marc Durdin
355b5f9085
Merge pull request #8907 from keymanapp/refactor/developer/8883-move-filename-consistency-check-to-kmc
refactor(developer): move filename consistency check to kmc
2023-06-02 13:20:57 +10:00
Marc Durdin
f762b31d01
Merge pull request #8899 from keymanapp/refactor/developer/8889-kmcmplib-interface-shuffle
refactor(developer): rearrange kmcmplib interface source
2023-06-02 13:20:50 +10:00
Marc Durdin
7301281247 chore(developer): loadFile callback error check and optimization
Fixes #8885.

Adds some optimization and error checking to the loadFile callback in
kmc-kmn. Also handles case of zero-byte bitmap file so we won't crash on
it.
2023-06-01 15:31:31 +07:00
Marc Durdin
c3458d040c refactor(developer): move filename consistency check to kmc
kmcmplib no longer has any filesystem access, so it cannot verify if a
referenced filename in a source file has the same case as the actual
filename on disk (a risk when moving projects between platforms). So
I opted to move this to the `loadFile` callback in kmc, which is the
only place where filesystem is actually accessed, and added
corresponding unit test.

Small additional fixes here:

1. Move from `Buffer` to `Uint8Array` in all kmc-* modules, so that we
   remove that barrier to running on web.
2. Use `callbacks.loadFile` instead of `callbacks.fs.readFileSync`, so
   that we can be sure to run the filename consistency check.
3. Fixed kps parser silently swallowing xml errors on load.
4. Added silent mode to NodeCompilerCallbacks so we could cleanly test
   the new filename consistency hint.
5. Noted a location where we still have NodeJS deps in kmc-ldml.
2023-06-01 15:11:38 +07:00
Marc Durdin
c3ecae4e98 refactor(developer): rearrange kmcmplib interface source
Fixes #8889.

No code changes, just moves WASM interfaces into
CompilerInterfacesWasm.cpp, and CompileKeyboardHandle is renamed to
CompileKeyboardBuffer and moved into its own source file.
2023-06-01 05:29:19 +07:00
Marc Durdin
717b1eea98
chore: Apply code review suggestion
Co-authored-by: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
2023-06-01 08:04:34 +10:00
Marc Durdin
9d351f4798 chore(developer): verify kvks files and report errors
Fixes #8886.

.kvks compiler now returns helpful errors for xml parse failures and
schema validation errors, and for invalid virtual key codes. Introduces
extra infrastructure for reporting and unit testing messages to kmc-kmn.

This also fixes unhandled xml load exceptions and simplifies the error
reporting coming out of the kvks loader, on the basis that only one type
of error was being reported anyway.
2023-06-01 05:02:26 +07:00
Marc Durdin
6f4f20acb8 chore(developer): Add TODO issue numbers to PR 2023-06-01 05:02:24 +07:00
Marc Durdin
47c8a95fb0 refactor(developer): complete fs move out of kmcmplib
* Moves filesystem access out of kmcmplib into kmc-kmn
* Adds filesystem access callback to kmcmplib unit tests
* Cleans up callback interface through wasm
* Adds unit tests for various file load scenarios
* Removes nodefs dependency from kmcmplib wasm build, and removes
  corresponding path mappings which were previously required for wasm
  builds; note that these are still present for the unit tests for
  kmcmplib.
2023-06-01 05:02:23 +07:00
Marc Durdin
980b893644 refactor(developer): move fs for kmn load to caller 2023-06-01 05:02:22 +07:00
Marc Durdin
8edd656edb
Merge pull request #8874 from keymanapp/chore/developer/move-kb-repo-fixtures
chore(developer): move keyboard repo fixtures
2023-05-31 13:28:42 +10:00
Marc Durdin
92278250d5
Merge pull request #8870 from keymanapp/chore/developer/refactor-kmcmplib-interfaces
chore(developer): refactor kmcmplib interfaces
2023-05-31 13:28:30 +10:00
Marc Durdin
8b89ddca5a
Merge pull request #8857 from keymanapp/chore/developer/replace-cwrap-with-bind
chore(developer): replace cwrap wasm bindings
2023-05-31 13:28:21 +10:00
Marc Durdin
f36a908d94 chore(developer): move keyboard repo fixtures
Relocates the keyboard-repo fixtures so we can add other local fixtures
for unit tests.
2023-05-30 13:08:53 +07:00
Marc Durdin
05fe88bb3a chore(developer): remove usekmcmplib flag from kmcomp 2023-05-30 10:57:57 +07:00
Marc Durdin
d763cf315a chore(developer): refactor kmcmplib interfaces
Relates to #8493.

* Removes kmcmplib calls from kmcmpdll (now that we have kmc)
* Removes old kmcmp_CompileKeyboardFile and
  kmcmp_CompileKeyboardFileToBuffer functions in preference for a much
  cleaner kmcmp_CompileKeyboard function
* Removes json validation helper from kmcmplib (we'll use js-native
  json schema validation instead)

This change means that we no longer need to keep compfile.h consistent
between kmcmplib and kmcmpdll. This will simplify upcoming refactoring
of kmcmplib.

kmcmplib no longer writes files, but it does still read them. The next
refactor will move file load responsibility into the caller.
2023-05-30 08:14:23 +07:00
Marc Durdin
62b41d385c
Merge pull request #8856 from keymanapp/chore/developer/remove-seterror
chore(developer): remove SetError macro
2023-05-26 18:43:33 +10:00
Marc Durdin
18c4ac5bb2
Merge pull request #8850 from keymanapp/refactor/developer/wasm-compiler-interface
refactor(developer): compiler interface part 1 for wasm
2023-05-26 18:43:24 +10:00
Marc Durdin
a92917f947 chore(developer): replace cwrap wasm bindings
This moves the remainder of the WASM interfaces in kmcmplib to using
emscripten bind. It is a little bit of a step backwards at present for
parseUnicodeSet, because I've changed the output buffer type to an int
for the purposes of simplifying the binding just now. But that can be
improved later, and at least we are consistent with the binding methods.

Next step is to move the filesystem access out of kmcmplib.
2023-05-25 12:54:27 +07:00