@keymanapp/kmc-ldml 17.0.300-beta → 17.0.302-beta

package/build/src/compiler/visual-keyboard-compiler.js

@@ -1,70 +1,71 @@
-!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]="84fc4934-7f9b-58c7-b32f-536bf1d3bdc8")}catch(e){}}();
-import { VisualKeyboard } from "@keymanapp/common-types";
-import { KeysCompiler } from "./keys.js";
-import { CompilerMessages } from "./messages.js";
-export class LdmlKeyboardVisualKeyboardCompiler {
-    callbacks;
-    constructor(callbacks) {
-        this.callbacks = callbacks;
-    }
-    compile(source) {
-        let result = new VisualKeyboard.VisualKeyboard();
-        /* TODO-LDML: consider VisualKeyboardHeaderFlags.kvkhUseUnderlying kvkhDisplayUnderlying kvkhAltGr kvkh102 */
-        result.header.flags = 0;
-        result.header.version = 0x0600;
-        /* TODO-LDML: consider associatedKeyboard: this _must_ be set to id (aka basename sans ext) of keyboard .kmx file */
-        result.header.associatedKeyboard = '';
-        result.header.ansiFont = { ...VisualKeyboard.DEFAULT_KVK_FONT };
-        result.header.unicodeFont = { ...VisualKeyboard.DEFAULT_KVK_FONT };
-        for (let layers of source.keyboard3.layers) {
-            const { formId } = layers;
-            for (let layer of layers.layer) {
-                this.compileHardwareLayer(source, result, layer, formId);
-            }
-        }
-        return result;
-    }
-    compileHardwareLayer(source, vk, layer, hardware) {
-        const layerId = layer.id;
-        if (hardware === 'touch') {
-            hardware = 'us'; // TODO-LDML: US Only. Do something different here?
-        }
-        const keymap = KeysCompiler.getKeymapFromForms(source.keyboard3?.forms?.form, hardware);
-        if (!keymap) {
-            this.callbacks.reportMessage(CompilerMessages.Error_InvalidHardware({ formId: hardware }));
-            return;
-        }
-        const shift = this.translateLayerIdToVisualKeyboardShift(layer.id);
-        let y = -1;
-        for (let row of layer.row) {
-            y++;
-            const keys = row.keys.split(' ');
-            let x = -1;
-            for (let key of keys) {
-                const keyId = key;
-                x++;
-                let keydef = source.keyboard3.keys?.key?.find(x => x.id == key);
-                if (!keydef) {
-                    this.callbacks.reportMessage(CompilerMessages.Error_KeyNotFoundInKeyBag({ keyId, layer: layerId, row: y, col: x, form: hardware }));
-                }
-                else {
-                    vk.keys.push({
-                        flags: 2 /* VisualKeyboard.VisualKeyboardKeyFlags.kvkkUnicode */,
-                        shift: shift,
-                        text: keydef.output,
-                        vkey: keymap[y][x],
-                    });
-                }
-            }
-        }
-    }
-    translateLayerIdToVisualKeyboardShift(id) {
-        if (id == 'base') {
-            return 0;
-        }
-        // TODO-LDML: other modifiers
-        return 0;
-    }
-}
-//# debugId=84fc4934-7f9b-58c7-b32f-536bf1d3bdc8
+
+!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]="20fe0858-b127-57f9-8acf-05baa436395b")}catch(e){}}();
+import { VisualKeyboard } from "@keymanapp/common-types";
+import { KeysCompiler } from "./keys.js";
+import { CompilerMessages } from "./messages.js";
+export class LdmlKeyboardVisualKeyboardCompiler {
+    callbacks;
+    constructor(callbacks) {
+        this.callbacks = callbacks;
+    }
+    compile(source) {
+        let result = new VisualKeyboard.VisualKeyboard();
+        /* TODO-LDML: consider VisualKeyboardHeaderFlags.kvkhUseUnderlying kvkhDisplayUnderlying kvkhAltGr kvkh102 */
+        result.header.flags = 0;
+        result.header.version = 0x0600;
+        /* TODO-LDML: consider associatedKeyboard: this _must_ be set to id (aka basename sans ext) of keyboard .kmx file */
+        result.header.associatedKeyboard = '';
+        result.header.ansiFont = { ...VisualKeyboard.DEFAULT_KVK_FONT };
+        result.header.unicodeFont = { ...VisualKeyboard.DEFAULT_KVK_FONT };
+        for (let layers of source.keyboard3.layers) {
+            const { formId } = layers;
+            for (let layer of layers.layer) {
+                this.compileHardwareLayer(source, result, layer, formId);
+            }
+        }
+        return result;
+    }
+    compileHardwareLayer(source, vk, layer, hardware) {
+        const layerId = layer.id;
+        if (hardware === 'touch') {
+            hardware = 'us'; // TODO-LDML: US Only. Do something different here?
+        }
+        const keymap = KeysCompiler.getKeymapFromForms(source.keyboard3?.forms?.form, hardware);
+        if (!keymap) {
+            this.callbacks.reportMessage(CompilerMessages.Error_InvalidHardware({ formId: hardware }));
+            return;
+        }
+        const shift = this.translateLayerIdToVisualKeyboardShift(layer.id);
+        let y = -1;
+        for (let row of layer.row) {
+            y++;
+            const keys = row.keys.split(' ');
+            let x = -1;
+            for (let key of keys) {
+                const keyId = key;
+                x++;
+                let keydef = source.keyboard3.keys?.key?.find(x => x.id == key);
+                if (!keydef) {
+                    this.callbacks.reportMessage(CompilerMessages.Error_KeyNotFoundInKeyBag({ keyId, layer: layerId, row: y, col: x, form: hardware }));
+                }
+                else {
+                    vk.keys.push({
+                        flags: 2 /* VisualKeyboard.VisualKeyboardKeyFlags.kvkkUnicode */,
+                        shift: shift,
+                        text: keydef.output,
+                        vkey: keymap[y][x],
+                    });
+                }
+            }
+        }
+    }
+    translateLayerIdToVisualKeyboardShift(id) {
+        if (id == 'base') {
+            return 0;
+        }
+        // TODO-LDML: other modifiers
+        return 0;
+    }
+}
 //# sourceMappingURL=visual-keyboard-compiler.js.map
