@keymanapp/kmc 17.0.81-alpha → 17.0.83-alpha

package/build/cjs-src/kmc.cjs

@@ -180767,8 +180767,10 @@ var KVKFile = class {
 // ../../../common/web/types/src/consts/virtual-key-constants.ts
 var virtual_key_constants_exports = {};
 __export(virtual_key_constants_exports, {
+  ABNT2VirtualKeyMap: () => ABNT2VirtualKeyMap,
   HardwareToKeymap: () => HardwareToKeymap,
   ISOVirtualKeyMap: () => ISOVirtualKeyMap,
+  JISVirtualKeyMap: () => JISVirtualKeyMap,
   LdmlVkeyNames: () => LdmlVkeyNames,
   USVirtualKeyCodes: () => USVirtualKeyCodes,
   USVirtualKeyMap: () => USVirtualKeyMap
@@ -180901,10 +180903,26 @@ var ISOVirtualKeyMap = [
   [k.K_oE2, k.K_Z, k.K_X, k.K_C, k.K_V, k.K_B, k.K_N, k.K_M, k.K_COMMA, k.K_PERIOD, k.K_SLASH],
   [k.K_SPACE]
 ];
+var JISVirtualKeyMap = [
+  [k.K_1, k.K_2, k.K_3, k.K_4, k.K_5, k.K_6, k.K_7, k.K_8, k.K_9, k.K_0, k.K_HYPHEN, k.K_EQUAL, k.K_oE2],
+  [k.K_Q, k.K_W, k.K_E, k.K_R, k.K_T, k.K_Y, k.K_U, k.K_I, k.K_O, k.K_P, k.K_BKQUOTE, k.K_LBRKT],
+  [k.K_A, k.K_S, k.K_D, k.K_F, k.K_G, k.K_H, k.K_J, k.K_K, k.K_L, k.K_COLON, k.K_QUOTE, k.K_BKSLASH],
+  [k.K_Z, k.K_X, k.K_C, k.K_V, k.K_B, k.K_N, k.K_M, k.K_COMMA, k.K_PERIOD, k.K_SLASH, k.k_oC1],
+  [k.K_SPACE]
+];
+var ABNT2VirtualKeyMap = [
+  [k.K_BKQUOTE, k.K_1, k.K_2, k.K_3, k.K_4, k.K_5, k.K_6, k.K_7, k.K_8, k.K_9, k.K_0, k.K_HYPHEN, k.K_EQUAL],
+  [k.K_Q, k.K_W, k.K_E, k.K_R, k.K_T, k.K_Y, k.K_U, k.K_I, k.K_O, k.K_P, k.K_LBRKT, k.K_RBRKT],
+  [k.K_A, k.K_S, k.K_D, k.K_F, k.K_G, k.K_H, k.K_J, k.K_K, k.K_L, k.K_COLON, k.K_QUOTE, k.K_BKSLASH],
+  [k.K_oE2, k.K_Z, k.K_X, k.K_C, k.K_V, k.K_B, k.K_N, k.K_M, k.K_COMMA, k.K_PERIOD, k.K_SLASH, k.k_oC1],
+  [k.K_SPACE]
+];
 var HardwareToKeymap = /* @__PURE__ */ new Map(
   [
     ["us", USVirtualKeyMap],
-    ["iso", ISOVirtualKeyMap]
+    ["iso", ISOVirtualKeyMap],
+    ["jis", JISVirtualKeyMap],
+    ["abnt2", ABNT2VirtualKeyMap]
   ]
 );
 var LdmlVkeyNames = {
@@ -181675,7 +181693,7 @@ __publicField(CompilerMessages, "Error_InvalidLocale", (o) => CompilerMessageSpe
 __publicField(CompilerMessages, "ERROR_InvalidLocale", SevError2 | 2);
 __publicField(CompilerMessages, "Error_HardwareLayerHasTooManyRows", () => CompilerMessageSpec(_CompilerMessages.ERROR_HardwareLayerHasTooManyRows, `'hardware' layer has too many rows`));
 __publicField(CompilerMessages, "ERROR_HardwareLayerHasTooManyRows", SevError2 | 3);
-__publicField(CompilerMessages, "Error_RowOnHardwareLayerHasTooManyKeys", (o) => CompilerMessageSpec(_CompilerMessages.ERROR_RowOnHardwareLayerHasTooManyKeys, `Row #${o.row} on 'hardware' ${o.hardware} layer has too many keys`));
+__publicField(CompilerMessages, "Error_RowOnHardwareLayerHasTooManyKeys", (o) => CompilerMessageSpec(_CompilerMessages.ERROR_RowOnHardwareLayerHasTooManyKeys, `Row #${o.row} on 'hardware' ${o.hardware} layer for modifier ${o.modifier || "none"} has too many keys`));
 __publicField(CompilerMessages, "ERROR_RowOnHardwareLayerHasTooManyKeys", SevError2 | 4);
 __publicField(CompilerMessages, "Error_KeyNotFoundInKeyBag", (o) => CompilerMessageSpec(_CompilerMessages.ERROR_KeyNotFoundInKeyBag, `Key '${o.keyId}' in position #${o.col} on row #${o.row} of layer ${o.layer}, form '${o.form}' not found in key bag`));
 __publicField(CompilerMessages, "ERROR_KeyNotFoundInKeyBag", SevError2 | 5);
@@ -182052,7 +182070,8 @@ var KeysCompiler = class extends SectionCompiler {
     }
     const keymap = virtual_key_constants_exports.HardwareToKeymap.get(hardware);
     if (!keymap) {
-      throw Error(`TODO-LDML: ${hardware} not supported, see #8161`);
+      this.callbacks.reportMessage(CompilerMessages.Error_InvalidHardware({ form: hardware }));
+      valid = false;
     }
     const uniqueKeys = calculateUniqueKeys([...this.keyboard.keys?.key]);
     if (layer.row.length > keymap.length) {
@@ -182062,7 +182081,7 @@ var KeysCompiler = class extends SectionCompiler {
     for (let y = 0; y < layer.row.length && y < keymap.length; y++) {
       const keys = layer.row[y].keys.split(" ");
       if (keys.length > keymap[y].length) {
-        this.callbacks.reportMessage(CompilerMessages.Error_RowOnHardwareLayerHasTooManyKeys({ row: y + 1, hardware }));
+        this.callbacks.reportMessage(CompilerMessages.Error_RowOnHardwareLayerHasTooManyKeys({ row: y + 1, hardware, modifier }));
         valid = false;
       }
       let x = -1;

package/package.json

@@ -69,5 +69,5 @@
     "type": "git",
     "url": "git+https://github.com/keymanapp/keyman.git"
   },
-  "version": "17.0.81-alpha"
+  "version": "17.0.83-alpha"
 }