chore(resources): update to latest CLDR preview 🙀 by srl295 · Pull Request #7477 · keymanapp/keyman

srl295 · 2022-10-18T16:17:55Z

Note: there's a commit that does nothing other than sort the existing schema, this is to allow comparison in the later commit.

moved dtd/xsd into the dtd/ subdir - left the schema where they were
brought in 3.0, test subdirs. Now each subdir matches CLDR.
Note, the CLDR xml files don't compile yet! Will work on that in a subsequent PR

Fixes: #7411
reopen of #7471 in the head fork

@keymanapp-test-bot skip

keymanapp-test-bot · 2022-10-18T16:17:58Z

User Test Results

Test specification and instructions

User tests are not required

For: chore(developer): update kmc to latest LDML keyboard DTD version 🙀 #7411

jq -S . > ldml-keyboard.schema.json sort the keys, so that subsequent changes can be reviewed For: chore(developer): update kmc to latest LDML keyboard DTD version 🙀 #7411

CLDR commit: b3c0702a837c4e11193483b85253b11e148fb06b For: chore(developer): update kmc to latest LDML keyboard DTD version 🙀 #7411

- update tooling in common and kmc - update spec - update test files

- dtd is in a subdirectory to match CLDR layout

- backspace is now a transform type. Keep the same test.

CLDR data update from unicode-org/cldr#2469 - displays is not an array #7411

With this change, fr-t-k0-azerty.xml and mt.xml can load without any ERROR 300007: The source file has an invalid structure errors. Other errs show up, but it is progress. Fixes #7411

srl295 · 2022-10-18T19:13:48Z

check/web/file-size — ❌ Oh dear! keymanweb.js is 20,773 bytes (5%) larger than 16.0.82, now 412,265 bytes

What is it pulling in?

mcdurdin · 2022-10-18T20:58:03Z

check/web/file-size — ❌ Oh dear! keymanweb.js is 20,773 bytes (5%) larger than 16.0.82, now 412,265 bytes

What is it pulling in?

I think you'll find your branch is out of date with master, and 16.0.82 has the touch alias element code removed (#7343). The file size check is suboptimal because it compares against latest release version rather than BASE of branch (because we often don't have a build for base of branch, so this is harder to do).

tl;dr: you can ignore it in this instance 😁

srl295 · 2022-10-18T21:04:23Z

#7479 adds on to this to support some standard CLDR files

mcdurdin

Looking good, some polish suggestiosn for the fetch-latest-cldr-techpreview.sh

mcdurdin · 2022-10-19T19:40:37Z

developer/src/kmc/src/kmc.ts

  if(!source) {
-    return null;
+    return [null, null];
  }
  if(!k.validate(source)) {
-    return null;
+    return [null, null];
  }
  let kmx = k.compile(source);
  if(!kmx) {
-    return null;
+    return [null, null];
  }


Good catch 👍

resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd

resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.xsd

resources/standards-data/ldml-keyboards/techpreview/fetch-latest-cldr-techpreview.sh

mcdurdin · 2022-10-19T19:51:45Z

resources/standards-data/ldml-keyboards/techpreview/fetch-latest-cldr-techpreview.sh

+    echo >&2 "$0: error: ${CHECK_1} did not exist"
+    echo >&2 "$0: error: Is ${CLDR_DIR} a valid cldr keyboard directory?"
+    exit 1


Could use die() from build-utils.sh instead with a two-line message?

using die, but how do I get a two line message to die()?

mcdurdin · 2022-10-19T19:51:53Z

resources/standards-data/ldml-keyboards/techpreview/fetch-latest-cldr-techpreview.sh

+    echo >&2 "$0: error: ${CHECK_2} did not exist"
+    echo >&2 "$0: error: Is ${CLDR_DIR} a valid cldr keyboard directory?"
+    exit 1


Could use die() from build-utils.sh instead with a two-line message?

using die, but how do I get a two line message to die()?

Let's improve die() to support multi-line messages: each parameter will be a new line.

…dr-epic-ldml fix(developer): support CLDR sample keyboards 🙀

- also use cp instead of rsync

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

- also fix ${JQ} from $(JQ)

update from 425f591aaa2abbd0016d33a09b967ae7f4847414 PR: unicode-org/cldr#2469

mcdurdin

LGTM

resources/standards-data/ldml-keyboards/techpreview/fetch-latest-cldr-techpreview.sh

mcdurdin · 2022-10-20T19:39:48Z

resources/standards-data/ldml-keyboards/techpreview/fetch-latest-cldr-techpreview.sh

