@keymanapp/kmc-ldml 17.0.184-alpha → 17.0.185-alpha
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/src/compiler/compiler.d.ts +3 -4
- package/build/src/compiler/compiler.d.ts.map +1 -1
- package/build/src/compiler/compiler.js +2 -4
- package/build/src/compiler/compiler.js.map +1 -1
- package/build/src/compiler/keys.d.ts +6 -3
- package/build/src/compiler/keys.d.ts.map +1 -1
- package/build/src/compiler/keys.js +38 -7
- package/build/src/compiler/keys.js.map +1 -1
- package/build/src/compiler/layr.d.ts +2 -2
- package/build/src/compiler/layr.d.ts.map +1 -1
- package/build/src/compiler/layr.js +3 -9
- package/build/src/compiler/layr.js.map +1 -1
- package/build/src/compiler/messages.d.ts +9 -16
- package/build/src/compiler/messages.d.ts.map +1 -1
- package/build/src/compiler/messages.js +10 -12
- package/build/src/compiler/messages.js.map +1 -1
- package/build/src/compiler/visual-keyboard-compiler.d.ts +2 -2
- package/build/src/compiler/visual-keyboard-compiler.d.ts.map +1 -1
- package/build/src/compiler/visual-keyboard-compiler.js +15 -7
- package/build/src/compiler/visual-keyboard-compiler.js.map +1 -1
- package/package.json +5 -5
- package/build/src/compiler/vkey.d.ts +0 -11
- package/build/src/compiler/vkey.d.ts.map +0 -1
- package/build/src/compiler/vkey.js +0 -61
- package/build/src/compiler/vkey.js.map +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
!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]="
|
|
1
|
+
!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]="dc6ee14a-4de0-5a08-b7f3-480737671c13")}catch(e){}}();
|
|
2
2
|
import { LDMLKeyboard, KMXPlus, CompilerCallbacks, LDMLKeyboardTestDataXMLSourceFile, UnicodeSetParser } from '@keymanapp/common-types';
|
|
3
3
|
import { LdmlCompilerOptions } from './ldml-compiler-options.js';
|
|
4
4
|
import { BkspCompiler, TranCompiler } from './tran.js';
|
|
@@ -8,11 +8,10 @@ import { LayrCompiler } from './layr.js';
|
|
|
8
8
|
import { LocaCompiler } from './loca.js';
|
|
9
9
|
import { MetaCompiler } from './meta.js';
|
|
10
10
|
import { NameCompiler } from './name.js';
|
|
11
|
-
import { VkeyCompiler } from './vkey.js';
|
|
12
11
|
import { VarsCompiler } from './vars.js';
|
|
13
12
|
import { StrsCompiler } from './empty-compiler.js';
|
|
14
13
|
import LDMLKeyboardXMLSourceFile = LDMLKeyboard.LDMLKeyboardXMLSourceFile;
|
|
15
|
-
export declare const SECTION_COMPILERS: (typeof TranCompiler | typeof BkspCompiler | typeof DispCompiler | typeof KeysCompiler | typeof LayrCompiler | typeof LocaCompiler | typeof MetaCompiler | typeof NameCompiler | typeof
|
|
14
|
+
export declare const SECTION_COMPILERS: (typeof TranCompiler | typeof BkspCompiler | typeof DispCompiler | typeof KeysCompiler | typeof LayrCompiler | typeof LocaCompiler | typeof MetaCompiler | typeof NameCompiler | typeof VarsCompiler | typeof StrsCompiler)[];
|
|
16
15
|
export declare class LdmlKeyboardCompiler {
|
|
17
16
|
private readonly callbacks;
|
|
18
17
|
private readonly options;
|
|
@@ -53,5 +52,5 @@ export declare class LdmlKeyboardCompiler {
|
|
|
53
52
|
*/
|
|
54
53
|
compile(source: LDMLKeyboardXMLSourceFile): Promise<KMXPlus.KMXPlusFile>;
|
|
55
54
|
}
|
|
56
|
-
//# debugId=
|
|
55
|
+
//# debugId=dc6ee14a-4de0-5a08-b7f3-480737671c13
|
|
57
56
|
//# sourceMappingURL=compiler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"dc6ee14a-4de0-5a08-b7f3-480737671c13","file":"compiler.d.ts","mappings":";AAAA,OAAO,EAAmC,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAE,iCAAiC,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACzK,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAA4C,MAAM,qBAAqB,CAAC;AAG7F,OAAO,yBAAyB,GAAG,YAAY,CAAC,yBAAyB,CAAC;AAM1E,eAAO,MAAM,iBAAiB,+NAmB7B,CAAC;AAEF,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoB;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAG9C,OAAO,CAAC,UAAU,CAAC,CAA+B;gBAErC,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,mBAAmB;IAOvE;;;OAGG;IACG,aAAa,IAAK,OAAO,CAAC,gBAAgB,CAAC;IAejD,OAAO,CAAC,aAAa;IAIrB;;;;;OAKG;IACI,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,yBAAyB,GAAG,IAAI;IA2B/D;;;;;OAKG;IACM,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,iCAAiC,GAAG,IAAI;IA4BjF;;;;;OAKG;IACI,QAAQ,CAAC,MAAM,EAAE,yBAAyB,GAAG,OAAO;IAI3D;;;;;OAKG;IACU,OAAO,CAAC,MAAM,EAAE,yBAAyB,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC;CAoDtF","names":[],"sourceRoot":"","sources":["../../../src/compiler/compiler.ts"],"version":3}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
!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]="
|
|
1
|
+
!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]="b4396b9e-8ba8-5e55-a054-5d2673051ae9")}catch(e){}}();
|
|
2
2
|
import { LDMLKeyboardXMLSourceFileReader, KMXPlus } from '@keymanapp/common-types';
|
|
3
3
|
import { CompilerMessages } from './messages.js';
|
|
4
4
|
import { BkspCompiler, TranCompiler } from './tran.js';
|
|
@@ -8,7 +8,6 @@ import { LayrCompiler } from './layr.js';
|
|
|
8
8
|
import { LocaCompiler } from './loca.js';
|
|
9
9
|
import { MetaCompiler } from './meta.js';
|
|
10
10
|
import { NameCompiler } from './name.js';
|
|
11
|
-
import { VkeyCompiler } from './vkey.js';
|
|
12
11
|
import { VarsCompiler } from './vars.js';
|
|
13
12
|
import { StrsCompiler, ElemCompiler, ListCompiler, UsetCompiler } from './empty-compiler.js';
|
|
14
13
|
var KMXPlusFile = KMXPlus.KMXPlusFile;
|
|
@@ -32,7 +31,6 @@ export const SECTION_COMPILERS = [
|
|
|
32
31
|
MetaCompiler,
|
|
33
32
|
NameCompiler,
|
|
34
33
|
TranCompiler,
|
|
35
|
-
VkeyCompiler,
|
|
36
34
|
];
|
|
37
35
|
export class LdmlKeyboardCompiler {
|
|
38
36
|
callbacks;
|
|
@@ -194,5 +192,5 @@ export class LdmlKeyboardCompiler {
|
|
|
194
192
|
return passed ? kmx : null;
|
|
195
193
|
}
|
|
196
194
|
}
|
|
197
|
-
//# debugId=
|
|
195
|
+
//# debugId=b4396b9e-8ba8-5e55-a054-5d2673051ae9
|
|
198
196
|
//# sourceMappingURL=compiler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"b4396b9e-8ba8-5e55-a054-5d2673051ae9","file":"compiler.js","mappings":";AAAA,OAAO,EAAE,+BAA+B,EAAgB,OAAO,EAA0E,MAAM,yBAAyB,CAAC;AAEzK,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAI7F,IAAO,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;AAEzC,OAAO,EAAgB,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,iCAAiC;IAEjC,qCAAqC;IACrC,YAAY;IACZ,YAAY;IACZ,YAAY;IACZ,YAAY;IACZ,sCAAsC;IACtC,YAAY;IACZ,kBAAkB;IAClB,YAAY;IACZ,YAAY;IACZ,YAAY;IACZ,YAAY;IACZ,YAAY;IACZ,YAAY;IACZ,YAAY;IACZ,YAAY;CACb,CAAC;AAEF,MAAM,OAAO,oBAAoB;IACd,SAAS,CAAoB;IAC7B,OAAO,CAAsB;IAE9C,cAAc;IACN,UAAU,GAAsB,SAAS,CAAC;IAElD,YAAa,SAA4B,EAAE,OAA4B;QACrE,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,OAAO;SACX,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,aAAa;QACjB,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE;YACjC,aAAa;YACb,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;YACnC,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/C,IAAI,EAAE,EAAE;gBACN,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC;aAC5B;iBAAM;gBACL,sBAAsB;gBACtB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC,wBAAwB;aACjD;SACF;QACD,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAEO,aAAa,CAAC,MAAiC;QACrD,OAAO,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACnE,CAAC;IAED;;;;;OAKG;IACI,IAAI,CAAC,QAAgB;QAC1B,MAAM,MAAM,GAAG,IAAI,+BAA+B,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/F,wCAAwC;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC/C,IAAG,CAAC,IAAI,EAAE;YACR,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAC,SAAS,EAAE,yBAAyB,EAAC,CAAC,CAAC,CAAC;YACzG,OAAO,IAAI,CAAC;SACb;QACD,8CAA8C;QAC9C,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAG,CAAC,MAAM,EAAE;YACV,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAC,SAAS,EAAE,yBAAyB,EAAC,CAAC,CAAC,CAAC;YACzG,OAAO,IAAI,CAAC;SACb;QACD,IAAI;YACF,mDAAmD;YACnD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBAC5B,OAAO,IAAI,CAAC;aACb;SACF;QAAC,OAAM,CAAC,EAAE;YACT,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAC,SAAS,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAC,CAAC,CAAC,CAAC;YAC5F,OAAO,IAAI,CAAC;SACb;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;OAKG;IACM,YAAY,CAAC,QAAgB;QAClC,MAAM,MAAM,GAAG,IAAI,+BAA+B,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/F,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC/C,IAAG,CAAC,IAAI,EAAE;YACR,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAC,SAAS,EAAE,yBAAyB,EAAC,CAAC,CAAC,CAAC;YACzG,OAAO,IAAI,CAAC;SACb;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACzC,sBAAsB;QACtB,IAAG,CAAC,MAAM,EAAE;YACV,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAC,SAAS,EAAE,yBAAyB,EAAC,CAAC,CAAC,CAAC;YACzG,OAAO,IAAI,CAAC;SACb;QACD,8FAA8F;QAE9F,QAAQ;QACR,oCAAoC;QACpC,mBAAmB;QACnB,MAAM;QACN,eAAe;QACf,iGAAiG;QACjG,iBAAiB;QACjB,IAAI;QAEJ,OAAO,MAAM,CAAC;IAChB,CAAC;IAGH;;;;;OAKG;IACI,QAAQ,CAAC,MAAiC;QAC/C,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,OAAO,CAAC,MAAiC;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,MAAM,GAAG,IAAI,CAAC;QAElB,MAAM,GAAG,GAAG,IAAI,WAAW,EAAE,CAAC;QAE9B,KAAI,IAAI,OAAO,IAAI,QAAQ,EAAE;YAC3B,IAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE;gBACtB,sBAAsB;gBACtB,MAAM,GAAG,KAAK,CAAC;gBACf,uEAAuE;gBACvE,qCAAqC;gBACrC,SAAS;aACV;YACD,QAAQ;YACR,MAAM,cAAc,GAAwB,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YAC3E,gCAAgC;YAChC,cAAc,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YACvD,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;YAC1C,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,OAAgB,EAAE,EAAE;gBAC1D,MAAM,MAAM,GAAkB,SAAS,CAAC,OAAO,CAAe,OAAO,CAAC,CAAC;gBACvE,IAAI,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBAC5B,sBAAsB;oBACtB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;wBACxB,gDAAgD;wBAChD,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,CAAC,EAAE,wCAAwC,MAAM,kBAAkB,CAAC,CAAC;qBACxH;iBACF;qBAAM;oBACL,6CAA6C;oBAC7C,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;iBAC/B;YACH,CAAC,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YAE7C,sBAAsB;YACtB,IAAG,CAAC,IAAI,EAAE;gBACR,2DAA2D;gBAC3D,2CAA2C;gBAC3C,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,EAAC,IAAI,EAAC,OAAO,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC;gBAC9F,MAAM,GAAG,KAAK,CAAC;gBACf,SAAS;aACV;YACD,sBAAsB;YACtB,IAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;gBAC1B,gDAAgD;gBAChD,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,CAAC,EAAE,0BAA0B,CAAC,CAAC;aAClF;YACD,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,IAAW,CAAC;SACvC;QAED,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7B,CAAC;CACF","names":[],"sourceRoot":"","sources":["../../../src/compiler/compiler.ts"],"version":3}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
!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]="
|
|
2
|
-
import { LDMLKeyboard, KMXPlus } from '@keymanapp/common-types';
|
|
1
|
+
!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]="58acdfbf-4b9d-5213-b812-317dabc0f1f4")}catch(e){}}();
|
|
2
|
+
import { LDMLKeyboard, KMXPlus, Constants } from '@keymanapp/common-types';
|
|
3
3
|
import { SectionCompiler } from "./section-compiler.js";
|
|
4
4
|
import DependencySections = KMXPlus.DependencySections;
|
|
5
5
|
import Keys = KMXPlus.Keys;
|
|
@@ -16,6 +16,9 @@ export declare class KeysCompiler extends SectionCompiler {
|
|
|
16
16
|
compile(sections: DependencySections): Keys;
|
|
17
17
|
loadFlicks(sections: DependencySections, sect: Keys): void;
|
|
18
18
|
loadKeys(sections: DependencySections, sect: Keys): void;
|
|
19
|
+
private getKeymapFromForm;
|
|
20
|
+
static getKeymapFromForms(forms: LDMLKeyboard.LKForm[], hardware: string, badScans?: Set<number>): Constants.KeyMap;
|
|
21
|
+
static getKeymapFromScancodes(ldmlForm: LDMLKeyboard.LKForm, badScans?: Set<number>): Constants.KeyMap;
|
|
19
22
|
/**
|
|
20
23
|
* TODO-LDML: from old 'keys'
|
|
21
24
|
* Validate for purpose of kmap
|
|
@@ -26,5 +29,5 @@ export declare class KeysCompiler extends SectionCompiler {
|
|
|
26
29
|
private validateHardwareLayerForKmap;
|
|
27
30
|
private compileHardwareLayerToKmap;
|
|
28
31
|
}
|
|
29
|
-
//# debugId=
|
|
32
|
+
//# debugId=58acdfbf-4b9d-5213-b812-317dabc0f1f4
|
|
30
33
|
//# sourceMappingURL=keys.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"58acdfbf-4b9d-5213-b812-317dabc0f1f4","file":"keys.d.ts","mappings":";AACA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAgB,MAAM,yBAAyB,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAI3B,OAAO,EAAE,aAAa,EAAa,MAAM,qBAAqB,CAAC;AAE/D,qBAAa,YAAa,SAAQ,eAAe;IAC/C,MAAM,CAAC,eAAe,CACpB,QAAQ,EAAE,YAAY,CAAC,UAAU,EACjC,EAAE,EAAE,aAAa,GAChB,OAAO;IAOV,IAAW,EAAE,8DAEZ;IAED;;;OAGG;IACI,cAAc;IAId,QAAQ;IAsDR,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAmC3C,UAAU,CAAC,QAAQ,EAAE,kBAAkB,EAAE,IAAI,EAAE,IAAI;IA4BnD,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,EAAE,IAAI,EAAE,IAAI;IAuDxD,OAAO,CAAC,iBAAiB;WAIX,kBAAkB,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,MAAM;WAS5G,sBAAsB,CAAC,QAAQ,EAAE,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;IAO1F;;;;;;OAMG;IACH,OAAO,CAAC,4BAA4B;IAoFpC,OAAO,CAAC,0BAA0B;CA+BnC","names":[],"sourceRoot":"","sources":["../../../src/compiler/keys.ts"],"version":3}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
!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]="
|
|
1
|
+
!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]="7f31d748-d130-57e6-bc37-32b36814cd00")}catch(e){}}();
|
|
2
2
|
import { constants } from '@keymanapp/ldml-keyboard-constants';
|
|
3
|
-
import { KMXPlus, Constants, MarkerParser } from '@keymanapp/common-types';
|
|
3
|
+
import { LDMLKeyboard, KMXPlus, Constants, MarkerParser } from '@keymanapp/common-types';
|
|
4
4
|
import { CompilerMessages } from './messages.js';
|
|
5
5
|
import { SectionCompiler } from "./section-compiler.js";
|
|
6
6
|
var Keys = KMXPlus.Keys;
|
|
@@ -24,6 +24,14 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
24
24
|
}
|
|
25
25
|
validate() {
|
|
26
26
|
let valid = true;
|
|
27
|
+
// There's no 'form' compiler.
|
|
28
|
+
// We validate this here so that someone checks it.
|
|
29
|
+
this.keyboard3.forms?.form?.forEach((form) => {
|
|
30
|
+
if (!LDMLKeyboard.ImportStatus.isImpliedImport(form)) {
|
|
31
|
+
// If it's not an implied import, give a warning.
|
|
32
|
+
this.callbacks.reportMessage(CompilerMessages.Warn_CustomForm({ id: form.id }));
|
|
33
|
+
}
|
|
34
|
+
});
|
|
27
35
|
// general key-level validation here, only of used keys
|
|
28
36
|
const usedKeys = allUsedKeyIdsInLayers(this.keyboard3?.layers);
|
|
29
37
|
const uniqueKeys = calculateUniqueKeys([...this.keyboard3.keys?.key]);
|
|
@@ -153,6 +161,23 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
153
161
|
});
|
|
154
162
|
}
|
|
155
163
|
}
|
|
164
|
+
getKeymapFromForm(hardware, badScans) {
|
|
165
|
+
return KeysCompiler.getKeymapFromForms(this.keyboard3?.forms.form, hardware, badScans);
|
|
166
|
+
}
|
|
167
|
+
static getKeymapFromForms(forms, hardware, badScans) {
|
|
168
|
+
// seach in reverse form because of overrides
|
|
169
|
+
const ldmlForm = [...forms].reverse().find((f) => f.id === hardware);
|
|
170
|
+
if (!ldmlForm) {
|
|
171
|
+
return undefined;
|
|
172
|
+
}
|
|
173
|
+
return KeysCompiler.getKeymapFromScancodes(ldmlForm, badScans);
|
|
174
|
+
}
|
|
175
|
+
static getKeymapFromScancodes(ldmlForm, badScans) {
|
|
176
|
+
const { scanCodes } = ldmlForm;
|
|
177
|
+
const ldmlScan = scanCodes.map(o => o.codes.split(" ").map(n => Number.parseInt(n, 16)));
|
|
178
|
+
const ldmlVkey = Constants.CLDRScanToKeyMap(ldmlScan, badScans);
|
|
179
|
+
return ldmlVkey;
|
|
180
|
+
}
|
|
156
181
|
/**
|
|
157
182
|
* TODO-LDML: from old 'keys'
|
|
158
183
|
* Validate for purpose of kmap
|
|
@@ -167,12 +192,18 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
167
192
|
this.callbacks.reportMessage(CompilerMessages.Error_InvalidModifier({ modifier, layer: layer.id }));
|
|
168
193
|
valid = false;
|
|
169
194
|
}
|
|
170
|
-
const
|
|
171
|
-
|
|
195
|
+
const badScans = new Set();
|
|
196
|
+
const keymap = this.getKeymapFromForm(hardware, badScans);
|
|
172
197
|
if (!keymap) {
|
|
173
|
-
// not reached due to XML validation
|
|
174
198
|
this.callbacks.reportMessage(CompilerMessages.Error_InvalidHardware({ form: hardware }));
|
|
175
199
|
valid = false;
|
|
200
|
+
return valid;
|
|
201
|
+
}
|
|
202
|
+
else if (badScans.size !== 0) {
|
|
203
|
+
const codes = Array.from(badScans.values()).map(n => Number(n).toString(16)).sort();
|
|
204
|
+
this.callbacks.reportMessage(CompilerMessages.Error_InvalidScanCode({ form: hardware, codes }));
|
|
205
|
+
valid = false;
|
|
206
|
+
return valid;
|
|
176
207
|
}
|
|
177
208
|
const uniqueKeys = calculateUniqueKeys([...this.keyboard3.keys?.key]);
|
|
178
209
|
if (layer.row.length > keymap.length) {
|
|
@@ -215,7 +246,7 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
215
246
|
}
|
|
216
247
|
compileHardwareLayerToKmap(sections, layer, sect, hardware) {
|
|
217
248
|
const mod = translateLayerAttrToModifier(layer);
|
|
218
|
-
const keymap =
|
|
249
|
+
const keymap = this.getKeymapFromForm(hardware);
|
|
219
250
|
let y = -1;
|
|
220
251
|
for (let row of layer.row) {
|
|
221
252
|
y++;
|
|
@@ -236,5 +267,5 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
236
267
|
return sect;
|
|
237
268
|
}
|
|
238
269
|
}
|
|
239
|
-
//# debugId=
|
|
270
|
+
//# debugId=7f31d748-d130-57e6-bc37-32b36814cd00
|
|
240
271
|
//# sourceMappingURL=keys.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"7f31d748-d130-57e6-bc37-32b36814cd00","file":"keys.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/keys.ts"],"version":3}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
!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]="
|
|
1
|
+
!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]="9f413bdb-0119-5ef9-8195-81d5def4ffdb")}catch(e){}}();
|
|
2
2
|
import { KMXPlus } from '@keymanapp/common-types';
|
|
3
3
|
import { SectionCompiler } from "./section-compiler.js";
|
|
4
4
|
import DependencySections = KMXPlus.DependencySections;
|
|
@@ -8,5 +8,5 @@ export declare class LayrCompiler extends SectionCompiler {
|
|
|
8
8
|
validate(): boolean;
|
|
9
9
|
compile(sections: DependencySections): Layr;
|
|
10
10
|
}
|
|
11
|
-
//# debugId=
|
|
11
|
+
//# debugId=9f413bdb-0119-5ef9-8195-81d5def4ffdb
|
|
12
12
|
//# sourceMappingURL=layr.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"9f413bdb-0119-5ef9-8195-81d5def4ffdb","file":"layr.d.ts","mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAIxD,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAK3B,qBAAa,YAAa,SAAQ,eAAe;IAE/C,IAAW,EAAE,8DAEZ;IAEM,QAAQ;IAqCR,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;CA2BnD","names":[],"sourceRoot":"","sources":["../../../src/compiler/layr.ts"],"version":3}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
!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]="
|
|
1
|
+
!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]="e2af0266-141a-5197-ad03-b6bdef9607cd")}catch(e){}}();
|
|
2
2
|
import { constants } from '@keymanapp/ldml-keyboard-constants';
|
|
3
3
|
import { KMXPlus } from '@keymanapp/common-types';
|
|
4
4
|
import { CompilerMessages } from './messages.js';
|
|
@@ -29,12 +29,6 @@ export class LayrCompiler extends SectionCompiler {
|
|
|
29
29
|
valid = false;
|
|
30
30
|
this.callbacks.reportMessage(CompilerMessages.Error_ExcessHardware({ form }));
|
|
31
31
|
}
|
|
32
|
-
else if (!constants.layr_list_hardware_map.get(form)) {
|
|
33
|
-
/* c8 ignore next 4 */
|
|
34
|
-
// not reached due to XML validation
|
|
35
|
-
valid = false;
|
|
36
|
-
this.callbacks.reportMessage(CompilerMessages.Error_InvalidHardware({ form }));
|
|
37
|
-
}
|
|
38
32
|
}
|
|
39
33
|
layers.layer.forEach((layer) => {
|
|
40
34
|
const { modifier, id } = layer;
|
|
@@ -55,7 +49,7 @@ export class LayrCompiler extends SectionCompiler {
|
|
|
55
49
|
compile(sections) {
|
|
56
50
|
const sect = new Layr();
|
|
57
51
|
sect.lists = this.keyboard3.layers.map((layers) => {
|
|
58
|
-
const hardware =
|
|
52
|
+
const hardware = sections.strs.allocString(layers.form);
|
|
59
53
|
// Already validated in validate
|
|
60
54
|
const list = {
|
|
61
55
|
hardware,
|
|
@@ -79,5 +73,5 @@ export class LayrCompiler extends SectionCompiler {
|
|
|
79
73
|
return sect;
|
|
80
74
|
}
|
|
81
75
|
}
|
|
82
|
-
//# debugId=
|
|
76
|
+
//# debugId=e2af0266-141a-5197-ad03-b6bdef9607cd
|
|
83
77
|
//# sourceMappingURL=layr.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"e2af0266-141a-5197-ad03-b6bdef9607cd","file":"layr.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/layr.ts"],"version":3}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
!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]="
|
|
1
|
+
!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]="69e974f9-37b2-5893-9649-8811854f28d3")}catch(e){}}();
|
|
2
2
|
export declare class CompilerMessages {
|
|
3
3
|
static Error_InvalidNormalization: (o: {
|
|
4
4
|
form: string;
|
|
@@ -35,22 +35,15 @@ export declare class CompilerMessages {
|
|
|
35
35
|
locale: string;
|
|
36
36
|
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
37
37
|
static HINT_LocaleIsNotMinimalAndClean: number;
|
|
38
|
-
static
|
|
39
|
-
|
|
38
|
+
static Error_InvalidScanCode: (o: {
|
|
39
|
+
form?: string;
|
|
40
|
+
codes?: string[];
|
|
40
41
|
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
41
|
-
static
|
|
42
|
-
static
|
|
43
|
-
|
|
44
|
-
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
45
|
-
static HINT_VkeyIsRedundant: number;
|
|
46
|
-
static Error_VkeyIsRepeated: (o: {
|
|
47
|
-
vkey: string;
|
|
48
|
-
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
49
|
-
static ERROR_VkeyIsRepeated: number;
|
|
50
|
-
static Info_MultipleVkeysHaveSameTarget: (o: {
|
|
51
|
-
vkey: string;
|
|
42
|
+
static ERROR_InvalidScanCode: number;
|
|
43
|
+
static Warn_CustomForm: (o: {
|
|
44
|
+
id: string;
|
|
52
45
|
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
53
|
-
static
|
|
46
|
+
static WARN_CustomForm: number;
|
|
54
47
|
static Error_InvalidVersion: (o: {
|
|
55
48
|
version: string;
|
|
56
49
|
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
@@ -136,5 +129,5 @@ export declare class CompilerMessages {
|
|
|
136
129
|
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
137
130
|
static ERROR_DisplayNeedsToOrId: number;
|
|
138
131
|
}
|
|
139
|
-
//# debugId=
|
|
132
|
+
//# debugId=69e974f9-37b2-5893-9649-8811854f28d3
|
|
140
133
|
//# sourceMappingURL=messages.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"69e974f9-37b2-5893-9649-8811854f28d3","file":"messages.d.ts","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/messages.ts"],"version":3}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
!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]="
|
|
1
|
+
!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]="6b284eb1-4b19-5ff2-a134-49b6e7769c61")}catch(e){}}();
|
|
2
2
|
import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m } from "@keymanapp/common-types";
|
|
3
|
-
const SevInfo = CompilerErrorSeverity.Info | CompilerErrorNamespace.LdmlKeyboardCompiler;
|
|
3
|
+
// const SevInfo = CompilerErrorSeverity.Info | CompilerErrorNamespace.LdmlKeyboardCompiler;
|
|
4
4
|
const SevHint = CompilerErrorSeverity.Hint | CompilerErrorNamespace.LdmlKeyboardCompiler;
|
|
5
|
-
|
|
5
|
+
const SevWarn = CompilerErrorSeverity.Warn | CompilerErrorNamespace.LdmlKeyboardCompiler;
|
|
6
6
|
const SevError = CompilerErrorSeverity.Error | CompilerErrorNamespace.LdmlKeyboardCompiler;
|
|
7
7
|
const SevFatal = CompilerErrorSeverity.Fatal | CompilerErrorNamespace.LdmlKeyboardCompiler;
|
|
8
8
|
export class CompilerMessages {
|
|
@@ -22,14 +22,12 @@ export class CompilerMessages {
|
|
|
22
22
|
static ERROR_InvalidFile = SevError | 0x0007;
|
|
23
23
|
static Hint_LocaleIsNotMinimalAndClean = (o) => m(this.HINT_LocaleIsNotMinimalAndClean, `Locale '${o.sourceLocale}' is not minimal or correctly formatted and should be '${o.locale}'`);
|
|
24
24
|
static HINT_LocaleIsNotMinimalAndClean = SevHint | 0x0008;
|
|
25
|
-
static
|
|
26
|
-
static
|
|
27
|
-
static
|
|
28
|
-
static
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
static Info_MultipleVkeysHaveSameTarget = (o) => m(this.INFO_MultipleVkeysHaveSameTarget, `Target virtual key '${o.vkey}' has multiple source mappings, which may be an error.`);
|
|
32
|
-
static INFO_MultipleVkeysHaveSameTarget = SevInfo | 0x000C;
|
|
25
|
+
static Error_InvalidScanCode = (o) => m(this.ERROR_InvalidScanCode, `Form '${o.form}' has invalid/unknown scancodes '${o.codes?.join(' ')}'`);
|
|
26
|
+
static ERROR_InvalidScanCode = SevError | 0x0009;
|
|
27
|
+
static Warn_CustomForm = (o) => m(this.WARN_CustomForm, `Custom <form id="${o.id}"> element. Key layout may not be as expected.`);
|
|
28
|
+
static WARN_CustomForm = SevWarn | 0x000A;
|
|
29
|
+
// 0x000B - available
|
|
30
|
+
// 0x000C - available
|
|
33
31
|
static Error_InvalidVersion = (o) => m(this.ERROR_InvalidVersion, `Version number '${o.version}' must be a semantic version format string.`);
|
|
34
32
|
static ERROR_InvalidVersion = SevError | 0x000D;
|
|
35
33
|
static Error_MustBeAtLeastOneLayerElement = () => m(this.ERROR_MustBeAtLeastOneLayerElement, `The source file must contain at least one layer element.`);
|
|
@@ -89,5 +87,5 @@ export class CompilerMessages {
|
|
|
89
87
|
static Error_DisplayNeedsToOrId = (o) => m(this.ERROR_DisplayNeedsToOrId, `display ${CompilerMessages.toOrId(o)} needs to= or id=, but not both`);
|
|
90
88
|
static ERROR_DisplayNeedsToOrId = SevError | 0x0022;
|
|
91
89
|
}
|
|
92
|
-
//# debugId=
|
|
90
|
+
//# debugId=6b284eb1-4b19-5ff2-a134-49b6e7769c61
|
|
93
91
|
//# sourceMappingURL=messages.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"6b284eb1-4b19-5ff2-a134-49b6e7769c61","file":"messages.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/messages.ts"],"version":3}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
!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]="
|
|
1
|
+
!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]="00a6a2b6-9c10-5afd-8fe5-66f6963f437f")}catch(e){}}();
|
|
2
2
|
import { VisualKeyboard, LDMLKeyboard } from "@keymanapp/common-types";
|
|
3
3
|
export declare class LdmlKeyboardVisualKeyboardCompiler {
|
|
4
4
|
compile(source: LDMLKeyboard.LDMLKeyboardXMLSourceFile): VisualKeyboard.VisualKeyboard;
|
|
5
5
|
private compileHardwareLayer;
|
|
6
6
|
private translateLayerIdToVisualKeyboardShift;
|
|
7
7
|
}
|
|
8
|
-
//# debugId=
|
|
8
|
+
//# debugId=00a6a2b6-9c10-5afd-8fe5-66f6963f437f
|
|
9
9
|
//# sourceMappingURL=visual-keyboard-compiler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"00a6a2b6-9c10-5afd-8fe5-66f6963f437f","file":"visual-keyboard-compiler.d.ts","mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvE,qBAAa,kCAAkC;IACtC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,yBAAyB,GAAG,cAAc,CAAC,cAAc;IAqB7F,OAAO,CAAC,oBAAoB;IAwC5B,OAAO,CAAC,qCAAqC;CAO9C","names":[],"sourceRoot":"","sources":["../../../src/compiler/visual-keyboard-compiler.ts"],"version":3}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
!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]="
|
|
2
|
-
import {
|
|
1
|
+
!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]="251a5d4a-be29-543d-a28d-e8d0a8104178")}catch(e){}}();
|
|
2
|
+
import { VisualKeyboard } from "@keymanapp/common-types";
|
|
3
|
+
import { KeysCompiler } from "./keys.js";
|
|
3
4
|
export class LdmlKeyboardVisualKeyboardCompiler {
|
|
4
5
|
compile(source) {
|
|
5
6
|
let result = new VisualKeyboard.VisualKeyboard();
|
|
@@ -11,14 +12,21 @@ export class LdmlKeyboardVisualKeyboardCompiler {
|
|
|
11
12
|
result.header.ansiFont = { ...VisualKeyboard.DEFAULT_KVK_FONT };
|
|
12
13
|
result.header.unicodeFont = { ...VisualKeyboard.DEFAULT_KVK_FONT };
|
|
13
14
|
for (let layers of source.keyboard3.layers) {
|
|
15
|
+
const hardware = layers.form;
|
|
14
16
|
for (let layer of layers.layer) {
|
|
15
|
-
this.compileHardwareLayer(source, result, layer);
|
|
17
|
+
this.compileHardwareLayer(source, result, layer, hardware);
|
|
16
18
|
}
|
|
17
19
|
}
|
|
18
20
|
return result;
|
|
19
21
|
}
|
|
20
|
-
compileHardwareLayer(source, vk, layer) {
|
|
21
|
-
|
|
22
|
+
compileHardwareLayer(source, vk, layer, hardware) {
|
|
23
|
+
if (hardware === 'touch') {
|
|
24
|
+
hardware = 'us'; // TODO-LDML: US Only. Do something different here?
|
|
25
|
+
}
|
|
26
|
+
const keymap = KeysCompiler.getKeymapFromForms(source.keyboard3?.forms?.form, hardware);
|
|
27
|
+
if (!keymap) {
|
|
28
|
+
throw Error(`Internal error: could not find keymap for form ${hardware}`);
|
|
29
|
+
}
|
|
22
30
|
const shift = this.translateLayerIdToVisualKeyboardShift(layer.id);
|
|
23
31
|
let y = -1;
|
|
24
32
|
for (let row of layer.row) {
|
|
@@ -35,7 +43,7 @@ export class LdmlKeyboardVisualKeyboardCompiler {
|
|
|
35
43
|
flags: 2 /* VisualKeyboard.VisualKeyboardKeyFlags.kvkkUnicode */,
|
|
36
44
|
shift: shift,
|
|
37
45
|
text: keydef.to,
|
|
38
|
-
vkey:
|
|
46
|
+
vkey: keymap[y][x],
|
|
39
47
|
});
|
|
40
48
|
}
|
|
41
49
|
}
|
|
@@ -48,5 +56,5 @@ export class LdmlKeyboardVisualKeyboardCompiler {
|
|
|
48
56
|
return 0;
|
|
49
57
|
}
|
|
50
58
|
}
|
|
51
|
-
//# debugId=
|
|
59
|
+
//# debugId=251a5d4a-be29-543d-a28d-e8d0a8104178
|
|
52
60
|
//# sourceMappingURL=visual-keyboard-compiler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"251a5d4a-be29-543d-a28d-e8d0a8104178","file":"visual-keyboard-compiler.js","mappings":";AAAA,OAAO,EAAE,cAAc,EAAgB,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,OAAO,kCAAkC;IACtC,OAAO,CAAC,MAA8C;QAC3D,IAAI,MAAM,GAAG,IAAI,cAAc,CAAC,cAAc,EAAE,CAAC;QAEjD,6GAA6G;QAC7G,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;QACxB,MAAM,CAAC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;QAE/B,oHAAoH;QACpH,MAAM,CAAC,MAAM,CAAC,kBAAkB,GAAG,EAAE,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,QAAQ,GAAG,EAAC,GAAG,cAAc,CAAC,gBAAgB,EAAC,CAAC;QAC9D,MAAM,CAAC,MAAM,CAAC,WAAW,GAAG,EAAC,GAAG,cAAc,CAAC,gBAAgB,EAAC,CAAC;QAEjE,KAAI,IAAI,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE;YACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC;YAC7B,KAAI,IAAI,KAAK,IAAI,MAAM,CAAC,KAAK,EAAE;gBAC7B,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;aAC5D;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,oBAAoB,CAC1B,MAA8C,EAC9C,EAAiC,EACjC,KAA2B,EAC3B,QAAgB;QAEhB,IAAI,QAAQ,KAAK,OAAO,EAAE;YACxB,QAAQ,GAAG,IAAI,CAAC,CAAC,mDAAmD;SACrE;QACD,MAAM,MAAM,GAAG,YAAY,CAAC,kBAAkB,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QACxF,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,KAAK,CAAC,kDAAkD,QAAQ,EAAE,CAAC,CAAC;SAC3E;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,qCAAqC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAEnE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACX,KAAI,IAAI,GAAG,IAAI,KAAK,CAAC,GAAG,EAAE;YACxB,CAAC,EAAE,CAAC;YAEJ,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YACX,KAAI,IAAI,GAAG,IAAI,IAAI,EAAE;gBACnB,CAAC,EAAE,CAAC;gBAEJ,IAAI,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC;gBAEhE,IAAI,CAAC,MAAM,EAAE;oBACX,MAAM,KAAK,CAAC,0CAA0C,GAAG,eAAe,KAAK,CAAC,EAAE,IAAI,QAAQ,WAAW,CAAC,GAAG,CAAC,CAAC;iBAC9G;gBAED,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;oBACX,KAAK,2DAAmD;oBACxD,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,MAAM,CAAC,EAAE;oBACf,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBACnB,CAAC,CAAC;aACJ;SACF;IACH,CAAC;IAEO,qCAAqC,CAAC,EAAU;QACtD,IAAG,EAAE,IAAI,MAAM,EAAE;YACf,OAAO,CAAC,CAAC;SACV;QACD,6BAA6B;QAC7B,OAAO,CAAC,CAAC;IACX,CAAC;CACF","names":[],"sourceRoot":"","sources":["../../../src/compiler/visual-keyboard-compiler.ts"],"version":3}
|
package/package.json
CHANGED
|
@@ -26,16 +26,16 @@
|
|
|
26
26
|
"url": "https://github.com/keymanapp/keyman/issues"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@keymanapp/keyman-version": "17.0.
|
|
30
|
-
"@keymanapp/kmc-kmn": "17.0.
|
|
31
|
-
"@keymanapp/ldml-keyboard-constants": "17.0.
|
|
29
|
+
"@keymanapp/keyman-version": "17.0.185-alpha",
|
|
30
|
+
"@keymanapp/kmc-kmn": "17.0.185-alpha",
|
|
31
|
+
"@keymanapp/ldml-keyboard-constants": "17.0.185-alpha",
|
|
32
32
|
"ajv": "^8.11.0",
|
|
33
33
|
"restructure": "git+https://github.com/keymanapp/dependency-restructure.git#7a188a1e26f8f36a175d95b67ffece8702363dfc",
|
|
34
34
|
"semver": "^7.5.2",
|
|
35
35
|
"xml2js": "git+https://github.com/keymanapp/dependency-node-xml2js#535fe732dc408d697e0f847c944cc45f0baf0829"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@keymanapp/developer-test-helpers": "17.0.
|
|
38
|
+
"@keymanapp/developer-test-helpers": "17.0.185-alpha",
|
|
39
39
|
"@types/chai": "^4.1.7",
|
|
40
40
|
"@types/mocha": "^5.2.7",
|
|
41
41
|
"@types/node": "^20.4.1",
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"type": "git",
|
|
69
69
|
"url": "git+https://github.com/keymanapp/keyman.git"
|
|
70
70
|
},
|
|
71
|
-
"version": "17.0.
|
|
71
|
+
"version": "17.0.185-alpha"
|
|
72
72
|
}
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
!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]="74359acc-a72c-5f70-b2ec-95aa0f5539b4")}catch(e){}}();
|
|
2
|
-
import { KMXPlus } from '@keymanapp/common-types';
|
|
3
|
-
import { SectionCompiler } from "./section-compiler.js";
|
|
4
|
-
import Vkey = KMXPlus.Vkey;
|
|
5
|
-
export declare class VkeyCompiler extends SectionCompiler {
|
|
6
|
-
get id(): import("@keymanapp/ldml-keyboard-constants").SectionIdent;
|
|
7
|
-
validate(): boolean;
|
|
8
|
-
compile(): Vkey;
|
|
9
|
-
}
|
|
10
|
-
//# debugId=74359acc-a72c-5f70-b2ec-95aa0f5539b4
|
|
11
|
-
//# sourceMappingURL=vkey.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"debug_id":"74359acc-a72c-5f70-b2ec-95aa0f5539b4","file":"vkey.d.ts","mappings":";AACA,OAAO,EAAE,OAAO,EAAa,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAG3B,qBAAa,YAAa,SAAQ,eAAe;IAE/C,IAAW,EAAE,8DAEZ;IAEM,QAAQ,IAAI,OAAO;IAqCnB,OAAO,IAAI,IAAI;CAiBvB","names":[],"sourceRoot":"","sources":["../../../src/compiler/vkey.ts"],"version":3}
|
|
@@ -1,61 +0,0 @@
|
|
|
1
|
-
!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]="907a9829-644c-5999-81cd-427cd67c38bd")}catch(e){}}();
|
|
2
|
-
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
3
|
-
import { KMXPlus, Constants } from '@keymanapp/common-types';
|
|
4
|
-
import { CompilerMessages } from "./messages.js";
|
|
5
|
-
import { SectionCompiler } from "./section-compiler.js";
|
|
6
|
-
var Vkey = KMXPlus.Vkey;
|
|
7
|
-
var LdmlVkeyNames = Constants.LdmlVkeyNames;
|
|
8
|
-
export class VkeyCompiler extends SectionCompiler {
|
|
9
|
-
get id() {
|
|
10
|
-
return constants.section.vkey;
|
|
11
|
-
}
|
|
12
|
-
validate() {
|
|
13
|
-
let valid = true;
|
|
14
|
-
if (this.keyboard3.vkeys) {
|
|
15
|
-
let from = [], to = [];
|
|
16
|
-
this.keyboard3.vkeys.vkey.forEach(vk => {
|
|
17
|
-
if (LdmlVkeyNames[vk.from] === undefined) {
|
|
18
|
-
// TODO-LDML: When we do #7135 this may need to change back to an error.
|
|
19
|
-
this.callbacks.reportMessage(CompilerMessages.Hint_VkeyIsNotValid({ vkey: vk.from }));
|
|
20
|
-
return;
|
|
21
|
-
}
|
|
22
|
-
if (LdmlVkeyNames[vk.to] === undefined) {
|
|
23
|
-
// TODO-LDML: When we do #7135 this may need to change back to an error.
|
|
24
|
-
this.callbacks.reportMessage(CompilerMessages.Hint_VkeyIsNotValid({ vkey: vk.to }));
|
|
25
|
-
return;
|
|
26
|
-
}
|
|
27
|
-
if (vk.from == vk.to) {
|
|
28
|
-
this.callbacks.reportMessage(CompilerMessages.Hint_VkeyIsRedundant({ vkey: vk.from }));
|
|
29
|
-
}
|
|
30
|
-
if (from.find(svk => svk == vk.from)) {
|
|
31
|
-
this.callbacks.reportMessage(CompilerMessages.Error_VkeyIsRepeated({ vkey: vk.from }));
|
|
32
|
-
valid = false;
|
|
33
|
-
}
|
|
34
|
-
from.push(vk.from);
|
|
35
|
-
if (to.find(svk => svk == vk.to)) {
|
|
36
|
-
this.callbacks.reportMessage(CompilerMessages.Info_MultipleVkeysHaveSameTarget({ vkey: vk.to }));
|
|
37
|
-
}
|
|
38
|
-
to.push(vk.to);
|
|
39
|
-
});
|
|
40
|
-
}
|
|
41
|
-
return valid;
|
|
42
|
-
}
|
|
43
|
-
compile() {
|
|
44
|
-
let result = new Vkey();
|
|
45
|
-
if (!this.keyboard3.vkeys) {
|
|
46
|
-
/* c8 ignore next 2 */
|
|
47
|
-
return result; // not hit due to boxing
|
|
48
|
-
}
|
|
49
|
-
result.vkeys = this.keyboard3.vkeys?.vkey.map(vk => {
|
|
50
|
-
return {
|
|
51
|
-
vkey: LdmlVkeyNames[vk.from],
|
|
52
|
-
target: LdmlVkeyNames[vk.to]
|
|
53
|
-
};
|
|
54
|
-
});
|
|
55
|
-
// Sort according to vkey binary order, per C7043
|
|
56
|
-
result.vkeys.sort((a, b) => a.vkey - b.vkey);
|
|
57
|
-
return result;
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
//# debugId=907a9829-644c-5999-81cd-427cd67c38bd
|
|
61
|
-
//# sourceMappingURL=vkey.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"debug_id":"907a9829-644c-5999-81cd-427cd67c38bd","file":"vkey.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/vkey.ts"],"version":3}
|