chore(common): ldml update out of techpreview 🙀

- updates to support techpreview -> 45 Fixes: #10900
keymanapp · Mar 1, 2024 · d8e773d · d8e773d
1 parent f6bdf64
commit d8e773d
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 30 deletions.
diff --git a/common/web/types/src/ldml-keyboard/ldml-keyboard-xml-reader.ts b/common/web/types/src/ldml-keyboard/ldml-keyboard-xml-reader.ts
@@ -156,15 +156,15 @@ export class LDMLKeyboardXMLSourceFileReader {
     }
     // then, the implied imports
     if (subtag === 'keys') {
-      // <import base="cldr" path="techpreview/keys-Latn-implied.xml"/>
+      // <import base="cldr" path="45/keys-Latn-implied.xml"/>
       if (!this.resolveOneImport(obj, subtag, {
         base: constants.cldr_import_base,
         path: constants.cldr_implied_keys_import
       }, true)) {
         return false;
       }
     } else if (subtag === 'forms') {
-      // <import base="cldr" path="techpreview/scanCodes-implied.xml"/>
+      // <import base="cldr" path="45/scanCodes-implied.xml"/>
       if (!this.resolveOneImport(obj, subtag, {
         base: constants.cldr_import_base,
         path: constants.cldr_implied_forms_import

diff --git a/common/web/types/src/ldml-keyboard/ldml-keyboard-xml.ts b/common/web/types/src/ldml-keyboard/ldml-keyboard-xml.ts
@@ -1,5 +1,5 @@
 //
-// Conforms to techpreview
+// Conforms to 45
 //
 // The interfaces in this file are designed with reference to the mapped
 // structures produced by xml2js when passed a LDML keyboard .xml file.
@@ -40,7 +40,7 @@ export interface LKImport {
    */
   base: string;
   /**
-   * path to imported resource, of the form `techpreview/*.xml`
+   * path to imported resource, of the form `45/*.xml`
    */
   path: string;
 };

diff --git a/common/web/types/test/fixtures/import-minimal.xml b/common/web/types/test/fixtures/import-minimal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="und" conformsTo="techpreview">
+<keyboard3 locale="und" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="Test Minimal Keyboard"/>
 </keyboard3>
diff --git a/common/web/types/test/fixtures/import-minimal1.xml b/common/web/types/test/fixtures/import-minimal1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="und" conformsTo="techpreview">
+<keyboard3 locale="und" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="Test Minimal Keyboard"/>
   <keys>
 

diff --git a/common/web/types/test/fixtures/import-minimal2.xml b/common/web/types/test/fixtures/import-minimal2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="und" conformsTo="techpreview">
+<keyboard3 locale="und" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="Test Minimal Keyboard"/>
   <keys>
     <key id="a" output="å"/> <!-- override -->

diff --git a/common/web/types/test/fixtures/import-symbols.xml b/common/web/types/test/fixtures/import-symbols.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="und" conformsTo="techpreview">
+<keyboard3 locale="und" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="Test Minimal Keyboard"/>
   <keys>
     <import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml"/>

diff --git a/common/web/types/test/fixtures/invalid-import-base.xml b/common/web/types/test/fixtures/invalid-import-base.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="mt" conformsTo="techpreview">
+<keyboard3 locale="mt" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TestKbd"/>
 
   <keys>

diff --git a/common/web/types/test/fixtures/invalid-import-path.xml b/common/web/types/test/fixtures/invalid-import-path.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="mt" conformsTo="techpreview">
+<keyboard3 locale="mt" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TestKbd"/>
 
   <keys>

diff --git a/common/web/types/test/fixtures/invalid-import-readfail.xml b/common/web/types/test/fixtures/invalid-import-readfail.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="mt" conformsTo="techpreview">
+<keyboard3 locale="mt" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TestKbd"/>
 
   <keys>

diff --git a/common/web/types/test/fixtures/invalid-import-wrongroot.xml b/common/web/types/test/fixtures/invalid-import-wrongroot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="mt" conformsTo="techpreview">
+<keyboard3 locale="mt" conformsTo="45">
   <info name="TestKbd" author="srl295" indicator="🙀" layout="qwerty" />
 
 

diff --git a/common/web/types/test/fixtures/invalid-structure-per-dtd.xml b/common/web/types/test/fixtures/invalid-structure-per-dtd.xml
@@ -4,5 +4,5 @@
   DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd"
   Disabling doctype for this invalid file, not used by compiler, and avoids complaints in IDEs etc.
 -->
-<keyboard3 locale="mt" conformsTo="techpreview">
+<keyboard3 locale="mt" conformsTo="45">
 </keyboard3>
diff --git a/common/web/types/test/fixtures/test-fr.xml b/common/web/types/test/fixtures/test-fr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
-<keyboardTest3 conformsTo="techpreview">
+<keyboardTest3 conformsTo="45">
     <!--
       Read by:
       - common/web/types/test/ldml-keyboard/test-ldml-keyboard-testdata-reader.ts

diff --git a/common/web/types/test/ldml-keyboard/test-ldml-keyboard-xml-reader.ts b/common/web/types/test/ldml-keyboard/test-ldml-keyboard-xml-reader.ts
@@ -28,7 +28,7 @@ describe('ldml keyboard xml reader tests', function () {
         instancePath: '/keyboard3/conformsTo',
         keyword: 'enum',
         message: `must be equal to one of the allowed values`,
-        params: 'allowedValues="techpreview"',
+        params: 'allowedValues="45"',
       })],
     },
     {
@@ -113,7 +113,7 @@ describe('ldml keyboard xml reader tests', function () {
       errors: [
         CommonTypesMessages.Error_ImportInvalidPath({
           base: null,
-          path: 'techpreview/too/many/slashes/leading/to/nothing-Zxxx-does-not-exist.xml',
+          path: '45/too/many/slashes/leading/to/nothing-Zxxx-does-not-exist.xml',
           subtag: null,
         }),
       ],
@@ -124,7 +124,7 @@ describe('ldml keyboard xml reader tests', function () {
       errors: [
         CommonTypesMessages.Error_ImportReadFail({
           base: null,
-          path: 'techpreview/none-Zxxx-does-not-exist.xml',
+          path: '45/none-Zxxx-does-not-exist.xml',
           subtag: null,
         }),
       ],
@@ -135,7 +135,7 @@ describe('ldml keyboard xml reader tests', function () {
       errors: [
         CommonTypesMessages.Error_ImportWrongRoot({
           base: null,
-          path: 'techpreview/keys-Zyyy-punctuation.xml',
+          path: '45/keys-Zyyy-punctuation.xml',
           subtag: 'flicks',
         }),
       ],

diff --git a/core/include/ldml/keyman_core_ldml.h b/core/include/ldml/keyman_core_ldml.h
@@ -16,11 +16,10 @@
 #pragma once
 
 #define LDML_BKSP_FLAGS_ERROR 0x1
-#define LDML_CLDR_IMPLIED_FORMS_IMPORT "techpreview/scanCodes-implied.xml"
-#define LDML_CLDR_IMPLIED_KEYS_IMPORT "techpreview/keys-Latn-implied.xml"
+#define LDML_CLDR_IMPLIED_FORMS_IMPORT "45/scanCodes-implied.xml"
+#define LDML_CLDR_IMPLIED_KEYS_IMPORT "45/keys-Latn-implied.xml"
 #define LDML_CLDR_IMPORT_BASE "cldr"
-#define LDML_CLDR_VERSION_LATEST "techpreview"
-#define LDML_CLDR_VERSION_TECHPREVIEW "techpreview"
+#define LDML_CLDR_VERSION_LATEST "45"
 #define LDML_ELEM_FLAGS_ORDER_BITSHIFT 0x10
 #define LDML_ELEM_FLAGS_ORDER_MASK 0xFF0000
 #define LDML_ELEM_FLAGS_PREBASE 0x8

diff --git a/core/include/ldml/keyman_core_ldml.ts b/core/include/ldml/keyman_core_ldml.ts
@@ -57,25 +57,21 @@ class Constants {
    */
   readonly version = '1.0';
   /**
-   * The techpreview CLDR version
+   * The current CLDR version
    */
-  readonly cldr_version_techpreview = 'techpreview';
-  /**
-   * The latest CLDR version
-   */
-  readonly cldr_version_latest = this.cldr_version_techpreview;
+  readonly cldr_version_latest = '45';
   /**
    * import base
    */
   readonly cldr_import_base = 'cldr';
   /**
    * implied keys file
    */
-  readonly cldr_implied_keys_import = `${this.cldr_version_techpreview}/keys-Latn-implied.xml`;
+  readonly cldr_implied_keys_import = `${this.cldr_version_latest}/keys-Latn-implied.xml`;
   /**
    * implied scancodes file
    */
-  readonly cldr_implied_forms_import = `${this.cldr_version_techpreview}/scanCodes-implied.xml`;
+  readonly cldr_implied_forms_import = `${this.cldr_version_latest}/scanCodes-implied.xml`;
   /**
    * Length of a raw section header, in bytes
    */