@keymanapp/kmc-ldml 18.0.40-alpha → 18.0.45-alpha

package/build/src/compiler/touch-layout-compiler.js

@@ -1,94 +1,91 @@
-
-!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]="69297fc7-3014-5509-98ca-7d49188be130")}catch(e){}}();
-export class TouchLayoutCompiler {
-    compileToJavascript(source) {
-        let result = {};
-        // start with desktop to mimic vk emit
-        result.desktop = {
-            defaultHint: "none",
-            layer: []
-        };
-        for (let layers of source.keyboard3.layers) {
-            for (let layer of layers.layer) {
-                const resultLayer = this.compileHardwareLayer(source, result, layer);
-                result.desktop.layer.push(resultLayer);
-            }
-        }
-        return result;
-    }
-    compileHardwareLayer(source, file, layer) {
-        // TODO-LDML: consider consolidation with keys.ts?
-        let fileLayer = {
-            id: this.translateLayerIdToTouchLayoutLayerId(layer.id, layer.modifiers),
-            row: []
-        };
-        let y = -1;
-        for (let row of layer.row) {
-            y++;
-            let fileRow = { id: y, key: [] };
-            fileLayer.row.push(fileRow);
-            const keys = row.keys.split(' ');
-            for (let key of keys) {
-                const keydef = source.keyboard3.keys?.key?.find(x => x.id == key);
-                if (keydef) {
-                    const fileKey = {
-                        id: this.translateKeyIdentifierToTouch(keydef.id),
-                        text: keydef.output || '',
-                        // TODO-LDML: additional properties
-                    };
-                    fileRow.key.push(fileKey);
-                }
-                else {
-                    // TODO-LDML: consider logging missing keys
-                }
-            }
-        }
-        return fileLayer;
-    }
-    translateLayerIdToTouchLayoutLayerId(id, modifier) {
-        // Touch layout layers have a set of reserved names that correspond to
-        // hardware modifiers. We want to map these identifiers first before falling
-        // back to the layer ids
-        // The set of recognized layer identifiers is:
-        //
-        // touch          | LDML
-        // ---------------+-------------
-        // default        | none
-        // shift          | shift
-        // caps           | caps
-        // rightalt       | altR
-        // rightalt-shift | altR shift
-        //
-        const map = {
-            none: 'default',
-            shift: 'shift',
-            caps: 'caps',
-            altR: 'rightalt',
-            "altR shift": 'rightalt-shift'
-        };
-        // canonicalize modifier string, alphabetical
-        // TODO-LDML: need to support multiple here
-        if (modifier && modifier.indexOf(',') !== -1) {
-            throw Error(`Internal error: TODO-LDML: multiple modifiers ${modifier} not yet supported.`);
-        }
-        modifier = (modifier || '').split(/\b/).sort().join(' ').trim();
-        if (Object.hasOwn(map, modifier)) {
-            return map[modifier];
-        }
-        // TODO-LDML: Other layer names will be used unmodified, is this sufficient?
-        return id;
-    }
-    translateKeyIdentifierToTouch(id) {
-        // Note: keys identifiers in kmx were traditionally case-insensitive, but we
-        // are going to use them as case-insensitive for LDML keyboards. The set of
-        // standard key identifiers a-z, A-Z, 0-9 will be used, where possible, and
-        // all other keys will be mapped to `T_key`.
-        if (id.match(/^[0-9a-zA-Z]$/)) {
-            return 'K_' + id;
-        }
-        // Not a standard key
-        return 'T_' + id;
-    }
-}
-//# sourceMappingURL=touch-layout-compiler.js.map
-//# debugId=69297fc7-3014-5509-98ca-7d49188be130
+export class TouchLayoutCompiler {
+    compileToJavascript(source) {
+        let result = {};
+        // start with desktop to mimic vk emit
+        result.desktop = {
+            defaultHint: "none", // TODO-LDML this should be optional
+            layer: []
+        };
+        for (let layers of source.keyboard3.layers) {
+            for (let layer of layers.layer) {
+                const resultLayer = this.compileHardwareLayer(source, result, layer);
+                result.desktop.layer.push(resultLayer);
+            }
+        }
+        return result;
+    }
+    compileHardwareLayer(source, file, layer) {
+        // TODO-LDML: consider consolidation with keys.ts?
+        let fileLayer = {
+            id: this.translateLayerIdToTouchLayoutLayerId(layer.id, layer.modifiers),
+            row: []
+        };
+        let y = -1;
+        for (let row of layer.row) {
+            y++;
+            let fileRow = { id: y, key: [] };
+            fileLayer.row.push(fileRow);
+            const keys = row.keys.split(' ');
+            for (let key of keys) {
+                const keydef = source.keyboard3.keys?.key?.find(x => x.id == key);
+                if (keydef) {
+                    const fileKey = {
+                        id: this.translateKeyIdentifierToTouch(keydef.id),
+                        text: keydef.output || '',
+                        // TODO-LDML: additional properties
+                    };
+                    fileRow.key.push(fileKey);
+                }
+                else {
+                    // TODO-LDML: consider logging missing keys
+                }
+            }
+        }
+        return fileLayer;
+    }
+    translateLayerIdToTouchLayoutLayerId(id, modifier) {
+        // Touch layout layers have a set of reserved names that correspond to
+        // hardware modifiers. We want to map these identifiers first before falling
+        // back to the layer ids
+        // The set of recognized layer identifiers is:
+        //
+        // touch          | LDML
+        // ---------------+-------------
+        // default        | none
+        // shift          | shift
+        // caps           | caps
+        // rightalt       | altR
+        // rightalt-shift | altR shift
+        //
+        const map = {
+            none: 'default',
+            shift: 'shift',
+            caps: 'caps',
+            altR: 'rightalt',
+            "altR shift": 'rightalt-shift'
+        };
+        // canonicalize modifier string, alphabetical
+        // TODO-LDML: need to support multiple here
+        if (modifier && modifier.indexOf(',') !== -1) {
+            throw Error(`Internal error: TODO-LDML: multiple modifiers ${modifier} not yet supported.`);
+        }
+        modifier = (modifier || '').split(/\b/).sort().join(' ').trim();
+        if (Object.hasOwn(map, modifier)) {
+            return map[modifier];
+        }
+        // TODO-LDML: Other layer names will be used unmodified, is this sufficient?
+        return id;
+    }
+    translateKeyIdentifierToTouch(id) {
+        // Note: keys identifiers in kmx were traditionally case-insensitive, but we
+        // are going to use them as case-insensitive for LDML keyboards. The set of
+        // standard key identifiers a-z, A-Z, 0-9 will be used, where possible, and
+        // all other keys will be mapped to `T_key`.
+        if (id.match(/^[0-9a-zA-Z]$/)) {
+            return 'K_' + id;
+        }
+        // Not a standard key
+        return 'T_' + id;
+    }
+}
+//# sourceMappingURL=touch-layout-compiler.js.map

