@keymanapp/kmc-package 18.0.17-alpha → 18.0.19-alpha

package/build/src/compiler/package-validation.js

@@ -1,180 +1,181 @@
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="6950d2e1-61fb-5609-bc9a-a22ff2baf9a9")}catch(e){}}();
-import { KeymanFileTypes } from '@keymanapp/common-types';
-import { CompilerMessages } from './package-compiler-messages.js';
-import { keymanEngineForWindowsFiles, keymanForWindowsInstallerFiles, keymanForWindowsRedistFiles } from './redist-files.js';
-// The keyboard ID SHOULD adhere to this pattern:
-const KEYBOARD_ID_PATTERN_PACKAGE = /^[a-z_][a-z0-9_]*\.(kps|kmp)$/;
-// The model ID SHOULD adhere to this pattern:
-//                                 author           .bcp47             .uniq
-const MODEL_ID_PATTERN_PACKAGE = /^[a-z_][a-z0-9_]*\.[a-z_][a-z0-9_-]*\.[a-z_][a-z0-9_]*\.model\.(kps|kmp)$/;
-// const MODEL_ID_PATTERN_JS      = /^[a-z_][a-z0-9_]*\.[a-z_][a-z0-9_-]*\.[a-z_][a-z0-9_]*\.model\.js$/;
-// const MODEL_ID_PATTERN_TS      = /^[a-z_][a-z0-9_]*\.[a-z_][a-z0-9_-]*\.[a-z_][a-z0-9_]*\.model\.ts$/;
-// const MODEL_ID_PATTERN_PROJECT = /^[a-z_][a-z0-9_]*\.[a-z_][a-z0-9_-]*\.[a-z_][a-z0-9_]*\.model\.kpj$/;
-// "Content files" within the package should adhere to these pattern:
-const CONTENT_FILE_BASENAME_PATTERN = /^[a-z0-9_+.-]+$/i; // base names can be case insensitive
-const CONTENT_FILE_EXTENSION_PATTERN = /^(\.[a-z0-9_-]+)?$/; // extensions should be lower-case or empty
-/**
- * @internal
- */
-export class PackageValidation {
-    callbacks;
-    options;
-    constructor(callbacks, options) {
-        this.callbacks = callbacks;
-        this.options = options;
-    }
-    validate(filename, kmpJson) {
-        if (!this.checkForModelsAndKeyboardsInSamePackage(kmpJson)) {
-            return false;
-        }
-        if (!this.checkKeyboards(filename, kmpJson)) {
-            return false;
-        }
-        if (!this.checkLexicalModels(filename, kmpJson)) {
-            return false;
-        }
-        if (!this.checkContentFiles(kmpJson)) {
-            return false;
-        }
-        if (!this.checkPackageInfo(kmpJson)) {
-            return false;
-        }
-        return true;
-    }
-    checkForDuplicatedOrNonMinimalLanguages(resourceType, id, languages) {
-        let minimalTags = {};
-        if (languages.length == 0) {
-            if (resourceType == 'keyboard') {
-                this.callbacks.reportMessage(CompilerMessages.Warn_KeyboardShouldHaveAtLeastOneLanguage({ id }));
-            }
-            else {
-                this.callbacks.reportMessage(CompilerMessages.Error_ModelMustHaveAtLeastOneLanguage({ id }));
-                return false;
-            }
-        }
-        for (let lang of languages) {
-            let locale;
-            try {
-                locale = new Intl.Locale(lang.id);
-            }
-            catch (e) {
-                this.callbacks.reportMessage(CompilerMessages.Error_LanguageTagIsNotValid({ resourceType, id, lang: lang.id, e }));
-                return false;
-            }
-            const minimalTag = locale.minimize().toString();
-            if (minimalTag.toLowerCase() !== lang.id.toLowerCase()) {
-                this.callbacks.reportMessage(CompilerMessages.Hint_LanguageTagIsNotMinimal({ resourceType, id, actual: lang.id, expected: minimalTag }));
-            }
-            if (minimalTags[minimalTag]) {
-                this.callbacks.reportMessage(CompilerMessages.Hint_PackageShouldNotRepeatLanguages({ resourceType, id, minimalTag, firstTag: lang.id, secondTag: minimalTags[minimalTag] }));
-            }
-            else {
-                minimalTags[minimalTag] = lang.id;
-            }
-        }
-        return true;
-    }
-    checkForModelsAndKeyboardsInSamePackage(kmpJson) {
-        if (kmpJson.lexicalModels?.length > 0 && kmpJson.keyboards?.length > 0) {
-            this.callbacks.reportMessage(CompilerMessages.Error_PackageCannotContainBothModelsAndKeyboards());
-            return false;
-        }
-        if (!kmpJson.lexicalModels?.length && !kmpJson.keyboards?.length) {
-            // Note: we require at least 1 keyboard or model in the package. This may
-            // change in the future if we start to use packages to distribute, e.g.
-            // localizations or themes.
-            this.callbacks.reportMessage(CompilerMessages.Error_PackageMustContainAModelOrAKeyboard());
-            return false;
-        }
-        return true;
-    }
-    checkLexicalModels(filename, kmpJson) {
-        if (!kmpJson.lexicalModels || kmpJson.lexicalModels.length == 0) {
-            return true;
-        }
-        filename = this.callbacks.path.basename(filename);
-        if (!MODEL_ID_PATTERN_PACKAGE.test(filename)) {
-            this.callbacks.reportMessage(CompilerMessages.Warn_PackageNameDoesNotFollowLexicalModelConventions({ filename }));
-        }
-        for (let model of kmpJson.lexicalModels) {
-            if (!this.checkForDuplicatedOrNonMinimalLanguages('model', model.id, model.languages)) {
-                return false;
-            }
-        }
-        return true;
-    }
-    checkKeyboards(filename, kmpJson) {
-        if (!kmpJson.keyboards || kmpJson.keyboards.length == 0) {
-            return true;
-        }
-        filename = this.callbacks.path.basename(filename);
-        if (!KEYBOARD_ID_PATTERN_PACKAGE.test(filename)) {
-            this.callbacks.reportMessage(CompilerMessages.Warn_PackageNameDoesNotFollowKeyboardConventions({ filename }));
-        }
-        for (let keyboard of kmpJson.keyboards) {
-            if (!this.checkForDuplicatedOrNonMinimalLanguages('keyboard', keyboard.id, keyboard.languages)) {
-                return false;
-            }
-            // Note: package-version-validation verifies that there is a corresponding
-            // content file for each keyboard
-        }
-        return true;
-    }
-    checkContentFiles(kmpJson) {
-        for (let file of kmpJson.files) {
-            if (!this.checkContentFile(file)) {
-                return false;
-            }
-        }
-        return true;
-    }
-    checkContentFile(file) {
-        const filename = this.callbacks.path.basename(file.name);
-        const ext = this.callbacks.path.extname(filename);
-        const base = filename.substring(0, filename.length - ext.length);
-        if (this.options.checkFilenameConventions) {
-            if (!CONTENT_FILE_BASENAME_PATTERN.test(base) || !CONTENT_FILE_EXTENSION_PATTERN.test(ext)) {
-                this.callbacks.reportMessage(CompilerMessages.Warn_FileInPackageDoesNotFollowFilenameConventions({ filename }));
-            }
-        }
-        if (!this.checkIfContentFileIsDangerous(file)) {
-            return false;
-        }
-        return true;
-    }
-    checkIfContentFileIsDangerous(file) {
-        const filename = this.callbacks.path.basename(file.name).toLowerCase();
-        // # Test for inclusion of redistributable files
-        if (keymanForWindowsInstallerFiles.includes(filename) ||
-            keymanForWindowsRedistFiles.includes(filename) ||
-            keymanEngineForWindowsFiles.includes(filename)) {
-            this.callbacks.reportMessage(CompilerMessages.Warn_RedistFileShouldNotBeInPackage({ filename }));
-        }
-        // # Test for inclusion of .doc or .docx files
-        if (filename.match(/\.doc(x?)$/)) {
-            this.callbacks.reportMessage(CompilerMessages.Warn_DocFileDangerous({ filename }));
-        }
-        // # Test for inclusion of keyboard source files
-        //
-        // We treat this as a hint, because it's not a dangerous problem, just
-        // something that suggests that perhaps they are trying to distribute the
-        // wrong files.
-        //
-        // Note: we allow .xml in the package because there are other files
-        // which may be valid, not just LDML keyboards
-        const fileType = KeymanFileTypes.sourceTypeFromFilename(file.name);
-        if (fileType !== null && fileType !== ".xml" /* KeymanFileTypes.Source.LdmlKeyboard */) {
-            this.callbacks.reportMessage(CompilerMessages.Hint_PackageContainsSourceFile({ filename: file.name }));
-        }
-        return true;
-    }
-    checkPackageInfo(file) {
-        if (!file.info || !file.info.name || !file.info.name.description.trim()) {
-            this.callbacks.reportMessage(CompilerMessages.Error_PackageNameCannotBeBlank());
-            return false;
-        }
-        return true;
-    }
-}
-//# debugId=6950d2e1-61fb-5609-bc9a-a22ff2baf9a9
+
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="23f9afaa-cea5-5f81-8a88-12f3b0eb5897")}catch(e){}}();
+import { KeymanFileTypes } from '@keymanapp/common-types';
+import { CompilerMessages } from './package-compiler-messages.js';
+import { keymanEngineForWindowsFiles, keymanForWindowsInstallerFiles, keymanForWindowsRedistFiles } from './redist-files.js';
+// The keyboard ID SHOULD adhere to this pattern:
+const KEYBOARD_ID_PATTERN_PACKAGE = /^[a-z_][a-z0-9_]*\.(kps|kmp)$/;
+// The model ID SHOULD adhere to this pattern:
+//                                 author           .bcp47             .uniq
+const MODEL_ID_PATTERN_PACKAGE = /^[a-z_][a-z0-9_]*\.[a-z_][a-z0-9_-]*\.[a-z_][a-z0-9_]*\.model\.(kps|kmp)$/;
+// const MODEL_ID_PATTERN_JS      = /^[a-z_][a-z0-9_]*\.[a-z_][a-z0-9_-]*\.[a-z_][a-z0-9_]*\.model\.js$/;
+// const MODEL_ID_PATTERN_TS      = /^[a-z_][a-z0-9_]*\.[a-z_][a-z0-9_-]*\.[a-z_][a-z0-9_]*\.model\.ts$/;
+// const MODEL_ID_PATTERN_PROJECT = /^[a-z_][a-z0-9_]*\.[a-z_][a-z0-9_-]*\.[a-z_][a-z0-9_]*\.model\.kpj$/;
+// "Content files" within the package should adhere to these pattern:
+const CONTENT_FILE_BASENAME_PATTERN = /^[a-z0-9_+.-]+$/i; // base names can be case insensitive
+const CONTENT_FILE_EXTENSION_PATTERN = /^(\.[a-z0-9_-]+)?$/; // extensions should be lower-case or empty
+/**
+ * @internal
+ */
+export class PackageValidation {
+    callbacks;
+    options;
+    constructor(callbacks, options) {
+        this.callbacks = callbacks;
+        this.options = options;
+    }
+    validate(filename, kmpJson) {
+        if (!this.checkForModelsAndKeyboardsInSamePackage(kmpJson)) {
+            return false;
+        }
+        if (!this.checkKeyboards(filename, kmpJson)) {
+            return false;
+        }
+        if (!this.checkLexicalModels(filename, kmpJson)) {
+            return false;
+        }
+        if (!this.checkContentFiles(kmpJson)) {
+            return false;
+        }
+        if (!this.checkPackageInfo(kmpJson)) {
+            return false;
+        }
+        return true;
+    }
+    checkForDuplicatedOrNonMinimalLanguages(resourceType, id, languages) {
+        let minimalTags = {};
+        if (languages.length == 0) {
+            if (resourceType == 'keyboard') {
+                this.callbacks.reportMessage(CompilerMessages.Warn_KeyboardShouldHaveAtLeastOneLanguage({ id }));
+            }
+            else {
+                this.callbacks.reportMessage(CompilerMessages.Error_ModelMustHaveAtLeastOneLanguage({ id }));
+                return false;
+            }
+        }
+        for (let lang of languages) {
+            let locale;
+            try {
+                locale = new Intl.Locale(lang.id);
+            }
+            catch (e) {
+                this.callbacks.reportMessage(CompilerMessages.Error_LanguageTagIsNotValid({ resourceType, id, lang: lang.id, e }));
+                return false;
+            }
+            const minimalTag = locale.minimize().toString();
+            if (minimalTag.toLowerCase() !== lang.id.toLowerCase()) {
+                this.callbacks.reportMessage(CompilerMessages.Hint_LanguageTagIsNotMinimal({ resourceType, id, actual: lang.id, expected: minimalTag }));
+            }
+            if (minimalTags[minimalTag]) {
+                this.callbacks.reportMessage(CompilerMessages.Hint_PackageShouldNotRepeatLanguages({ resourceType, id, minimalTag, firstTag: lang.id, secondTag: minimalTags[minimalTag] }));
+            }
+            else {
+                minimalTags[minimalTag] = lang.id;
+            }
+        }
+        return true;
+    }
+    checkForModelsAndKeyboardsInSamePackage(kmpJson) {
+        if (kmpJson.lexicalModels?.length > 0 && kmpJson.keyboards?.length > 0) {
+            this.callbacks.reportMessage(CompilerMessages.Error_PackageCannotContainBothModelsAndKeyboards());
+            return false;
+        }
+        if (!kmpJson.lexicalModels?.length && !kmpJson.keyboards?.length) {
+            // Note: we require at least 1 keyboard or model in the package. This may
+            // change in the future if we start to use packages to distribute, e.g.
+            // localizations or themes.
+            this.callbacks.reportMessage(CompilerMessages.Error_PackageMustContainAModelOrAKeyboard());
+            return false;
+        }
+        return true;
+    }
+    checkLexicalModels(filename, kmpJson) {
+        if (!kmpJson.lexicalModels || kmpJson.lexicalModels.length == 0) {
+            return true;
+        }
+        filename = this.callbacks.path.basename(filename);
+        if (!MODEL_ID_PATTERN_PACKAGE.test(filename)) {
+            this.callbacks.reportMessage(CompilerMessages.Warn_PackageNameDoesNotFollowLexicalModelConventions({ filename }));
+        }
+        for (let model of kmpJson.lexicalModels) {
+            if (!this.checkForDuplicatedOrNonMinimalLanguages('model', model.id, model.languages)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    checkKeyboards(filename, kmpJson) {
+        if (!kmpJson.keyboards || kmpJson.keyboards.length == 0) {
+            return true;
+        }
+        filename = this.callbacks.path.basename(filename);
+        if (!KEYBOARD_ID_PATTERN_PACKAGE.test(filename)) {
+            this.callbacks.reportMessage(CompilerMessages.Warn_PackageNameDoesNotFollowKeyboardConventions({ filename }));
+        }
+        for (let keyboard of kmpJson.keyboards) {
+            if (!this.checkForDuplicatedOrNonMinimalLanguages('keyboard', keyboard.id, keyboard.languages)) {
+                return false;
+            }
+            // Note: package-version-validation verifies that there is a corresponding
+            // content file for each keyboard
+        }
+        return true;
+    }
+    checkContentFiles(kmpJson) {
+        for (let file of kmpJson.files) {
+            if (!this.checkContentFile(file)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    checkContentFile(file) {
+        const filename = this.callbacks.path.basename(file.name);
+        const ext = this.callbacks.path.extname(filename);
+        const base = filename.substring(0, filename.length - ext.length);
+        if (this.options.checkFilenameConventions) {
+            if (!CONTENT_FILE_BASENAME_PATTERN.test(base) || !CONTENT_FILE_EXTENSION_PATTERN.test(ext)) {
+                this.callbacks.reportMessage(CompilerMessages.Warn_FileInPackageDoesNotFollowFilenameConventions({ filename }));
+            }
+        }
+        if (!this.checkIfContentFileIsDangerous(file)) {
+            return false;
+        }
+        return true;
+    }
+    checkIfContentFileIsDangerous(file) {
+        const filename = this.callbacks.path.basename(file.name).toLowerCase();
+        // # Test for inclusion of redistributable files
+        if (keymanForWindowsInstallerFiles.includes(filename) ||
+            keymanForWindowsRedistFiles.includes(filename) ||
+            keymanEngineForWindowsFiles.includes(filename)) {
+            this.callbacks.reportMessage(CompilerMessages.Warn_RedistFileShouldNotBeInPackage({ filename }));
+        }
+        // # Test for inclusion of .doc or .docx files
+        if (filename.match(/\.doc(x?)$/)) {
+            this.callbacks.reportMessage(CompilerMessages.Warn_DocFileDangerous({ filename }));
+        }
+        // # Test for inclusion of keyboard source files
+        //
+        // We treat this as a hint, because it's not a dangerous problem, just
+        // something that suggests that perhaps they are trying to distribute the
+        // wrong files.
+        //
+        // Note: we allow .xml in the package because there are other files
+        // which may be valid, not just LDML keyboards
+        const fileType = KeymanFileTypes.sourceTypeFromFilename(file.name);
+        if (fileType !== null && fileType !== ".xml" /* KeymanFileTypes.Source.LdmlKeyboard */) {
+            this.callbacks.reportMessage(CompilerMessages.Hint_PackageContainsSourceFile({ filename: file.name }));
+        }
+        return true;
+    }
+    checkPackageInfo(file) {
+        if (!file.info || !file.info.name || !file.info.name.description.trim()) {
+            this.callbacks.reportMessage(CompilerMessages.Error_PackageNameCannotBeBlank());
+            return false;
+        }
+        return true;
+    }
+}
 //# sourceMappingURL=package-validation.js.map
+//# debugId=23f9afaa-cea5-5f81-8a88-12f3b0eb5897

package/build/src/compiler/package-validation.js.map

@@ -1 +1 @@
-{"debug_id":"6950d2e1-61fb-5609-bc9a-a22ff2baf9a9","file":"package-validation.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/package-validation.ts"],"version":3}
+{"version":3,"file":"package-validation.js","sources":["../../../src/compiler/package-validation.ts"],"sourceRoot":"","names":[],"mappings":"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","debug_id":"23f9afaa-cea5-5f81-8a88-12f3b0eb5897"}

package/build/src/compiler/package-version-validator.js

@@ -1,92 +1,93 @@
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="ea231759-32a8-5242-a89b-0a02e62a9c33")}catch(e){}}();
-import { CompilerMessages } from './package-compiler-messages.js';
-export const DEFAULT_KEYBOARD_VERSION = '1.0';
-export const MIN_LM_FILEVERSION_KMP_JSON = '12.0';
-export const MIN_KBD_FILEVERSION_KMP_JSON = '7.0';
-export class PackageVersionValidator {
-    callbacks;
-    constructor(callbacks) {
-        this.callbacks = callbacks;
-    }
-    getMinKeymanVersion(keyboardMetadata) {
-        let minKeymanVersion = MIN_KBD_FILEVERSION_KMP_JSON;
-        for (let id of Object.keys(keyboardMetadata)) {
-            // minKeymanVersion is always a float so float comparison is safe
-            let kbdMinKeymanVersion = parseFloat(keyboardMetadata[id].data.minKeymanVersion);
-            if (kbdMinKeymanVersion > 14.0) {
-                // Keyman for Windows 14 and earlier only accepted version 7.0 for keyboard
-                // packages, so we must not write any other version in order to allow
-                // earlier versions of Keyman to load the package.
-                if (parseFloat(minKeymanVersion) < kbdMinKeymanVersion) {
-                    minKeymanVersion = keyboardMetadata[id].data.minKeymanVersion;
-                }
-            }
-        }
-        return minKeymanVersion;
-    }
-    /**
-     * Verifies version information in corresponding keyboards and updates kmpJson
-     * metadata as the version information can be out of sync in the .kps file
-     * after updating a contained keyboard.
-     * @param kps
-     * @param kmp
-     * @returns
-     */
-    validateAndUpdateVersions(kps, kmp, keyboardMetadata) {
-        const followKeyboardVersion = kps.Options?.FollowKeyboardVersion !== undefined;
-        if (followKeyboardVersion) {
-            if (!this.checkFollowKeyboardVersion(kmp)) {
-                return false;
-            }
-        }
-        if (!kmp.keyboards) {
-            // Lexical models don't have version metadata; only their packages.
-            return true;
-        }
-        let result = true;
-        // We now know we have at least one keyboard in the package
-        for (let keyboard of kmp.keyboards) {
-            const data = keyboardMetadata[keyboard.id];
-            if (!data) {
-                // Warnings or errors will have been raised by getKeyboardFileData
-                // TODO raise error -- we should not have gotten here
-                return false;
-            }
-            // Note: there is often version metadata in the .kps <Keyboard> element, but
-            // we don't read from the metadata because we want to ensure we have the
-            // most up-to-date keyboard version data here, from the compiled keyboard.
-            if (followKeyboardVersion && data.data.keyboardVersion === null) {
-                this.callbacks.reportMessage(CompilerMessages.Info_KeyboardFileHasNoKeyboardVersion({ filename: keyboard.id }));
-            }
-            keyboard.version = data.data.keyboardVersion ?? DEFAULT_KEYBOARD_VERSION;
-            if (result && followKeyboardVersion) {
-                if (kmp.keyboards[0].version !== keyboard.version) {
-                    this.callbacks.reportMessage(CompilerMessages.Warn_KeyboardVersionsDoNotMatch({
-                        keyboard: keyboard.id,
-                        version: keyboard.version,
-                        firstKeyboard: kmp.keyboards[0].id,
-                        firstVersion: kmp.keyboards[0].version
-                    }));
-                }
-            }
-        }
-        if (result && followKeyboardVersion) {
-            kmp.info.version = { description: kmp.keyboards[0].version };
-        }
-        return result;
-    }
-    checkFollowKeyboardVersion(kmp) {
-        // Lexical model packages do not allow FollowKeyboardVersion
-        if (kmp.lexicalModels && kmp.lexicalModels.length) {
-            this.callbacks.reportMessage(CompilerMessages.Error_FollowKeyboardVersionNotAllowedForModelPackages());
-            return false;
-        }
-        if (!kmp.keyboards || !kmp.keyboards.length) {
-            this.callbacks.reportMessage(CompilerMessages.Error_FollowKeyboardVersionButNoKeyboards());
-            return false;
-        }
-        return true;
-    }
-}
-//# debugId=ea231759-32a8-5242-a89b-0a02e62a9c33
+
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="2fed3219-dbc8-5798-b47d-f1496278331b")}catch(e){}}();
+import { CompilerMessages } from './package-compiler-messages.js';
+export const DEFAULT_KEYBOARD_VERSION = '1.0';
+export const MIN_LM_FILEVERSION_KMP_JSON = '12.0';
+export const MIN_KBD_FILEVERSION_KMP_JSON = '7.0';
+export class PackageVersionValidator {
+    callbacks;
+    constructor(callbacks) {
+        this.callbacks = callbacks;
+    }
+    getMinKeymanVersion(keyboardMetadata) {
+        let minKeymanVersion = MIN_KBD_FILEVERSION_KMP_JSON;
+        for (let id of Object.keys(keyboardMetadata)) {
+            // minKeymanVersion is always a float so float comparison is safe
+            let kbdMinKeymanVersion = parseFloat(keyboardMetadata[id].data.minKeymanVersion);
+            if (kbdMinKeymanVersion > 14.0) {
+                // Keyman for Windows 14 and earlier only accepted version 7.0 for keyboard
+                // packages, so we must not write any other version in order to allow
+                // earlier versions of Keyman to load the package.
+                if (parseFloat(minKeymanVersion) < kbdMinKeymanVersion) {
+                    minKeymanVersion = keyboardMetadata[id].data.minKeymanVersion;
+                }
+            }
+        }
+        return minKeymanVersion;
+    }
+    /**
+     * Verifies version information in corresponding keyboards and updates kmpJson
+     * metadata as the version information can be out of sync in the .kps file
+     * after updating a contained keyboard.
+     * @param kps
+     * @param kmp
+     * @returns
+     */
+    validateAndUpdateVersions(kps, kmp, keyboardMetadata) {
+        const followKeyboardVersion = kps.Options?.FollowKeyboardVersion !== undefined;
+        if (followKeyboardVersion) {
+            if (!this.checkFollowKeyboardVersion(kmp)) {
+                return false;
+            }
+        }
+        if (!kmp.keyboards) {
+            // Lexical models don't have version metadata; only their packages.
+            return true;
+        }
+        let result = true;
+        // We now know we have at least one keyboard in the package
+        for (let keyboard of kmp.keyboards) {
+            const data = keyboardMetadata[keyboard.id];
+            if (!data) {
+                // Warnings or errors will have been raised by getKeyboardFileData
+                // TODO raise error -- we should not have gotten here
+                return false;
+            }
+            // Note: there is often version metadata in the .kps <Keyboard> element, but
+            // we don't read from the metadata because we want to ensure we have the
+            // most up-to-date keyboard version data here, from the compiled keyboard.
+            if (followKeyboardVersion && data.data.keyboardVersion === null) {
+                this.callbacks.reportMessage(CompilerMessages.Info_KeyboardFileHasNoKeyboardVersion({ filename: keyboard.id }));
+            }
+            keyboard.version = data.data.keyboardVersion ?? DEFAULT_KEYBOARD_VERSION;
+            if (result && followKeyboardVersion) {
+                if (kmp.keyboards[0].version !== keyboard.version) {
+                    this.callbacks.reportMessage(CompilerMessages.Warn_KeyboardVersionsDoNotMatch({
+                        keyboard: keyboard.id,
+                        version: keyboard.version,
+                        firstKeyboard: kmp.keyboards[0].id,
+                        firstVersion: kmp.keyboards[0].version
+                    }));
+                }
+            }
+        }
+        if (result && followKeyboardVersion) {
+            kmp.info.version = { description: kmp.keyboards[0].version };
+        }
+        return result;
+    }
+    checkFollowKeyboardVersion(kmp) {
+        // Lexical model packages do not allow FollowKeyboardVersion
+        if (kmp.lexicalModels && kmp.lexicalModels.length) {
+            this.callbacks.reportMessage(CompilerMessages.Error_FollowKeyboardVersionNotAllowedForModelPackages());
+            return false;
+        }
+        if (!kmp.keyboards || !kmp.keyboards.length) {
+            this.callbacks.reportMessage(CompilerMessages.Error_FollowKeyboardVersionButNoKeyboards());
+            return false;
+        }
+        return true;
+    }
+}
 //# sourceMappingURL=package-version-validator.js.map
+//# debugId=2fed3219-dbc8-5798-b47d-f1496278331b

package/build/src/compiler/package-version-validator.js.map

@@ -1 +1 @@
-{"debug_id":"ea231759-32a8-5242-a89b-0a02e62a9c33","file":"package-version-validator.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/package-version-validator.ts"],"version":3}
+{"version":3,"file":"package-version-validator.js","sources":["../../../src/compiler/package-version-validator.ts"],"sourceRoot":"","names":[],"mappings":"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","debug_id":"2fed3219-dbc8-5798-b47d-f1496278331b"}