+    echo "${xsd} -> ${json}"
+    (cd .. ; npx -p  jgexml xsd2json techpreview/"${xsd}" techpreview/"${json}") || exit
+    echo 'fixup-schema.js' "${json}"
+    node fixup-schema.js "${json}" || die "failed to fixup schema ${json}"


Technically we don't need die here because of set -e, but LGTM anyway

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

srl295 self-assigned this Oct 18, 2022

srl295 requested review from darcywong00, jahorton, mcdurdin, rc-swag and sgschantz as code owners October 18, 2022 16:17

github-actions bot added common/ common/resources/ Build infrastructure common/web/ core/ Keyman Core developer/ developer/compilers/ chore epic-ldml labels Oct 18, 2022

srl295 added 4 commits October 18, 2022 11:32

feat(resources): tool for fetching later CLDR data 🙀

c6e6c5c

For: chore(developer): update kmc to latest LDML keyboard DTD version 🙀 #7411

chore(resources): sort ldml-keyboard.schema.json 🙀

74a8c6d

jq -S . > ldml-keyboard.schema.json sort the keys, so that subsequent changes can be reviewed For: chore(developer): update kmc to latest LDML keyboard DTD version 🙀 #7411

chore(resources): update to latest keyboard-preview 🙀

fdd410a

CLDR commit: b3c0702a837c4e11193483b85253b11e148fb06b For: chore(developer): update kmc to latest LDML keyboard DTD version 🙀 #7411

chore(developer): ldml: update tools and data for keyboard-preview 🙀

66a5cdb

- update tooling in common and kmc - update spec - update test files

srl295 force-pushed the chore/resources/7411-ldmlupdate-epic-ldml branch from 61b946a to 66a5cdb Compare October 18, 2022 16:33

srl295 added 4 commits October 18, 2022 12:52

chore(developer): update DTD location 🙀

85da473

- dtd is in a subdirectory to match CLDR layout

fix(developer): support updated CLDR structure 🙀

56dcbc9

- backspace is now a transform type. Keep the same test.

chore(resource): pickup DTD fix 🙀

fc1fabf

CLDR data update from unicode-org/cldr#2469 - displays is not an array #7411

fix(developer): fixes for flicks, imports, specials 🙀

8ffba3f

With this change, fr-t-k0-azerty.xml and mt.xml can load without any ERROR 300007: The source file has an invalid structure errors. Other errs show up, but it is progress. Fixes #7411

srl295 added this to the A16S13 milestone Oct 18, 2022

mcdurdin requested changes Oct 19, 2022

View reviewed changes

Merge pull request #7479 from keymanapp/fix/developer/7411-support-cl…

64af829

…dr-epic-ldml fix(developer): support CLDR sample keyboards 🙀

srl295 and others added 2 commits October 19, 2022 15:27

fix(resources) ldml fetcher: include the standard build script

f62abe7

- also use cp instead of rsync

Apply suggestions from code review

9a1bd98

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

srl295 force-pushed the chore/resources/7411-ldmlupdate-epic-ldml branch from b09b63b to b5f6ff9 Compare October 19, 2022 20:38

use 'die' per suggestion

b30af3f

- also fix ${JQ} from $(JQ)

srl295 force-pushed the chore/resources/7411-ldmlupdate-epic-ldml branch from b5f6ff9 to b30af3f Compare October 19, 2022 20:40

chore(resources): ldml: update from keyboard-preview

4296d02

update from 425f591aaa2abbd0016d33a09b967ae7f4847414 PR: unicode-org/cldr#2469

srl295 requested a review from mcdurdin October 19, 2022 20:41

mcdurdin approved these changes Oct 20, 2022

View reviewed changes

Apply suggestions from code review

8934b9f

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

srl295 merged commit be63384 into feature-ldml Oct 20, 2022

srl295 deleted the chore/resources/7411-ldmlupdate-epic-ldml branch October 20, 2022 20:22

Uh oh!

Conversation

srl295 commented Oct 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

keymanapp-test-bot bot commented Oct 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

User Test Results

Uh oh!

srl295 commented Oct 18, 2022

Uh oh!

mcdurdin commented Oct 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

srl295 commented Oct 18, 2022

Uh oh!

mcdurdin left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mcdurdin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

srl295 commented Oct 18, 2022 •

edited

Loading

keymanapp-test-bot bot commented Oct 18, 2022 •

edited

Loading

mcdurdin commented Oct 18, 2022 •

edited

Loading