package/build/src/compiler/touch-layout-compiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"touch-layout-compiler.js","sources":["../../../src/compiler/touch-layout-compiler.ts"],"sourceRoot":"","names":[],"mappings":";;AAEA,MAAM,OAAO,mBAAmB;IACvB,mBAAmB,CAAC,MAA8C;QACvE,IAAI,MAAM,GAAgC,EAAE,CAAC;QAE7C,sCAAsC;QACtC,MAAM,CAAC,OAAO,GAAG;YACf,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE,EAAE;SACV,CAAC;QAEF,KAAI,IAAI,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE;YACzC,KAAI,IAAI,KAAK,IAAI,MAAM,CAAC,KAAK,EAAE;gBAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;gBACrE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aACxC;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,oBAAoB,CAC1B,MAA8C,EAC9C,IAAiC,EACjC,KAA2B;QAE3B,kDAAkD;QAElD,IAAI,SAAS,GAAiC;YAC5C,EAAE,EAAE,IAAI,CAAC,oCAAoC,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,CAAC;YACxE,GAAG,EAAE,EAAE;SACR,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAEX,KAAI,IAAI,GAAG,IAAI,KAAK,CAAC,GAAG,EAAE;YACxB,CAAC,EAAE,CAAC;YAEJ,IAAI,OAAO,GAA+B,EAAC,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAC,CAAC;YAC3D,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAE5B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACjC,KAAI,IAAI,GAAG,IAAI,IAAI,EAAE;gBACnB,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC;gBAClE,IAAG,MAAM,EAAE;oBACT,MAAM,OAAO,GAA+B;wBAC1C,EAAE,EAAE,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,EAAE,CAAiC;wBACjF,IAAI,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;wBACzB,mCAAmC;qBACpC,CAAC;oBACF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBAC3B;qBAAM;oBACL,2CAA2C;iBAC5C;aACF;SACF;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,oCAAoC,CAAC,EAAU,EAAE,QAAgB;QACvE,sEAAsE;QACtE,4EAA4E;QAC5E,wBAAwB;QAExB,8CAA8C;QAC9C,EAAE;QACF,wBAAwB;QACxB,gCAAgC;QAChC,wBAAwB;QACxB,yBAAyB;QACzB,wBAAwB;QACxB,wBAAwB;QACxB,8BAA8B;QAC9B,EAAE;QACF,MAAM,GAAG,GAAG;YACV,IAAI,EAAU,SAAS;YACvB,KAAK,EAAS,OAAO;YACrB,IAAI,EAAU,MAAM;YACpB,IAAI,EAAU,UAAU;YACxB,YAAY,EAAE,gBAAgB;SAC/B,CAAC;QAEF,6CAA6C;QAC7C,2CAA2C;QAC3C,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;YAC5C,MAAM,KAAK,CAAC,iDAAiD,QAAQ,qBAAqB,CAAC,CAAC;SAC7F;QACD,QAAQ,GAAG,CAAC,QAAQ,IAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAE9D,IAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE;YAC/B,OAAQ,GAAW,CAAC,QAAQ,CAAC,CAAC;SAC/B;QAED,4EAA4E;QAC5E,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,6BAA6B,CAAC,EAAU;QAC9C,4EAA4E;QAC5E,2EAA2E;QAC3E,2EAA2E;QAC3E,4CAA4C;QAE5C,IAAG,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE;YAC5B,OAAO,IAAI,GAAC,EAAE,CAAC;SAChB;QAED,qBAAqB;QACrB,OAAO,IAAI,GAAC,EAAE,CAAC;IACjB,CAAC;CACF","debug_id":"69297fc7-3014-5509-98ca-7d49188be130"}
+{"version":3,"file":"touch-layout-compiler.js","sourceRoot":"","sources":["../../../src/compiler/touch-layout-compiler.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,mBAAmB;IACvB,mBAAmB,CAAC,MAA8C;QACvE,IAAI,MAAM,GAAgC,EAAE,CAAC;QAE7C,sCAAsC;QACtC,MAAM,CAAC,OAAO,GAAG;YACf,WAAW,EAAE,MAAM,EAAG,oCAAoC;YAC1D,KAAK,EAAE,EAAE;SACV,CAAC;QAEF,KAAI,IAAI,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YAC1C,KAAI,IAAI,KAAK,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBAC9B,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;gBACrE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,oBAAoB,CAC1B,MAA8C,EAC9C,IAAiC,EACjC,KAA2B;QAE3B,kDAAkD;QAElD,IAAI,SAAS,GAAiC;YAC5C,EAAE,EAAE,IAAI,CAAC,oCAAoC,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,CAAC;YACxE,GAAG,EAAE,EAAE;SACR,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAEX,KAAI,IAAI,GAAG,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;YACzB,CAAC,EAAE,CAAC;YAEJ,IAAI,OAAO,GAA+B,EAAC,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAC,CAAC;YAC3D,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAE5B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACjC,KAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;gBACpB,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC;gBAClE,IAAG,MAAM,EAAE,CAAC;oBACV,MAAM,OAAO,GAA+B;wBAC1C,EAAE,EAAE,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,EAAE,CAAiC;wBACjF,IAAI,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;wBACzB,mCAAmC;qBACpC,CAAC;oBACF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,2CAA2C;gBAC7C,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,oCAAoC,CAAC,EAAU,EAAE,QAAgB;QACvE,sEAAsE;QACtE,4EAA4E;QAC5E,wBAAwB;QAExB,8CAA8C;QAC9C,EAAE;QACF,wBAAwB;QACxB,gCAAgC;QAChC,wBAAwB;QACxB,yBAAyB;QACzB,wBAAwB;QACxB,wBAAwB;QACxB,8BAA8B;QAC9B,EAAE;QACF,MAAM,GAAG,GAAG;YACV,IAAI,EAAU,SAAS;YACvB,KAAK,EAAS,OAAO;YACrB,IAAI,EAAU,MAAM;YACpB,IAAI,EAAU,UAAU;YACxB,YAAY,EAAE,gBAAgB;SAC/B,CAAC;QAEF,6CAA6C;QAC7C,2CAA2C;QAC3C,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC7C,MAAM,KAAK,CAAC,iDAAiD,QAAQ,qBAAqB,CAAC,CAAC;QAC9F,CAAC;QACD,QAAQ,GAAG,CAAC,QAAQ,IAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAE9D,IAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;YAChC,OAAQ,GAAW,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;QAED,4EAA4E;QAC5E,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,6BAA6B,CAAC,EAAU;QAC9C,4EAA4E;QAC5E,2EAA2E;QAC3E,2EAA2E;QAC3E,4CAA4C;QAE5C,IAAG,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC;YAC7B,OAAO,IAAI,GAAC,EAAE,CAAC;QACjB,CAAC;QAED,qBAAqB;QACrB,OAAO,IAAI,GAAC,EAAE,CAAC;IACjB,CAAC;CACF"}

package/build/src/compiler/tran.d.ts

@@ -1,58 +1,58 @@
-import { SectionIdent } from "@keymanapp/ldml-keyboard-constants";
-import { KMXPlus, LDMLKeyboard, CompilerCallbacks } from '@keymanapp/common-types';
-import { SectionCompiler } from "./section-compiler.js";
-import Bksp = KMXPlus.Bksp;
-import DependencySections = KMXPlus.DependencySections;
-import Tran = KMXPlus.Tran;
-import LDMLKeyboardXMLSourceFile = LDMLKeyboard.LDMLKeyboardXMLSourceFile;
-import { Substitutions } from "./substitution-tracker.js";
-type TransformCompilerType = 'simple' | 'backspace';
-export declare abstract class TransformCompiler<T extends TransformCompilerType, TranBase extends Tran> extends SectionCompiler {
-    static validateSubstitutions(keyboard: LDMLKeyboard.LKKeyboard, st: Substitutions): boolean;
-    protected type: T;
-    constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
-    validate(): boolean;
-    /** allocate a new TranBase subclass */
-    protected newTran(): TranBase;
-    private compileTransforms;
-    private compileTransformGroup;
-    private compileTransformTranGroup;
-    private compileTransform;
-    /**
-     * Validate the final regex
-     * @param cookedFrom the regex to use, missing the trailing '$'
-     * @param from the original from - for error reporting
-     * @returns true if OK
-     */
-    private isValidRegex;
-    private compileReorderTranGroup;
-    private compileReorder;
-    compile(sections: DependencySections): TranBase;
-    get dependencies(): Set<SectionIdent>;
-    /**
-     * Analyze reorders and regexes for \uXXXX escapes.
-     * The LDML spec requires \u{XXXX} format.
-     * @param cookedFrom the original string
-     * @returns the original string, or null if an error was reported
-     */
-    private checkEscapes;
-    /**
-     * Analyze character classes such as '[a-z]' for denormalized characters.
-     * Escapes non-NFD characters as hex escapes.
-     * @param cookedFrom input regex string
-     * @returns updated 'from' string
-     */
-    private checkRanges;
-}
-export declare class TranCompiler extends TransformCompiler<'simple', Tran> {
-    constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
-    protected newTran(): Tran;
-    get id(): SectionIdent;
-}
-export declare class BkspCompiler extends TransformCompiler<'backspace', Bksp> {
-    constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
-    protected newTran(): Bksp;
-    get id(): SectionIdent;
-}
-export {};
+import { SectionIdent } from "@keymanapp/ldml-keyboard-constants";
+import { KMXPlus, LDMLKeyboard, CompilerCallbacks } from '@keymanapp/common-types';
+import { SectionCompiler } from "./section-compiler.js";
+import Bksp = KMXPlus.Bksp;
+import DependencySections = KMXPlus.DependencySections;
+import Tran = KMXPlus.Tran;
+import LDMLKeyboardXMLSourceFile = LDMLKeyboard.LDMLKeyboardXMLSourceFile;
+import { Substitutions } from "./substitution-tracker.js";
+type TransformCompilerType = 'simple' | 'backspace';
+export declare abstract class TransformCompiler<T extends TransformCompilerType, TranBase extends Tran> extends SectionCompiler {
+    static validateSubstitutions(keyboard: LDMLKeyboard.LKKeyboard, st: Substitutions): boolean;
+    protected type: T;
+    constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
+    validate(): boolean;
+    /** allocate a new TranBase subclass */
+    protected newTran(): TranBase;
+    private compileTransforms;
+    private compileTransformGroup;
+    private compileTransformTranGroup;
+    private compileTransform;
+    /**
+     * Validate the final regex
+     * @param cookedFrom the regex to use, missing the trailing '$'
+     * @param from the original from - for error reporting
+     * @returns true if OK
+     */
+    private isValidRegex;
+    private compileReorderTranGroup;
+    private compileReorder;
+    compile(sections: DependencySections): TranBase;
+    get dependencies(): Set<SectionIdent>;
+    /**
+     * Analyze reorders and regexes for \uXXXX escapes.
+     * The LDML spec requires \u{XXXX} format.
+     * @param cookedFrom the original string
+     * @returns the original string, or null if an error was reported
+     */
+    private checkEscapes;
+    /**
+     * Analyze character classes such as '[a-z]' for denormalized characters.
+     * Escapes non-NFD characters as hex escapes.
+     * @param cookedFrom input regex string
+     * @returns updated 'from' string
+     */
+    private checkRanges;
+}
+export declare class TranCompiler extends TransformCompiler<'simple', Tran> {
+    constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
+    protected newTran(): Tran;
+    get id(): SectionIdent;
+}
+export declare class BkspCompiler extends TransformCompiler<'backspace', Bksp> {
+    constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
+    protected newTran(): Bksp;
+    get id(): SectionIdent;
+}
+export {};
 //# sourceMappingURL=tran.d.ts.map