Commit graph

115 commits

Author SHA1 Message Date
Steven R. Loomis
f0cc2b56e6
Merge pull request #8436 from keymanapp/fix/developer-8069/todo2-epic-ldml 2023-03-14 21:51:08 -05:00
Steven R. Loomis
f7e5b114cf
Merge pull request #8412 from keymanapp/chore/resources-7042-cldr-update-202303-epic-ldml 2023-03-14 21:50:17 -05:00
Marc Durdin
409b722eb6
Merge pull request #8426 from keymanapp/fix/common-8419
fix(common): fix broken common/web/types cases 🙀
2023-03-15 11:33:44 +11:00
Steven R. Loomis
f7499238a2 fix(core): ldml more TODO-LDML fixes 🙀
- drop some TODO-LDMLs, document others.

For: #8069
2023-03-14 18:54:28 -05:00
Steven R. Loomis
f92cd36125 chore(developer): ldml update compiler for updated spec 🙀
#7042
2023-03-14 17:38:30 -05:00
Steven R. Loomis
5c25bf429f fix(common): fix broken common/web/types cases
Fixes: #8419
2023-03-14 17:34:37 -05:00
Joshua Horton
10518dd62e
Merge pull request #8429 from keymanapp/chore/common/ldml-ts-and-node-updates
chore(common): TS updates to non-sync'd packages, feature-esmodule merge conflict prevention
2023-03-14 12:06:15 +07:00
Joshua A. Horton
2439ba4e97 fix(developer): updates kmc, web/types module resolution, adds missing type import/exports 2023-03-14 08:41:29 +07:00
Joshua A. Horton
0da7ac24be chore(common): updates TS, sets export map for keyman-version 2023-03-14 08:22:26 +07:00
Marc Durdin
92ed99c4d6 chore(common): build script performance improvements
Improves build script performance by:
* using built-ins wherever possible (e.g. string splitting)
* eliminating redundant code
* using absolute (to $KEYMAN_ROOT) rather than relative paths to avoid realpath
* removing unnecessary `npm run` calls

BEFORE                         | AFTER
-------------------------------|----------------------
time ./core/build.sh --help    |
real    0m2.116s               | real    0m0.874s
user    0m0.578s               | user    0m0.198s
sys     0m0.984s               | sys     0m0.289s
-------------------------------|----------------------
time ./web/build.sh --help     |
real    0m3.523s               | real    0m0.757s
user    0m1.166s               | user    0m0.320s
sys     0m2.273s               | sys     0m0.455s
-------------------------------|----------------------
time ./web/build.sh -d         |
real    1m34.750s              | real    0m59.974s
user    0m9.721s               | user    0m6.284s
sys     0m19.652s              | sys     0m13.202s

@keymanapp-test-bot skip
2023-03-13 07:18:09 +07:00
Marc Durdin
be4f036a3c feat(developer): Add support for building a folder to kmc
Relates to #2761.

kmc now supports passing in a folder and building all Keyman source
files found in the folder, even if a .kpj is not present in the folder.

If a .kpj file exists, `KeymanDeveloperProject/Options/Version` will be
checked to determine behaviour. If this field is missing or "1.0", then
the classical behaviour persists.

If the Version field is "2.0", the `Files` key is ignored, and .kmn,
.xml, .model.ts, and .kps files under `sourcePath` are enumerated and
added to the in-memory project for build.

If a .kpj is not present in the folder, a virtual project is constructed
in memory with the following defaults:

* `version`: `2.0`
* `buildPath`: `$PROJECTPATH/build`
* `sourcePath`: `$PROJECTPATH/source`
* `compilerWarningsAsErrors`: `false`
* `warnDeprecatedCode`: `true`
* `checkFilenameConventions`: `true`

It is still considered an error to include both a keyboard and a model
in the same file, but a version 2.0 project will not include the field
determining its type in `Options/ProjectType`; this will instead be
checked during build.

The call to `kmc` can reference a folder or a .kpj file. The .kpj file
must have the same basename as the folder name (e.g.
`khmer_angkor/khmer_angkor.kpj`).

WARNING: this does not add support for 2.0 projects to Keyman Developer;
it is likely that opening a version 2.0 project in Developer will
currently corrupt it.

