@keymanapp/kmc-ldml 19.0.51-alpha → 19.0.53-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 +2 -0
- package/build/src/compiler/compiler.d.ts.map +1 -1
- package/build/src/compiler/compiler.js +3 -1
- package/build/src/compiler/compiler.js.map +1 -1
- package/build/src/compiler/disp.d.ts.map +1 -1
- package/build/src/compiler/disp.js +5 -4
- package/build/src/compiler/disp.js.map +1 -1
- package/build/src/compiler/layr.d.ts.map +1 -1
- package/build/src/compiler/layr.js +20 -6
- package/build/src/compiler/layr.js.map +1 -1
- package/build/src/compiler/ldml-compiler-messages.d.ts +26 -26
- package/build/src/compiler/ldml-compiler-messages.d.ts.map +1 -1
- package/build/src/compiler/ldml-compiler-messages.js +21 -16
- package/build/src/compiler/ldml-compiler-messages.js.map +1 -1
- package/build/src/compiler/loca.d.ts +6 -0
- package/build/src/compiler/loca.d.ts.map +1 -1
- package/build/src/compiler/loca.js +13 -3
- package/build/src/compiler/loca.js.map +1 -1
- package/build/src/compiler/tran.d.ts +2 -0
- package/build/src/compiler/tran.d.ts.map +1 -1
- package/build/src/compiler/tran.js +31 -25
- package/build/src/compiler/tran.js.map +1 -1
- package/build/src/util/util.d.ts +1 -1
- package/build/src/util/util.d.ts.map +1 -1
- package/build/src/util/util.js.map +1 -1
- package/package.json +7 -7
|
@@ -120,6 +120,8 @@ export declare class LdmlKeyboardCompiler implements KeymanCompiler {
|
|
|
120
120
|
* Transforms in-memory LDML keyboard xml file to an intermediate
|
|
121
121
|
* representation of a .kmx file.
|
|
122
122
|
* @param source - in-memory representation of LDML keyboard xml file
|
|
123
|
+
* @param postValidate - pass true if sections should run a 'validate' phase at the very end.
|
|
124
|
+
* Set this to true if you aren't calling validate() separately.
|
|
123
125
|
* @returns KMXPlusFile intermediate file
|
|
124
126
|
*/
|
|
125
127
|
compile(source: LDMLKeyboardXMLSourceFile, postValidate?: boolean): Promise<KMXPlus.KMXPlusFile>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/compiler.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAsB,MAAM,yBAAyB,CAAC;AACzF,OAAO,EACL,iBAAiB,EAAE,cAAc,EAAE,oBAAoB,EAAE,uBAAuB,EACvB,YAAY,EACrE,iCAAiC,EACjC,8BAA8B,EAG/B,MAAM,4BAA4B,CAAC;AACpC,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,EAA4C,MAAM,qBAAqB,CAAC;AAG7F,OAAO,yBAAyB,GAAG,YAAY,CAAC,yBAAyB,CAAC;AAS1E,eAAO,MAAM,iBAAiB,yMAmB7B,CAAC;AAOF;;;GAGG;AACH,MAAM,WAAW,6BAA8B,SAAQ,uBAAuB;IAC5E;;;OAGG;IACH,GAAG,CAAC,EAAE,8BAA8B,CAAC;IACrC;;;OAGG;IACH,GAAG,CAAC,EAAE,8BAA8B,CAAC;CACtC;AAED,MAAM,WAAW,0BAA2B,SAAQ,oBAAoB;IACtE;;;OAGG;IACH,SAAS,EAAE,6BAA6B,CAAC;CAC1C;AAED;;;;;GAKG;AACH,qBAAa,oBAAqB,YAAW,cAAc;IACzD,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,OAAO,CAAsB;IAGrC,OAAO,CAAC,UAAU,CAAC,CAAiD;IACpE,OAAO,CAAC,MAAM,CAAC,CAAkC;IAEjD;;;;;;;OAOG;IACG,IAAI,CAAC,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;IAQxF;;;;;;;;;;OAUG;IACG,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAgE9F;;;;;;;;;OASG;IACG,KAAK,CAAC,SAAS,EAAE,6BAA6B,GAAG,OAAO,CAAC,OAAO,CAAC;IAYvE;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,iBAAiB,CAAC,gBAAgB,CAAC;IAelE,OAAO,CAAC,aAAa;IAIrB;;;;;;OAMG;IACI,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,yBAAyB,GAAG,IAAI;IA8B/D;;;;;;OAMG;IACI,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,iCAAiC,GAAG,IAAI;IA2B/E,yDAAyD;IACzD,OAAO,CAAC,YAAY;IAIpB;;;;OAIG;YACW,IAAI;IAclB;;;;;OAKG;IACU,QAAQ,CAAC,MAAM,EAAE,yBAAyB,GAAG,OAAO,CAAC,OAAO,CAAC;IAW1E
|
|
1
|
+
{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/compiler.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAsB,MAAM,yBAAyB,CAAC;AACzF,OAAO,EACL,iBAAiB,EAAE,cAAc,EAAE,oBAAoB,EAAE,uBAAuB,EACvB,YAAY,EACrE,iCAAiC,EACjC,8BAA8B,EAG/B,MAAM,4BAA4B,CAAC;AACpC,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,EAA4C,MAAM,qBAAqB,CAAC;AAG7F,OAAO,yBAAyB,GAAG,YAAY,CAAC,yBAAyB,CAAC;AAS1E,eAAO,MAAM,iBAAiB,yMAmB7B,CAAC;AAOF;;;GAGG;AACH,MAAM,WAAW,6BAA8B,SAAQ,uBAAuB;IAC5E;;;OAGG;IACH,GAAG,CAAC,EAAE,8BAA8B,CAAC;IACrC;;;OAGG;IACH,GAAG,CAAC,EAAE,8BAA8B,CAAC;CACtC;AAED,MAAM,WAAW,0BAA2B,SAAQ,oBAAoB;IACtE;;;OAGG;IACH,SAAS,EAAE,6BAA6B,CAAC;CAC1C;AAED;;;;;GAKG;AACH,qBAAa,oBAAqB,YAAW,cAAc;IACzD,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,OAAO,CAAsB;IAGrC,OAAO,CAAC,UAAU,CAAC,CAAiD;IACpE,OAAO,CAAC,MAAM,CAAC,CAAkC;IAEjD;;;;;;;OAOG;IACG,IAAI,CAAC,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;IAQxF;;;;;;;;;;OAUG;IACG,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAgE9F;;;;;;;;;OASG;IACG,KAAK,CAAC,SAAS,EAAE,6BAA6B,GAAG,OAAO,CAAC,OAAO,CAAC;IAYvE;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,iBAAiB,CAAC,gBAAgB,CAAC;IAelE,OAAO,CAAC,aAAa;IAIrB;;;;;;OAMG;IACI,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,yBAAyB,GAAG,IAAI;IA8B/D;;;;;;OAMG;IACI,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,iCAAiC,GAAG,IAAI;IA2B/E,yDAAyD;IACzD,OAAO,CAAC,YAAY;IAIpB;;;;OAIG;YACW,IAAI;IAclB;;;;;OAKG;IACU,QAAQ,CAAC,MAAM,EAAE,yBAAyB,GAAG,OAAO,CAAC,OAAO,CAAC;IAW1E;;;;;;;;OAQG;IACU,OAAO,CAAC,MAAM,EAAE,yBAAyB,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC;CAoE9G"}
|
|
@@ -92,7 +92,7 @@ export class LdmlKeyboardCompiler {
|
|
|
92
92
|
if (!source) {
|
|
93
93
|
return null;
|
|
94
94
|
}
|
|
95
|
-
const kmx = await this.compile(source);
|
|
95
|
+
const kmx = await this.compile(source, true);
|
|
96
96
|
if (!kmx) {
|
|
97
97
|
return null;
|
|
98
98
|
}
|
|
@@ -284,6 +284,8 @@ export class LdmlKeyboardCompiler {
|
|
|
284
284
|
* Transforms in-memory LDML keyboard xml file to an intermediate
|
|
285
285
|
* representation of a .kmx file.
|
|
286
286
|
* @param source - in-memory representation of LDML keyboard xml file
|
|
287
|
+
* @param postValidate - pass true if sections should run a 'validate' phase at the very end.
|
|
288
|
+
* Set this to true if you aren't calling validate() separately.
|
|
287
289
|
* @returns KMXPlusFile intermediate file
|
|
288
290
|
*/
|
|
289
291
|
async compile(source, postValidate) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../src/compiler/compiler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,OAAO,EAAqB,aAAa,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AACzF,OAAO,EAEL,sBAAsB,EAAE,+BAA+B,EACpB,UAAU,EAE7C,0BAA0B,EAC1B,eAAe,GAChB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,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,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;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,kCAAkC,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,iCAAiC;IAEjC,qCAAqC;IACrC,YAAY;IACZ,2EAA2E;IAC3E,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;CACb,CAAC;AAEF,iCAAiC;AACjC,MAAM,OAAO,GAAG;IACd,aAAa;CACd,CAAC;AAiBD,CAAC;AAQD,CAAC;AAEF;;;;;GAKG;AACH,MAAM,OAAO,oBAAoB;IACvB,SAAS,CAAoB;IAC7B,OAAO,CAAsB;IAErC,cAAc;IACN,UAAU,GAAwC,SAAS,CAAC;IAC5D,MAAM,CAAmC;IAEjD;;;;;;;OAOG;IACH,KAAK,CAAC,IAAI,CAAC,SAA4B,EAAE,OAA4B;QACnE,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,MAAM,GAAG,IAAI,+BAA+B,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QACzF,yDAAyD;QACzD,IAAI,CAAC,SAAS,GAAG,IAAI,0BAA0B,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACtF,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,GAAG,CAAC,aAAqB,EAAE,cAAuB;QAEtD,MAAM,eAAe,GAAwB;YAC3C,GAAG,sBAAsB;YACzB,GAAG,IAAI,CAAC,OAAO;SAChB,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../src/compiler/compiler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"disp.d.ts","sourceRoot":"","sources":["../../../src/compiler/disp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGlD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAE3B,OAAO,EAAmB,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE3E,qBAAa,YAAa,SAAQ,eAAe;IAC/C,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAG,aAAa,GAAG,OAAO;IAS5F,IAAW,EAAE,8DAEZ;IAEM,QAAQ,IAAI,OAAO;
|
|
1
|
+
{"version":3,"file":"disp.d.ts","sourceRoot":"","sources":["../../../src/compiler/disp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGlD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAE3B,OAAO,EAAmB,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE3E,qBAAa,YAAa,SAAQ,eAAe;IAC/C,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAG,aAAa,GAAG,OAAO;IAS5F,IAAW,EAAE,8DAEZ;IAEM,QAAQ,IAAI,OAAO;IAiCnB,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;CAiCnD"}
|
|
@@ -21,14 +21,15 @@ export class DispCompiler extends SectionCompiler {
|
|
|
21
21
|
const tos = new Set();
|
|
22
22
|
const ids = new Set();
|
|
23
23
|
if (this.keyboard3.displays?.display) {
|
|
24
|
-
for (const
|
|
24
|
+
for (const display of this.keyboard3.displays?.display) {
|
|
25
|
+
const { output, keyId } = display;
|
|
25
26
|
if ((output && keyId) || (!output && !keyId)) {
|
|
26
|
-
this.callbacks.reportMessage(LdmlCompilerMessages.Error_DisplayNeedsToOrId({ output, keyId }));
|
|
27
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_DisplayNeedsToOrId({ output, keyId }, display));
|
|
27
28
|
return false;
|
|
28
29
|
}
|
|
29
30
|
else if (output) {
|
|
30
31
|
if (tos.has(output)) {
|
|
31
|
-
this.callbacks.reportMessage(LdmlCompilerMessages.Error_DisplayIsRepeated({ output }));
|
|
32
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_DisplayIsRepeated({ output }, display));
|
|
32
33
|
return false;
|
|
33
34
|
}
|
|
34
35
|
else {
|
|
@@ -37,7 +38,7 @@ export class DispCompiler extends SectionCompiler {
|
|
|
37
38
|
}
|
|
38
39
|
else if (keyId) {
|
|
39
40
|
if (ids.has(keyId)) {
|
|
40
|
-
this.callbacks.reportMessage(LdmlCompilerMessages.Error_DisplayIsRepeated({ keyId }));
|
|
41
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_DisplayIsRepeated({ keyId }, display));
|
|
41
42
|
return false;
|
|
42
43
|
}
|
|
43
44
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"disp.js","sourceRoot":"","sources":["../../../src/compiler/disp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE/D,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,IAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAE3B,OAAO,EAAE,eAAe,EAAiB,MAAM,2BAA2B,CAAC;AAE3E,MAAM,OAAO,YAAa,SAAQ,eAAe;IAC/C,MAAM,CAAC,qBAAqB,CAAC,QAAiC,EAAE,EAAkB;QAChF,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;YAC1D,EAAE,CAAC,8BAA8B,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACjE,EAAE,CAAC,qBAAqB,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QACH,+BAA+B;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAW,EAAE;QACX,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;IAChC,CAAC;IAEM,QAAQ;QACb,MAAM,KAAK,GAAG,IAAI,CAAC;QAEnB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;QAEtB,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC;YACrC,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"disp.js","sourceRoot":"","sources":["../../../src/compiler/disp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layr.d.ts","sourceRoot":"","sources":["../../../src/compiler/layr.ts"],"names":[],"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;AAI3B,qBAAa,YAAa,SAAQ,eAAe;IAE/C,IAAW,EAAE,8DAEZ;IAEM,QAAQ;
|
|
1
|
+
{"version":3,"file":"layr.d.ts","sourceRoot":"","sources":["../../../src/compiler/layr.ts"],"names":[],"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;AAI3B,qBAAa,YAAa,SAAQ,eAAe;IAE/C,IAAW,EAAE,8DAEZ;IAEM,QAAQ;IAiDR,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;CAkCnD"}
|
|
@@ -12,21 +12,35 @@ export class LayrCompiler extends SectionCompiler {
|
|
|
12
12
|
let valid = true;
|
|
13
13
|
let totalLayerCount = 0;
|
|
14
14
|
let hardwareLayers = 0;
|
|
15
|
-
|
|
15
|
+
let touchLayers = 0;
|
|
16
|
+
const deviceWidths = new Set();
|
|
16
17
|
this.keyboard3.layers?.forEach((layers) => {
|
|
17
18
|
const { formId } = layers;
|
|
18
19
|
if (formId === 'touch') {
|
|
19
|
-
|
|
20
|
-
// multiple touch layers are OK
|
|
20
|
+
touchLayers++;
|
|
21
21
|
totalLayerCount += layers.layer?.length;
|
|
22
|
-
|
|
22
|
+
const { minDeviceWidth } = layers;
|
|
23
|
+
if (!minDeviceWidth ||
|
|
24
|
+
minDeviceWidth < constants.layr_min_minDeviceWidth ||
|
|
25
|
+
minDeviceWidth > constants.layr_max_minDeviceWidth ||
|
|
26
|
+
Number.isNaN(Number(minDeviceWidth))) {
|
|
27
|
+
valid = false;
|
|
28
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidLayerWidth({ minDeviceWidth }, layers));
|
|
29
|
+
}
|
|
30
|
+
else if (deviceWidths.has(minDeviceWidth)) {
|
|
31
|
+
valid = false;
|
|
32
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_DuplicateLayerWidth({ minDeviceWidth }, layers));
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
deviceWidths.add(minDeviceWidth);
|
|
36
|
+
}
|
|
23
37
|
}
|
|
24
38
|
else {
|
|
25
39
|
// hardware
|
|
26
40
|
hardwareLayers++;
|
|
27
41
|
if (hardwareLayers > 1) {
|
|
28
42
|
valid = false;
|
|
29
|
-
this.callbacks.reportMessage(LdmlCompilerMessages.Error_ExcessHardware({ formId }));
|
|
43
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_ExcessHardware({ formId }, layers));
|
|
30
44
|
}
|
|
31
45
|
}
|
|
32
46
|
layers.layer.forEach((layer) => {
|
|
@@ -41,7 +55,7 @@ export class LayrCompiler extends SectionCompiler {
|
|
|
41
55
|
if (totalLayerCount === 0) { // TODO-LDML: does not validate touch layers yet
|
|
42
56
|
// no layers seen anywhere
|
|
43
57
|
valid = false;
|
|
44
|
-
this.callbacks.reportMessage(LdmlCompilerMessages.Error_MustBeAtLeastOneLayerElement());
|
|
58
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_MustBeAtLeastOneLayerElement(this.keyboard3?.layers[0]));
|
|
45
59
|
}
|
|
46
60
|
return valid;
|
|
47
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layr.js","sourceRoot":"","sources":["../../../src/compiler/layr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,4BAA4B,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAI9E,IAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAI3B,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,IAAI,eAAe,GAAG,CAAC,CAAC;QACxB,IAAI,cAAc,GAAG,CAAC,CAAC;QACvB,
|
|
1
|
+
{"version":3,"file":"layr.js","sourceRoot":"","sources":["../../../src/compiler/layr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,4BAA4B,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAI9E,IAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAI3B,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,IAAI,eAAe,GAAG,CAAC,CAAC;QACxB,IAAI,cAAc,GAAG,CAAC,CAAC;QACvB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACvC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACxC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;YAC1B,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;gBACvB,WAAW,EAAE,CAAC;gBACd,eAAe,IAAI,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC;gBACxC,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;gBAClC,IAAI,CAAC,cAAc;oBACjB,cAAc,GAAG,SAAS,CAAC,uBAAuB;oBAClD,cAAc,GAAG,SAAS,CAAC,uBAAuB;oBAClD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;oBACvC,KAAK,GAAG,KAAK,CAAC;oBACd,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,uBAAuB,CAAC,EAAC,cAAc,EAAC,EAAE,MAAM,CAAC,CAAC,CAAC;gBACvG,CAAC;qBAAM,IAAI,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;oBAC5C,KAAK,GAAG,KAAK,CAAC;oBACd,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,yBAAyB,CAAC,EAAC,cAAc,EAAC,EAAE,MAAM,CAAC,CAAC,CAAC;gBACzG,CAAC;qBAAM,CAAC;oBACN,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;gBACnC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,WAAW;gBACX,cAAc,EAAE,CAAC;gBACjB,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;oBACvB,KAAK,GAAG,KAAK,CAAC;oBACd,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,EAAC,MAAM,EAAC,EAAE,MAAM,CAAC,CAAC,CAAC;gBAC5F,CAAC;YACH,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC7B,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;gBAC5B,eAAe,EAAE,CAAC;gBAClB,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC9B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;oBAC7G,KAAK,GAAG,KAAK,CAAC;gBAChB,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,eAAe,KAAK,CAAC,EAAE,CAAC,CAAC,gDAAgD;YAC3E,0BAA0B;YAC1B,KAAK,GAAG,KAAK,CAAC;YACd,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,kCAAkC,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACnH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,OAAO,CAAC,QAA4B;QACzC,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAExB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAChD,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC1D,gCAAgC;YAChC,MAAM,YAAY,GAAG,EAAE,CAAC;YACxB,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBACjC,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBACjC,MAAM,IAAI,GAAY;wBACpB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;qBACjF,CAAC;oBACF,kCAAkC;oBAClC,OAAO,eAAe,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBAChD,CAAC,CAAC,CAAC;gBACH,MAAM,IAAI,GAAG,4BAA4B,CAAC,KAAK,CAAC,CAAC;gBACjD,2CAA2C;gBAC3C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;oBACvB,YAAY,CAAC,IAAI,CAAC;wBAChB,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;wBACvC,GAAG;wBACH,IAAI;qBACL,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YACD,MAAM,IAAI,GAAa;gBACrB,QAAQ;gBACR,cAAc,EAAE,MAAM,CAAC,cAAc,IAAI,CAAC;gBAC1C,MAAM,EAAE,YAAY;aACrB,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
@@ -1,11 +1,4 @@
|
|
|
1
|
-
import { CompilerEvent } from '@keymanapp/developer-utils';
|
|
2
|
-
/**
|
|
3
|
-
* Any object with metadata, for line number errs.
|
|
4
|
-
* Could be for example an LKKeys or KMXPlus.KeysKeys object.
|
|
5
|
-
* Defined as 'any' here to reduce noise on the client side.
|
|
6
|
-
* @see {@link KeymanXMLReader.getMetaData()}
|
|
7
|
-
*/
|
|
8
|
-
type ObjectWithMetadata = any;
|
|
1
|
+
import { CompilerEvent, ObjectWithMetadata } from '@keymanapp/developer-utils';
|
|
9
2
|
/**
|
|
10
3
|
* @internal
|
|
11
4
|
*/
|
|
@@ -15,7 +8,7 @@ export declare class LdmlCompilerMessages {
|
|
|
15
8
|
static ERROR_InvalidLocale: number;
|
|
16
9
|
static Error_InvalidLocale: (o: {
|
|
17
10
|
tag: string;
|
|
18
|
-
}) => CompilerEvent;
|
|
11
|
+
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
19
12
|
static ERROR_HardwareLayerHasTooManyRows: number;
|
|
20
13
|
static Error_HardwareLayerHasTooManyRows: (x?: ObjectWithMetadata) => CompilerEvent;
|
|
21
14
|
static ERROR_RowOnHardwareLayerHasTooManyKeys: number;
|
|
@@ -33,7 +26,7 @@ export declare class LdmlCompilerMessages {
|
|
|
33
26
|
form: string;
|
|
34
27
|
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
35
28
|
static HINT_OneOrMoreRepeatedLocales: number;
|
|
36
|
-
static Hint_OneOrMoreRepeatedLocales: () => CompilerEvent;
|
|
29
|
+
static Hint_OneOrMoreRepeatedLocales: (x?: ObjectWithMetadata) => CompilerEvent;
|
|
37
30
|
static ERROR_InvalidFile: number;
|
|
38
31
|
static Error_InvalidFile: (o: {
|
|
39
32
|
errorText: string;
|
|
@@ -42,7 +35,7 @@ export declare class LdmlCompilerMessages {
|
|
|
42
35
|
static Hint_LocaleIsNotMinimalAndClean: (o: {
|
|
43
36
|
sourceLocale: string;
|
|
44
37
|
locale: string;
|
|
45
|
-
}) => CompilerEvent;
|
|
38
|
+
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
46
39
|
static ERROR_InvalidScanCode: number;
|
|
47
40
|
static Error_InvalidScanCode: (o: {
|
|
48
41
|
codes: string;
|
|
@@ -67,7 +60,7 @@ export declare class LdmlCompilerMessages {
|
|
|
67
60
|
version: string;
|
|
68
61
|
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
69
62
|
static ERROR_MustBeAtLeastOneLayerElement: number;
|
|
70
|
-
static Error_MustBeAtLeastOneLayerElement: () => CompilerEvent;
|
|
63
|
+
static Error_MustBeAtLeastOneLayerElement: (x?: ObjectWithMetadata) => CompilerEvent;
|
|
71
64
|
static HINT_NoDisplayForSwitch: number;
|
|
72
65
|
static Hint_NoDisplayForSwitch: (o: {
|
|
73
66
|
id: string;
|
|
@@ -78,7 +71,7 @@ export declare class LdmlCompilerMessages {
|
|
|
78
71
|
static Error_DisplayIsRepeated: (o: {
|
|
79
72
|
output?: string;
|
|
80
73
|
keyId?: string;
|
|
81
|
-
}) => CompilerEvent;
|
|
74
|
+
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
82
75
|
static ERROR_KeyMissingToGapOrSwitch: number;
|
|
83
76
|
static Error_KeyMissingToGapOrSwitch: (o: {
|
|
84
77
|
keyId: string;
|
|
@@ -86,7 +79,7 @@ export declare class LdmlCompilerMessages {
|
|
|
86
79
|
static ERROR_ExcessHardware: number;
|
|
87
80
|
static Error_ExcessHardware: (o: {
|
|
88
81
|
formId: string;
|
|
89
|
-
}) => CompilerEvent;
|
|
82
|
+
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
90
83
|
static ERROR_InvalidHardware: number;
|
|
91
84
|
static Error_InvalidHardware: (o: {
|
|
92
85
|
formId: string;
|
|
@@ -108,16 +101,16 @@ export declare class LdmlCompilerMessages {
|
|
|
108
101
|
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
109
102
|
static ERROR_InvalidTransformsType: number;
|
|
110
103
|
static Error_InvalidTransformsType: (o: {
|
|
111
|
-
|
|
112
|
-
}) => CompilerEvent;
|
|
104
|
+
type: string;
|
|
105
|
+
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
113
106
|
static ERROR_DuplicateTransformsType: number;
|
|
114
107
|
static Error_DuplicateTransformsType: (o: {
|
|
115
|
-
|
|
116
|
-
}) => CompilerEvent;
|
|
108
|
+
type: string;
|
|
109
|
+
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
117
110
|
static ERROR_MixedTransformGroup: number;
|
|
118
|
-
static Error_MixedTransformGroup: () => CompilerEvent;
|
|
111
|
+
static Error_MixedTransformGroup: (x?: ObjectWithMetadata) => CompilerEvent;
|
|
119
112
|
static ERROR_EmptyTransformGroup: number;
|
|
120
|
-
static Error_EmptyTransformGroup: () => CompilerEvent;
|
|
113
|
+
static Error_EmptyTransformGroup: (x?: ObjectWithMetadata) => CompilerEvent;
|
|
121
114
|
static ERROR_MissingStringVariable: number;
|
|
122
115
|
static Error_MissingStringVariable: (o: {
|
|
123
116
|
id: string;
|
|
@@ -146,7 +139,7 @@ export declare class LdmlCompilerMessages {
|
|
|
146
139
|
static Error_DisplayNeedsToOrId: (o: {
|
|
147
140
|
output?: string;
|
|
148
141
|
keyId?: string;
|
|
149
|
-
}) => CompilerEvent;
|
|
142
|
+
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
150
143
|
static HINT_PUACharacters: number;
|
|
151
144
|
static Hint_PUACharacters: (o: {
|
|
152
145
|
count: number;
|
|
@@ -165,11 +158,11 @@ export declare class LdmlCompilerMessages {
|
|
|
165
158
|
static HINT_CharClassImplicitDenorm: number;
|
|
166
159
|
static Hint_CharClassImplicitDenorm: (o: {
|
|
167
160
|
lowestCh: number;
|
|
168
|
-
}) => CompilerEvent;
|
|
161
|
+
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
169
162
|
static WARN_CharClassExplicitDenorm: number;
|
|
170
163
|
static Warn_CharClassExplicitDenorm: (o: {
|
|
171
164
|
lowestCh: number;
|
|
172
|
-
}) => CompilerEvent;
|
|
165
|
+
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
173
166
|
static ERROR_UnparseableReorderSet: number;
|
|
174
167
|
static Error_UnparseableReorderSet: (o: {
|
|
175
168
|
from: string;
|
|
@@ -187,10 +180,18 @@ export declare class LdmlCompilerMessages {
|
|
|
187
180
|
static Warn_StringDenorm: (o: {
|
|
188
181
|
s: string;
|
|
189
182
|
}) => CompilerEvent;
|
|
183
|
+
static ERROR_DuplicateLayerWidth: number;
|
|
184
|
+
static Error_DuplicateLayerWidth: (o: {
|
|
185
|
+
minDeviceWidth: number;
|
|
186
|
+
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
187
|
+
static ERROR_InvalidLayerWidth: number;
|
|
188
|
+
static Error_InvalidLayerWidth: (o: {
|
|
189
|
+
minDeviceWidth: number;
|
|
190
|
+
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
190
191
|
static ERROR_InvalidQuadEscape: number;
|
|
191
192
|
static Error_InvalidQuadEscape: (o: {
|
|
192
193
|
cp: number;
|
|
193
|
-
}) => CompilerEvent;
|
|
194
|
+
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
194
195
|
static ERROR_UnparseableTransformFrom: number;
|
|
195
196
|
static Error_UnparseableTransformFrom: (o: {
|
|
196
197
|
from: string;
|
|
@@ -203,7 +204,7 @@ export declare class LdmlCompilerMessages {
|
|
|
203
204
|
static ERROR_TransformFromMatchesNothing: number;
|
|
204
205
|
static Error_TransformFromMatchesNothing: (o: {
|
|
205
206
|
from: string;
|
|
206
|
-
}) => CompilerEvent;
|
|
207
|
+
}, x?: ObjectWithMetadata) => CompilerEvent;
|
|
207
208
|
static ERROR_IllegalTransformPlus: number;
|
|
208
209
|
static Error_IllegalTransformPlus: (o: {
|
|
209
210
|
from: string;
|
|
@@ -229,5 +230,4 @@ export declare class LdmlCompilerMessages {
|
|
|
229
230
|
*/
|
|
230
231
|
static offset(event: CompilerEvent, x?: any): CompilerEvent;
|
|
231
232
|
}
|
|
232
|
-
export {};
|
|
233
233
|
//# sourceMappingURL=ldml-compiler-messages.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ldml-compiler-messages.d.ts","sourceRoot":"","sources":["../../../src/compiler/ldml-compiler-messages.ts"],"names":[],"mappings":"AACA,OAAO,EAA2H,aAAa,EAAmB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"ldml-compiler-messages.d.ts","sourceRoot":"","sources":["../../../src/compiler/ldml-compiler-messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,7 @@ export class LdmlCompilerMessages {
|
|
|
49
49
|
static HINT_NormalizationDisabled = SevHint | 0x0001;
|
|
50
50
|
static Hint_NormalizationDisabled = (x) => mx(this.HINT_NormalizationDisabled, x, `normalization=disabled is not recommended.`);
|
|
51
51
|
static ERROR_InvalidLocale = SevError | 0x0002;
|
|
52
|
-
static Error_InvalidLocale = (o) =>
|
|
52
|
+
static Error_InvalidLocale = (o, x) => mx(this.ERROR_InvalidLocale, x, `Invalid BCP 47 locale form '${def(o.tag)}'`);
|
|
53
53
|
static ERROR_HardwareLayerHasTooManyRows = SevError | 0x0003;
|
|
54
54
|
static Error_HardwareLayerHasTooManyRows = (x) => mx(this.ERROR_HardwareLayerHasTooManyRows, x, `'hardware' layer has too many rows`);
|
|
55
55
|
static ERROR_RowOnHardwareLayerHasTooManyKeys = SevError | 0x0004;
|
|
@@ -57,11 +57,11 @@ export class LdmlCompilerMessages {
|
|
|
57
57
|
static ERROR_KeyNotFoundInKeyBag = SevError | 0x0005;
|
|
58
58
|
static Error_KeyNotFoundInKeyBag = (o, x) => mx(this.ERROR_KeyNotFoundInKeyBag, x, `Key '${def(o.keyId)}' in position #${def(o.col)} on row #${def(o.row)} of layer ${def(o.layer)}, form '${def(o.form)}' not found in key bag`);
|
|
59
59
|
static HINT_OneOrMoreRepeatedLocales = SevHint | 0x0006;
|
|
60
|
-
static Hint_OneOrMoreRepeatedLocales = () =>
|
|
60
|
+
static Hint_OneOrMoreRepeatedLocales = (x) => mx(this.HINT_OneOrMoreRepeatedLocales, x, `After minimization, one or more locales is repeated and has been removed`);
|
|
61
61
|
static ERROR_InvalidFile = SevError | 0x0007;
|
|
62
62
|
static Error_InvalidFile = (o) => m(this.ERROR_InvalidFile, `The source file has an invalid structure: ${def(o.errorText)}`);
|
|
63
63
|
static HINT_LocaleIsNotMinimalAndClean = SevHint | 0x0008;
|
|
64
|
-
static Hint_LocaleIsNotMinimalAndClean = (o) =>
|
|
64
|
+
static Hint_LocaleIsNotMinimalAndClean = (o, x) => mx(this.HINT_LocaleIsNotMinimalAndClean, x, `Locale '${def(o.sourceLocale)}' is not minimal or correctly formatted and should be '${def(o.locale)}'`);
|
|
65
65
|
static ERROR_InvalidScanCode = SevError | 0x0009;
|
|
66
66
|
static Error_InvalidScanCode = (o, x) => mx(this.ERROR_InvalidScanCode, x, `Form '${def(o.id)}' has invalid/unknown scancodes '${def(o.codes)}'`);
|
|
67
67
|
static WARN_CustomForm = SevWarn | 0x000A;
|
|
@@ -80,7 +80,7 @@ export class LdmlCompilerMessages {
|
|
|
80
80
|
|
|
81
81
|
Example: \`"1.12.3"\``);
|
|
82
82
|
static ERROR_MustBeAtLeastOneLayerElement = SevError | 0x000E;
|
|
83
|
-
static Error_MustBeAtLeastOneLayerElement = () =>
|
|
83
|
+
static Error_MustBeAtLeastOneLayerElement = (x) => mx(this.ERROR_MustBeAtLeastOneLayerElement, x, `The source file must contain at least one layer element.`);
|
|
84
84
|
static HINT_NoDisplayForSwitch = SevHint | 0x000F;
|
|
85
85
|
static Hint_NoDisplayForSwitch = (o) => m(this.HINT_NoDisplayForSwitch, `Key element with id "${def(o.id)}" is a layer switch key, but there is no matching display element by keyId. Keycap may be blank.`);
|
|
86
86
|
/** annotate the to= or id= entry */
|
|
@@ -99,11 +99,11 @@ export class LdmlCompilerMessages {
|
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
101
|
static ERROR_DisplayIsRepeated = SevError | 0x0010;
|
|
102
|
-
static Error_DisplayIsRepeated = (o) =>
|
|
102
|
+
static Error_DisplayIsRepeated = (o, x) => mx(this.ERROR_DisplayIsRepeated, x, `display ${LdmlCompilerMessages.outputOrKeyId(o)} has more than one display entry.`);
|
|
103
103
|
static ERROR_KeyMissingToGapOrSwitch = SevError | 0x0011;
|
|
104
104
|
static Error_KeyMissingToGapOrSwitch = (o, x) => mx(this.ERROR_KeyMissingToGapOrSwitch, x, `key id='${def(o.keyId)}' must have either output=, gap=, or layerId=.`);
|
|
105
105
|
static ERROR_ExcessHardware = SevError | 0x0012;
|
|
106
|
-
static Error_ExcessHardware = (o) =>
|
|
106
|
+
static Error_ExcessHardware = (o, x) => mx(this.ERROR_ExcessHardware, x, `layers formId=${def(o.formId)}: Can only have one non-'touch' element`);
|
|
107
107
|
static ERROR_InvalidHardware = SevError | 0x0013;
|
|
108
108
|
static Error_InvalidHardware = (o, x) => mx(this.ERROR_InvalidHardware, x, `layers has invalid value formId=${def(o.formId)}`);
|
|
109
109
|
static layerIdOrEmpty(layer) {
|
|
@@ -122,13 +122,13 @@ export class LdmlCompilerMessages {
|
|
|
122
122
|
static Error_DuplicateVariable = (o, x) => mx(this.ERROR_DuplicateVariable, x, `duplicate variable: id=${def(o.id)}`);
|
|
123
123
|
// Not hit due to XML parsing
|
|
124
124
|
static ERROR_InvalidTransformsType = SevError | 0x0018;
|
|
125
|
-
static Error_InvalidTransformsType = (o) =>
|
|
125
|
+
static Error_InvalidTransformsType = (o, x) => mx(this.ERROR_InvalidTransformsType, x, `Invalid transforms type: '${def(o.type)}'`);
|
|
126
126
|
static ERROR_DuplicateTransformsType = SevError | 0x0019;
|
|
127
|
-
static Error_DuplicateTransformsType = (o) =>
|
|
127
|
+
static Error_DuplicateTransformsType = (o, x) => mx(this.ERROR_DuplicateTransformsType, x, `Duplicate transforms type: '${def(o.type)}'`);
|
|
128
128
|
static ERROR_MixedTransformGroup = SevError | 0x001A;
|
|
129
|
-
static Error_MixedTransformGroup = () =>
|
|
129
|
+
static Error_MixedTransformGroup = (x) => mx(this.ERROR_MixedTransformGroup, x, `transformGroup cannot contain both reorder and transform elements`);
|
|
130
130
|
static ERROR_EmptyTransformGroup = SevError | 0x001B;
|
|
131
|
-
static Error_EmptyTransformGroup = () =>
|
|
131
|
+
static Error_EmptyTransformGroup = (x) => mx(this.ERROR_EmptyTransformGroup, x, `transformGroup must have either reorder or transform elements`);
|
|
132
132
|
static ERROR_MissingStringVariable = SevError | 0x001C;
|
|
133
133
|
static Error_MissingStringVariable = (o, x) => mx(this.ERROR_MissingStringVariable, x, `Reference to undefined string variable: \${${def(o.id)}}`);
|
|
134
134
|
static ERROR_MissingSetVariable = SevError | 0x001D;
|
|
@@ -142,7 +142,7 @@ export class LdmlCompilerMessages {
|
|
|
142
142
|
static ERROR_MissingMarkers = SevError | 0x0021;
|
|
143
143
|
static Error_MissingMarkers = (o) => m(this.ERROR_MissingMarkers, `Markers used for matching but not defined: ${def(o.ids?.join(','))}`);
|
|
144
144
|
static ERROR_DisplayNeedsToOrId = SevError | 0x0022;
|
|
145
|
-
static Error_DisplayNeedsToOrId = (o) =>
|
|
145
|
+
static Error_DisplayNeedsToOrId = (o, x) => mx(this.ERROR_DisplayNeedsToOrId, x, `display ${LdmlCompilerMessages.outputOrKeyId(o)} needs output= or keyId=, but not both`);
|
|
146
146
|
static HINT_PUACharacters = SevHint | 0x0023;
|
|
147
147
|
static Hint_PUACharacters = (o) => m(this.HINT_PUACharacters, `File contains ${def(o.count)} PUA character(s), including ${util.describeCodepoint(o.lowestCh)}`);
|
|
148
148
|
static WARN_UnassignedCharacters = SevWarn | 0x0024;
|
|
@@ -150,9 +150,9 @@ export class LdmlCompilerMessages {
|
|
|
150
150
|
static ERROR_IllegalCharacters = SevError | 0x0025;
|
|
151
151
|
static Error_IllegalCharacters = (o) => m(this.ERROR_IllegalCharacters, `File contains ${def(o.count)} illegal character(s), including ${util.describeCodepoint(o.lowestCh)}`);
|
|
152
152
|
static HINT_CharClassImplicitDenorm = SevHint | 0x0026;
|
|
153
|
-
static Hint_CharClassImplicitDenorm = (o) =>
|
|
153
|
+
static Hint_CharClassImplicitDenorm = (o, x) => mx(this.HINT_CharClassImplicitDenorm, x, `File has character classes which span non-NFD character(s), including ${util.describeCodepoint(o.lowestCh)}. These will not match any text.`);
|
|
154
154
|
static WARN_CharClassExplicitDenorm = SevWarn | 0x0027;
|
|
155
|
-
static Warn_CharClassExplicitDenorm = (o) =>
|
|
155
|
+
static Warn_CharClassExplicitDenorm = (o, x) => mx(this.WARN_CharClassExplicitDenorm, x, `File has character classes which include non-NFD characters(s), including ${util.describeCodepoint(o.lowestCh)}. These will not match any text.`);
|
|
156
156
|
static ERROR_UnparseableReorderSet = SevError | 0x0028;
|
|
157
157
|
static Error_UnparseableReorderSet = (o) => m(this.ERROR_UnparseableReorderSet, `Illegal UnicodeSet "${def(o.set)}" in reorder "${def(o.from)}`);
|
|
158
158
|
static ERROR_InvalidVariableIdentifier = SevError | 0x0029;
|
|
@@ -161,9 +161,14 @@ export class LdmlCompilerMessages {
|
|
|
161
161
|
static Error_InvalidMarkerIdentifier = (o) => m(this.ERROR_InvalidMarkerIdentifier, `Invalid marker identifier "\m{${def(o.id)}}". Identifiers must be between 1 and 32 characters, and can use A-Z, a-z, 0-9, and _.`);
|
|
162
162
|
static WARN_StringDenorm = SevWarn | 0x002B;
|
|
163
163
|
static Warn_StringDenorm = (o) => m(this.WARN_StringDenorm, `File contains string "${def(o.s)}" that is neither NFC nor NFD.`);
|
|
164
|
-
|
|
164
|
+
static ERROR_DuplicateLayerWidth = SevError | 0x002C;
|
|
165
|
+
static Error_DuplicateLayerWidth = (o, x) => mx(this.ERROR_DuplicateLayerWidth, x, `Two or more layers have minDeviceWidth=${def(o?.minDeviceWidth)}`, `Touch layers must have distinct widths.`);
|
|
166
|
+
static ERROR_InvalidLayerWidth = SevError | 0x002D;
|
|
167
|
+
static Error_InvalidLayerWidth = (o, x) => mx(this.ERROR_InvalidLayerWidth, x, `Invalid Layers minDeviceWidth=${def(o?.minDeviceWidth)}`, `Width must be between 1-999 (millimeters), inclusive.` // sync with layr_max_minDeviceWidth / layr_max_maxDeviceWidth (from spec)
|
|
168
|
+
);
|
|
169
|
+
// Available: 0x02E-0x2F
|
|
165
170
|
static ERROR_InvalidQuadEscape = SevError | 0x0030;
|
|
166
|
-
static Error_InvalidQuadEscape = (o) =>
|
|
171
|
+
static Error_InvalidQuadEscape = (o, x) => mx(this.ERROR_InvalidQuadEscape, x, `Invalid escape "\\u${util.hexQuad(o?.cp || 0)}". Hint: Use "\\u{${def(o?.cp?.toString(16))}}"`);
|
|
167
172
|
//
|
|
168
173
|
// Transform syntax errors begin at ...F00 (SevErrorTransform)
|
|
169
174
|
// This is a bit of a catch-all and represents messages bubbling up from the underlying regex engine
|
|
@@ -179,7 +184,7 @@ export class LdmlCompilerMessages {
|
|
|
179
184
|
character maximum).
|
|
180
185
|
`);
|
|
181
186
|
static ERROR_TransformFromMatchesNothing = SevErrorTransform | 0x02;
|
|
182
|
-
static Error_TransformFromMatchesNothing = (o) =>
|
|
187
|
+
static Error_TransformFromMatchesNothing = (o, x) => mx(this.ERROR_TransformFromMatchesNothing, x, `Invalid transfom from="${def(o.from)}": Matches an empty string.`);
|
|
183
188
|
static ERROR_IllegalTransformPlus = SevErrorTransform | 0x03;
|
|
184
189
|
static Error_IllegalTransformPlus = (o) => m(this.ERROR_IllegalTransformPlus, `Invalid transform from="${def(o.from)}": Unescaped plus (+) is not valid transform syntax.`, `
|
|
185
190
|
**Hint**: Use \`\\+\` to match a literal plus.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ldml-compiler-messages.js","sourceRoot":"","sources":["../../../src/compiler/ldml-compiler-messages.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ldml-compiler-messages.js","sourceRoot":"","sources":["../../../src/compiler/ldml-compiler-messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,12 @@ export declare class LocaCompiler extends SectionCompiler {
|
|
|
10
10
|
* @returns list of BCP 47 tags in the keyboard xml, potentially with invalid or repeated entries
|
|
11
11
|
*/
|
|
12
12
|
private getLocales;
|
|
13
|
+
/**
|
|
14
|
+
* Attempt to locate context metadata for a locale, for error messages
|
|
15
|
+
* @param loc locale tag
|
|
16
|
+
* @returns context metadata or null
|
|
17
|
+
*/
|
|
18
|
+
private contextForLocale;
|
|
13
19
|
validate(): boolean;
|
|
14
20
|
compile(sections: DependencySections): Loca;
|
|
15
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loca.d.ts","sourceRoot":"","sources":["../../../src/compiler/loca.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAG3B,qBAAa,YAAa,SAAQ,eAAe;IAE/C,IAAW,EAAE,8DAEZ;IAED;;;;OAIG;IACH,OAAO,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"loca.d.ts","sourceRoot":"","sources":["../../../src/compiler/loca.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAG3B,qBAAa,YAAa,SAAQ,eAAe;IAE/C,IAAW,EAAE,8DAEZ;IAED;;;;OAIG;IACH,OAAO,CAAC,UAAU,CAEgG;IAElH;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAKjB,QAAQ,IAAI,OAAO;IAmBnB,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;CA2BnD"}
|
|
@@ -13,6 +13,16 @@ export class LocaCompiler extends SectionCompiler {
|
|
|
13
13
|
* @returns list of BCP 47 tags in the keyboard xml, potentially with invalid or repeated entries
|
|
14
14
|
*/
|
|
15
15
|
getLocales = (keyboard) => [keyboard.locale].concat(Array.isArray(keyboard.locales?.locale) ? keyboard.locales.locale.map(v => v.id) : []);
|
|
16
|
+
/**
|
|
17
|
+
* Attempt to locate context metadata for a locale, for error messages
|
|
18
|
+
* @param loc locale tag
|
|
19
|
+
* @returns context metadata or null
|
|
20
|
+
*/
|
|
21
|
+
contextForLocale(loc) {
|
|
22
|
+
if (loc == this.keyboard3.locale)
|
|
23
|
+
return this.keyboard3;
|
|
24
|
+
return this.keyboard3?.locales;
|
|
25
|
+
}
|
|
16
26
|
validate() {
|
|
17
27
|
let valid = true;
|
|
18
28
|
const locales = this.getLocales(this.keyboard3);
|
|
@@ -22,7 +32,7 @@ export class LocaCompiler extends SectionCompiler {
|
|
|
22
32
|
}
|
|
23
33
|
catch (e) {
|
|
24
34
|
if (e instanceof RangeError) {
|
|
25
|
-
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidLocale({ tag }));
|
|
35
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidLocale({ tag }, this.contextForLocale(tag)));
|
|
26
36
|
valid = false;
|
|
27
37
|
}
|
|
28
38
|
else {
|
|
@@ -41,7 +51,7 @@ export class LocaCompiler extends SectionCompiler {
|
|
|
41
51
|
const locales = sourceLocales.map((sourceLocale) => {
|
|
42
52
|
const locale = new Intl.Locale(sourceLocale).minimize().toString();
|
|
43
53
|
if (locale != sourceLocale) {
|
|
44
|
-
this.callbacks.reportMessage(LdmlCompilerMessages.Hint_LocaleIsNotMinimalAndClean({ sourceLocale, locale }));
|
|
54
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Hint_LocaleIsNotMinimalAndClean({ sourceLocale, locale }, this.contextForLocale(sourceLocale)));
|
|
45
55
|
}
|
|
46
56
|
return locale;
|
|
47
57
|
});
|
|
@@ -51,7 +61,7 @@ export class LocaCompiler extends SectionCompiler {
|
|
|
51
61
|
const canonicalLocales = Intl.getCanonicalLocales(locales);
|
|
52
62
|
result.locales = canonicalLocales.map(locale => sections.strs.allocString(locale));
|
|
53
63
|
if (result.locales.length < locales.length) {
|
|
54
|
-
this.callbacks.reportMessage(LdmlCompilerMessages.Hint_OneOrMoreRepeatedLocales());
|
|
64
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Hint_OneOrMoreRepeatedLocales(this.keyboard3?.locales));
|
|
55
65
|
}
|
|
56
66
|
return result;
|
|
57
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loca.js","sourceRoot":"","sources":["../../../src/compiler/loca.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAGnE,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,
|
|
1
|
+
{"version":3,"file":"loca.js","sourceRoot":"","sources":["../../../src/compiler/loca.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,6 +60,8 @@ export declare class BkspCompiler extends TransformCompiler<'backspace', Bksp> {
|
|
|
60
60
|
constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
|
|
61
61
|
protected newTran(): Bksp;
|
|
62
62
|
get id(): SectionIdent;
|
|
63
|
+
/** */
|
|
64
|
+
validate(): boolean;
|
|
63
65
|
}
|
|
64
66
|
export {};
|
|
65
67
|
//# sourceMappingURL=tran.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tran.d.ts","sourceRoot":"","sources":["../../../src/compiler/tran.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAA2B,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAC3B,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAI3B,OAAO,yBAAyB,GAAG,YAAY,CAAC,yBAAyB,CAAC;AAO1E,OAAO,EAAE,aAAa,EAAmB,MAAM,2BAA2B,CAAC;AAG3E,KAAK,qBAAqB,GAAG,QAAQ,GAAG,WAAW,CAAC;AAEpD,8BAAsB,iBAAiB,CAAC,CAAC,SAAS,qBAAqB,EAAE,QAAQ,SAAS,IAAI,CAAE,SAAQ,eAAe;IAErH,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO;IAwB3F,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;gBAEN,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAIpE,QAAQ,IAAI,OAAO;IAyC1B,uCAAuC;IACvC,SAAS,CAAC,OAAO,IAAI,QAAQ;IAI7B,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,qBAAqB;IAe7B,OAAO,CAAC,yBAAyB;IAUjC,OAAO,CAAC,gBAAgB;IAwFxB;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAQjB;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAkCpB,OAAO,CAAC,uBAAuB;IAU/B,OAAO,CAAC,cAAc;IAqBf,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,QAAQ;IAStD,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAW3C;IAED;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAgBpB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;
|
|
1
|
+
{"version":3,"file":"tran.d.ts","sourceRoot":"","sources":["../../../src/compiler/tran.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAA2B,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAC3B,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAI3B,OAAO,yBAAyB,GAAG,YAAY,CAAC,yBAAyB,CAAC;AAO1E,OAAO,EAAE,aAAa,EAAmB,MAAM,2BAA2B,CAAC;AAG3E,KAAK,qBAAqB,GAAG,QAAQ,GAAG,WAAW,CAAC;AAEpD,8BAAsB,iBAAiB,CAAC,CAAC,SAAS,qBAAqB,EAAE,QAAQ,SAAS,IAAI,CAAE,SAAQ,eAAe;IAErH,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO;IAwB3F,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;gBAEN,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAIpE,QAAQ,IAAI,OAAO;IAyC1B,uCAAuC;IACvC,SAAS,CAAC,OAAO,IAAI,QAAQ;IAI7B,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,qBAAqB;IAe7B,OAAO,CAAC,yBAAyB;IAUjC,OAAO,CAAC,gBAAgB;IAwFxB;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAQjB;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAkCpB,OAAO,CAAC,uBAAuB;IAU/B,OAAO,CAAC,cAAc;IAqBf,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,QAAQ;IAStD,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAW3C;IAED;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAgBpB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;CA2FpB;AAED,qBAAa,YAAa,SAAQ,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAgB;gBACpE,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAI3E,SAAS,CAAC,OAAO,IAAI,IAAI;IAGzB,IAAW,EAAE,iBAEZ;CACF;AAED,qBAAa,YAAa,SAAQ,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAgB;gBACvE,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAI3E,SAAS,CAAC,OAAO,IAAI,IAAI;IAGzB,IAAW,EAAE,iBAEZ;IACD,OAAO;IACA,QAAQ,IAAI,OAAO;CAG3B"}
|
|
@@ -38,32 +38,30 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
38
38
|
}
|
|
39
39
|
validate() {
|
|
40
40
|
const reportMessage = this.callbacks.reportMessage.bind(this.callbacks);
|
|
41
|
+
const ALLOWED_TYPES = ["simple", "backspace"];
|
|
41
42
|
let valid = true;
|
|
42
43
|
const transforms = this?.keyboard3?.transforms;
|
|
43
|
-
if (transforms) {
|
|
44
|
+
if (transforms && this.id == "tran") {
|
|
45
|
+
// Only run this part in the main "tran" compiler.
|
|
46
|
+
// we use this map to get back to a context object for the error message
|
|
47
|
+
const typeToObject = new Map();
|
|
48
|
+
transforms.forEach(t => typeToObject.set(t.type, t));
|
|
44
49
|
const types = transforms.map(({ type }) => type);
|
|
45
|
-
if (!verifyValidAndUnique(types, types => reportMessage(LdmlCompilerMessages.Error_DuplicateTransformsType({
|
|
50
|
+
if (!verifyValidAndUnique(types, types => types.forEach(type => reportMessage(LdmlCompilerMessages.Error_DuplicateTransformsType({ type }, typeToObject.get(type)))), new Set(ALLOWED_TYPES), types => types.forEach(type => reportMessage(LdmlCompilerMessages.Error_InvalidTransformsType({ type }, typeToObject.get(type)))))) {
|
|
46
51
|
valid = false;
|
|
47
52
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
transforms.forEach(({ transformGroup }) => transformGroup.forEach((transformGroup) => {
|
|
53
|
+
transforms.forEach(({ type, transformGroup }) => transformGroup.forEach((transformGroup) => {
|
|
54
|
+
if (this.type != type)
|
|
55
|
+
return; // only validate bskp in bksp, tran in tran, etc.
|
|
52
56
|
if (transformGroup.reorder?.length && transformGroup.transform?.length) {
|
|
53
|
-
|
|
57
|
+
valid = false;
|
|
58
|
+
reportMessage(LdmlCompilerMessages.Error_MixedTransformGroup(transformGroup));
|
|
54
59
|
}
|
|
55
|
-
if (!transformGroup.reorder?.length && !transformGroup.transform?.length) {
|
|
56
|
-
|
|
60
|
+
else if (!transformGroup.reorder?.length && !transformGroup.transform?.length) {
|
|
61
|
+
valid = false;
|
|
62
|
+
reportMessage(LdmlCompilerMessages.Error_EmptyTransformGroup(transformGroup));
|
|
57
63
|
}
|
|
58
64
|
}));
|
|
59
|
-
if (mixed) {
|
|
60
|
-
valid = false;
|
|
61
|
-
reportMessage(LdmlCompilerMessages.Error_MixedTransformGroup()); // report this once
|
|
62
|
-
}
|
|
63
|
-
if (empty) {
|
|
64
|
-
valid = false;
|
|
65
|
-
reportMessage(LdmlCompilerMessages.Error_EmptyTransformGroup()); // report this once
|
|
66
|
-
}
|
|
67
65
|
// TODO-LDML: linting here should check for identical from, but this involves a double-parse which is ugly
|
|
68
66
|
// TODO-LDML: unicodesets means that either we fully parse them and verify conflicting rules or the linting is imperfect
|
|
69
67
|
}
|
|
@@ -72,7 +70,7 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
72
70
|
/* c8 ignore next 4 */
|
|
73
71
|
/** allocate a new TranBase subclass */
|
|
74
72
|
newTran() {
|
|
75
|
-
throw Error(`Internal Error: newTran() not implemented`);
|
|
73
|
+
throw Error(`Internal Error: TranBase.newTran() not implemented (should not be called)`);
|
|
76
74
|
}
|
|
77
75
|
compileTransforms(sections, transforms) {
|
|
78
76
|
const result = this.newTran();
|
|
@@ -123,7 +121,7 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
123
121
|
// We run this first because it's more helpful than the ABNF.
|
|
124
122
|
cookedFrom = this.checkEscapes(cookedFrom); // check for \uXXXX escapes before normalizing
|
|
125
123
|
if (cookedFrom === '') {
|
|
126
|
-
this.callbacks.reportMessage(LdmlCompilerMessages.Error_TransformFromMatchesNothing({ from: cookedFrom }));
|
|
124
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_TransformFromMatchesNothing({ from: cookedFrom }, transform));
|
|
127
125
|
return null;
|
|
128
126
|
}
|
|
129
127
|
cookedFrom = sections.vars.substituteStrings(cookedFrom, sections, true);
|
|
@@ -150,7 +148,7 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
150
148
|
// unescape from \u{} form to plain, or in some cases \uXXXX / \UXXXXXXXX for core
|
|
151
149
|
cookedFrom = util.unescapeStringToRegex(cookedFrom);
|
|
152
150
|
// check for denormalized ranges
|
|
153
|
-
cookedFrom = this.checkRanges(cookedFrom); // check before normalizing
|
|
151
|
+
cookedFrom = this.checkRanges(cookedFrom, transform); // check before normalizing
|
|
154
152
|
if (!sections?.meta?.normalizationDisabled) {
|
|
155
153
|
// nfd here.
|
|
156
154
|
cookedFrom = LdmlKeyboardTypes.MarkerParser.nfd_markers(cookedFrom, true);
|
|
@@ -299,7 +297,7 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
299
297
|
* @param cookedFrom the original string
|
|
300
298
|
* @returns the original string, or null if an error was reported
|
|
301
299
|
*/
|
|
302
|
-
checkEscapes(cookedFrom) {
|
|
300
|
+
checkEscapes(cookedFrom, transform) {
|
|
303
301
|
if (!cookedFrom)
|
|
304
302
|
return cookedFrom;
|
|
305
303
|
// should not follow marker prefix, nor marker prefix with range
|
|
@@ -307,7 +305,7 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
307
305
|
for (const [, sub] of cookedFrom.matchAll(anyQuad)) {
|
|
308
306
|
const s = util.unescapeOne(sub);
|
|
309
307
|
if (s !== '\uffff' && s !== '\u0008') { // markers
|
|
310
|
-
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidQuadEscape({ cp: s.codePointAt(0) }));
|
|
308
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidQuadEscape({ cp: s.codePointAt(0) }, transform));
|
|
311
309
|
return null; // exit on the first error
|
|
312
310
|
}
|
|
313
311
|
}
|
|
@@ -319,7 +317,7 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
319
317
|
* @param cookedFrom input regex string
|
|
320
318
|
* @returns updated 'from' string
|
|
321
319
|
*/
|
|
322
|
-
checkRanges(cookedFrom) {
|
|
320
|
+
checkRanges(cookedFrom, transform) {
|
|
323
321
|
if (!cookedFrom)
|
|
324
322
|
return cookedFrom;
|
|
325
323
|
// extract all of the potential ranges - but don't match any-markers!
|
|
@@ -364,14 +362,18 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
364
362
|
let needCooking = false;
|
|
365
363
|
const explicitSet = rangeExplicit.analyze()?.get(util.BadStringType.denormalized);
|
|
366
364
|
if (explicitSet) {
|
|
367
|
-
this.callbacks.reportMessage(LdmlCompilerMessages.Warn_CharClassExplicitDenorm({
|
|
365
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Warn_CharClassExplicitDenorm({
|
|
366
|
+
lowestCh: explicitSet.values().next().value
|
|
367
|
+
}, transform));
|
|
368
368
|
needCooking = true;
|
|
369
369
|
}
|
|
370
370
|
else {
|
|
371
371
|
// don't analyze the implicit set of THIS range, if explicit is already problematic
|
|
372
372
|
const implicitSet = rangeImplicit.analyze()?.get(util.BadStringType.denormalized);
|
|
373
373
|
if (implicitSet) {
|
|
374
|
-
this.callbacks.reportMessage(LdmlCompilerMessages.Hint_CharClassImplicitDenorm({
|
|
374
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Hint_CharClassImplicitDenorm({
|
|
375
|
+
lowestCh: implicitSet.values().next().value
|
|
376
|
+
}, transform));
|
|
375
377
|
needCooking = true;
|
|
376
378
|
}
|
|
377
379
|
}
|
|
@@ -430,6 +432,10 @@ export class BkspCompiler extends TransformCompiler {
|
|
|
430
432
|
get id() {
|
|
431
433
|
return constants.section.bksp;
|
|
432
434
|
}
|
|
435
|
+
/** */
|
|
436
|
+
validate() {
|
|
437
|
+
return true;
|
|
438
|
+
}
|
|
433
439
|
}
|
|
434
440
|
;
|
|
435
441
|
//# sourceMappingURL=tran.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tran.js","sourceRoot":"","sources":["../../../src/compiler/tran.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tran.js","sourceRoot":"","sources":["../../../src/compiler/tran.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAgB,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAE3E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,IAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAE3B,IAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAE3B,IAAO,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;AACzC,IAAO,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAM7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAiB,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAIhF,MAAM,OAAgB,iBAA0E,SAAQ,eAAe;IAErH,MAAM,CAAC,qBAAqB,CAAC,QAAiC,EAAE,EAAiB;QAC/E,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,CACzC,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACjD,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;gBACjD,EAAE,CAAC,0BAA0B,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBAC7D,EAAE,CAAC,0BAA0B,CAAC,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACxD,MAAM,OAAO,GAAG,iBAAiB,CAAC,cAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAClF,MAAM,KAAK,GAAG,iBAAiB,CAAC,cAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;gBACnF,IAAI,OAAO,EAAE,CAAC;oBACZ,4BAA4B;oBAC5B,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACpD,CAAC;gBACD,IAAI,KAAK,EAAE,CAAC;oBACV,4BAA4B;oBAC5B,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/C,CAAC;YACH,CAAC,CAAC,CAAC;YACH,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;gBAC7C,EAAE,CAAC,qBAAqB,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;IAES,IAAI,CAAI;IAElB,YAAY,MAAiC,EAAE,SAA4B;QACzE,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC3B,CAAC;IAEM,QAAQ;QACb,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxE,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC9C,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,MAAM,UAAU,GAAG,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC;QAC/C,IAAI,UAAU,IAAI,IAAI,CAAC,EAAE,IAAI,MAAM,EAAE,CAAC;YACpC,kDAAkD;YAClD,wEAAwE;YACxE,MAAM,YAAY,GAAG,IAAI,GAAG,EAAwB,CAAC;YACrD,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACrD,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAC7B,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAC5B,aAAa,CAAC,oBAAoB,CAAC,6BAA6B,CAAC,EAAE,IAAI,EAAE,EAAE,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CACpG,EACD,IAAI,GAAG,CAAC,aAAa,CAAC,EACtB,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAC5B,aAAa,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,EAAE,IAAI,EAAE,EAAE,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAClG,CACF,EAAE,CAAC;gBACF,KAAK,GAAG,KAAK,CAAC;YAChB,CAAC;YAED,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;gBACzF,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI;oBAAE,OAAO,CAAC,iDAAiD;gBAChF,IAAI,cAAc,CAAC,OAAO,EAAE,MAAM,IAAI,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;oBACvE,KAAK,GAAG,KAAK,CAAC;oBACd,aAAa,CAAC,oBAAoB,CAAC,yBAAyB,CAAC,cAAc,CAAC,CAAC,CAAC;gBAChF,CAAC;qBAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;oBAChF,KAAK,GAAG,KAAK,CAAC;oBACd,aAAa,CAAC,oBAAoB,CAAC,yBAAyB,CAAC,cAAc,CAAC,CAAC,CAAC;gBAChF,CAAC;YACH,CAAC,CAAC,CAAC,CAAC;YAEJ,0GAA0G;YAC1G,wHAAwH;QAC1H,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,sBAAsB;IACtB,uCAAuC;IAC7B,OAAO;QACf,MAAM,KAAK,CAAC,2EAA2E,CAAC,CAAC;IAC3F,CAAC;IAEO,iBAAiB,CAAC,QAA4B,EAAE,UAAwB;QAC9E,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE9B,IAAI,UAAU,EAAE,cAAc,EAAE,CAAC;YAC/B,KAAK,MAAM,cAAc,IAAI,UAAU,CAAC,cAAc,EAAE,CAAC;gBACvD,MAAM,EAAE,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;gBAChE,IAAI,CAAC,EAAE;oBAAE,OAAO,IAAI,CAAC,CAAC,OAAO;gBAC7B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,qBAAqB,CAAC,QAA4B,EAAE,cAAgC;QAC1F,IAAI,cAAc,CAAC,OAAO,CAAC,MAAM,IAAI,cAAc,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACrE,sBAAsB;YACtB,sCAAsC;YACtC,MAAM,KAAK,CAAC,yEAAyE,CAAC,CAAC;QACzF,CAAC;aAAM,IAAI,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACzC,OAAO,IAAI,CAAC,uBAAuB,CAAC,QAAQ,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;QACxE,CAAC;aAAM,IAAI,cAAc,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAC,yBAAyB,CAAC,QAAQ,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;QAC5E,CAAC;aAAM,CAAC;YACN,oBAAoB;YACpB,MAAM,KAAK,CAAC,4EAA4E,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;IAEO,yBAAyB,CAAC,QAA4B,EAAE,UAAyB;QACvF,MAAM,MAAM,GAAe;YACzB,IAAI,EAAE,SAAS,CAAC,yBAAyB;YACzC,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACnF,QAAQ,EAAE,EAAE;SACb,CAAA;QACD,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAClD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,gBAAgB,CAAC,QAA4B,EAAE,SAAsB;QAC3E,MAAM,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QACnC,wBAAwB;QACxB,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC;QAC9B,MAAM,CAAC,GAAG,GAAG,SAAS,CAAC,EAAE,CAAC;QAC1B,IAAI,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC;QAEhC,mFAAmF;QACnF,6DAA6D;QAC7D,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,8CAA8C;QAE1F,IAAI,UAAU,KAAK,EAAE,EAAE,CAAC;YACtB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAiC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC;YACtH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,iBAAiB,CAAC,cAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxF,MAAM,KAAK,GAAG,iBAAiB,CAAC,cAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7F,IAAI,OAAO,IAAI,KAAK,EAAE,CAAC,CAAC,yBAAyB;YAC/C,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW;YACnE,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW;QACjE,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAC/C,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAE7C,qBAAqB;YACrB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;gBACxC,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,IAAI,UAAU,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC,CAAC,QAAQ;QAE9C,uGAAuG;QACvG,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAEpE,4CAA4C;QAC5C,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAEpE,kFAAkF;QAClF,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAEpD,gCAAgC;QAChC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,2BAA2B;QAEjF,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC;YAC3C,YAAY;YACZ,UAAU,GAAG,iBAAiB,CAAC,YAAY,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC5E,CAAC;QAED,2BAA2B;QAC3B,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,iDAAiD;QACjD,IAAI,CAAC;YACH,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;gBACvB,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,8BAA8B,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;YAC/H,OAAO,IAAI,CAAC;QACd,CAAC;QAED,+CAA+C;QAC/C,IAAI,CAAC;YACH,kBAAkB,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,4BAA4B,CAAC,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;YACnI,OAAO,IAAI,CAAC;QACd,CAAC;QAED,mEAAmE;QACnE,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE;YAClD,QAAQ,EAAE,KAAK;SAChB,EAAE,QAAQ,CAAC,CAAC;QACb,kCAAkC;QAClC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,EAAE;YAClD,eAAe,EAAE,IAAI;YACrB,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,IAAI;YACd,GAAG,EAAE,IAAI;SACV,EAAE,QAAQ,CAAC,CAAC;QACb,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACK,SAAS,CAAC,EAAU;QAC1B,IAAI,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,4BAA4B,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;YACxF,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACK,YAAY,CAAC,UAAkB,EAAE,IAAY;QACnD,2CAA2C;QAC3C,IAAI,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC1C,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,gCAAgC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAC9F,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC1C,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,8BAA8B,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAC5F,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC1C,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,0BAA0B,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YACxF,OAAO,KAAK,CAAC;QACf,CAAC;QACD,+CAA+C;QAC/C,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,UAAU,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;YAC9C,2BAA2B;YAE3B,iCAAiC;YACjC,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBAChB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAiC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;gBAC/F,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,wDAAwD;YACxD,kEAAkE;YAClE,uFAAuF;YACvF,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,8BAA8B,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAChH,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,uBAAuB,CAAC,QAA4B,EAAE,QAAqB;QACjF,MAAM,MAAM,GAAe;YACzB,IAAI,EAAE,SAAS,CAAC,uBAAuB;YACvC,UAAU,EAAE,EAAE;YACd,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;SAC1E,CAAA;QACD,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC,CAAC,+DAA+D;QAChH,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,cAAc,CAAC,QAA4B,EAAE,OAAkB;QACrE,MAAM,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QACjC,kBAAkB;QAClB,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;QAChC,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;QAC5B,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QAC9B,IAAI,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAC7D,OAAO,IAAI,CAAC,CAAC,WAAW;QAC1B,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;YACjE,OAAO,IAAI,CAAC,CAAC,WAAW;QAC1B,CAAC;QACD,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACnJ,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3E,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC,CAAC,mBAAmB;QAClC,CAAC;aAAM,CAAC;YACN,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAEM,OAAO,CAAC,QAA4B;QACzC,KAAI,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;YACzC,IAAG,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACvB,kDAAkD;gBAClD,OAAO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,qCAAqC;IAC9D,CAAC;IACD,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;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;;;;;OAKG;IACK,YAAY,CAAC,UAAkB,EAAE,SAAuB;QAC9D,IAAI,CAAC,UAAU;YAAE,OAAO,UAAU,CAAC;QAEnC,gEAAgE;QAChE,MAAM,OAAO,GAAG,gEAAgE,CAAC;QAEjF,KAAK,MAAM,CAAC,EAAE,GAAG,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACnD,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YAChC,IAAI,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC,CAAC,UAAU;gBAChD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,uBAAuB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC;gBAChH,OAAO,IAAI,CAAC,CAAC,0BAA0B;YACzC,CAAC;QACH,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED;;;;;OAKG;IACK,WAAW,CAAC,UAAkB,EAAE,SAAuB;QAC7D,IAAI,CAAC,UAAU;YAAE,OAAO,UAAU,CAAC;QAEnC,qEAAqE;QACrE,MAAM,QAAQ,GAAG,kCAAkC,CAAC;QACpD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAE7C,IAAI,CAAC,MAAM;YAAE,OAAO,UAAU,CAAC;QAE/B,mDAAmD;QACnD,MAAM,UAAU,GAAG,4DAA4D,CAAC;QAEhF,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QAC7C,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QAE7C,gCAAgC;QAChC,SAAS,eAAe,CAAC,CAAS;YAChC,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzB,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;YAC7B,CAAC;YACD,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACrB,OAAO,CAAC,CAAC;QACX,CAAC;QAED,KAAK,MAAM,CAAC,EAAE,GAAG,CAAC,IAAI,MAAM,EAAE,CAAC;YAC7B,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,IAAI,SAAS,EAAE,CAAC;gBAC1C,IAAI,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC;oBACnB,uBAAuB;oBACvB,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAmB;gBAC3C,CAAC;qBAAM,CAAC;oBACN,qDAAqD;oBACrD,MAAM,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;oBACjC,MAAM,GAAG,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;oBAC7B,MAAM,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;oBAC/B,MAAM,GAAG,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;oBAC7B,uDAAuD;oBACvD,KAAK,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;wBAC/B,iBAAiB;wBACjB,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC7C,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,iBAAiB;QACjB,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QAClF,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,4BAA4B,CAAC;gBAC7E,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK;aAC5C,EAAE,SAAS,CAAC,CAAC,CAAC;YACf,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC;aAAM,CAAC;YACN,mFAAmF;YACnF,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;YAClF,IAAI,WAAW,EAAE,CAAC;gBAChB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,4BAA4B,CAAC;oBAC7E,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK;iBAC5C,EAAE,SAAS,CAAC,CAAC,CAAC;gBACf,WAAW,GAAG,IAAI,CAAC;YACrB,CAAC;QACH,CAAC;QAED,kCAAkC;QAClC,+CAA+C;QAC/C,IAAI,WAAW,EAAE,CAAC;YAChB,gEAAgE;YAChE,4CAA4C;YAC5C,SAAS,OAAO,CAAC,CAAS;gBACxB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;oBACd,OAAO,CAAC,CAAC,CAAC,SAAS;gBACrB,CAAC;qBAAM,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;oBACvD,OAAO,CAAC,CAAC,CAAC,kBAAkB;gBAC9B,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;gBACjC,CAAC;YACH,CAAC;YACD,OAAO,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,QAAa,EAAE,GAAW,EAAE,EAAE;gBACpE,OAAO,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,GAAQ,EAAE,KAAa,EAAE,GAAW,EAAE,EAAE;oBAC/E,IAAI,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC;wBACnB,uBAAuB;wBACvB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAmB;oBAC1C,CAAC;yBAAM,CAAC;wBACN,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;oBAC7C,CAAC;gBACH,CAAC,CAAC,GAAG,GAAG,CAAC;YACX,CAAC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,UAAU,CAAC,CAAC,YAAY;IACjC,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,iBAAgD;IAChF,YAAY,MAAiC,EAAE,SAA4B;QACzE,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC;IACvB,CAAC;IACS,OAAO;QACf,OAAO,IAAI,IAAI,EAAE,CAAC;IACpB,CAAC;IACD,IAAW,EAAE;QACX,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;IAChC,CAAC;CACF;AAAA,CAAC;AAEF,MAAM,OAAO,YAAa,SAAQ,iBAAmD;IACnF,YAAY,MAAiC,EAAE,SAA4B;QACzE,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC;IAC1B,CAAC;IACS,OAAO;QACf,OAAO,IAAI,IAAI,EAAE,CAAC;IACpB,CAAC;IACD,IAAW,EAAE;QACX,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;IAChC,CAAC;IACD,OAAO;IACA,QAAQ;QACX,OAAO,IAAI,CAAC;IAChB,CAAC;CACF;AAAA,CAAC"}
|
package/build/src/util/util.d.ts
CHANGED
|
@@ -35,7 +35,7 @@ export declare function allUsedKeyIdsInFlick(flick?: LDMLKeyboard.LKFlick): Set<
|
|
|
35
35
|
* @param onInvalid callback with array of invalid values, deduped
|
|
36
36
|
* @returns true if all OK
|
|
37
37
|
*/
|
|
38
|
-
export declare function verifyValidAndUnique(values:
|
|
38
|
+
export declare function verifyValidAndUnique<T>(values: T[], onDuplicate: (duplicates: T[]) => void, allowed?: Set<T>, onInvalid?: (invalids: T[]) => void): boolean;
|
|
39
39
|
/**
|
|
40
40
|
* Determine modifier from layer info
|
|
41
41
|
* @param layer layer obj
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,WAEjG;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,KAAK,EAAE,GAAG,YAAY,CAAC,KAAK,EAAE,CAiBrF;AAED,yCAAyC;AACzC,wBAAgB,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,KAAK,EAAE,GAAI,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC,CAMtF;AAED,wBAAgB,UAAU,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,OAAO,EAAE,GAAI,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,CAM9F;AAGD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,CAAC,EAAE,YAAY,CAAC,QAAQ,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAgBvF;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAG,YAAY,CAAC,KAAK,GAAI,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAuBnF;AAED,wBAAgB,oBAAoB,CAAC,KAAK,CAAC,EAAG,YAAY,CAAC,OAAO,GAAI,GAAG,CAAC,MAAM,CAAC,CAQhF;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,WAEjG;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,KAAK,EAAE,GAAG,YAAY,CAAC,KAAK,EAAE,CAiBrF;AAED,yCAAyC;AACzC,wBAAgB,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,KAAK,EAAE,GAAI,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC,CAMtF;AAED,wBAAgB,UAAU,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,OAAO,EAAE,GAAI,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,CAM9F;AAGD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,CAAC,EAAE,YAAY,CAAC,QAAQ,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAgBvF;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAG,YAAY,CAAC,KAAK,GAAI,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAuBnF;AAED,wBAAgB,oBAAoB,CAAC,KAAK,CAAC,EAAG,YAAY,CAAC,OAAO,GAAI,GAAG,CAAC,MAAM,CAAC,CAQhF;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EACpC,MAAM,EAAE,CAAC,EAAE,EACX,WAAW,EAAE,CAAC,UAAU,EAAE,CAAC,EAAE,KAAK,IAAI,EACtC,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAChB,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,EAAE,KAAK,IAAI,GACjC,OAAO,CA0BV;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,GAAI,MAAM,EAAE,CAInF;AAmBD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAI,OAAO,CAWzD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -25,15 +25,15 @@
|
|
|
25
25
|
"url": "https://github.com/keymanapp/keyman/issues"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@keymanapp/developer-utils": "19.0.
|
|
29
|
-
"@keymanapp/keyman-version": "19.0.
|
|
30
|
-
"@keymanapp/kmc-kmn": "19.0.
|
|
31
|
-
"@keymanapp/ldml-keyboard-constants": "19.0.
|
|
28
|
+
"@keymanapp/developer-utils": "19.0.53-alpha",
|
|
29
|
+
"@keymanapp/keyman-version": "19.0.53-alpha",
|
|
30
|
+
"@keymanapp/kmc-kmn": "19.0.53-alpha",
|
|
31
|
+
"@keymanapp/ldml-keyboard-constants": "19.0.53-alpha",
|
|
32
32
|
"semver": "^7.5.4"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"@keymanapp/developer-test-helpers": "19.0.
|
|
36
|
-
"@keymanapp/resources-gosh": "19.0.
|
|
35
|
+
"@keymanapp/developer-test-helpers": "19.0.53-alpha",
|
|
36
|
+
"@keymanapp/resources-gosh": "19.0.53-alpha",
|
|
37
37
|
"@types/common-tags": "^1.8.4",
|
|
38
38
|
"@types/mocha": "^5.2.7",
|
|
39
39
|
"@types/node": "^20.4.1",
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"type": "git",
|
|
68
68
|
"url": "git+https://github.com/keymanapp/keyman.git"
|
|
69
69
|
},
|
|
70
|
-
"version": "19.0.
|
|
70
|
+
"version": "19.0.53-alpha"
|
|
71
71
|
}
|