+//# debugId=20fe0858-b127-57f9-8acf-05baa436395b

package/build/src/compiler/visual-keyboard-compiler.js.map

@@ -1 +1 @@
-{"debug_id":"84fc4934-7f9b-58c7-b32f-536bf1d3bdc8","file":"visual-keyboard-compiler.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/visual-keyboard-compiler.ts"],"version":3}
+{"version":3,"file":"visual-keyboard-compiler.js","sources":["../../../src/compiler/visual-keyboard-compiler.ts"],"sourceRoot":"","names":[],"mappings":"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","debug_id":"20fe0858-b127-57f9-8acf-05baa436395b"}

package/build/src/main.js

@@ -1,5 +1,6 @@
-!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]="19304dd8-b397-5c91-a393-c86c3c398b6c")}catch(e){}}();
-export { LdmlKeyboardCompiler } from './compiler/compiler.js';
-export { CompilerMessages as LdmlKeyboardCompilerMessages } from './compiler/messages.js'; // TODO: rename messages.js and CompilerMessages
-//# debugId=19304dd8-b397-5c91-a393-c86c3c398b6c
+
+!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]="473a60eb-f332-5e3d-bf08-69b6693d2f74")}catch(e){}}();
+export { LdmlKeyboardCompiler } from './compiler/compiler.js';
+export { CompilerMessages as LdmlKeyboardCompilerMessages } from './compiler/messages.js'; // TODO: rename messages.js and CompilerMessages
 //# sourceMappingURL=main.js.map
+//# debugId=473a60eb-f332-5e3d-bf08-69b6693d2f74

package/build/src/main.js.map

@@ -1 +1 @@
-{"debug_id":"19304dd8-b397-5c91-a393-c86c3c398b6c","file":"main.js","mappings":";AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,gBAAgB,IAAI,4BAA4B,EAAE,MAAM,wBAAwB,CAAC,CAAC,gDAAgD","names":[],"sourceRoot":"","sources":["../../src/main.ts"],"version":3}
+{"version":3,"file":"main.js","sources":["../../src/main.ts"],"sourceRoot":"","names":[],"mappings":";;AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,gBAAgB,IAAI,4BAA4B,EAAE,MAAM,wBAAwB,CAAC,CAAC,gDAAgD","debug_id":"473a60eb-f332-5e3d-bf08-69b6693d2f74"}

package/build/src/util/util.js