WARNING: it is not anticipated that kmcomp.exe will be updated to
support version 2.0 projects -- rather kmcomp.exe will be removed before
release of v17, and replaced with kmc.
2023-02-27 13:11:22 +07:00
Marc Durdin
b04489a47b feat(developer): kmc .kpj support
Adds support for building .kpj projects. Required minor tweak to kmcomp
to allow it to build both .kmx and .js from .kmn command line.
Currently, calls kmcomp.exe to build .kmn files, until we support a
cross-platform kmc-kmn C++ project.
2023-02-27 06:14:06 +07:00
Marc Durdin
35c706576b chore(common): export kpj from module 2023-02-26 06:02:43 +07:00
Marc Durdin
647803ef28 feat(common): add .kpj typescript reader and schema 2023-02-25 11:17:39 +07:00
Marc Durdin
a2ceb98948 chore: rewrite extra standard build script prolog 2023-02-23 08:09:41 +07:00
Marc Durdin
a0ecb30a9c
Merge pull request #8265 from keymanapp/feat/developer/epic-ldml/7238-touch-layout-compiler
feat(developer): touch layout compiler for LDML 🙀
2023-02-23 08:47:46 +11:00
Steven R. Loomis
e1e5eea469 feat(core): ldml rename key2 to keys 🙀
- So in summary, since before #7532 basically keys was restructured, and the old 'keys' was moved into 'keys.kmap'.

#8069
2023-02-20 17:40:34 -06:00
Marc Durdin
88df443ba1 feat(developer): touch layout compiler [unfinished] 2023-02-20 10:18:01 +07:00
Steven R. Loomis
83adfdd1c6
Update common/web/types/src/kmx/kmx-plus-builder/build-key2.ts
Co-authored-by: rc-swag <58423624+rc-swag@users.noreply.github.com>
2023-02-16 21:43:45 -06:00
Steven R. Loomis
8ea87aa828 feat(common): ldml: merge keys into key2 🙀 2023-02-16 12:29:19 -06:00
Steven R. Loomis
dd76a1fc36 feat(developer): add -T option to kmc 🙀
- -T converts testdata.xml into testdata.json

#7535
2023-02-15 17:58:52 -06:00
Steven R. Loomis
228cdd6281 feat(common): ldml read keyboard testdata 🙀
- full data test

#7535
2023-02-15 17:58:52 -06:00
Steven R. Loomis
c2556acc4a feat(common): ldml read keyboard testdata 🙀
- full data read

#7535
2023-02-15 17:58:52 -06:00
Steven R. Loomis
9a31e866df feat(common): ldml read keyboard testdata 🙀
- early scaffolding
- with some basic tests

#7535
2023-02-15 17:58:52 -06:00
Steven R. Loomis
ac2366f460 feat(core): ldml C++ updates to modifiers 🙀
- spec: change caps value to 0x100 #7533
- add a 'mod_all'  for validating valid modifier keys, plus tests
- add asserts on C++ side mapping modifiers to keyman constants
- use 'mod_all' to validate modifiers
- further fix modifier -> mod in binary

For: #7985 and related to #7533
2023-02-14 09:23:03 -06:00
Steven R. Loomis
7983fd9609 fix(developer): ldml spec: layr…mod needs to be a bitfield 🙀
- layr.layers.layer.mod needs to be a bit field just as keys.key.mod

