@keymanapp/kmc 17.0.65-alpha → 17.0.69-alpha

package/build/cjs-src/kmc.cjs

@@ -178041,6 +178041,22 @@ var fs = __toESM(require("fs"), 1);
 var path = __toESM(require("path"), 1);
 var xml2js = __toESM(require_xml2js(), 1);
 var import_jszip = __toESM(require_lib4(), 1);
+
+// ../../../common/web/keyman-version/keyman-version.mts
+var KEYMAN_VERSION2 = class {
+};
+__publicField(KEYMAN_VERSION2, "VERSION", "17.0.58");
+__publicField(KEYMAN_VERSION2, "VERSION_RELEASE", "17.0");
+__publicField(KEYMAN_VERSION2, "VERSION_MAJOR", "17");
+__publicField(KEYMAN_VERSION2, "VERSION_MINOR", "0");
+__publicField(KEYMAN_VERSION2, "VERSION_PATCH", "58");
+__publicField(KEYMAN_VERSION2, "TIER", "alpha");
+__publicField(KEYMAN_VERSION2, "VERSION_TAG", "-alpha");
+__publicField(KEYMAN_VERSION2, "VERSION_WITH_TAG", "17.0.58-alpha");
+__publicField(KEYMAN_VERSION2, "VERSION_ENVIRONMENT", "alpha");
+__publicField(KEYMAN_VERSION2, "SENTRY_RELEASE", "release-17.0.58-alpha");
+
+// ../kmc-package/src/kmp-compiler.ts
 var FILEVERSION_KMP_JSON = "12.0";
 var KmpCompiler = class {
   transformKpsToKmpObject(kpsString, kpsPath) {
@@ -178059,7 +178075,7 @@ var KmpCompiler = class {
     let kmp = {
       system: {
         fileVersion: FILEVERSION_KMP_JSON,
-        keymanDeveloperVersion: KEYMAN_VERSION.VERSION
+        keymanDeveloperVersion: KEYMAN_VERSION2.VERSION
       },
       options: {}
     };
@@ -180998,6 +181014,7 @@ var VisualKeyboardLegalShiftStates = [
 // ../../../common/web/types/src/kvk/kvks-file-reader.ts
 var xml2js2 = __toESM(require_xml2js(), 1);
 var import_ajv = __toESM(require_ajv(), 1);
+var Ajv = import_ajv.default.default;
 
 // ../../../common/web/types/src/kvk/kvk-file-writer.ts
 var KvkFileWriter = class {
@@ -181110,6 +181127,7 @@ __publicField(CommonTypesMessages, "ERROR_TestDataUnexpectedAction", SevError |
 
 // ../../../common/web/types/src/ldml-keyboard/ldml-keyboard-xml-reader.ts
 var import_meta2 = {};
+var Ajv2 = import_ajv2.default.default;
 var _LDMLKeyboardXMLSourceFileReader = class {
   callbacks;
   constructor(callbacks) {
@@ -181243,7 +181261,7 @@ var _LDMLKeyboardXMLSourceFileReader = class {
   }
   validate(source, schemaSource) {
     const schema = JSON.parse(schemaSource.toString("utf8"));
-    const ajv = new import_ajv2.default();
+    const ajv = new Ajv2();
     if (!ajv.validate(schema, source)) {
       for (let err of ajv.errors) {
         this.callbacks.reportMessage(CommonTypesMessages.Error_SchemaValidationError({
@@ -181376,6 +181394,7 @@ __publicField(LDMLKeyboardXMLSourceFileReader, "defaultMapper", (o, r) => o?.$);
 
 // ../../../common/web/types/src/keyman-touch-layout/keyman-touch-layout-file-reader.ts
 var import_ajv3 = __toESM(require_ajv(), 1);
+var Ajv3 = import_ajv3.default.default;
 
 // ../../../common/web/types/src/keyman-touch-layout/keyman-touch-layout-file-writer.ts
 var TouchLayoutFileWriter = class {
@@ -181543,6 +181562,7 @@ var KeymanDeveloperProjectFile20 = class {
 };
 
 // ../../../common/web/types/src/kpj/kpj-file-reader.ts
+var Ajv4 = import_ajv4.default.default;
 var KPJFileReader = class {
   read(file) {
     let data;
@@ -181561,7 +181581,7 @@ var KPJFileReader = class {
   }
   validate(source, schemaBuffer) {
     const schema = JSON.parse(schemaBuffer.toString("utf8"));
-    const ajv = new import_ajv4.default();
+    const ajv = new Ajv4();
     if (!ajv.validate(schema, source)) {
       throw new Error(ajv.errorsText());
     }
@@ -181683,36 +181703,26 @@ __publicField(CompilerMessages, "Error_DisplayIsRepeated", (o) => CompilerMessag
 __publicField(CompilerMessages, "ERROR_DisplayIsRepeated", SevError2 | 16);
 __publicField(CompilerMessages, "Error_KeyMissingToGapOrSwitch", (o) => CompilerMessageSpec(_CompilerMessages.ERROR_KeyMissingToGapOrSwitch, `key id='${o.keyId}' must have either to=, gap=, or switch=.`));
 __publicField(CompilerMessages, "ERROR_KeyMissingToGapOrSwitch", SevError2 | 17);
-__publicField(CompilerMessages, "Error_MustHaveAtMostOneLayersElementPerForm", (o) => CompilerMessageSpec(
-  _CompilerMessages.ERROR_MustHaveAtMostOneLayersElementPerForm,
-  `Must have at most one layers element with form=${o.form}`
+__publicField(CompilerMessages, "Error_ExcessHardware", (o) => CompilerMessageSpec(
+  _CompilerMessages.ERROR_ExcessHardware,
+  `layers form=${o.form}: Can only have one non-'touch' element`
 ));
-__publicField(CompilerMessages, "ERROR_MustHaveAtMostOneLayersElementPerForm", SevError2 | 18);
-__publicField(CompilerMessages, "Error_NoHardwareOnTouch", (o) => CompilerMessageSpec(
-  _CompilerMessages.ERROR_NoHardwareOnTouch,
-  `Not allowed: form=touch with hardware=${o.hardware}`
-));
-__publicField(CompilerMessages, "ERROR_NoHardwareOnTouch", SevError2 | 19);
-__publicField(CompilerMessages, "Error_MissingHardware", () => CompilerMessageSpec(
-  _CompilerMessages.ERROR_MissingHardware,
-  `layers form=hardware missing hardware= attribute`
-));
-__publicField(CompilerMessages, "ERROR_MissingHardware", SevError2 | 20);
+__publicField(CompilerMessages, "ERROR_ExcessHardware", SevError2 | 18);
 __publicField(CompilerMessages, "Error_InvalidHardware", (o) => CompilerMessageSpec(
   _CompilerMessages.ERROR_InvalidHardware,
-  `layers has invalid value hardware=${o.hardware}`
+  `layers has invalid value form=${o.form}`
 ));
-__publicField(CompilerMessages, "ERROR_InvalidHardware", SevError2 | 21);
+__publicField(CompilerMessages, "ERROR_InvalidHardware", SevError2 | 19);
 __publicField(CompilerMessages, "Error_InvalidModifier", (o) => CompilerMessageSpec(
   _CompilerMessages.ERROR_InvalidModifier,
   `layer has invalid modifier='${o.modifier}' on layer id=${o.layer}`
 ));
-__publicField(CompilerMessages, "ERROR_InvalidModifier", SevError2 | 22);
+__publicField(CompilerMessages, "ERROR_InvalidModifier", SevError2 | 20);
 __publicField(CompilerMessages, "Error_MissingFlicks", (o) => CompilerMessageSpec(
   _CompilerMessages.ERROR_MissingFlicks,
   `key id=${o.id} refers to missing flicks=${o.flicks}`
 ));
-__publicField(CompilerMessages, "ERROR_MissingFlicks", SevError2 | 23);
+__publicField(CompilerMessages, "ERROR_MissingFlicks", SevError2 | 21);
 
 // ../kmc-keyboard/src/compiler/section-compiler.ts
 var SectionCompiler = class {
@@ -181929,6 +181939,9 @@ var KeysCompiler = class extends SectionCompiler {
   get id() {
     return constants.section.keys;
   }
+  hardwareLayers() {
+    return this.keyboard.layers?.filter(({ form }) => form !== "touch");
+  }
   validate() {
     let valid = true;
     const usedKeys = allUsedKeyIdsInLayers(this.keyboard?.layers);
@@ -181947,15 +181960,14 @@ var KeysCompiler = class extends SectionCompiler {
         this.callbacks.reportMessage(CompilerMessages.Error_MissingFlicks({ flicks, id }));
       }
     }
-    const theLayers = this.keyboard.layers?.[0];
-    if (!theLayers?.layer?.length) {
-      valid = false;
-      this.callbacks.reportMessage(CompilerMessages.Error_MustBeAtLeastOneLayerElement());
-    }
-    if (theLayers?.form == "hardware") {
-      for (let layer of theLayers?.layer) {
-        valid = this.validateHardwareLayerForKmap(theLayers?.hardware, layer) && valid;
+    const hardwareLayers = this.hardwareLayers();
+    if (hardwareLayers.length >= 1) {
+      for (let layers of hardwareLayers) {
+        for (let layer of layers.layer) {
+          valid = this.validateHardwareLayerForKmap(layers.form, layer) && valid;
+        }
       }
+    } else {
     }
     return valid;
   }
@@ -181966,12 +181978,15 @@ var KeysCompiler = class extends SectionCompiler {
     let sect = new Keys2(sections.strs);
     this.loadFlicks(sections, sect);
     this.loadKeys(sections, sect);
-    const theLayers = this.keyboard.layers?.[0];
-    if (theLayers?.form == "hardware") {
+    const hardwareLayers = this.hardwareLayers();
+    if (hardwareLayers.length > 1) {
+      throw Error(`Internal error: Expected 0 or 1 hardware layer, not ${hardwareLayers.length}`);
+    } else if (hardwareLayers.length === 1) {
+      const theLayers = hardwareLayers[0];
+      const { form } = theLayers;
       for (let layer of theLayers.layer) {
-        this.compileHardwareLayerToKmap(sections, layer, sect, theLayers.hardware);
+        this.compileHardwareLayerToKmap(sections, layer, sect, form);
       }
-      return sect;
     }
     return sect;
   }
@@ -182037,9 +182052,7 @@ var KeysCompiler = class extends SectionCompiler {
     }
     const keymap = virtual_key_constants_exports.HardwareToKeymap.get(hardware);
     if (!keymap) {
-      this.callbacks.reportMessage(CompilerMessages.Error_InvalidHardware({ hardware }));
-      valid = false;
-      return valid;
+      throw Error(`TODO-LDML: ${hardware} not supported, see #8161`);
     }
     const uniqueKeys = calculateUniqueKeys([...this.keyboard.keys?.key]);
     if (layer.row.length > keymap.length) {
@@ -182099,50 +182112,41 @@ var LayrCompiler = class extends SectionCompiler {
   }
   validate() {
     let valid = true;
-    if (!this.keyboard.layers?.[0]?.layer?.length) {
-      valid = false;
-      this.callbacks.reportMessage(CompilerMessages.Error_MustBeAtLeastOneLayerElement());
-    }
+    let totalLayerCount = 0;
     let hardwareLayers = 0;
-    this.keyboard.layers.forEach((layers) => {
-      const { hardware, form } = layers;
+    this.keyboard.layers?.forEach((layers) => {
+      const { form } = layers;
       if (form === "touch") {
-        if (hardware) {
-          valid = false;
-          this.callbacks.reportMessage(CompilerMessages.Error_NoHardwareOnTouch({ hardware }));
-        }
-      } else if (form === "hardware") {
+        totalLayerCount += layers.layer?.length;
+      } else {
         hardwareLayers++;
-        if (!hardware) {
-          valid = false;
-          this.callbacks.reportMessage(CompilerMessages.Error_MissingHardware());
-        } else if (!constants.layr_list_hardware_map.get(hardware)) {
+        if (hardwareLayers > 1) {
           valid = false;
-          this.callbacks.reportMessage(CompilerMessages.Error_InvalidHardware({ hardware }));
-        } else if (hardwareLayers > 1) {
+          this.callbacks.reportMessage(CompilerMessages.Error_ExcessHardware({ form }));
+        } else if (!constants.layr_list_hardware_map.get(form)) {
           valid = false;
-          this.callbacks.reportMessage(CompilerMessages.Error_MustHaveAtMostOneLayersElementPerForm({ form }));
+          this.callbacks.reportMessage(CompilerMessages.Error_InvalidHardware({ form }));
         }
-      } else {
-        valid = false;
-        this.callbacks.reportMessage(CompilerMessages.Error_InvalidFile({
-          errorText: `INTERNAL ERROR: Invalid XML: Invalid form="${form}" on layers element`
-        }));
       }
       layers.layer.forEach((layer) => {
         const { modifier, id } = layer;
+        totalLayerCount++;
         if (!validModifier(modifier)) {
           this.callbacks.reportMessage(CompilerMessages.Error_InvalidModifier({ modifier, layer: id }));
           valid = false;
         }
       });
     });
+    if (totalLayerCount === 0) {
+      valid = false;
+      this.callbacks.reportMessage(CompilerMessages.Error_MustBeAtLeastOneLayerElement());
+    }
     return valid;
   }
   compile(sections) {
     const sect = new Layr2();
     sect.lists = this.keyboard.layers.map((layers) => {
-      const hardware = constants.layr_list_hardware_map.get(layers.hardware || "touch");
+      const hardware = constants.layr_list_hardware_map.get(layers.form);
       const list = {
         hardware,
         minDeviceWidth: layers.minDeviceWidth || 0,

package/build/cjs-src/kmlmi.cjs

@@ -6,6 +6,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
@@ -21,6 +22,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 
 // node_modules/commander/lib/error.js
 var require_error = __commonJS({
@@ -17003,19 +17008,19 @@ var path = __toESM(require("path"), 1);
 var xml2js = __toESM(require_xml2js(), 1);
 var import_jszip = __toESM(require_lib4(), 1);
 
-// ../../../common/web/keyman-version/build/keyman-version.mjs
+// ../../../common/web/keyman-version/keyman-version.mts
 var KEYMAN_VERSION = class {
 };
-KEYMAN_VERSION.VERSION = "17.0.58";
-KEYMAN_VERSION.VERSION_RELEASE = "17.0";
-KEYMAN_VERSION.VERSION_MAJOR = "17";
-KEYMAN_VERSION.VERSION_MINOR = "0";
-KEYMAN_VERSION.VERSION_PATCH = "58";
-KEYMAN_VERSION.TIER = "alpha";
-KEYMAN_VERSION.VERSION_TAG = "-alpha";
-KEYMAN_VERSION.VERSION_WITH_TAG = "17.0.58-alpha";
-KEYMAN_VERSION.VERSION_ENVIRONMENT = "alpha";
-KEYMAN_VERSION.SENTRY_RELEASE = "release-17.0.58-alpha";
+__publicField(KEYMAN_VERSION, "VERSION", "17.0.58");
+__publicField(KEYMAN_VERSION, "VERSION_RELEASE", "17.0");
+__publicField(KEYMAN_VERSION, "VERSION_MAJOR", "17");
+__publicField(KEYMAN_VERSION, "VERSION_MINOR", "0");
+__publicField(KEYMAN_VERSION, "VERSION_PATCH", "58");
+__publicField(KEYMAN_VERSION, "TIER", "alpha");
+__publicField(KEYMAN_VERSION, "VERSION_TAG", "-alpha");
+__publicField(KEYMAN_VERSION, "VERSION_WITH_TAG", "17.0.58-alpha");
+__publicField(KEYMAN_VERSION, "VERSION_ENVIRONMENT", "alpha");
+__publicField(KEYMAN_VERSION, "SENTRY_RELEASE", "release-17.0.58-alpha");
 
 // ../kmc-package/src/kmp-compiler.ts
 var FILEVERSION_KMP_JSON = "12.0";
@@ -17228,10 +17233,24 @@ function writeMergedModelMetadataFile(sourceModelInfoFileName, destModelInfoFile
   fs2.writeFileSync(destModelInfoFileName, JSON.stringify(model_info, null, 2));
 }
 
+// ../../../common/web/keyman-version/build/keyman-version.mjs
+var KEYMAN_VERSION2 = class {
+};
+KEYMAN_VERSION2.VERSION = "17.0.58";
+KEYMAN_VERSION2.VERSION_RELEASE = "17.0";
+KEYMAN_VERSION2.VERSION_MAJOR = "17";
+KEYMAN_VERSION2.VERSION_MINOR = "0";
+KEYMAN_VERSION2.VERSION_PATCH = "58";
+KEYMAN_VERSION2.TIER = "alpha";
+KEYMAN_VERSION2.VERSION_TAG = "-alpha";
+KEYMAN_VERSION2.VERSION_WITH_TAG = "17.0.58-alpha";
+KEYMAN_VERSION2.VERSION_ENVIRONMENT = "alpha";
+KEYMAN_VERSION2.SENTRY_RELEASE = "release-17.0.58-alpha";
+
 // build/src/kmlmi.js
 var inputFilename;
 var program2 = new Command();
-program2.description("Merges Keyman lexical model model_info files. Intended for use within the keymanapp/lexical-models repository.").version(KEYMAN_VERSION.VERSION_WITH_TAG).arguments("<infile>").action((infile) => inputFilename = infile).option("-o, --outFile <filename>", "where to save the resultant file").option("-m, --model <model_id>", "model id, defaults to basename of input file sans .model_info extension").option("-s, --source <source>", "path to source of model, relative to lexical-models repo root").option("--kpsFilename <kpsFilename>", "path to .model.kps file, defaults to source/<model_id>.model.kps").option("--kmpFilename <kmpFilename>", "path to .model.kmp file, defaults to build/<model_id>.model.kmp").option("--jsFilename <jsFilename>", "path to .model.js file, defaults to build/<model_id>.model.js");
+program2.description("Merges Keyman lexical model model_info files. Intended for use within the keymanapp/lexical-models repository.").version(KEYMAN_VERSION2.VERSION_WITH_TAG).arguments("<infile>").action((infile) => inputFilename = infile).option("-o, --outFile <filename>", "where to save the resultant file").option("-m, --model <model_id>", "model id, defaults to basename of input file sans .model_info extension").option("-s, --source <source>", "path to source of model, relative to lexical-models repo root").option("--kpsFilename <kpsFilename>", "path to .model.kps file, defaults to source/<model_id>.model.kps").option("--kmpFilename <kmpFilename>", "path to .model.kmp file, defaults to build/<model_id>.model.kmp").option("--jsFilename <jsFilename>", "path to .model.js file, defaults to build/<model_id>.model.js");
 program2.parse(process.argv);
 if (!inputFilename) {
   exitDueToUsageError("Must provide a lexical model .model_info source file.");

package/build/cjs-src/kmlmp.cjs

@@ -6,6 +6,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
@@ -21,6 +22,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 
 // node_modules/commander/lib/error.js
 var require_error = __commonJS({
@@ -17002,19 +17007,19 @@ var path = __toESM(require("path"), 1);
 var xml2js = __toESM(require_xml2js(), 1);
 var import_jszip = __toESM(require_lib4(), 1);
 
-// ../../../common/web/keyman-version/build/keyman-version.mjs
+// ../../../common/web/keyman-version/keyman-version.mts
 var KEYMAN_VERSION = class {
 };
-KEYMAN_VERSION.VERSION = "17.0.58";
-KEYMAN_VERSION.VERSION_RELEASE = "17.0";
-KEYMAN_VERSION.VERSION_MAJOR = "17";
-KEYMAN_VERSION.VERSION_MINOR = "0";
-KEYMAN_VERSION.VERSION_PATCH = "58";
-KEYMAN_VERSION.TIER = "alpha";
-KEYMAN_VERSION.VERSION_TAG = "-alpha";
-KEYMAN_VERSION.VERSION_WITH_TAG = "17.0.58-alpha";
-KEYMAN_VERSION.VERSION_ENVIRONMENT = "alpha";
-KEYMAN_VERSION.SENTRY_RELEASE = "release-17.0.58-alpha";
+__publicField(KEYMAN_VERSION, "VERSION", "17.0.58");
+__publicField(KEYMAN_VERSION, "VERSION_RELEASE", "17.0");
+__publicField(KEYMAN_VERSION, "VERSION_MAJOR", "17");
+__publicField(KEYMAN_VERSION, "VERSION_MINOR", "0");
+__publicField(KEYMAN_VERSION, "VERSION_PATCH", "58");
+__publicField(KEYMAN_VERSION, "TIER", "alpha");
+__publicField(KEYMAN_VERSION, "VERSION_TAG", "-alpha");
+__publicField(KEYMAN_VERSION, "VERSION_WITH_TAG", "17.0.58-alpha");
+__publicField(KEYMAN_VERSION, "VERSION_ENVIRONMENT", "alpha");
+__publicField(KEYMAN_VERSION, "SENTRY_RELEASE", "release-17.0.58-alpha");
 
 // ../kmc-package/src/kmp-compiler.ts
 var FILEVERSION_KMP_JSON = "12.0";
@@ -17183,10 +17188,24 @@ var KmpCompiler = class {
   }
 };
 
+// ../../../common/web/keyman-version/build/keyman-version.mjs
+var KEYMAN_VERSION2 = class {
+};
+KEYMAN_VERSION2.VERSION = "17.0.58";
+KEYMAN_VERSION2.VERSION_RELEASE = "17.0";
+KEYMAN_VERSION2.VERSION_MAJOR = "17";
+KEYMAN_VERSION2.VERSION_MINOR = "0";
+KEYMAN_VERSION2.VERSION_PATCH = "58";
+KEYMAN_VERSION2.TIER = "alpha";
+KEYMAN_VERSION2.VERSION_TAG = "-alpha";
+KEYMAN_VERSION2.VERSION_WITH_TAG = "17.0.58-alpha";
+KEYMAN_VERSION2.VERSION_ENVIRONMENT = "alpha";
+KEYMAN_VERSION2.SENTRY_RELEASE = "release-17.0.58-alpha";
+
 // build/src/kmlmp.js
 var inputFilename;
 var program2 = new Command();
-program2.description("Compiles Keyman lexical model packages").version(KEYMAN_VERSION.VERSION_WITH_TAG).arguments("<infile>").action((infile) => inputFilename = infile).option("-o, --outFile <filename>", "where to save the resultant file");
+program2.description("Compiles Keyman lexical model packages").version(KEYMAN_VERSION2.VERSION_WITH_TAG).arguments("<infile>").action((infile) => inputFilename = infile).option("-o, --outFile <filename>", "where to save the resultant file");
 program2.parse(process.argv);
 if (!inputFilename) {
   exitDueToUsageError("Must provide a lexical model package source file.");

package/build/src/kmc.js

@@ -3,7 +3,7 @@
  * kmc - Keyman Next Generation Compiler
  */
 import { Command } from 'commander';
-import KEYMAN_VERSION from "@keymanapp/keyman-version/keyman-version.mjs";
+import KEYMAN_VERSION from "@keymanapp/keyman-version";
 import { declareBuild } from './commands/build.js';
 import { declareBuildTestData } from './commands/buildTestData.js';
 const program = new Command();

package/build/src/kmc.js.map

@@ -1 +1 @@
-{"version":3,"file":"kmc.js","sourceRoot":"","sources":["../../src/kmc.ts"],"names":[],"mappings":";AACA;;GAEG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,cAAc,MAAM,8CAA8C,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,eAAe;AACf,OAAO;KACJ,WAAW,CAAC,yCAAyC,CAAC;KACtD,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;AAE5C,YAAY,CAAC,OAAO,CAAC,CAAC;AACtB,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAE9B;;;;;;;;;;;;;;;;;;;;;EAqBE;AAEF,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;KAC7B,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC"}
+{"version":3,"file":"kmc.js","sourceRoot":"","sources":["../../src/kmc.ts"],"names":[],"mappings":";AACA;;GAEG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,cAAc,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,eAAe;AACf,OAAO;KACJ,WAAW,CAAC,yCAAyC,CAAC;KACtD,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;AAE5C,YAAY,CAAC,OAAO,CAAC,CAAC;AACtB,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAE9B;;;;;;;;;;;;;;;;;;;;;EAqBE;AAEF,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;KAC7B,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC"}

package/build/src/kmlmc.js

@@ -5,7 +5,7 @@
 import * as fs from 'fs';
 import { Command } from 'commander';
 import { compileModel } from '@keymanapp/kmc-model';
-import KEYMAN_VERSION from "@keymanapp/keyman-version/keyman-version.mjs";
+import KEYMAN_VERSION from "@keymanapp/keyman-version";
 let inputFilename;
 const program = new Command();
 /* Arguments */

package/build/src/kmlmc.js.map

@@ -1 +1 @@
-{"version":3,"file":"kmlmc.js","sourceRoot":"","sources":["../../src/kmlmc.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,cAAc,MAAM,8CAA8C,CAAC;AAE1E,IAAI,aAAqB,CAAC;AAC1B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,eAAe;AACf,OAAO;KACJ,WAAW,CAAC,gCAAgC,CAAC;KAC7C,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC;KACxC,SAAS,CAAC,UAAU,CAAC;KACrB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC;KACxC,MAAM,CAAC,0BAA0B,EAAE,kCAAkC,CAAC,CAAC;AAE1E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,6BAA6B;AAC7B,IAAI,CAAC,aAAa,EAAE;IAClB,mBAAmB,CAAC,2CAA2C,CAAC,CAAC;CAClE;AAED,IAAI,IAAI,GAAG,IAAI,CAAC;AAChB,WAAW;AACX,IAAI;IACF,IAAI,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;CACpC;AAAC,OAAM,CAAC,EAAE;IACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,IAAI,8BAAqB,CAAC;CACnC;AAED,IAAG,CAAC,IAAI,EAAE;IACR,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACpC,OAAO,CAAC,IAAI,8BAAqB,CAAC;CACnC;AAED,UAAU;AACV,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE;IAC1B,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;CACxD;KAAM;IACL,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;CACnB;AAED,SAAS,mBAAmB,CAAC,OAAe;IAC1C,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,KAAK,OAAO,EAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,KAAK,EAAE,CAAC;IAChB,OAAO,CAAC,UAAU,EAAE,CAAC;IACrB,OAAO,OAAO,CAAC,IAAI,4BAAmB,CAAC;AACzC,CAAC"}
+{"version":3,"file":"kmlmc.js","sourceRoot":"","sources":["../../src/kmlmc.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,cAAc,MAAM,2BAA2B,CAAC;AAEvD,IAAI,aAAqB,CAAC;AAC1B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,eAAe;AACf,OAAO;KACJ,WAAW,CAAC,gCAAgC,CAAC;KAC7C,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC;KACxC,SAAS,CAAC,UAAU,CAAC;KACrB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC;KACxC,MAAM,CAAC,0BAA0B,EAAE,kCAAkC,CAAC,CAAC;AAE1E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,6BAA6B;AAC7B,IAAI,CAAC,aAAa,EAAE;IAClB,mBAAmB,CAAC,2CAA2C,CAAC,CAAC;CAClE;AAED,IAAI,IAAI,GAAG,IAAI,CAAC;AAChB,WAAW;AACX,IAAI;IACF,IAAI,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;CACpC;AAAC,OAAM,CAAC,EAAE;IACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,IAAI,8BAAqB,CAAC;CACnC;AAED,IAAG,CAAC,IAAI,EAAE;IACR,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACpC,OAAO,CAAC,IAAI,8BAAqB,CAAC;CACnC;AAED,UAAU;AACV,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE;IAC1B,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;CACxD;KAAM;IACL,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;CACnB;AAED,SAAS,mBAAmB,CAAC,OAAe;IAC1C,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,KAAK,OAAO,EAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,KAAK,EAAE,CAAC;IAChB,OAAO,CAAC,UAAU,EAAE,CAAC;IACrB,OAAO,OAAO,CAAC,IAAI,4BAAmB,CAAC;AACzC,CAAC"}

package/build/src/kmlmi.js

@@ -7,7 +7,7 @@ import * as path from 'path';
 import { Command } from 'commander';
 import KmpCompiler from '@keymanapp/kmc-package';
 import { writeMergedModelMetadataFile } from '@keymanapp/kmc-model-info';
-import KEYMAN_VERSION from "@keymanapp/keyman-version/keyman-version.mjs";
+import KEYMAN_VERSION from "@keymanapp/keyman-version";
 let inputFilename;
 const program = new Command();
 /* Arguments */

package/build/src/kmlmi.js.map

@@ -1 +1 @@
-{"version":3,"file":"kmlmi.js","sourceRoot":"","sources":["../../src/kmlmi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"kmlmi.js","sourceRoot":"","sources":["../../src/kmlmi.ts"],"names":[],"mappings":"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"}

package/build/src/kmlmp.js

@@ -5,7 +5,7 @@
 import * as fs from 'fs';
 import { Command } from 'commander';
 import KmpCompiler from '@keymanapp/kmc-package';
-import KEYMAN_VERSION from "@keymanapp/keyman-version/keyman-version.mjs";
+import KEYMAN_VERSION from "@keymanapp/keyman-version";
 let inputFilename;
 const program = new Command();
 /* Arguments */

package/build/src/kmlmp.js.map

@@ -1 +1 @@
-{"version":3,"file":"kmlmp.js","sourceRoot":"","sources":["../../src/kmlmp.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,WAAW,MAAM,wBAAwB,CAAC;AAEjD,OAAO,cAAc,MAAM,8CAA8C,CAAC;AAE1E,IAAI,aAAqB,CAAC;AAC1B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,eAAe;AACf,OAAO;KACJ,WAAW,CAAC,wCAAwC,CAAC;KACrD,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC;KACxC,SAAS,CAAC,UAAU,CAAC;KACrB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC;KACxC,MAAM,CAAC,0BAA0B,EAAE,kCAAkC,CAAC,CAAC;AAE1E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,6BAA6B;AAE7B,IAAI,CAAC,aAAa,EAAE;IAClB,mBAAmB,CAAC,mDAAmD,CAAC,CAAC;CAC1E;AAED,IAAI,cAAc,GAAW,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAEvH,EAAE;AACF,wBAAwB;AACxB,EAAE;AAEF,IAAI,SAAS,GAAW,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AACpC,IAAI,WAAW,GAAG,WAAW,CAAC,uBAAuB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AAEhF,EAAE;AACF,8BAA8B;AAC9B,EAAE;AAEF,IAAI,OAAO,GAAG,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;AACnE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;IAClB,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;IACf,wCAAwC;IACxC,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEH,SAAS,mBAAmB,CAAC,OAAe;IAC1C,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,KAAK,OAAO,EAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,KAAK,EAAE,CAAC;IAChB,OAAO,CAAC,UAAU,EAAE,CAAC;IACrB,OAAO,OAAO,CAAC,IAAI,4BAAmB,CAAC;AACzC,CAAC"}
+{"version":3,"file":"kmlmp.js","sourceRoot":"","sources":["../../src/kmlmp.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,WAAW,MAAM,wBAAwB,CAAC;AAEjD,OAAO,cAAc,MAAM,2BAA2B,CAAC;AAEvD,IAAI,aAAqB,CAAC;AAC1B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,eAAe;AACf,OAAO;KACJ,WAAW,CAAC,wCAAwC,CAAC;KACrD,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC;KACxC,SAAS,CAAC,UAAU,CAAC;KACrB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC;KACxC,MAAM,CAAC,0BAA0B,EAAE,kCAAkC,CAAC,CAAC;AAE1E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,6BAA6B;AAE7B,IAAI,CAAC,aAAa,EAAE;IAClB,mBAAmB,CAAC,mDAAmD,CAAC,CAAC;CAC1E;AAED,IAAI,cAAc,GAAW,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAEvH,EAAE;AACF,wBAAwB;AACxB,EAAE;AAEF,IAAI,SAAS,GAAW,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AACpC,IAAI,WAAW,GAAG,WAAW,CAAC,uBAAuB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AAEhF,EAAE;AACF,8BAA8B;AAC9B,EAAE;AAEF,IAAI,OAAO,GAAG,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;AACnE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;IAClB,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;IACf,wCAAwC;IACxC,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEH,SAAS,mBAAmB,CAAC,OAAe;IAC1C,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,KAAK,OAAO,EAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,KAAK,EAAE,CAAC;IAChB,OAAO,CAAC,UAAU,EAAE,CAAC;IACrB,OAAO,OAAO,CAAC,IAAI,4BAAmB,CAAC;AACzC,CAAC"}

package/build/src/util/NodeCompilerCallbacks.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import { CompilerCallbacks, CompilerEvent } from '@keymanapp/common-types';
 /**
  * Concrete implementation for CLI use

package/build/src/util/ldml-keyboard.schema.json

@@ -249,14 +249,14 @@
       "properties": {
         "form": {
           "enum": [
-            "hardware",
-            "touch"
+            "touch",
+            "us",
+            "iso",
+            "jis",
+            "abnt2"
           ],
           "type": "string"
         },
-        "hardware": {
-          "type": "string"
-        },
         "import": {
           "items": {
             "$ref": "#/definitions/import"

package/package.json

@@ -12,10 +12,10 @@
   "scripts": {
     "build": "tsc -b",
     "bundle": "npm run bundle-kmc && npm run bundle-kmlmc && npm run bundle-kmlmi && npm run bundle-kmlmp",
-    "bundle-kmc": "esbuild build/src/kmc.js --bundle --platform=node > build/cjs-src/kmc.cjs",
-    "bundle-kmlmc": "esbuild build/src/kmlmc.js --bundle --platform=node > build/cjs-src/kmlmc.cjs",
-    "bundle-kmlmi": "esbuild build/src/kmlmi.js --bundle --platform=node > build/cjs-src/kmlmi.cjs",
-    "bundle-kmlmp": "esbuild build/src/kmlmp.js --bundle --platform=node > build/cjs-src/kmlmp.cjs",
+    "bundle-kmc": "esbuild build/src/kmc.js --bundle --platform=node --target=es2022 > build/cjs-src/kmc.cjs",
+    "bundle-kmlmc": "esbuild build/src/kmlmc.js --bundle --platform=node --target=es2022 > build/cjs-src/kmlmc.cjs",
+    "bundle-kmlmi": "esbuild build/src/kmlmi.js --bundle --platform=node --target=es2022 > build/cjs-src/kmlmi.cjs",
+    "bundle-kmlmp": "esbuild build/src/kmlmp.js --bundle --platform=node --target=es2022 > build/cjs-src/kmlmp.cjs",
     "test": "cd test && tsc -b && cd .. && c8 --reporter=lcov --reporter=text mocha",
     "prepublishOnly": "npm run build"
   },
@@ -57,7 +57,7 @@
     "esbuild": "^0.15.8",
     "mocha": "^8.4.0",
     "ts-node": "^9.1.1",
-    "typescript": "^4.5.4"
+    "typescript": "^4.9.5"
   },
   "mocha": {
     "spec": "build/test/**/test-*.js",
@@ -69,5 +69,5 @@
     "type": "git",
     "url": "git+https://github.com/keymanapp/keyman.git"
   },
-  "version": "17.0.65-alpha"
+  "version": "17.0.69-alpha"
 }