@keymanapp/kmc-ldml 17.0.171-alpha → 17.0.184-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/disp.js +6 -6
- package/build/src/compiler/disp.js.map +1 -1
- package/build/src/compiler/keymanweb-compiler.js +4 -4
- package/build/src/compiler/keymanweb-compiler.js.map +1 -1
- package/build/src/compiler/keys.js +12 -12
- package/build/src/compiler/keys.js.map +1 -1
- package/build/src/compiler/layr.js +4 -4
- package/build/src/compiler/layr.js.map +1 -1
- package/build/src/compiler/loca.js +4 -4
- package/build/src/compiler/loca.js.map +1 -1
- package/build/src/compiler/messages.d.ts +2 -5
- package/build/src/compiler/messages.d.ts.map +1 -1
- package/build/src/compiler/messages.js +2 -5
- package/build/src/compiler/messages.js.map +1 -1
- package/build/src/compiler/meta.js +13 -13
- package/build/src/compiler/meta.js.map +1 -1
- package/build/src/compiler/name.js +4 -4
- package/build/src/compiler/name.js.map +1 -1
- package/build/src/compiler/section-compiler.d.ts +3 -3
- package/build/src/compiler/section-compiler.d.ts.map +1 -1
- package/build/src/compiler/section-compiler.js +4 -4
- package/build/src/compiler/section-compiler.js.map +1 -1
- package/build/src/compiler/touch-layout-compiler.js +4 -4
- package/build/src/compiler/touch-layout-compiler.js.map +1 -1
- package/build/src/compiler/tran.js +4 -4
- package/build/src/compiler/tran.js.map +1 -1
- package/build/src/compiler/vars.js +8 -8
- package/build/src/compiler/vars.js.map +1 -1
- package/build/src/compiler/visual-keyboard-compiler.js +4 -4
- package/build/src/compiler/visual-keyboard-compiler.js.map +1 -1
- package/build/src/compiler/vkey.js +6 -6
- package/build/src/compiler/vkey.js.map +1 -1
- package/package.json +5 -5
|
@@ -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]="7c95fff9-f0b1-5b09-8601-69218d8e3844")}catch(e){}}();
|
|
2
2
|
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
3
3
|
import { KMXPlus, MarkerParser } from '@keymanapp/common-types';
|
|
4
4
|
import { CompilerMessages } from "./messages.js";
|
|
@@ -18,8 +18,8 @@ export class DispCompiler extends SectionCompiler {
|
|
|
18
18
|
let valid = true;
|
|
19
19
|
const tos = new Set();
|
|
20
20
|
const ids = new Set();
|
|
21
|
-
if (this.
|
|
22
|
-
for (const { to, id } of this.
|
|
21
|
+
if (this.keyboard3.displays?.display) {
|
|
22
|
+
for (const { to, id } of this.keyboard3.displays?.display) {
|
|
23
23
|
if ((to && id) || (!to && !id)) {
|
|
24
24
|
this.callbacks.reportMessage(CompilerMessages.Error_DisplayNeedsToOrId({ to, id }));
|
|
25
25
|
return false;
|
|
@@ -49,10 +49,10 @@ export class DispCompiler extends SectionCompiler {
|
|
|
49
49
|
compile(sections) {
|
|
50
50
|
let result = new Disp();
|
|
51
51
|
// displayOptions
|
|
52
|
-
result.baseCharacter = sections.strs.allocAndUnescapeString(this.
|
|
52
|
+
result.baseCharacter = sections.strs.allocAndUnescapeString(this.keyboard3.displays?.displayOptions?.baseCharacter);
|
|
53
53
|
// TODO-LDML: substitute variables!
|
|
54
54
|
// displays
|
|
55
|
-
result.disps = this.
|
|
55
|
+
result.disps = this.keyboard3.displays?.display.map(display => ({
|
|
56
56
|
to: sections.strs.allocAndUnescapeString(sections.vars.substituteMarkerString(display.to)),
|
|
57
57
|
id: sections.strs.allocString(display.id),
|
|
58
58
|
display: sections.strs.allocAndUnescapeString(display.display),
|
|
@@ -71,5 +71,5 @@ export class DispCompiler extends SectionCompiler {
|
|
|
71
71
|
return result;
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
|
-
//# debugId=
|
|
74
|
+
//# debugId=7c95fff9-f0b1-5b09-8601-69218d8e3844
|
|
75
75
|
//# sourceMappingURL=disp.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"7c95fff9-f0b1-5b09-8601-69218d8e3844","file":"disp.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/disp.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]="8229517c-bdb7-544f-b760-2084b297fd10")}catch(e){}}();
|
|
2
2
|
import { VisualKeyboard, TouchLayoutFileWriter } from "@keymanapp/common-types";
|
|
3
3
|
import { TouchLayoutCompiler } from "./touch-layout-compiler.js";
|
|
4
4
|
import { LdmlKeyboardVisualKeyboardCompiler } from "./visual-keyboard-compiler.js";
|
|
@@ -61,13 +61,13 @@ export class LdmlKeyboardKeymanWebCompiler {
|
|
|
61
61
|
// `${tab}${this.setupDebug()}${nl}` + ? we may use this for modifierBitmask in future
|
|
62
62
|
// `${tab}this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;${nl}` + ? we probably don't need this, it's for back-compat
|
|
63
63
|
`${tab}this.KI="${sName}";${nl}` +
|
|
64
|
-
`${tab}this.KN=${JSON.stringify(source.
|
|
64
|
+
`${tab}this.KN=${JSON.stringify(source.keyboard3.names.name[0])};${nl}` +
|
|
65
65
|
`${tab}this.KMINVER=${JSON.stringify(MINIMUM_KMW_VERSION)};${nl}` +
|
|
66
66
|
`${tab}this.KV=${this.compileVisualKeyboard(source)};${nl}` +
|
|
67
67
|
`${tab}this.KDU=${displayUnderlying ? '1' : '0'};${nl}` +
|
|
68
68
|
`${tab}this.KH="";${nl}` + // TODO-LDML: help text not supported
|
|
69
69
|
`${tab}this.KM=0;${nl}` + // TODO-LDML: mnemonic layout not supported for LDML keyboards
|
|
70
|
-
`${tab}this.KBVER=${JSON.stringify(source.
|
|
70
|
+
`${tab}this.KBVER=${JSON.stringify(source.keyboard3.version?.number || '0.0')};${nl}` +
|
|
71
71
|
`${tab}this.KMBM=${modifierBitmask};${nl}`;
|
|
72
72
|
if (isRTL) {
|
|
73
73
|
result += `${tab}this.KRTL=1;${nl}`;
|
|
@@ -93,5 +93,5 @@ export class LdmlKeyboardKeymanWebCompiler {
|
|
|
93
93
|
return result;
|
|
94
94
|
}
|
|
95
95
|
}
|
|
96
|
-
//# debugId=
|
|
96
|
+
//# debugId=8229517c-bdb7-544f-b760-2084b297fd10
|
|
97
97
|
//# sourceMappingURL=keymanweb-compiler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"8229517c-bdb7-544f-b760-2084b297fd10","file":"keymanweb-compiler.js","mappings":";AAAA,OAAO,EAAqB,cAAc,EAAgB,qBAAqB,EAAmB,MAAM,yBAAyB,CAAC;AAElI,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,kCAAkC,EAAE,MAAM,+BAA+B,CAAC;AAEnF,MAAM,mBAAmB,GAAG,MAAM,CAAC;AAEnC,MAAM,OAAO,6BAA6B;IAKpB;IAJH,OAAO,CAAsB;IAC7B,EAAE,CAAS;IACX,GAAG,CAAS;IAE7B,YAAoB,SAA4B,EAAE,OAA6B;QAA3D,cAAS,GAAT,SAAS,CAAmB;QAC9C,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7C,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAChD,CAAC;IAEM,qBAAqB,CAAC,MAA8C;QACzE,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACnC,MAAM,GAAG,GAAG,IAAI,kCAAkC,EAAE,CAAC;QACrD,MAAM,EAAE,GAAkC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAE9D,IAAI,MAAM,GACR,aAAa,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK;YAC5D,SAAS,EAAE,CAAC,MAAM,CAAC,KAAK,2DAAmD,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,GAAG,mDAAmD;YAClJ,GAAG,GAAG,gBAAgB,EAAE,EAAE;YAC1B,GAAG,GAAG,GAAG,GAAG,cAAc,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,EAAE;YAC/C,yBAAyB;YACzB,GAAG,GAAG,GAAG,CAAC;QAEZ,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,kBAAkB,CAAC,MAA8C;QACtE,MAAM,UAAU,GAAG,IAAI,mBAAmB,EAAE,CAAC;QAC7C,MAAM,MAAM,GAAG,UAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,IAAI,qBAAqB,CAAC,EAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAC,CAAC,CAAC;QAC9E,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAEO,SAAS,CAAC,IAAY;QAC5B,IAAI,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,mDAAsC,CAAC;QACrF,IAAG,CAAC,MAAM,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;SAC9C;QAED,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QAC9C,IAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YACzB,gCAAgC;YAChC,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC;SACvB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,OAAO,CAAC,IAAY,EAAE,MAA8C;QACzE,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QAEnC,MAAM,KAAK,GAAG,WAAW,GAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,iBAAiB,GAAG,IAAI,CAAC,CAAC,YAAY;QAC5C,MAAM,eAAe,GAAG,CAAC,CAAC,CAAC,wDAAwD;QACnF,MAAM,YAAY,GAAG,EAAE,CAAC,CAAE,0CAA0C;QACpE,MAAM,0BAA0B,GAAG,KAAK,CAAC,CAAC,YAAY;QACtD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,YAAY;QAEjC,IAAI,MAAM,GACR,sCAAsC,EAAE,EAAE;YAC1C,GAAG,GAAG,8CAA8C,mBAAmB,eAAe,EAAE,EAAE;YAC1F,WAAW,EAAE,EAAE;YACf,GAAG,GAAG,oBAAoB,KAAK,OAAO,EAAE,EAAE;YAC1C,IAAI,EAAE,EAAE;YACR,YAAY,KAAK,OAAO,EAAE,EAAE;YAC5B,sFAAsF;YACtF,0KAA0K;YAC1K,GAAG,GAAG,YAAY,KAAK,KAAK,EAAE,EAAE;YAChC,GAAG,GAAG,WAAW,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE;YACvE,GAAG,GAAG,gBAAgB,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,EAAE;YACjE,GAAG,GAAG,WAAW,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE;YAC3D,GAAG,GAAG,YAAY,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE;YACvD,GAAG,GAAG,cAAc,EAAE,EAAE,GAAI,qCAAqC;YACjE,GAAG,GAAG,aAAa,EAAE,EAAE,GAAI,8DAA8D;YACzF,GAAG,GAAG,cAAc,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE;YACrF,GAAG,GAAG,aAAa,eAAe,IAAI,EAAE,EAAE,CAAC;QAE7C,IAAG,KAAK,EAAE;YACR,MAAM,IAAI,GAAG,GAAG,eAAe,EAAE,EAAE,CAAC;SACrC;QAED,IAAG,0BAA0B,EAAE;YAC7B,MAAM,IAAI,GAAG,GAAG,aAAa,EAAE,EAAE,CAAC;SACnC;QAED,IAAG,YAAY,IAAI,EAAE,EAAE;YACrB,MAAM,IAAI,GAAG,GAAG,aAAa,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;SACnE;QAED,IAAI,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACjD,IAAG,UAAU,IAAI,EAAE,EAAE;YACnB,MAAM,IAAI,GAAG,GAAG,aAAa,UAAU,IAAI,EAAE,EAAE,CAAC;SACjD;QACD,gCAAgC;QAEhC,yDAAyD;QAEzD,qEAAqE;QACrE,uDAAuD;QACvD,MAAM,IAAI,GAAG,GAAG,yBAAyB,EAAE,EAAE;YACnC,GAAG,GAAG,GAAG,GAAG,YAAY,EAAE,EAAE,GAAE,mEAAmE;YACjG,GAAG,GAAG,KAAK,EAAE,EAAE,CAAC;QAE1B,MAAM,IAAI,IAAI,EAAE,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC;IAChB,CAAC;CACF","names":[],"sourceRoot":"","sources":["../../../src/compiler/keymanweb-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]="ff2b3e31-90d5-5594-b432-6d41c4e5f427")}catch(e){}}();
|
|
2
2
|
import { constants } from '@keymanapp/ldml-keyboard-constants';
|
|
3
3
|
import { KMXPlus, Constants, MarkerParser } from '@keymanapp/common-types';
|
|
4
4
|
import { CompilerMessages } from './messages.js';
|
|
@@ -20,13 +20,13 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
20
20
|
* @returns just the non-touch layers.
|
|
21
21
|
*/
|
|
22
22
|
hardwareLayers() {
|
|
23
|
-
return this.
|
|
23
|
+
return this.keyboard3.layers?.filter(({ form }) => form !== "touch");
|
|
24
24
|
}
|
|
25
25
|
validate() {
|
|
26
26
|
let valid = true;
|
|
27
27
|
// general key-level validation here, only of used keys
|
|
28
|
-
const usedKeys = allUsedKeyIdsInLayers(this.
|
|
29
|
-
const uniqueKeys = calculateUniqueKeys([...this.
|
|
28
|
+
const usedKeys = allUsedKeyIdsInLayers(this.keyboard3?.layers);
|
|
29
|
+
const uniqueKeys = calculateUniqueKeys([...this.keyboard3.keys?.key]);
|
|
30
30
|
for (let key of uniqueKeys) {
|
|
31
31
|
const { id, flicks } = key;
|
|
32
32
|
if (!usedKeys.has(id)) {
|
|
@@ -36,7 +36,7 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
36
36
|
if (!flicks) {
|
|
37
37
|
continue; // no flicks
|
|
38
38
|
}
|
|
39
|
-
const flickEntry = this.
|
|
39
|
+
const flickEntry = this.keyboard3.keys?.flicks?.find((x) => x.id === flicks);
|
|
40
40
|
if (!flickEntry) {
|
|
41
41
|
valid = false;
|
|
42
42
|
this.callbacks.reportMessage(CompilerMessages.Error_MissingFlicks({ flicks, id }));
|
|
@@ -59,7 +59,7 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
59
59
|
}
|
|
60
60
|
compile(sections) {
|
|
61
61
|
/* c8 ignore next 4 */
|
|
62
|
-
if (!this.
|
|
62
|
+
if (!this.keyboard3?.keys?.key && !this.keyboard3?.keys?.flicks) {
|
|
63
63
|
// short-circuit if no keys or flicks. Doesn't happen in practice due to implied import.
|
|
64
64
|
return null;
|
|
65
65
|
}
|
|
@@ -86,7 +86,7 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
86
86
|
return sect;
|
|
87
87
|
}
|
|
88
88
|
loadFlicks(sections, sect) {
|
|
89
|
-
for (let lkflicks of this.
|
|
89
|
+
for (let lkflicks of this.keyboard3.keys.flicks) {
|
|
90
90
|
let flicks = new KeysFlicks(sections.strs.allocString(lkflicks.id));
|
|
91
91
|
for (let lkflick of lkflicks.flick) {
|
|
92
92
|
let flags = 0;
|
|
@@ -106,8 +106,8 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
108
|
loadKeys(sections, sect) {
|
|
109
|
-
const usedKeys = allUsedKeyIdsInLayers(this.
|
|
110
|
-
const uniqueKeys = calculateUniqueKeys([...this.
|
|
109
|
+
const usedKeys = allUsedKeyIdsInLayers(this.keyboard3?.layers);
|
|
110
|
+
const uniqueKeys = calculateUniqueKeys([...this.keyboard3.keys?.key]);
|
|
111
111
|
for (let key of uniqueKeys) {
|
|
112
112
|
if (!usedKeys.has(key.id)) {
|
|
113
113
|
// TODO-LDML: linting for unused, non-implied and non-imported keys,
|
|
@@ -174,7 +174,7 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
174
174
|
this.callbacks.reportMessage(CompilerMessages.Error_InvalidHardware({ form: hardware }));
|
|
175
175
|
valid = false;
|
|
176
176
|
}
|
|
177
|
-
const uniqueKeys = calculateUniqueKeys([...this.
|
|
177
|
+
const uniqueKeys = calculateUniqueKeys([...this.keyboard3.keys?.key]);
|
|
178
178
|
if (layer.row.length > keymap.length) {
|
|
179
179
|
this.callbacks.reportMessage(CompilerMessages.Error_HardwareLayerHasTooManyRows());
|
|
180
180
|
valid = false;
|
|
@@ -225,7 +225,7 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
225
225
|
x++;
|
|
226
226
|
// TODO-LDML: we already validated that the key exists, above.
|
|
227
227
|
// So here we only need the ID?
|
|
228
|
-
// let keydef = this.
|
|
228
|
+
// let keydef = this.keyboard3.keys?.key?.find(x => x.id == key);
|
|
229
229
|
sect.kmap.push({
|
|
230
230
|
vkey: keymap[y][x],
|
|
231
231
|
mod: mod,
|
|
@@ -236,5 +236,5 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
236
236
|
return sect;
|
|
237
237
|
}
|
|
238
238
|
}
|
|
239
|
-
//# debugId=
|
|
239
|
+
//# debugId=ff2b3e31-90d5-5594-b432-6d41c4e5f427
|
|
240
240
|
//# sourceMappingURL=keys.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"ff2b3e31-90d5-5594-b432-6d41c4e5f427","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]="fbd8d979-fb76-5687-b8f2-424473172400")}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';
|
|
@@ -14,7 +14,7 @@ export class LayrCompiler extends SectionCompiler {
|
|
|
14
14
|
let totalLayerCount = 0;
|
|
15
15
|
let hardwareLayers = 0;
|
|
16
16
|
// let touchLayers = 0;
|
|
17
|
-
this.
|
|
17
|
+
this.keyboard3.layers?.forEach((layers) => {
|
|
18
18
|
const { form } = layers;
|
|
19
19
|
if (form === 'touch') {
|
|
20
20
|
// touchLayers++;
|
|
@@ -54,7 +54,7 @@ export class LayrCompiler extends SectionCompiler {
|
|
|
54
54
|
}
|
|
55
55
|
compile(sections) {
|
|
56
56
|
const sect = new Layr();
|
|
57
|
-
sect.lists = this.
|
|
57
|
+
sect.lists = this.keyboard3.layers.map((layers) => {
|
|
58
58
|
const hardware = constants.layr_list_hardware_map.get(layers.form);
|
|
59
59
|
// Already validated in validate
|
|
60
60
|
const list = {
|
|
@@ -79,5 +79,5 @@ export class LayrCompiler extends SectionCompiler {
|
|
|
79
79
|
return sect;
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
|
-
//# debugId=
|
|
82
|
+
//# debugId=fbd8d979-fb76-5687-b8f2-424473172400
|
|
83
83
|
//# sourceMappingURL=layr.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"fbd8d979-fb76-5687-b8f2-424473172400","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]="58d4e3bc-5adb-5c68-a6db-35855c5453d2")}catch(e){}}();
|
|
2
2
|
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
3
3
|
import { KMXPlus } from '@keymanapp/common-types';
|
|
4
4
|
import { SectionCompiler } from "./section-compiler.js";
|
|
@@ -16,7 +16,7 @@ export class LocaCompiler extends SectionCompiler {
|
|
|
16
16
|
getLocales = (keyboard) => [keyboard.locale].concat(Array.isArray(keyboard.locales?.locale) ? keyboard.locales.locale.map(v => v.id) : []);
|
|
17
17
|
validate() {
|
|
18
18
|
let valid = true;
|
|
19
|
-
const locales = this.getLocales(this.
|
|
19
|
+
const locales = this.getLocales(this.keyboard3);
|
|
20
20
|
for (let tag of locales) {
|
|
21
21
|
try {
|
|
22
22
|
new Intl.Locale(tag);
|
|
@@ -38,7 +38,7 @@ export class LocaCompiler extends SectionCompiler {
|
|
|
38
38
|
let result = new Loca();
|
|
39
39
|
// This also minimizes locales according to Remove Likely Subtags algorithm:
|
|
40
40
|
// https://www.unicode.org/reports/tr35/#Likely_Subtags
|
|
41
|
-
const sourceLocales = this.getLocales(this.
|
|
41
|
+
const sourceLocales = this.getLocales(this.keyboard3);
|
|
42
42
|
const locales = sourceLocales.map((sourceLocale) => {
|
|
43
43
|
const locale = new Intl.Locale(sourceLocale).minimize().toString();
|
|
44
44
|
if (locale != sourceLocale) {
|
|
@@ -57,5 +57,5 @@ export class LocaCompiler extends SectionCompiler {
|
|
|
57
57
|
return result;
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
|
-
//# debugId=
|
|
60
|
+
//# debugId=58d4e3bc-5adb-5c68-a6db-35855c5453d2
|
|
61
61
|
//# sourceMappingURL=loca.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"58d4e3bc-5adb-5c68-a6db-35855c5453d2","file":"loca.js","mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAgB,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,IAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAG3B,MAAM,OAAO,YAAa,SAAQ,eAAe;IAE/C,IAAW,EAAE;QACX,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;IAChC,CAAC;IAED;;;;OAIG;IACK,UAAU,GAChB,CAAC,QAAoB,EAAE,EAAE,CACzB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAE1G,QAAQ;QACb,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAChD,KAAI,IAAI,GAAG,IAAI,OAAO,EAAE;YACtB,IAAI;gBACF,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aACtB;YAAC,OAAM,CAAC,EAAE;gBACT,IAAG,CAAC,YAAY,UAAU,EAAE;oBAC1B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,EAAC,GAAG,EAAC,CAAC,CAAC,CAAC;oBAC1E,KAAK,GAAG,KAAK,CAAC;iBACf;qBAAM;oBACL,sBAAsB;oBACtB,MAAM,CAAC,CAAC;iBACT;aACF;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,OAAO,CAAC,QAA4B;QACzC,IAAI,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QAExB,4EAA4E;QAC5E,uDAAuD;QACvD,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,YAAoB,EAAE,EAAE;YACzD,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;YACnE,IAAG,MAAM,IAAI,YAAY,EAAE;gBACzB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,+BAA+B,CAAC,EAAC,YAAY,EAAE,MAAM,EAAC,CAAC,CAAC,CAAC;aACxG;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,4EAA4E;QAC5E,0EAA0E;QAC1E,yDAAyD;QACzD,MAAM,gBAAgB,GAAI,IAAY,CAAC,mBAAmB,CAAC,OAAO,CAAa,CAAC;QAChF,MAAM,CAAC,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;QAEnF,IAAG,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE;YACzC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,6BAA6B,EAAE,CAAC,CAAC;SAChF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF","names":[],"sourceRoot":"","sources":["../../../src/compiler/loca.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]="e8fd12da-1460-5278-8f0e-d75f032b801e")}catch(e){}}();
|
|
2
2
|
export declare class CompilerMessages {
|
|
3
3
|
static Error_InvalidNormalization: (o: {
|
|
4
4
|
form: string;
|
|
@@ -79,9 +79,6 @@ export declare class CompilerMessages {
|
|
|
79
79
|
static Error_InvalidHardware: (o: {
|
|
80
80
|
form: string;
|
|
81
81
|
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
82
|
-
/**
|
|
83
|
-
* Note: may not hit this due to XML validation.
|
|
84
|
-
*/
|
|
85
82
|
static ERROR_InvalidHardware: number;
|
|
86
83
|
static Error_InvalidModifier: (o: {
|
|
87
84
|
layer: string;
|
|
@@ -139,5 +136,5 @@ export declare class CompilerMessages {
|
|
|
139
136
|
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
140
137
|
static ERROR_DisplayNeedsToOrId: number;
|
|
141
138
|
}
|
|
142
|
-
//# debugId=
|
|
139
|
+
//# debugId=e8fd12da-1460-5278-8f0e-d75f032b801e
|
|
143
140
|
//# sourceMappingURL=messages.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"e8fd12da-1460-5278-8f0e-d75f032b801e","file":"messages.d.ts","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/messages.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]="321f6586-31c2-5393-bdff-e79404ea2a34")}catch(e){}}();
|
|
2
2
|
import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m } from "@keymanapp/common-types";
|
|
3
3
|
const SevInfo = CompilerErrorSeverity.Info | CompilerErrorNamespace.LdmlKeyboardCompiler;
|
|
4
4
|
const SevHint = CompilerErrorSeverity.Hint | CompilerErrorNamespace.LdmlKeyboardCompiler;
|
|
@@ -58,9 +58,6 @@ export class CompilerMessages {
|
|
|
58
58
|
static Error_ExcessHardware = (o) => m(this.ERROR_ExcessHardware, `layers form=${o.form}: Can only have one non-'touch' element`);
|
|
59
59
|
static ERROR_ExcessHardware = SevError | 0x0012;
|
|
60
60
|
static Error_InvalidHardware = (o) => m(this.ERROR_InvalidHardware, `layers has invalid value form=${o.form}`);
|
|
61
|
-
/**
|
|
62
|
-
* Note: may not hit this due to XML validation.
|
|
63
|
-
*/
|
|
64
61
|
static ERROR_InvalidHardware = SevError | 0x0013;
|
|
65
62
|
static Error_InvalidModifier = (o) => m(this.ERROR_InvalidModifier, `layer has invalid modifier='${o.modifier}' on layer id=${o.layer}`);
|
|
66
63
|
static ERROR_InvalidModifier = SevError | 0x0014;
|
|
@@ -92,5 +89,5 @@ export class CompilerMessages {
|
|
|
92
89
|
static Error_DisplayNeedsToOrId = (o) => m(this.ERROR_DisplayNeedsToOrId, `display ${CompilerMessages.toOrId(o)} needs to= or id=, but not both`);
|
|
93
90
|
static ERROR_DisplayNeedsToOrId = SevError | 0x0022;
|
|
94
91
|
}
|
|
95
|
-
//# debugId=
|
|
92
|
+
//# debugId=321f6586-31c2-5393-bdff-e79404ea2a34
|
|
96
93
|
//# sourceMappingURL=messages.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"321f6586-31c2-5393-bdff-e79404ea2a34","file":"messages.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/messages.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]="82348478-dbd1-531b-b809-741d43414061")}catch(e){}}();
|
|
2
2
|
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
3
3
|
import { KMXPlus } from '@keymanapp/common-types';
|
|
4
4
|
import { isValidEnumValue } from "../util/util.js";
|
|
@@ -14,8 +14,8 @@ export class MetaCompiler extends SectionCompiler {
|
|
|
14
14
|
}
|
|
15
15
|
validate() {
|
|
16
16
|
let valid = true;
|
|
17
|
-
valid &&= this.validateNormalization(this.
|
|
18
|
-
valid &&= this.validateVersion(this.
|
|
17
|
+
valid &&= this.validateNormalization(this.keyboard3.info?.normalization);
|
|
18
|
+
valid &&= this.validateVersion(this.keyboard3.version?.number);
|
|
19
19
|
return valid;
|
|
20
20
|
}
|
|
21
21
|
validateVersion(versionNumber) {
|
|
@@ -43,18 +43,18 @@ export class MetaCompiler extends SectionCompiler {
|
|
|
43
43
|
}
|
|
44
44
|
compile(sections) {
|
|
45
45
|
let result = new Meta();
|
|
46
|
-
result.author = sections.strs.allocString(this.
|
|
47
|
-
result.conform = sections.strs.allocString(this.
|
|
48
|
-
result.layout = sections.strs.allocString(this.
|
|
49
|
-
result.normalization = sections.strs.allocString(this.
|
|
50
|
-
result.indicator = sections.strs.allocString(this.
|
|
51
|
-
result.version = sections.strs.allocString(this.
|
|
46
|
+
result.author = sections.strs.allocString(this.keyboard3.info?.author);
|
|
47
|
+
result.conform = sections.strs.allocString(this.keyboard3.conformsTo);
|
|
48
|
+
result.layout = sections.strs.allocString(this.keyboard3.info?.layout);
|
|
49
|
+
result.normalization = sections.strs.allocString(this.keyboard3.info?.normalization);
|
|
50
|
+
result.indicator = sections.strs.allocString(this.keyboard3.info?.indicator);
|
|
51
|
+
result.version = sections.strs.allocString(this.keyboard3.version?.number ?? "0.0.0");
|
|
52
52
|
result.settings =
|
|
53
|
-
(this.
|
|
54
|
-
(this.
|
|
55
|
-
(this.
|
|
53
|
+
(this.keyboard3.settings?.fallback == "omit" ? KeyboardSettings.fallback : 0) |
|
|
54
|
+
(this.keyboard3.settings?.transformFailure == "omit" ? KeyboardSettings.transformFailure : 0) |
|
|
55
|
+
(this.keyboard3.settings?.transformPartial == "hide" ? KeyboardSettings.transformPartial : 0);
|
|
56
56
|
return result;
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
|
-
//# debugId=
|
|
59
|
+
//# debugId=82348478-dbd1-531b-b809-741d43414061
|
|
60
60
|
//# sourceMappingURL=meta.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"82348478-dbd1-531b-b809-741d43414061","file":"meta.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/meta.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]="5f5a65bd-c021-5c7d-a21a-90ebc0a54cb1")}catch(e){}}();
|
|
2
2
|
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
3
3
|
import { KMXPlus } from '@keymanapp/common-types';
|
|
4
4
|
import { SectionCompiler } from "./section-compiler.js";
|
|
@@ -9,14 +9,14 @@ export class NameCompiler extends SectionCompiler {
|
|
|
9
9
|
}
|
|
10
10
|
validate() {
|
|
11
11
|
let valid = true;
|
|
12
|
-
valid = (this.
|
|
12
|
+
valid = (this.keyboard3.names?.name?.length ?? 0) > 0;
|
|
13
13
|
return valid;
|
|
14
14
|
}
|
|
15
15
|
compile(sections) {
|
|
16
16
|
let result = new Name();
|
|
17
|
-
result.names = this.
|
|
17
|
+
result.names = this.keyboard3.names?.name?.map(v => sections.strs.allocString(v.value)) ?? [];
|
|
18
18
|
return result;
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
//# debugId=
|
|
21
|
+
//# debugId=5f5a65bd-c021-5c7d-a21a-90ebc0a54cb1
|
|
22
22
|
//# sourceMappingURL=name.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"5f5a65bd-c021-5c7d-a21a-90ebc0a54cb1","file":"name.js","mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,IAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAE3B,MAAM,OAAO,YAAa,SAAQ,eAAe;IAE/C,IAAW,EAAE;QACX,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;IAChC,CAAC;IAEM,QAAQ;QACb,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,KAAK,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACtD,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,OAAO,CAAC,QAA4B;QACzC,IAAI,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9F,OAAO,MAAM,CAAC;IAChB,CAAC;CACF","names":[],"sourceRoot":"","sources":["../../../src/compiler/name.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]="f0ad92df-820d-5ca2-a4e7-2059f0bfa1dc")}catch(e){}}();
|
|
2
2
|
import { LDMLKeyboard, KMXPlus, CompilerCallbacks } from "@keymanapp/common-types";
|
|
3
3
|
import { SectionIdent } from '@keymanapp/ldml-keyboard-constants';
|
|
4
4
|
export declare class SectionCompiler {
|
|
5
|
-
protected readonly
|
|
5
|
+
protected readonly keyboard3: LDMLKeyboard.LKKeyboard;
|
|
6
6
|
protected readonly callbacks: CompilerCallbacks;
|
|
7
7
|
constructor(source: LDMLKeyboard.LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
|
|
8
8
|
get id(): SectionIdent;
|
|
@@ -14,5 +14,5 @@ export declare class SectionCompiler {
|
|
|
14
14
|
*/
|
|
15
15
|
get dependencies(): Set<SectionIdent>;
|
|
16
16
|
}
|
|
17
|
-
//# debugId=
|
|
17
|
+
//# debugId=f0ad92df-820d-5ca2-a4e7-2059f0bfa1dc
|
|
18
18
|
//# sourceMappingURL=section-compiler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"f0ad92df-820d-5ca2-a4e7-2059f0bfa1dc","file":"section-compiler.d.ts","mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAa,MAAM,oCAAoC,CAAC;AAG7E,qBAAa,eAAe;IAC1B,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC,UAAU,CAAC;IACtD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC;gBAEpC,MAAM,EAAE,YAAY,CAAC,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAMxF,IAAW,EAAE,IAAI,YAAY,CAE5B;IAEM,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,OAAO;IAI9D,QAAQ,IAAI,OAAO;IAI1B;;;OAGG;IACH,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAQ3C;CACF","names":[],"sourceRoot":"","sources":["../../../src/compiler/section-compiler.ts"],"version":3}
|
|
@@ -1,11 +1,11 @@
|
|
|
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]="db984c15-74e1-530e-b436-1676945b9345")}catch(e){}}();
|
|
2
2
|
import { constants } from '@keymanapp/ldml-keyboard-constants';
|
|
3
3
|
/* istanbul ignore next */
|
|
4
4
|
export class SectionCompiler {
|
|
5
|
-
|
|
5
|
+
keyboard3;
|
|
6
6
|
callbacks;
|
|
7
7
|
constructor(source, callbacks) {
|
|
8
|
-
this.
|
|
8
|
+
this.keyboard3 = source.keyboard3;
|
|
9
9
|
this.callbacks = callbacks;
|
|
10
10
|
}
|
|
11
11
|
/* c8 ignore next 11 */
|
|
@@ -32,5 +32,5 @@ export class SectionCompiler {
|
|
|
32
32
|
return defaults;
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
|
-
//# debugId=
|
|
35
|
+
//# debugId=db984c15-74e1-530e-b436-1676945b9345
|
|
36
36
|
//# sourceMappingURL=section-compiler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"db984c15-74e1-530e-b436-1676945b9345","file":"section-compiler.js","mappings":";AACA,OAAO,EAAgB,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE7E,0BAA0B;AAC1B,MAAM,OAAO,eAAe;IACP,SAAS,CAA0B;IACnC,SAAS,CAAoB;IAEhD,YAAY,MAA8C,EAAE,SAA4B;QACtF,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,uBAAuB;IACvB,IAAW,EAAE;QACX,MAAM,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACtD,CAAC;IAEM,OAAO,CAAC,QAAoC;QACjD,MAAM,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC3D,CAAC;IAEM,QAAQ;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,IAAW,YAAY;QACrB,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAiB;YACvC,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;SACvB,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF","names":[],"sourceRoot":"","sources":["../../../src/compiler/section-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]="71bed881-cf9b-5450-aa1b-7896f39c69ae")}catch(e){}}();
|
|
2
2
|
export class TouchLayoutCompiler {
|
|
3
3
|
compileToJavascript(source) {
|
|
4
4
|
let result = {};
|
|
@@ -7,7 +7,7 @@ export class TouchLayoutCompiler {
|
|
|
7
7
|
defaultHint: "none",
|
|
8
8
|
layer: []
|
|
9
9
|
};
|
|
10
|
-
for (let layers of source.
|
|
10
|
+
for (let layers of source.keyboard3.layers) {
|
|
11
11
|
for (let layer of layers.layer) {
|
|
12
12
|
const resultLayer = this.compileHardwareLayer(source, result, layer);
|
|
13
13
|
result.desktop.layer.push(resultLayer);
|
|
@@ -28,7 +28,7 @@ export class TouchLayoutCompiler {
|
|
|
28
28
|
fileLayer.row.push(fileRow);
|
|
29
29
|
const keys = row.keys.split(' ');
|
|
30
30
|
for (let key of keys) {
|
|
31
|
-
const keydef = source.
|
|
31
|
+
const keydef = source.keyboard3.keys?.key?.find(x => x.id == key);
|
|
32
32
|
if (keydef) {
|
|
33
33
|
const fileKey = {
|
|
34
34
|
id: this.translateKeyIdentifierToTouch(keydef.id),
|
|
@@ -85,5 +85,5 @@ export class TouchLayoutCompiler {
|
|
|
85
85
|
return 'T_' + id;
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
|
-
//# debugId=
|
|
88
|
+
//# debugId=71bed881-cf9b-5450-aa1b-7896f39c69ae
|
|
89
89
|
//# sourceMappingURL=touch-layout-compiler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"71bed881-cf9b-5450-aa1b-7896f39c69ae","file":"touch-layout-compiler.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/touch-layout-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]="0916f332-c943-518b-a737-6f8af4396e0d")}catch(e){}}();
|
|
2
2
|
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
3
3
|
import { KMXPlus, VariableParser, MarkerParser } from '@keymanapp/common-types';
|
|
4
4
|
import { SectionCompiler } from "./section-compiler.js";
|
|
@@ -26,7 +26,7 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
26
26
|
validate() {
|
|
27
27
|
const reportMessage = this.callbacks.reportMessage.bind(this.callbacks);
|
|
28
28
|
let valid = true;
|
|
29
|
-
const transforms = this?.
|
|
29
|
+
const transforms = this?.keyboard3?.transforms;
|
|
30
30
|
if (transforms) {
|
|
31
31
|
const types = transforms.map(({ type }) => type);
|
|
32
32
|
if (!verifyValidAndUnique(types, types => reportMessage(CompilerMessages.Error_DuplicateTransformsType({ types })), new Set(['simple', 'backspace']), types => reportMessage(CompilerMessages.Error_InvalidTransformsType({ types })))) {
|
|
@@ -137,7 +137,7 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
137
137
|
return result;
|
|
138
138
|
}
|
|
139
139
|
compile(sections) {
|
|
140
|
-
for (let t of this.
|
|
140
|
+
for (let t of this.keyboard3.transforms) {
|
|
141
141
|
if (t.type == this.type) {
|
|
142
142
|
// compile only the transforms of the correct type
|
|
143
143
|
return this.compileTransforms(sections, t);
|
|
@@ -183,5 +183,5 @@ export class BkspCompiler extends TransformCompiler {
|
|
|
183
183
|
}
|
|
184
184
|
}
|
|
185
185
|
;
|
|
186
|
-
//# debugId=
|
|
186
|
+
//# debugId=0916f332-c943-518b-a737-6f8af4396e0d
|
|
187
187
|
//# sourceMappingURL=tran.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"0916f332-c943-518b-a737-6f8af4396e0d","file":"tran.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/tran.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]="74f2b31e-ab85-5a7e-8228-9c81af14ea0b")}catch(e){}}();
|
|
2
2
|
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
3
3
|
import { KMXPlus, MarkerParser } from '@keymanapp/common-types';
|
|
4
4
|
import { VariableParser } from '@keymanapp/common-types';
|
|
@@ -36,7 +36,7 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
36
36
|
}
|
|
37
37
|
validateVars() {
|
|
38
38
|
let valid = true;
|
|
39
|
-
const variables = this.
|
|
39
|
+
const variables = this.keyboard3?.variables;
|
|
40
40
|
if (!variables) {
|
|
41
41
|
return true; // nothing to check
|
|
42
42
|
}
|
|
@@ -139,10 +139,10 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
139
139
|
collectMarkers(mt) {
|
|
140
140
|
let valid = true;
|
|
141
141
|
// call our friends to validate
|
|
142
|
-
valid = this.validateVarsMarkers(this.
|
|
143
|
-
valid = KeysCompiler.validateMarkers(this.
|
|
144
|
-
valid = TransformCompiler.validateMarkers(this.
|
|
145
|
-
valid = DispCompiler.validateMarkers(this.
|
|
142
|
+
valid = this.validateVarsMarkers(this.keyboard3, mt) && valid; // accumulate validity
|
|
143
|
+
valid = KeysCompiler.validateMarkers(this.keyboard3, mt) && valid; // accumulate validity
|
|
144
|
+
valid = TransformCompiler.validateMarkers(this.keyboard3, mt) && valid; // accumulate validity
|
|
145
|
+
valid = DispCompiler.validateMarkers(this.keyboard3, mt) && valid; // accumulate validity
|
|
146
146
|
return valid;
|
|
147
147
|
}
|
|
148
148
|
validateMarkers() {
|
|
@@ -177,7 +177,7 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
177
177
|
}
|
|
178
178
|
compile(sections) {
|
|
179
179
|
const result = new Vars();
|
|
180
|
-
const variables = this.
|
|
180
|
+
const variables = this.keyboard3?.variables;
|
|
181
181
|
// we always have vars, it's depended on by other sections
|
|
182
182
|
// we already know the variables do not conflict with each other
|
|
183
183
|
// need to add these one by one, because they depend on each other.
|
|
@@ -221,5 +221,5 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
221
221
|
result.unicodeSets.push(new UnicodeSetItem(id, value, sections, sections.usetparser));
|
|
222
222
|
}
|
|
223
223
|
}
|
|
224
|
-
//# debugId=
|
|
224
|
+
//# debugId=74f2b31e-ab85-5a7e-8228-9c81af14ea0b
|
|
225
225
|
//# sourceMappingURL=vars.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"74f2b31e-ab85-5a7e-8228-9c81af14ea0b","file":"vars.js","mappings":";AAAA,OAAO,EAAgB,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAmC,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACjG,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,IAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAC3B,IAAO,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAC7C,IAAO,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;AACvC,IAAO,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;AAG/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC/D,MAAM,OAAO,YAAa,SAAQ,eAAe;IAC/C,IAAW,EAAE;QACX,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;IAChC,CAAC;IAED,IAAW,YAAY;QACrB,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAiB;YACvC,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;SACvB,CAAC,CAAC;QACH,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,YAAY,MAAiC,EAAE,SAA4B;QACzE,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC3B,CAAC;IAEM,QAAQ;QACb,IAAI,KAAK,GAAG,IAAI,CAAC;QAEjB,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,IAAI,KAAK,CAAC,CAAC,sBAAsB;QAC5D,KAAK,GAAG,IAAI,CAAC,eAAe,EAAE,IAAI,KAAK,CAAC,CAAC,sBAAsB;QAE/D,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,YAAY;QAClB,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;QAE5C,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,IAAI,CAAC,CAAC,mBAAmB;SACjC;QAED,0BAA0B;QAC1B,MAAM,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;QAEvB,MAAM,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;QAC1B,MAAM,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;QAEjC;;;WAGG;QACH,SAAS,KAAK,CAAC,EAAU;YACvB,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBAClB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aACd;iBAAM;gBACL,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAChB;QACH,CAAC;QAED,UAAU;QACV,KAAK,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,SAAS,EAAE,MAAM,EAAE;YAC7C,KAAK,CAAC,EAAE,CAAC,CAAC;YACV,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACnB,MAAM,UAAU,GAAG,cAAc,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAC7D,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;gBAC5B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBACxB,KAAK,GAAG,KAAK,CAAC;oBACd,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;iBACzF;aACF;SACF;QACD,OAAO;QACP,KAAK,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,SAAS,CAAC,GAAG,EAAE;YACzC,KAAK,CAAC,EAAE,CAAC,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,sCAAsC;YACtC,MAAM,UAAU,GAAG,cAAc,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAC7D,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;gBAC5B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBACxB,KAAK,GAAG,KAAK,CAAC;oBACd,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;iBACzF;aACF;YAED,yBAAyB;YACzB,MAAM,KAAK,GAAa,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAC1D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,MAAM,OAAO,GAAG,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;gBACtD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oBACtB,kCAAkC;oBAClC,KAAK,GAAG,KAAK,CAAC;oBACd,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,mCAAmC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;iBAC9F;qBAAM;oBACL,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;wBACzB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;4BACrB,KAAK,GAAG,KAAK,CAAC;4BACd,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;yBACtF;qBACF;iBACF;gBACD,uEAAuE;aACxE;SACF;QACD,cAAc;QACd,KAAK,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,SAAS,CAAC,UAAU,EAAE;YAChD,KAAK,CAAC,EAAE,CAAC,CAAC;YACV,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACvB,MAAM,UAAU,GAAG,cAAc,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAC7D,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;gBAC5B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBACxB,KAAK,GAAG,KAAK,CAAC;oBACd,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;iBACzF;aACF;YACD,MAAM,OAAO,GAAG,cAAc,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YACvD,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;gBACzB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBAC5B,KAAK,GAAG,KAAK,CAAC;oBACd,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;wBACpB,qDAAqD;wBACrD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,oCAAoC,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;qBAClG;yBAAM;wBACL,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,+BAA+B,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;qBAC7F;iBACF;aACF;SACF;QAED,yBAAyB;QACzB,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,EAAE;YACjB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,uBAAuB,CAAC;gBACpE,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;aACjD,CAAC,CAAC,CAAC;YACJ,KAAK,GAAG,KAAK,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,cAAc,CAAC,EAAkB;QACvC,IAAI,KAAK,GAAG,IAAI,CAAC;QAEjB,+BAA+B;QAC/B,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,sBAAsB;QACrF,KAAK,GAAG,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,sBAAsB;QACzF,KAAK,GAAG,iBAAiB,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,sBAAsB;QAC9F,KAAK,GAAG,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,sBAAsB;QAEzF,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,eAAe;QACrB,MAAM,EAAE,GAAG,IAAI,aAAa,EAAE,CAAC;QAC/B,IAAI,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QACpC,+CAA+C;QAC/C,MAAM,iBAAiB,GAAiB,IAAI,GAAG,EAAU,CAAC;QAC1D,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;YACnC,IAAI,CAAC,KAAK,YAAY,CAAC,aAAa;gBAAE,SAAS,CAAC,mBAAmB;YACnE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBACtB,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aAC1B;SACF;QACD,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE;YACpC,IAAI,CAAC,KAAK,YAAY,CAAC,aAAa;gBAAE,SAAS,CAAC,mBAAmB;YACnE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBACtB,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aAC1B;SACF;QAED,cAAc;QACd,IAAI,iBAAiB,CAAC,IAAI,GAAG,CAAC,EAAE;YAC9B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;YAC5H,KAAK,GAAG,KAAK,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,mBAAmB,CAAC,QAAiC,EAAE,EAAkB;QACvE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAC3C,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACrE,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,OAAO,CAAC,QAA4B;QACzC,MAAM,MAAM,GAAI,IAAI,IAAI,EAAE,CAAC;QAE3B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;QAC5C,0DAA0D;QAC1D,gEAAgE;QAChE,mEAAmE;QACnE,yFAAyF;QACzF,kDAAkD;QAElD,kBAAkB;QAClB,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/B,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;QACvC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;QACpC,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;QAE3C,2CAA2C;QAC3C,MAAM,EAAE,GAAG,IAAI,aAAa,EAAE,CAAC;QAC/B,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QAExB,+CAA+C;QAC/C,MAAM,UAAU,GAAc,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,YAAY,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC;QACtG,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAEpE,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACxC,CAAC;IAED,+DAA+D;IAC/D,SAAS,CAAC,MAAY,EAAE,CAAwB,EAAE,QAA4B;QAC5E,MAAM,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QACjB,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QAClB,oBAAoB;QACpB,KAAK,GAAG,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAClD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,CAAC,MAAY,EAAE,CAAqB,EAAE,QAA4B;QACtE,MAAM,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QACjB,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QAClB,2BAA2B;QAC3B,KAAK,GAAG,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAClD,gFAAgF;QAChF,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAc,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC3D,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IACxD,CAAC;IACD,aAAa,CAAC,MAAY,EAAE,CAA4B,EAAE,QAA4B;QACpF,MAAM,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QACjB,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QAClB,KAAK,GAAG,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAClD,KAAK,GAAG,MAAM,CAAC,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACtD,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IACxF,CAAC;CAGF","names":[],"sourceRoot":"","sources":["../../../src/compiler/vars.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]="edfa04cd-b71d-5be0-86b1-ae2cf8de2ae6")}catch(e){}}();
|
|
2
2
|
import { Constants, VisualKeyboard } from "@keymanapp/common-types";
|
|
3
3
|
export class LdmlKeyboardVisualKeyboardCompiler {
|
|
4
4
|
compile(source) {
|
|
@@ -10,7 +10,7 @@ export class LdmlKeyboardVisualKeyboardCompiler {
|
|
|
10
10
|
result.header.associatedKeyboard = '';
|
|
11
11
|
result.header.ansiFont = { ...VisualKeyboard.DEFAULT_KVK_FONT };
|
|
12
12
|
result.header.unicodeFont = { ...VisualKeyboard.DEFAULT_KVK_FONT };
|
|
13
|
-
for (let layers of source.
|
|
13
|
+
for (let layers of source.keyboard3.layers) {
|
|
14
14
|
for (let layer of layers.layer) {
|
|
15
15
|
this.compileHardwareLayer(source, result, layer);
|
|
16
16
|
}
|
|
@@ -27,7 +27,7 @@ export class LdmlKeyboardVisualKeyboardCompiler {
|
|
|
27
27
|
let x = -1;
|
|
28
28
|
for (let key of keys) {
|
|
29
29
|
x++;
|
|
30
|
-
let keydef = source.
|
|
30
|
+
let keydef = source.keyboard3.keys?.key?.find(x => x.id == key);
|
|
31
31
|
if (!keydef) {
|
|
32
32
|
throw Error(`Internal Error: could not find key id="${key}" in layer "${layer.id || '<none>'}", row "${y}"`);
|
|
33
33
|
}
|
|
@@ -48,5 +48,5 @@ export class LdmlKeyboardVisualKeyboardCompiler {
|
|
|
48
48
|
return 0;
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
|
-
//# debugId=
|
|
51
|
+
//# debugId=edfa04cd-b71d-5be0-86b1-ae2cf8de2ae6
|
|
52
52
|
//# sourceMappingURL=visual-keyboard-compiler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"edfa04cd-b71d-5be0-86b1-ae2cf8de2ae6","file":"visual-keyboard-compiler.js","mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAgB,MAAM,yBAAyB,CAAC;AAElF,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,KAAI,IAAI,KAAK,IAAI,MAAM,CAAC,KAAK,EAAE;gBAC7B,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;aAClD;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,oBAAoB,CAC1B,MAA8C,EAC9C,EAAiC,EACjC,KAA2B;QAE3B,kDAAkD;QAClD,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,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,4BAA4B;iBACnE,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}
|
|
@@ -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]="907a9829-644c-5999-81cd-427cd67c38bd")}catch(e){}}();
|
|
2
2
|
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
3
3
|
import { KMXPlus, Constants } from '@keymanapp/common-types';
|
|
4
4
|
import { CompilerMessages } from "./messages.js";
|
|
@@ -11,9 +11,9 @@ export class VkeyCompiler extends SectionCompiler {
|
|
|
11
11
|
}
|
|
12
12
|
validate() {
|
|
13
13
|
let valid = true;
|
|
14
|
-
if (this.
|
|
14
|
+
if (this.keyboard3.vkeys) {
|
|
15
15
|
let from = [], to = [];
|
|
16
|
-
this.
|
|
16
|
+
this.keyboard3.vkeys.vkey.forEach(vk => {
|
|
17
17
|
if (LdmlVkeyNames[vk.from] === undefined) {
|
|
18
18
|
// TODO-LDML: When we do #7135 this may need to change back to an error.
|
|
19
19
|
this.callbacks.reportMessage(CompilerMessages.Hint_VkeyIsNotValid({ vkey: vk.from }));
|
|
@@ -42,11 +42,11 @@ export class VkeyCompiler extends SectionCompiler {
|
|
|
42
42
|
}
|
|
43
43
|
compile() {
|
|
44
44
|
let result = new Vkey();
|
|
45
|
-
if (!this.
|
|
45
|
+
if (!this.keyboard3.vkeys) {
|
|
46
46
|
/* c8 ignore next 2 */
|
|
47
47
|
return result; // not hit due to boxing
|
|
48
48
|
}
|
|
49
|
-
result.vkeys = this.
|
|
49
|
+
result.vkeys = this.keyboard3.vkeys?.vkey.map(vk => {
|
|
50
50
|
return {
|
|
51
51
|
vkey: LdmlVkeyNames[vk.from],
|
|
52
52
|
target: LdmlVkeyNames[vk.to]
|
|
@@ -57,5 +57,5 @@ export class VkeyCompiler extends SectionCompiler {
|
|
|
57
57
|
return result;
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
|
-
//# debugId=
|
|
60
|
+
//# debugId=907a9829-644c-5999-81cd-427cd67c38bd
|
|
61
61
|
//# sourceMappingURL=vkey.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
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}
|
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.184-alpha",
|
|
30
|
+
"@keymanapp/kmc-kmn": "17.0.184-alpha",
|
|
31
|
+
"@keymanapp/ldml-keyboard-constants": "17.0.184-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.184-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.184-alpha"
|
|
72
72
|
}
|