Related to #7533
2023-02-14 09:23:03 -06:00
Steven R. Loomis
7c02ab85af feat(core): ldml C++ feature support 🙀
- make ldml.cpp print FAILED on failure especially because of https://github.com/microsoft/vscode-cpptools/issues/487
- add vkey validation (#7135)
- add disp validation
- fix: a latent bug in disp! disp.count was === vkey.count, oops. Fix and test cases.

For: #7985
2023-02-14 09:23:03 -06:00
Steven R. Loomis
a8832ea893
Merge pull request #8172 from keymanapp/feat/developer/7965-morehardware-epic-ldml
feat(common): ldml different hardware support 🙀
2023-02-07 17:06:35 -06:00
Steven R. Loomis
9d6289d420
Merge pull request #8171 from keymanapp/feat/core/7533-modifier-epic-ldml
feat(common): ldml modifier support 🙀
2023-02-07 17:05:55 -06:00
Steven R. Loomis
75fb36b9e0
Merge pull request #8143 from keymanapp/fix/common/7534-more-import-errs-epic-ldml
feat(common): ldml: import error messages from the compiler   🙀
2023-02-06 11:25:20 -06:00
Steven R. Loomis
c4f7f0eb12
Apply suggestions from code review
Co-authored-by: Marc Durdin <marc@durdin.net>
2023-02-06 11:24:24 -06:00
Steven R. Loomis
f74a419bc6 chore: Review comment 2023-02-03 19:03:26 -06:00
Steven R. Loomis
41f77a874c feat(common): ldml different hardware support 🙀
- add HardwareToKeymap in common/web/types
- add a mt-iso keyboard, very close to stock mt.xml
- add machinery for parsing modifier key sequences
- more test machinery
- add assertions against invalid modifier sequences

Fixes: #7965
2023-02-03 19:00:57 -06:00
Steven R. Loomis
af10312f84 feat(common): ldml modifier support 🙀
- spec: update spec for layr.mod field
- core/include/ldm: update constants
- bitfield modelled after s_modifier_names[]  / LCTRLFLAG etc.
- new test case k_004_tinyshift, also update k_010_mt
- update const builder to ignore all *_map properties
- split utility out to utils, add test

For: #7533
(cherry picked from commit 0346bea488)
2023-02-03 18:54:22 -06:00
Steven R. Loomis
6f51be0684 feat(common): ldml: unit tests for import error messages from the compiler 🙀
- test fixup

For: #7534
2023-02-03 18:54:07 -06:00
Steven R. Loomis
7ffd2b94f5 feat(common): ldml: updates to xml loading 🙀
per review comments

- exit-early on import errs

For: #7534
2023-02-03 18:43:06 -06:00
Steven R. Loomis
ac38c277d8 feat(common): ldml: comprehensive import/implied data tests 🙀
For: #7534
(cherry picked from commit 2b64006dba)
2023-02-03 18:43:06 -06:00
Steven R. Loomis
5c357fad81 feat(common): ldml: unit tests for import error messages from the compiler 🙀
- also, change loadFile in callbacks to return null when file isn't found.

For: #7534
(cherry picked from commit 33274dd2c8)
2023-02-03 18:39:51 -06:00
Steven R. Loomis
20c1f5ec9e feat(common): ldml: import error messages from the compiler 🙀
For: #7534
(cherry picked from commit 3a3729e5c6)
2023-02-03 18:38:01 -06:00
Steven R. Loomis
1f594e6cf1 fix(common): test fix for test-ldml-keyboard-xml-reader 2023-02-03 18:24:43 -06:00
Steven R. Loomis
f527caaf0b feat(common): ldml updates to validation errors 🙀
- Apply suggestions from code review
- move m() into common code
- rename several error-related fields and types
- drop the 'unknown AJV error' - we expect errors to be populated
- halt compilation if validation fails, don't press on

For: #7534

Co-authored-by: Marc Durdin <marc@durdin.net>
(cherry picked from commit 05cc200f2027ee3c61280812a2de85ef20ea8b51)
2023-02-03 18:24:43 -06:00
Steven R. Loomis
0a0a9dcc27 feat(common): ldml: error messages from the compiler 🙀
- more refactor into common/web/types
- refactor test harness
- use reportMessage instead of throwing

For: #7964
(cherry picked from commit a112b847c4)
2023-02-03 18:24:43 -06:00
Steven R. Loomis
709c1ccca5 fix(common) make common/web/types kvk tests pass 🙀
- use hexy and git-diff to show a rich diff when files are changed
- add additional round trip tests
- initialize the underlyingLayout to undefined to promote round tripping
- fix an issue with the CompilerCallbacks in the xml tests (broken in #8107)
- fix an issue with the kvk file writer where it should set strings irregardless (#7955)

Fixes #7967, again
2023-01-31 12:15:39 -06:00
Steven R. Loomis
80a001520c chore(common): imports: Apply suggestions from code review 🙀
-  rename compiler.ts to compiler-interfaces.ts

applies to 5a4b44f2d7

Co-authored-by: Marc Durdin <marc@durdin.net>

For: #7534
2023-01-30 21:04:05 -06:00
Steven R. Loomis
a40ee01767 feat(developer): ldml import/implied keys : review comment 🙀
- add a TODO comment about using a custom error class
2023-01-27 13:06:00 -06:00
Steven R. Loomis
bbd850c03b feat(common): ldml: imports: use cldr version from constants 🙀
- common: more robustness in importing.
- build: don't copy imports to kmc which doesn't need it

supports #7964
2023-01-27 12:45:00 -06:00
Steven R. Loomis
a0b184a022 feat(common): ldml: use cldr version from constants 🙀
- update several config files

supports #7964
2023-01-27 12:45:00 -06:00
Steven R. Loomis
e5c5fd025e feat(common): ldml: change importer to use callbacks for fs 🙀
supports #7964
2023-01-27 12:45:00 -06:00
Steven R. Loomis
3eb7f05df6 feat(developer): ldml implied keys work 🙀
- update test cases per review

- review comment
2023-01-27 12:42:18 -06:00
Steven R. Loomis
727056cb87 feat(developer): ldml support implied keys 🙀
- automatically add the import

Fixes: #7964

Apply suggestions from code review

Co-authored-by: Marc Durdin <marc@durdin.net>
2023-01-27 12:41:39 -06:00