@@ -1,185 +1,186 @@
-!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]="7d7cc53f-898c-5e04-831b-4f72c82dcfd6")}catch(e){}}();
-import { constants } from "@keymanapp/ldml-keyboard-constants";
-/**
- * Verifies that value is an item in the enumeration.
- */
-export function isValidEnumValue(enu, value) {
-    return Object.values(enu).includes(value);
-}
-/**
- * Returns unique LKKeys only, preserving later ones
- * in case of conflict. (i.e. later overrides)
- * @param keys list of keys to consider. (mutated)
- * @returns Array of unique keys. Order is not specified.
- */
-export function calculateUniqueKeys(keys) {
-    if (!keys) {
-        return [];
-    }
-    // Need 'newer' (later) keys to override older ones.
-    const reverseKeys = keys.reverse(); // newest to oldest
-    const alreadySeen = new Set();
-    // filter out only the keys that haven't already been seen
-    const uniqueKeys = reverseKeys.filter(({ id }) => {
-        if (!alreadySeen.has(id)) {
-            alreadySeen.add(id);
-            return true;
-        }
-        return false;
-    });
-    return uniqueKeys;
-}
-/** Convert an array of keys to a hash */
-export function hashKeys(keys) {
-    const m = new Map();
-    for (const k of keys ?? []) {
-        m.set(k.id, k);
-    }
-    return m;
-}
-export function hashFlicks(flicks) {
-    const m = new Map();
-    for (const k of flicks ?? []) {
-        m.set(k.id, k);
-    }
-    return m;
-}
-/**
- * @param layersList list of layers elements, from `keyboard?.layers`
- * @returns set of key IDs
- */
-export function allUsedKeyIdsInLayers(layersList) {
-    const s = new Set();
-    if (layersList) {
-        for (const layers of layersList || []) {
-            for (const layer of layers.layer || []) {
-                for (const row of layer.row || []) {
-                    if (row.keys) {
-                        for (const k of row.keys.split(" ")) {
-                            s.add(k);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return s;
-}
-/**
- * Extract all of the key ids that this key refers to, not counting flicks
- * @returns map from the key id to a set of attribute names (such as `multiTapDefaultKeyId` etc.) used by that key.
- */
-export function allUsedKeyIdsInKey(key) {
-    const m = new Map();
-    /** add one key */
-    function addKey(keyId, attr) {
-        if (!keyId)
-            return;
-        if (!m.has(keyId))
-            m.set(keyId, []);
-        m.get(keyId).push(attr);
-    }
-    /** add a set of keys */
-    function addKeys(keyIds, attr) {
-        if (!keyIds)
-            return;
-        for (const keyId of keyIds?.split(' ')) {
-            addKey(keyId, attr);
-        }
-    }
-    const { longPressKeyIds, longPressDefaultKeyId, multiTapKeyIds } = key;
-    addKey(longPressDefaultKeyId, 'longPressDefaultKeyId');
-    addKeys(longPressKeyIds, 'longPressKeyIds');
-    addKeys(multiTapKeyIds, 'multiTapKeyIds');
-    return m;
-}
-export function allUsedKeyIdsInFlick(flick) {
-    const s = new Set();
-    if (flick) {
-        for (const { keyId } of flick.flickSegment) {
-            s.add(keyId);
-        }
-    }
-    return s;
-}
-/**
- * Helper function for validating child elements. Written for the convenience of message passing functions.
- *
- * @param values array of values to check
- * @param onDuplicate callback with array of duplicate values, deduped
- * @param allowed optional set of valid values
- * @param onInvalid callback with array of invalid values, deduped
- * @returns true if all OK
- */
-export function verifyValidAndUnique(values, onDuplicate, allowed, onInvalid) {
-    const dups = [];
-    const invalids = [];
-    const seen = new Set();
-    for (const value of values) {
-        if (allowed && !allowed.has(value)) {
-            invalids.push(value);
-        }
-        if (seen.has(value)) {
-            dups.push(value);
-        }
-        else {
-            seen.add(value);
-        }
-    }
-    function dedupedSortedArray(values) {
-        return Array.from(new Set(values)).sort();
-    }
-    if (dups.length > 0 && onDuplicate) {
-        onDuplicate(dedupedSortedArray(dups));
-    }
-    if (invalids.length > 0 && onInvalid) {
-        onInvalid(dedupedSortedArray(invalids));
-    }
-    return (!dups.length && !invalids.length);
-}
-/**
- * Determine modifier from layer info
- * @param layer layer obj
- * @returns modifier array
- */
-export function translateLayerAttrToModifier(layer) {
-    const { modifiers } = layer;
-    if (!modifiers)
-        return [constants.keys_mod_none];
-    return modifiers.split(',').map(m => translateModifierSubsetToLayer(m)).sort();
-}
-function translateModifierSubsetToLayer(modifiers) {
-    // TODO-LDML: Default #11072
-    if (modifiers) {
-        if (modifiers.indexOf(',') !== -1) {
-            throw Error(`translateModifierSubsetToLayer only takes a single subset of the modifiers`);
-        }
-        let mod = constants.keys_mod_none;
-        for (let str of modifiers.split(' ')) {
-            const submod = constants.keys_mod_map.get(str);
-            mod |= submod;
-        }
-        return mod;
-    }
-    // TODO-LDML: other modifiers, other ids?
-    return constants.keys_mod_none;
-}
-/**
- * @param modifier modifier sequence such as undefined, "none", "shift altR" etc
- * @returns true if valid
- */
-export function validModifier(modifier) {
-    if (!modifier)
-        return true; // valid to have no modifier, == none
-    // TODO-LDML: enforce illegal combinations per spec.
-    for (let sub of modifier.trim().split(',')) {
-        for (let str of sub.trim().split(' ')) {
-            if (!constants.keys_mod_map.has(str)) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-//# debugId=7d7cc53f-898c-5e04-831b-4f72c82dcfd6
+
+!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]="92c01187-7818-5f35-9ffc-8e06975000b5")}catch(e){}}();
+import { constants } from "@keymanapp/ldml-keyboard-constants";
+/**
+ * Verifies that value is an item in the enumeration.
+ */
+export function isValidEnumValue(enu, value) {
+    return Object.values(enu).includes(value);
+}
+/**
+ * Returns unique LKKeys only, preserving later ones
+ * in case of conflict. (i.e. later overrides)
+ * @param keys list of keys to consider. (mutated)
+ * @returns Array of unique keys. Order is not specified.
+ */
+export function calculateUniqueKeys(keys) {
+    if (!keys) {
+        return [];
+    }
+    // Need 'newer' (later) keys to override older ones.
+    const reverseKeys = keys.reverse(); // newest to oldest
+    const alreadySeen = new Set();
+    // filter out only the keys that haven't already been seen
+    const uniqueKeys = reverseKeys.filter(({ id }) => {
+        if (!alreadySeen.has(id)) {
+            alreadySeen.add(id);
+            return true;
+        }
+        return false;
+    });
+    return uniqueKeys;
+}
+/** Convert an array of keys to a hash */
+export function hashKeys(keys) {
+    const m = new Map();
+    for (const k of keys ?? []) {
+        m.set(k.id, k);
+    }
+    return m;
+}
+export function hashFlicks(flicks) {
+    const m = new Map();
+    for (const k of flicks ?? []) {
+        m.set(k.id, k);
+    }
+    return m;
+}
+/**
+ * @param layersList list of layers elements, from `keyboard?.layers`
+ * @returns set of key IDs
+ */
+export function allUsedKeyIdsInLayers(layersList) {
+    const s = new Set();
+    if (layersList) {
+        for (const layers of layersList || []) {
+            for (const layer of layers.layer || []) {
+                for (const row of layer.row || []) {
+                    if (row.keys) {
+                        for (const k of row.keys.split(" ")) {
+                            s.add(k);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return s;
+}
+/**
+ * Extract all of the key ids that this key refers to, not counting flicks
+ * @returns map from the key id to a set of attribute names (such as `multiTapDefaultKeyId` etc.) used by that key.
+ */
+export function allUsedKeyIdsInKey(key) {
+    const m = new Map();
+    /** add one key */
+    function addKey(keyId, attr) {
+        if (!keyId)
+            return;
+        if (!m.has(keyId))
+            m.set(keyId, []);
+        m.get(keyId).push(attr);
+    }
+    /** add a set of keys */
+    function addKeys(keyIds, attr) {
+        if (!keyIds)
+            return;
+        for (const keyId of keyIds?.split(' ')) {
+            addKey(keyId, attr);
+        }
+    }
+    const { longPressKeyIds, longPressDefaultKeyId, multiTapKeyIds } = key;
+    addKey(longPressDefaultKeyId, 'longPressDefaultKeyId');
+    addKeys(longPressKeyIds, 'longPressKeyIds');
+    addKeys(multiTapKeyIds, 'multiTapKeyIds');
+    return m;
+}
+export function allUsedKeyIdsInFlick(flick) {
+    const s = new Set();
+    if (flick) {
+        for (const { keyId } of flick.flickSegment) {
+            s.add(keyId);
+        }
+    }
+    return s;
+}
+/**
+ * Helper function for validating child elements. Written for the convenience of message passing functions.
+ *
+ * @param values array of values to check
+ * @param onDuplicate callback with array of duplicate values, deduped
+ * @param allowed optional set of valid values
+ * @param onInvalid callback with array of invalid values, deduped
+ * @returns true if all OK
+ */
+export function verifyValidAndUnique(values, onDuplicate, allowed, onInvalid) {
+    const dups = [];
+    const invalids = [];
+    const seen = new Set();
+    for (const value of values) {
+        if (allowed && !allowed.has(value)) {
+            invalids.push(value);
+        }
+        if (seen.has(value)) {
+            dups.push(value);
+        }
+        else {
+            seen.add(value);
+        }
+    }
+    function dedupedSortedArray(values) {
+        return Array.from(new Set(values)).sort();
+    }
+    if (dups.length > 0 && onDuplicate) {
+        onDuplicate(dedupedSortedArray(dups));
+    }
+    if (invalids.length > 0 && onInvalid) {
+        onInvalid(dedupedSortedArray(invalids));
+    }
+    return (!dups.length && !invalids.length);
+}
+/**
+ * Determine modifier from layer info
+ * @param layer layer obj
+ * @returns modifier array
+ */
+export function translateLayerAttrToModifier(layer) {
+    const { modifiers } = layer;
+    if (!modifiers)
+        return [constants.keys_mod_none];
+    return modifiers.split(',').map(m => translateModifierSubsetToLayer(m)).sort();
+}
+function translateModifierSubsetToLayer(modifiers) {
+    // TODO-LDML: Default #11072
+    if (modifiers) {
+        if (modifiers.indexOf(',') !== -1) {
+            throw Error(`translateModifierSubsetToLayer only takes a single subset of the modifiers`);
+        }
+        let mod = constants.keys_mod_none;
+        for (let str of modifiers.split(' ')) {
+            const submod = constants.keys_mod_map.get(str);
+            mod |= submod;
+        }
+        return mod;
+    }
+    // TODO-LDML: other modifiers, other ids?
+    return constants.keys_mod_none;
+}
+/**
+ * @param modifier modifier sequence such as undefined, "none", "shift altR" etc
+ * @returns true if valid
+ */
+export function validModifier(modifier) {
+    if (!modifier)
+        return true; // valid to have no modifier, == none
+    // TODO-LDML: enforce illegal combinations per spec.
+    for (let sub of modifier.trim().split(',')) {
+        for (let str of sub.trim().split(' ')) {
+            if (!constants.keys_mod_map.has(str)) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
 //# sourceMappingURL=util.js.map
+//# debugId=92c01187-7818-5f35-9ffc-8e06975000b5

package/build/src/util/util.js.map

@@ -1 +1 @@
-{"debug_id":"7d7cc53f-898c-5e04-831b-4f72c82dcfd6","file":"util.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/util/util.ts"],"version":3}
+{"version":3,"file":"util.js","sources":["../../../src/util/util.ts"],"sourceRoot":"","names":[],"mappings":"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","debug_id":"92c01187-7818-5f35-9ffc-8e06975000b5"}

package/package.json

@@ -25,15 +25,15 @@
     "url": "https://github.com/keymanapp/keyman/issues"
   },
   "dependencies": {
-    "@keymanapp/keyman-version": "17.0.300-beta",
-    "@keymanapp/kmc-kmn": "17.0.300-beta",
-    "@keymanapp/ldml-keyboard-constants": "17.0.300-beta",
+    "@keymanapp/keyman-version": "17.0.302-beta",
+    "@keymanapp/kmc-kmn": "17.0.302-beta",
+    "@keymanapp/ldml-keyboard-constants": "17.0.302-beta",
     "restructure": "git+https://github.com/keymanapp/dependency-restructure.git#7a188a1e26f8f36a175d95b67ffece8702363dfc",
     "semver": "^7.5.2"
   },
   "devDependencies": {
-    "@keymanapp/developer-test-helpers": "17.0.300-beta",
-    "@keymanapp/resources-gosh": "17.0.300-beta",
+    "@keymanapp/developer-test-helpers": "17.0.302-beta",
+    "@keymanapp/resources-gosh": "17.0.302-beta",
     "@types/chai": "^4.1.7",
     "@types/mocha": "^5.2.7",
     "@types/node": "^20.4.1",
@@ -65,5 +65,5 @@
     "type": "git",
     "url": "git+https://github.com/keymanapp/keyman.git"
   },
-  "version": "17.0.300-beta"
+  "version": "17.0.302-beta"
 }