@keymanapp/kmc-ldml 18.0.74-alpha → 18.0.75-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.js +7 -7
- package/build/src/compiler/compiler.js.map +1 -1
- package/build/src/compiler/disp.js +4 -4
- package/build/src/compiler/disp.js.map +1 -1
- package/build/src/compiler/empty-compiler.js +4 -4
- package/build/src/compiler/empty-compiler.js.map +1 -1
- package/build/src/compiler/keys.js +11 -11
- 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/{messages.d.ts → ldml-compiler-messages.d.ts} +2 -2
- package/build/src/compiler/ldml-compiler-messages.d.ts.map +1 -0
- package/build/src/compiler/{messages.js → ldml-compiler-messages.js} +5 -5
- package/build/src/compiler/ldml-compiler-messages.js.map +1 -0
- package/build/src/compiler/linter-keycaps.js +3 -3
- package/build/src/compiler/linter-keycaps.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/meta.js +4 -4
- package/build/src/compiler/meta.js.map +1 -1
- package/build/src/compiler/tran.js +12 -12
- 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 +3 -3
- package/build/src/compiler/visual-keyboard-compiler.js.map +1 -1
- package/build/src/main.d.ts +1 -1
- package/build/src/main.d.ts.map +1 -1
- package/build/src/main.js +1 -1
- package/build/src/main.js.map +1 -1
- package/package.json +6 -6
- package/build/src/compiler/messages.d.ts.map +0 -1
- package/build/src/compiler/messages.js.map +0 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { LDMLKeyboardXMLSourceFileReader, KMXPlus, defaultCompilerOptions, KMXBuilder, KvkFileWriter } from '@keymanapp/common-types';
|
|
2
|
-
import {
|
|
2
|
+
import { LdmlCompilerMessages } from './ldml-compiler-messages.js';
|
|
3
3
|
import { BkspCompiler, TranCompiler } from './tran.js';
|
|
4
4
|
import { DispCompiler } from './disp.js';
|
|
5
5
|
import { KeysCompiler } from './keys.js';
|
|
@@ -174,13 +174,13 @@ export class LdmlKeyboardCompiler {
|
|
|
174
174
|
// load the file from disk into a string
|
|
175
175
|
const data = this.callbacks.loadFile(filename);
|
|
176
176
|
if (!data) {
|
|
177
|
-
this.callbacks.reportMessage(
|
|
177
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({ errorText: 'Unable to read XML file' }));
|
|
178
178
|
return null;
|
|
179
179
|
}
|
|
180
180
|
// parse (load) the string into an object tree
|
|
181
181
|
const source = reader.load(data);
|
|
182
182
|
if (!source) {
|
|
183
|
-
this.callbacks.reportMessage(
|
|
183
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({ errorText: 'Unable to load XML file' }));
|
|
184
184
|
return null;
|
|
185
185
|
}
|
|
186
186
|
try {
|
|
@@ -190,7 +190,7 @@ export class LdmlKeyboardCompiler {
|
|
|
190
190
|
}
|
|
191
191
|
}
|
|
192
192
|
catch (e) {
|
|
193
|
-
this.callbacks.reportMessage(
|
|
193
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({ errorText: e.toString() }));
|
|
194
194
|
return null;
|
|
195
195
|
}
|
|
196
196
|
return source;
|
|
@@ -206,13 +206,13 @@ export class LdmlKeyboardCompiler {
|
|
|
206
206
|
const reader = new LDMLKeyboardXMLSourceFileReader(this.options.readerOptions, this.callbacks);
|
|
207
207
|
const data = this.callbacks.loadFile(filename);
|
|
208
208
|
if (!data) {
|
|
209
|
-
this.callbacks.reportMessage(
|
|
209
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({ errorText: 'Unable to read XML file' }));
|
|
210
210
|
return null;
|
|
211
211
|
}
|
|
212
212
|
const source = reader.loadTestData(data);
|
|
213
213
|
/* c8 ignore next 4 */
|
|
214
214
|
if (!source) {
|
|
215
|
-
this.callbacks.reportMessage(
|
|
215
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({ errorText: 'Unable to load XML file' }));
|
|
216
216
|
return null;
|
|
217
217
|
}
|
|
218
218
|
// TODO-LDML: The unboxed data doesn't match the schema anymore. Skipping validation, for now.
|
|
@@ -221,7 +221,7 @@ export class LdmlKeyboardCompiler {
|
|
|
221
221
|
// return null;
|
|
222
222
|
// }
|
|
223
223
|
// } catch(e) {
|
|
224
|
-
// this.callbacks.reportMessage(
|
|
224
|
+
// this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({errorText: e.toString()}));
|
|
225
225
|
// return null;
|
|
226
226
|
// }
|
|
227
227
|
return source;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../src/compiler/compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAgB,OAAO,EAAyI,sBAAsB,EAAE,UAAU,EAAE,aAAa,EAAkC,MAAM,yBAAyB,CAAC;AAE3T,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../src/compiler/compiler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
2
2
|
import { KMXPlus } from '@keymanapp/common-types';
|
|
3
|
-
import {
|
|
3
|
+
import { LdmlCompilerMessages } from "./ldml-compiler-messages.js";
|
|
4
4
|
import { SectionCompiler } from "./section-compiler.js";
|
|
5
5
|
var Disp = KMXPlus.Disp;
|
|
6
6
|
import { SubstitutionUse } from "./substitution-tracker.js";
|
|
@@ -23,12 +23,12 @@ export class DispCompiler extends SectionCompiler {
|
|
|
23
23
|
if (this.keyboard3.displays?.display) {
|
|
24
24
|
for (const { output, keyId } of this.keyboard3.displays?.display) {
|
|
25
25
|
if ((output && keyId) || (!output && !keyId)) {
|
|
26
|
-
this.callbacks.reportMessage(
|
|
26
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_DisplayNeedsToOrId({ output, keyId }));
|
|
27
27
|
return false;
|
|
28
28
|
}
|
|
29
29
|
else if (output) {
|
|
30
30
|
if (tos.has(output)) {
|
|
31
|
-
this.callbacks.reportMessage(
|
|
31
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_DisplayIsRepeated({ output }));
|
|
32
32
|
return false;
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
@@ -37,7 +37,7 @@ export class DispCompiler extends SectionCompiler {
|
|
|
37
37
|
}
|
|
38
38
|
else if (keyId) {
|
|
39
39
|
if (ids.has(keyId)) {
|
|
40
|
-
this.callbacks.reportMessage(
|
|
40
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_DisplayIsRepeated({ keyId }));
|
|
41
41
|
return false;
|
|
42
42
|
}
|
|
43
43
|
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;AAC/D,OAAO,EAAE,OAAO,EAAgB,MAAM,yBAAyB,CAAC;AAEhE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"disp.js","sourceRoot":"","sources":["../../../src/compiler/disp.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { constants } from '@keymanapp/ldml-keyboard-constants';
|
|
|
2
2
|
import { SectionCompiler } from "./section-compiler.js";
|
|
3
3
|
import { KMXPlus, util, MarkerParser } from "@keymanapp/common-types";
|
|
4
4
|
import { VarsCompiler } from './vars.js';
|
|
5
|
-
import {
|
|
5
|
+
import { LdmlCompilerMessages } from './ldml-compiler-messages.js';
|
|
6
6
|
/**
|
|
7
7
|
* Compiler for typrs that don't actually consume input XML
|
|
8
8
|
*/
|
|
@@ -54,16 +54,16 @@ export class StrsCompiler extends EmptyCompiler {
|
|
|
54
54
|
const illegals = m.get(util.BadStringType.illegal);
|
|
55
55
|
if (puas) {
|
|
56
56
|
const [count, lowestCh] = [puas.size, Array.from(puas.values()).sort((a, b) => a - b)[0]];
|
|
57
|
-
this.callbacks.reportMessage(
|
|
57
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Hint_PUACharacters({ count, lowestCh }));
|
|
58
58
|
}
|
|
59
59
|
if (unassigneds) {
|
|
60
60
|
const [count, lowestCh] = [unassigneds.size, Array.from(unassigneds.values()).sort((a, b) => a - b)[0]];
|
|
61
|
-
this.callbacks.reportMessage(
|
|
61
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Warn_UnassignedCharacters({ count, lowestCh }));
|
|
62
62
|
}
|
|
63
63
|
if (illegals) {
|
|
64
64
|
// do this last, because we will return false.
|
|
65
65
|
const [count, lowestCh] = [illegals.size, Array.from(illegals.values()).sort((a, b) => a - b)[0]];
|
|
66
|
-
this.callbacks.reportMessage(
|
|
66
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalCharacters({ count, lowestCh }));
|
|
67
67
|
return false;
|
|
68
68
|
}
|
|
69
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"empty-compiler.js","sourceRoot":"","sources":["../../../src/compiler/empty-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAgB,OAAO,EAAqB,IAAI,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvG,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"empty-compiler.js","sourceRoot":"","sources":["../../../src/compiler/empty-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAgB,OAAO,EAAqB,IAAI,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvG,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE;;GAEG;AACH,MAAM,OAAgB,aAAc,SAAQ,eAAe;IACjD,GAAG,CAAe;IAC1B,YAAY,EAAgB,EAAE,MAA8C,EAAE,SAA4B;QACxG,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACzB,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;IAChB,CAAC;IAED,IAAW,EAAE;QACX,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IACD,IAAW,YAAY;QACrB,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC,kBAAkB;IACtC,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,aAAa;IAC7C,YAAY,MAA8C,EAAE,SAA4B;QACtF,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC;IACM,OAAO,CAAC,QAAoC;QACjD,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC;IACM,YAAY,CAAC,OAAyB;QAC3C,MAAM,IAAI,GAAiB,OAAO,CAAC;QAEnC,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,iBAAiB,GAAG,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvD,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;YACxE,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,EAAE,CAAC;gBAChD,kDAAkD;gBAClD,+DAA+D;gBAC/D,kDAAkD;gBAClD,IAAI,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBACtC,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;gBACjC,CAAC;gBACD,sBAAsB;gBACtB,IAAI,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBAClC,2EAA2E;oBAC3E,4BAA4B;oBAC5B,MAAM,oBAAoB,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;oBAC5E,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC,CAAC,kBAAkB;gBAChE,CAAC;gBACD,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC3B,CAAC;YACD,MAAM,CAAC,GAAG,iBAAiB,CAAC,OAAO,EAAE,CAAC;YACtC,IAAI,CAAC,EAAE,IAAI,GAAG,CAAC,EAAE,CAAC;gBAChB,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBAC3C,MAAM,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;gBACzD,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;gBACnD,IAAI,IAAI,EAAE,CAAC;oBACT,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC1F,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAA;gBAC5F,CAAC;gBACD,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACxG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,yBAAyB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAA;gBACnG,CAAC;gBACD,IAAI,QAAQ,EAAE,CAAC;oBACb,8CAA8C;oBAC9C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAClG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,uBAAuB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAA;oBAC/F,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,aAAa;IAC7C,YAAY,MAA8C,EAAE,SAA4B;QACtF,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC;IACM,OAAO,CAAC,QAAoC;QACjD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;IACD,IAAW,YAAY;QACrB,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAiB,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACnE,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,aAAa;IAC7C,YAAY,MAA8C,EAAE,SAA4B;QACtF,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC;IACM,OAAO,CAAC,QAAoC;QACjD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IACD,IAAW,YAAY;QACrB,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAiB,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACnE,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,aAAa;IAC7C,YAAY,MAA8C,EAAE,SAA4B;QACtF,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC;IACM,OAAO,CAAC,QAAoC;QACjD,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC;IACD,IAAW,YAAY;QACrB,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAiB,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACnE,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,CAAE,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { constants } from '@keymanapp/ldml-keyboard-constants';
|
|
2
2
|
import { LDMLKeyboard, KMXPlus, Constants } from '@keymanapp/common-types';
|
|
3
|
-
import {
|
|
3
|
+
import { LdmlCompilerMessages } from './ldml-compiler-messages.js';
|
|
4
4
|
import { SectionCompiler } from "./section-compiler.js";
|
|
5
5
|
var Keys = KMXPlus.Keys;
|
|
6
6
|
var KeysFlicks = KMXPlus.KeysFlicks;
|
|
@@ -56,7 +56,7 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
56
56
|
this.keyboard3.forms?.form?.forEach((form) => {
|
|
57
57
|
if (!LDMLKeyboard.ImportStatus.isImpliedImport(form)) {
|
|
58
58
|
// If it's not an implied import, give a warning.
|
|
59
|
-
this.callbacks.reportMessage(
|
|
59
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Warn_CustomForm({ id: form.id }));
|
|
60
60
|
}
|
|
61
61
|
});
|
|
62
62
|
const keyBag = this.getKeyBag();
|
|
@@ -78,7 +78,7 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
78
78
|
if (flickId) {
|
|
79
79
|
if (!flickHash.has(flickId)) {
|
|
80
80
|
valid = false;
|
|
81
|
-
this.callbacks.reportMessage(
|
|
81
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_MissingFlicks({ flickId, id: keyId }));
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
84
|
const gestureKeys = allUsedKeyIdsInKey(key);
|
|
@@ -87,7 +87,7 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
87
87
|
if (gestureKey == null) {
|
|
88
88
|
// TODO-LDML: could keep track of already missing keys so we don't warn multiple times on gesture keys
|
|
89
89
|
valid = false;
|
|
90
|
-
this.callbacks.reportMessage(
|
|
90
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_GestureKeyNotFoundInKeyBag({ keyId: gestureKeyId, parentKeyId: keyId, attribute: attrs.join(',') }));
|
|
91
91
|
}
|
|
92
92
|
else {
|
|
93
93
|
usedKeys.add(gestureKeyId);
|
|
@@ -324,30 +324,30 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
324
324
|
let valid = true;
|
|
325
325
|
const { modifiers } = layer;
|
|
326
326
|
if (!validModifier(modifiers)) {
|
|
327
|
-
this.callbacks.reportMessage(
|
|
327
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidModifier({ modifiers, layer: layer.id }));
|
|
328
328
|
valid = false;
|
|
329
329
|
}
|
|
330
330
|
const badScans = new Set();
|
|
331
331
|
const keymap = this.getKeymapFromForm(hardware, badScans);
|
|
332
332
|
if (!keymap) {
|
|
333
|
-
this.callbacks.reportMessage(
|
|
333
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidHardware({ formId: hardware }));
|
|
334
334
|
valid = false;
|
|
335
335
|
return valid;
|
|
336
336
|
}
|
|
337
337
|
else if (badScans.size !== 0) {
|
|
338
338
|
const codes = Array.from(badScans.values()).map(n => Number(n).toString(16)).sort();
|
|
339
|
-
this.callbacks.reportMessage(
|
|
339
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidScanCode({ form: hardware, codes }));
|
|
340
340
|
valid = false;
|
|
341
341
|
return valid;
|
|
342
342
|
}
|
|
343
343
|
if (layer.row.length > keymap.length) {
|
|
344
|
-
this.callbacks.reportMessage(
|
|
344
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_HardwareLayerHasTooManyRows());
|
|
345
345
|
valid = false;
|
|
346
346
|
}
|
|
347
347
|
for (let y = 0; y < layer.row.length && y < keymap.length; y++) {
|
|
348
348
|
const keys = layer.row[y].keys.split(" ");
|
|
349
349
|
if (keys.length > keymap[y].length) {
|
|
350
|
-
this.callbacks.reportMessage(
|
|
350
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_RowOnHardwareLayerHasTooManyKeys({
|
|
351
351
|
row: y + 1,
|
|
352
352
|
hardware,
|
|
353
353
|
modifiers,
|
|
@@ -359,7 +359,7 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
359
359
|
x++;
|
|
360
360
|
let keydef = keyHash.get(key);
|
|
361
361
|
if (!keydef) {
|
|
362
|
-
this.callbacks.reportMessage(
|
|
362
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_KeyNotFoundInKeyBag({
|
|
363
363
|
keyId: key,
|
|
364
364
|
col: x + 1,
|
|
365
365
|
row: y + 1,
|
|
@@ -370,7 +370,7 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
370
370
|
continue;
|
|
371
371
|
}
|
|
372
372
|
if (!keydef.output && !keydef.gap && !keydef.layerId) {
|
|
373
|
-
this.callbacks.reportMessage(
|
|
373
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_KeyMissingToGapOrSwitch({ keyId: key }));
|
|
374
374
|
valid = false;
|
|
375
375
|
continue;
|
|
376
376
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../../src/compiler/keys.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../../src/compiler/keys.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { constants } from '@keymanapp/ldml-keyboard-constants';
|
|
2
2
|
import { KMXPlus } from '@keymanapp/common-types';
|
|
3
|
-
import {
|
|
3
|
+
import { LdmlCompilerMessages } from './ldml-compiler-messages.js';
|
|
4
4
|
import { SectionCompiler } from "./section-compiler.js";
|
|
5
5
|
import { translateLayerAttrToModifier, validModifier } from '../util/util.js';
|
|
6
6
|
var Layr = KMXPlus.Layr;
|
|
@@ -26,14 +26,14 @@ export class LayrCompiler extends SectionCompiler {
|
|
|
26
26
|
hardwareLayers++;
|
|
27
27
|
if (hardwareLayers > 1) {
|
|
28
28
|
valid = false;
|
|
29
|
-
this.callbacks.reportMessage(
|
|
29
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_ExcessHardware({ formId }));
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
layers.layer.forEach((layer) => {
|
|
33
33
|
const { modifiers, id } = layer;
|
|
34
34
|
totalLayerCount++;
|
|
35
35
|
if (!validModifier(modifiers)) {
|
|
36
|
-
this.callbacks.reportMessage(
|
|
36
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidModifier({ modifiers, layer: id || '' }));
|
|
37
37
|
valid = false;
|
|
38
38
|
}
|
|
39
39
|
});
|
|
@@ -41,7 +41,7 @@ export class LayrCompiler extends SectionCompiler {
|
|
|
41
41
|
if (totalLayerCount === 0) { // TODO-LDML: does not validate touch layers yet
|
|
42
42
|
// no layers seen anywhere
|
|
43
43
|
valid = false;
|
|
44
|
-
this.callbacks.reportMessage(
|
|
44
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_MustBeAtLeastOneLayerElement());
|
|
45
45
|
}
|
|
46
46
|
return valid;
|
|
47
47
|
}
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"layr.js","sourceRoot":"","sources":["../../../src/compiler/layr.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @internal
|
|
3
3
|
*/
|
|
4
|
-
export declare class
|
|
4
|
+
export declare class LdmlCompilerMessages {
|
|
5
5
|
static HINT_NormalizationDisabled: number;
|
|
6
6
|
static Hint_NormalizationDisabled: () => import("@keymanapp/common-types").CompilerEvent;
|
|
7
7
|
static ERROR_InvalidLocale: number;
|
|
@@ -193,4 +193,4 @@ export declare class CompilerMessages {
|
|
|
193
193
|
from: string;
|
|
194
194
|
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
195
195
|
}
|
|
196
|
-
//# sourceMappingURL=messages.d.ts.map
|
|
196
|
+
//# sourceMappingURL=ldml-compiler-messages.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ldml-compiler-messages.d.ts","sourceRoot":"","sources":["../../../src/compiler/ldml-compiler-messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const SevErrorTransform = SevError | 0xF00;
|
|
|
9
9
|
/**
|
|
10
10
|
* @internal
|
|
11
11
|
*/
|
|
12
|
-
export class
|
|
12
|
+
export class LdmlCompilerMessages {
|
|
13
13
|
static HINT_NormalizationDisabled = SevHint | 0x0001;
|
|
14
14
|
static Hint_NormalizationDisabled = () => m(this.HINT_NormalizationDisabled, `normalization=disabled is not recommended.`);
|
|
15
15
|
static ERROR_InvalidLocale = SevError | 0x0002;
|
|
@@ -56,7 +56,7 @@ export class CompilerMessages {
|
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
58
|
static ERROR_DisplayIsRepeated = SevError | 0x0010;
|
|
59
|
-
static Error_DisplayIsRepeated = (o) => m(this.ERROR_DisplayIsRepeated, `display ${
|
|
59
|
+
static Error_DisplayIsRepeated = (o) => m(this.ERROR_DisplayIsRepeated, `display ${LdmlCompilerMessages.outputOrKeyId(o)} has more than one display entry.`);
|
|
60
60
|
static ERROR_KeyMissingToGapOrSwitch = SevError | 0x0011;
|
|
61
61
|
static Error_KeyMissingToGapOrSwitch = (o) => m(this.ERROR_KeyMissingToGapOrSwitch, `key id='${def(o.keyId)}' must have either output=, gap=, or layerId=.`);
|
|
62
62
|
static ERROR_ExcessHardware = SevError | 0x0012;
|
|
@@ -72,7 +72,7 @@ export class CompilerMessages {
|
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
static ERROR_InvalidModifier = SevError | 0x0014;
|
|
75
|
-
static Error_InvalidModifier = (o) => m(this.ERROR_InvalidModifier, `layer has invalid modifiers='${def(o.modifiers)}'` +
|
|
75
|
+
static Error_InvalidModifier = (o) => m(this.ERROR_InvalidModifier, `layer has invalid modifiers='${def(o.modifiers)}'` + LdmlCompilerMessages.layerIdOrEmpty(o.layer));
|
|
76
76
|
static ERROR_MissingFlicks = SevError | 0x0015;
|
|
77
77
|
static Error_MissingFlicks = (o) => m(this.ERROR_MissingFlicks, `key id=${def(o.id)} refers to missing flickId=${def(o.flickId)}`);
|
|
78
78
|
static ERROR_DuplicateVariable = SevError | 0x0016;
|
|
@@ -99,7 +99,7 @@ export class CompilerMessages {
|
|
|
99
99
|
static ERROR_MissingMarkers = SevError | 0x0021;
|
|
100
100
|
static Error_MissingMarkers = (o) => m(this.ERROR_MissingMarkers, `Markers used for matching but not defined: ${def(o.ids?.join(','))}`);
|
|
101
101
|
static ERROR_DisplayNeedsToOrId = SevError | 0x0022;
|
|
102
|
-
static Error_DisplayNeedsToOrId = (o) => m(this.ERROR_DisplayNeedsToOrId, `display ${
|
|
102
|
+
static Error_DisplayNeedsToOrId = (o) => m(this.ERROR_DisplayNeedsToOrId, `display ${LdmlCompilerMessages.outputOrKeyId(o)} needs output= or keyId=, but not both`);
|
|
103
103
|
static HINT_PUACharacters = SevHint | 0x0023;
|
|
104
104
|
static Hint_PUACharacters = (o) => m(this.HINT_PUACharacters, `File contains ${def(o.count)} PUA character(s), including ${util.describeCodepoint(o.lowestCh)}`);
|
|
105
105
|
static WARN_UnassignedCharacters = SevWarn | 0x0024;
|
|
@@ -129,4 +129,4 @@ export class CompilerMessages {
|
|
|
129
129
|
static ERROR_IllegalTransformAsterisk = SevErrorTransform | 0x04;
|
|
130
130
|
static Error_IllegalTransformAsterisk = (o) => m(this.ERROR_IllegalTransformAsterisk, `Invalid transform from="${def(o.from)}": Unescaped asterisk (*) is not valid transform syntax.`, '**Hint**: Use `\\*` to match a literal asterisk.');
|
|
131
131
|
}
|
|
132
|
-
//# sourceMappingURL=messages.js.map
|
|
132
|
+
//# sourceMappingURL=ldml-compiler-messages.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ldml-compiler-messages.js","sourceRoot":"","sources":["../../../src/compiler/ldml-compiler-messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { MarkerParser } from "@keymanapp/common-types";
|
|
2
2
|
import { Linter } from "./linter.js";
|
|
3
|
-
import {
|
|
3
|
+
import { LdmlCompilerMessages } from "./ldml-compiler-messages.js";
|
|
4
4
|
/** A linter concerned with the display of keycaps */
|
|
5
5
|
export class LinterKeycaps extends Linter {
|
|
6
6
|
findDisp(keyId, output) {
|
|
@@ -28,14 +28,14 @@ export class LinterKeycaps extends Linter {
|
|
|
28
28
|
// switch with no output
|
|
29
29
|
const disp = this.findDisp(id.value, to.value);
|
|
30
30
|
if (!disp) {
|
|
31
|
-
this.callbacks.reportMessage(
|
|
31
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Hint_NoDisplayForSwitch({ id: id.value }));
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
else if (to.value !== '' && nonMarkerOutput === '') {
|
|
35
35
|
// has output, but only markers
|
|
36
36
|
const disp = this.findDisp(id.value, to.value);
|
|
37
37
|
if (!disp) {
|
|
38
|
-
this.callbacks.reportMessage(
|
|
38
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Hint_NoDisplayForMarker({ id: id.value }));
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linter-keycaps.js","sourceRoot":"","sources":["../../../src/compiler/linter-keycaps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"linter-keycaps.js","sourceRoot":"","sources":["../../../src/compiler/linter-keycaps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,qDAAqD;AACrD,MAAM,OAAO,aAAc,SAAQ,MAAM;IAE7B,QAAQ,CAAC,KAAa,EAAE,MAAc;QAC1C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC7C,MAAM,EAAC,EAAE,EAAE,EAAE,EAAC,GAAG,IAAI,CAAC;YACtB,IAAI,EAAE,CAAC,KAAK,KAAK,EAAE,IAAI,EAAE,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;gBACxC,OAAO,IAAI,CAAC;YAChB,CAAC;YAED,IAAI,EAAE,CAAC,KAAK,KAAK,EAAE,IAAI,EAAE,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;gBACzC,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,IAAI;QACb,MAAM,gBAAgB,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAC,GAAG,CAAC,CAAC;QACvE,4BAA4B;QAC5B,wDAAwD;QACxD,4CAA4C;QAC5C,2DAA2D;QAE3D,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAC3C,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC;YACvB,MAAM,eAAe,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;YAElE,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,KAAK,EAAE,IAAI,EAAE,CAAC,KAAK,KAAK,EAAE,EAAE,CAAC;gBAChD,wBAAwB;gBACxB,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;gBAE/C,IAAI,CAAC,IAAI,EAAE,CAAC;oBACR,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,uBAAuB,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBACjG,CAAC;YACL,CAAC;iBAAM,IAAI,EAAE,CAAC,KAAK,KAAK,EAAE,IAAI,eAAe,KAAK,EAAE,EAAE,CAAC;gBACnD,+BAA+B;gBAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;gBAC/C,IAAI,CAAC,IAAI,EAAE,CAAC;oBACR,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,uBAAuB,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBACjG,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
2
2
|
import { KMXPlus } from '@keymanapp/common-types';
|
|
3
3
|
import { SectionCompiler } from "./section-compiler.js";
|
|
4
|
-
import {
|
|
4
|
+
import { LdmlCompilerMessages } from "./ldml-compiler-messages.js";
|
|
5
5
|
var Loca = KMXPlus.Loca;
|
|
6
6
|
export class LocaCompiler extends SectionCompiler {
|
|
7
7
|
get id() {
|
|
@@ -22,7 +22,7 @@ export class LocaCompiler extends SectionCompiler {
|
|
|
22
22
|
}
|
|
23
23
|
catch (e) {
|
|
24
24
|
if (e instanceof RangeError) {
|
|
25
|
-
this.callbacks.reportMessage(
|
|
25
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidLocale({ tag }));
|
|
26
26
|
valid = false;
|
|
27
27
|
}
|
|
28
28
|
else {
|
|
@@ -41,7 +41,7 @@ export class LocaCompiler extends SectionCompiler {
|
|
|
41
41
|
const locales = sourceLocales.map((sourceLocale) => {
|
|
42
42
|
const locale = new Intl.Locale(sourceLocale).minimize().toString();
|
|
43
43
|
if (locale != sourceLocale) {
|
|
44
|
-
this.callbacks.reportMessage(
|
|
44
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Hint_LocaleIsNotMinimalAndClean({ sourceLocale, locale }));
|
|
45
45
|
}
|
|
46
46
|
return locale;
|
|
47
47
|
});
|
|
@@ -51,7 +51,7 @@ export class LocaCompiler extends SectionCompiler {
|
|
|
51
51
|
const canonicalLocales = Intl.getCanonicalLocales(locales);
|
|
52
52
|
result.locales = canonicalLocales.map(locale => sections.strs.allocString(locale));
|
|
53
53
|
if (result.locales.length < locales.length) {
|
|
54
|
-
this.callbacks.reportMessage(
|
|
54
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Hint_OneOrMoreRepeatedLocales());
|
|
55
55
|
}
|
|
56
56
|
return result;
|
|
57
57
|
}
|
|
@@ -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,EAAgB,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,
|
|
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,EAAgB,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAChE,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,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,CAAC;YACvB,IAAI,CAAC;gBACH,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC;YAAC,OAAM,CAAC,EAAE,CAAC;gBACV,IAAG,CAAC,YAAY,UAAU,EAAE,CAAC;oBAC3B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,EAAC,GAAG,EAAC,CAAC,CAAC,CAAC;oBAC9E,KAAK,GAAG,KAAK,CAAC;gBAChB,CAAC;qBAAM,CAAC;oBACN,sBAAsB;oBACtB,MAAM,CAAC,CAAC;gBACV,CAAC;YACH,CAAC;QACH,CAAC;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,CAAC;gBAC1B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,+BAA+B,CAAC,EAAC,YAAY,EAAE,MAAM,EAAC,CAAC,CAAC,CAAC;YAC7G,CAAC;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,CAAC;YAC1C,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,6BAA6B,EAAE,CAAC,CAAC;QACrF,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
2
2
|
import { KMXPlus } from '@keymanapp/common-types';
|
|
3
|
-
import {
|
|
3
|
+
import { LdmlCompilerMessages } from "./ldml-compiler-messages.js";
|
|
4
4
|
import { SectionCompiler } from "./section-compiler.js";
|
|
5
5
|
import semver from "semver";
|
|
6
6
|
var Meta = KMXPlus.Meta;
|
|
@@ -19,11 +19,11 @@ export class MetaCompiler extends SectionCompiler {
|
|
|
19
19
|
if (versionNumber !== undefined) {
|
|
20
20
|
if (versionNumber.match(/^[=v]/i)) {
|
|
21
21
|
// semver ignores a preceding '=' or 'v'
|
|
22
|
-
this.callbacks.reportMessage(
|
|
22
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidVersion({ version: versionNumber }));
|
|
23
23
|
return false;
|
|
24
24
|
}
|
|
25
25
|
if (!semver.parse(versionNumber, { loose: false })) {
|
|
26
|
-
this.callbacks.reportMessage(
|
|
26
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidVersion({ version: versionNumber }));
|
|
27
27
|
return false;
|
|
28
28
|
}
|
|
29
29
|
}
|
|
@@ -31,7 +31,7 @@ export class MetaCompiler extends SectionCompiler {
|
|
|
31
31
|
}
|
|
32
32
|
validateNormalization(normalization) {
|
|
33
33
|
if (normalization === 'disabled') {
|
|
34
|
-
this.callbacks.reportMessage(
|
|
34
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Hint_NormalizationDisabled());
|
|
35
35
|
}
|
|
36
36
|
return true;
|
|
37
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meta.js","sourceRoot":"","sources":["../../../src/compiler/meta.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"meta.js","sourceRoot":"","sources":["../../../src/compiler/meta.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ var Tran = KMXPlus.Tran;
|
|
|
6
6
|
var TranReorder = KMXPlus.TranReorder;
|
|
7
7
|
var TranTransform = KMXPlus.TranTransform;
|
|
8
8
|
import { verifyValidAndUnique } from "../util/util.js";
|
|
9
|
-
import {
|
|
9
|
+
import { LdmlCompilerMessages } from "./ldml-compiler-messages.js";
|
|
10
10
|
import { SubstitutionUse } from "./substitution-tracker.js";
|
|
11
11
|
export class TransformCompiler extends SectionCompiler {
|
|
12
12
|
static validateSubstitutions(keyboard, st) {
|
|
@@ -41,7 +41,7 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
41
41
|
const transforms = this?.keyboard3?.transforms;
|
|
42
42
|
if (transforms) {
|
|
43
43
|
const types = transforms.map(({ type }) => type);
|
|
44
|
-
if (!verifyValidAndUnique(types, types => reportMessage(
|
|
44
|
+
if (!verifyValidAndUnique(types, types => reportMessage(LdmlCompilerMessages.Error_DuplicateTransformsType({ types })), new Set(['simple', 'backspace']), types => reportMessage(LdmlCompilerMessages.Error_InvalidTransformsType({ types })))) {
|
|
45
45
|
valid = false;
|
|
46
46
|
}
|
|
47
47
|
// check for mixed groups
|
|
@@ -57,11 +57,11 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
57
57
|
}));
|
|
58
58
|
if (mixed) {
|
|
59
59
|
valid = false;
|
|
60
|
-
reportMessage(
|
|
60
|
+
reportMessage(LdmlCompilerMessages.Error_MixedTransformGroup()); // report this once
|
|
61
61
|
}
|
|
62
62
|
if (empty) {
|
|
63
63
|
valid = false;
|
|
64
|
-
reportMessage(
|
|
64
|
+
reportMessage(LdmlCompilerMessages.Error_EmptyTransformGroup()); // report this once
|
|
65
65
|
}
|
|
66
66
|
// TODO-LDML: linting here should check for identical from, but this involves a double-parse which is ugly
|
|
67
67
|
// TODO-LDML: unicodesets means that either we fully parse them and verify conflicting rules or the linting is imperfect
|
|
@@ -168,15 +168,15 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
168
168
|
isValidRegex(cookedFrom, from) {
|
|
169
169
|
// check for any unescaped dollar sign here
|
|
170
170
|
if (/(?<!\\)(?:\\\\)*\$/.test(cookedFrom)) {
|
|
171
|
-
this.callbacks.reportMessage(
|
|
171
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformDollarsign({ from }));
|
|
172
172
|
return false;
|
|
173
173
|
}
|
|
174
174
|
if (/(?<!\\)(?:\\\\)*\*/.test(cookedFrom)) {
|
|
175
|
-
this.callbacks.reportMessage(
|
|
175
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformAsterisk({ from }));
|
|
176
176
|
return false;
|
|
177
177
|
}
|
|
178
178
|
if (/(?<!\\)(?:\\\\)*\+/.test(cookedFrom)) {
|
|
179
|
-
this.callbacks.reportMessage(
|
|
179
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformPlus({ from }));
|
|
180
180
|
return false;
|
|
181
181
|
}
|
|
182
182
|
// Verify that the regex is syntactically valid
|
|
@@ -185,7 +185,7 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
185
185
|
// Tests against the regex:
|
|
186
186
|
// does it match an empty string?
|
|
187
187
|
if (rg.test('')) {
|
|
188
|
-
this.callbacks.reportMessage(
|
|
188
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_TransformFromMatchesNothing({ from }));
|
|
189
189
|
return false;
|
|
190
190
|
}
|
|
191
191
|
}
|
|
@@ -193,7 +193,7 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
193
193
|
// We're exposing the internal regex error message here.
|
|
194
194
|
// In the future, CLDR plans to expose the EBNF for the transform,
|
|
195
195
|
// at which point we would have more precise validation prior to getting to this point.
|
|
196
|
-
this.callbacks.reportMessage(
|
|
196
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_UnparseableTransformFrom({ from, message: e.message }));
|
|
197
197
|
return false;
|
|
198
198
|
}
|
|
199
199
|
return true;
|
|
@@ -260,7 +260,7 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
260
260
|
for (const [, sub] of cookedFrom.matchAll(anyQuad)) {
|
|
261
261
|
const s = util.unescapeOne(sub);
|
|
262
262
|
if (s !== '\uffff' && s !== '\u0008') { // markers
|
|
263
|
-
this.callbacks.reportMessage(
|
|
263
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidQuadEscape({ cp: s.codePointAt(0) }));
|
|
264
264
|
return null; // exit on the first error
|
|
265
265
|
}
|
|
266
266
|
}
|
|
@@ -317,14 +317,14 @@ export class TransformCompiler extends SectionCompiler {
|
|
|
317
317
|
let needCooking = false;
|
|
318
318
|
const explicitSet = rangeExplicit.analyze()?.get(util.BadStringType.denormalized);
|
|
319
319
|
if (explicitSet) {
|
|
320
|
-
this.callbacks.reportMessage(
|
|
320
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Warn_CharClassExplicitDenorm({ lowestCh: explicitSet.values().next().value }));
|
|
321
321
|
needCooking = true;
|
|
322
322
|
}
|
|
323
323
|
else {
|
|
324
324
|
// don't analyze the implicit set of THIS range, if explicit is already problematic
|
|
325
325
|
const implicitSet = rangeImplicit.analyze()?.get(util.BadStringType.denormalized);
|
|
326
326
|
if (implicitSet) {
|
|
327
|
-
this.callbacks.reportMessage(
|
|
327
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Hint_CharClassImplicitDenorm({ lowestCh: implicitSet.values().next().value }));
|
|
328
328
|
needCooking = true;
|
|
329
329
|
}
|
|
330
330
|
}
|
|
@@ -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":"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"}
|
|
@@ -6,7 +6,7 @@ var Vars = KMXPlus.Vars;
|
|
|
6
6
|
var StringVarItem = KMXPlus.StringVarItem;
|
|
7
7
|
var SetVarItem = KMXPlus.SetVarItem;
|
|
8
8
|
var UnicodeSetItem = KMXPlus.UnicodeSetItem;
|
|
9
|
-
import {
|
|
9
|
+
import { LdmlCompilerMessages } from "./ldml-compiler-messages.js";
|
|
10
10
|
import { KeysCompiler } from "./keys.js";
|
|
11
11
|
import { TransformCompiler } from "./tran.js";
|
|
12
12
|
import { DispCompiler } from "./disp.js";
|
|
@@ -75,7 +75,7 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
75
75
|
if (setrefs.length > 1) {
|
|
76
76
|
// this is the form $[seta]$[setb]
|
|
77
77
|
valid = false;
|
|
78
|
-
this.callbacks.reportMessage(
|
|
78
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_NeedSpacesBetweenSetVariables({ item }));
|
|
79
79
|
}
|
|
80
80
|
else {
|
|
81
81
|
st.set.add(SubstitutionUse.variable, setrefs); // the reference to a 'map'
|
|
@@ -95,7 +95,7 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
95
95
|
valid = false;
|
|
96
96
|
if (allSets.has(id2)) {
|
|
97
97
|
// $[set] in a UnicodeSet must be another UnicodeSet.
|
|
98
|
-
this.callbacks.reportMessage(
|
|
98
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_CantReferenceSetFromUnicodeSet({ id: id2 }));
|
|
99
99
|
}
|
|
100
100
|
else {
|
|
101
101
|
st.uset.add(SubstitutionUse.variable, [id2]);
|
|
@@ -106,7 +106,7 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
106
106
|
}
|
|
107
107
|
// one report if any dups
|
|
108
108
|
if (dups.size > 0) {
|
|
109
|
-
this.callbacks.reportMessage(
|
|
109
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_DuplicateVariable({
|
|
110
110
|
ids: Array.from(dups.values()).sort().join(', ')
|
|
111
111
|
}));
|
|
112
112
|
valid = false;
|
|
@@ -117,19 +117,19 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
117
117
|
// intended. collisions are handled separately.
|
|
118
118
|
if (!allSets.has(id) && !allUnicodeSets.has(id)) {
|
|
119
119
|
valid = false;
|
|
120
|
-
this.callbacks.reportMessage(
|
|
120
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_MissingSetVariable({ id }));
|
|
121
121
|
}
|
|
122
122
|
}
|
|
123
123
|
for (const id of st.string.all) {
|
|
124
124
|
if (!allStrings.has(id)) {
|
|
125
125
|
valid = false;
|
|
126
|
-
this.callbacks.reportMessage(
|
|
126
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_MissingStringVariable({ id }));
|
|
127
127
|
}
|
|
128
128
|
}
|
|
129
129
|
for (const id of st.uset.all) {
|
|
130
130
|
if (!allUnicodeSets.has(id)) {
|
|
131
131
|
valid = false;
|
|
132
|
-
this.callbacks.reportMessage(
|
|
132
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_MissingUnicodeSetVariable({ id }));
|
|
133
133
|
}
|
|
134
134
|
}
|
|
135
135
|
return valid;
|
|
@@ -165,7 +165,7 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
165
165
|
}
|
|
166
166
|
// report once
|
|
167
167
|
if (matchedNotEmitted.size > 0) {
|
|
168
|
-
this.callbacks.reportMessage(
|
|
168
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_MissingMarkers({ ids: Array.from(matchedNotEmitted.values()).sort() }));
|
|
169
169
|
valid = false;
|
|
170
170
|
}
|
|
171
171
|
// now, validate the variables.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vars.js","sourceRoot":"","sources":["../../../src/compiler/vars.ts"],"names":[],"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,
|
|
1
|
+
{"version":3,"file":"vars.js","sourceRoot":"","sources":["../../../src/compiler/vars.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { VisualKeyboard } from "@keymanapp/common-types";
|
|
2
2
|
import { KeysCompiler } from "./keys.js";
|
|
3
|
-
import {
|
|
3
|
+
import { LdmlCompilerMessages } from "./ldml-compiler-messages.js";
|
|
4
4
|
export class LdmlKeyboardVisualKeyboardCompiler {
|
|
5
5
|
callbacks;
|
|
6
6
|
constructor(callbacks) {
|
|
@@ -30,7 +30,7 @@ export class LdmlKeyboardVisualKeyboardCompiler {
|
|
|
30
30
|
}
|
|
31
31
|
const keymap = KeysCompiler.getKeymapFromForms(source.keyboard3?.forms?.form, hardware);
|
|
32
32
|
if (!keymap) {
|
|
33
|
-
this.callbacks.reportMessage(
|
|
33
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidHardware({ formId: hardware }));
|
|
34
34
|
return;
|
|
35
35
|
}
|
|
36
36
|
const shift = this.translateLayerIdToVisualKeyboardShift(layer.id);
|
|
@@ -44,7 +44,7 @@ export class LdmlKeyboardVisualKeyboardCompiler {
|
|
|
44
44
|
x++;
|
|
45
45
|
let keydef = source.keyboard3.keys?.key?.find(x => x.id == key);
|
|
46
46
|
if (!keydef) {
|
|
47
|
-
this.callbacks.reportMessage(
|
|
47
|
+
this.callbacks.reportMessage(LdmlCompilerMessages.Error_KeyNotFoundInKeyBag({ keyId, layer: layerId, row: y, col: x, form: hardware }));
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
50
50
|
vk.keys.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visual-keyboard-compiler.js","sourceRoot":"","sources":["../../../src/compiler/visual-keyboard-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAmC,MAAM,yBAAyB,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"visual-keyboard-compiler.js","sourceRoot":"","sources":["../../../src/compiler/visual-keyboard-compiler.ts"],"names":[],"mappings":"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"}
|
package/build/src/main.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { LdmlKeyboardCompiler } from './compiler/compiler.js';
|
|
2
2
|
export { LdmlCompilerOptions } from './compiler/ldml-compiler-options.js';
|
|
3
|
-
export {
|
|
3
|
+
export { LdmlCompilerMessages } from './compiler/ldml-compiler-messages.js';
|
|
4
4
|
//# sourceMappingURL=main.d.ts.map
|
package/build/src/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC"}
|
package/build/src/main.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export { LdmlKeyboardCompiler } from './compiler/compiler.js';
|
|
2
|
-
export {
|
|
2
|
+
export { LdmlCompilerMessages } from './compiler/ldml-compiler-messages.js';
|
|
3
3
|
//# sourceMappingURL=main.js.map
|
package/build/src/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC"}
|
package/package.json
CHANGED
|
@@ -25,14 +25,14 @@
|
|
|
25
25
|
"url": "https://github.com/keymanapp/keyman/issues"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@keymanapp/keyman-version": "18.0.
|
|
29
|
-
"@keymanapp/kmc-kmn": "18.0.
|
|
30
|
-
"@keymanapp/ldml-keyboard-constants": "18.0.
|
|
28
|
+
"@keymanapp/keyman-version": "18.0.75-alpha",
|
|
29
|
+
"@keymanapp/kmc-kmn": "18.0.75-alpha",
|
|
30
|
+
"@keymanapp/ldml-keyboard-constants": "18.0.75-alpha",
|
|
31
31
|
"semver": "^7.5.2"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@keymanapp/developer-test-helpers": "18.0.
|
|
35
|
-
"@keymanapp/resources-gosh": "18.0.
|
|
34
|
+
"@keymanapp/developer-test-helpers": "18.0.75-alpha",
|
|
35
|
+
"@keymanapp/resources-gosh": "18.0.75-alpha",
|
|
36
36
|
"@types/mocha": "^5.2.7",
|
|
37
37
|
"@types/node": "^20.4.1",
|
|
38
38
|
"@types/semver": "^7.3.12",
|
|
@@ -61,5 +61,5 @@
|
|
|
61
61
|
"type": "git",
|
|
62
62
|
"url": "git+https://github.com/keymanapp/keyman.git"
|
|
63
63
|
},
|
|
64
|
-
"version": "18.0.
|
|
64
|
+
"version": "18.0.75-alpha"
|
|
65
65
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/compiler/messages.ts"],"names":[],"mappings":"AAUA;;GAEG;AACH,qBAAa,gBAAgB;IAC3B,MAAM,CAAC,0BAA0B,SAAoB;IACrD,MAAM,CAAC,0BAA0B,wDAA0F;IAE3H,MAAM,CAAC,mBAAmB,SAAqB;IAC/C,MAAM,CAAC,mBAAmB,MAAM;QAAC,GAAG,EAAE,MAAM,CAAA;KAAC,qDAA+E;IAE5H,MAAM,CAAC,iCAAiC,SAAqB;IAC7D,MAAM,CAAC,iCAAiC,wDAAyF;IAEjI,MAAM,CAAC,sCAAsC,SAAqB;IAClE,MAAM,CAAC,sCAAsC,MAAM;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC,qDAA0K;IAE/Q,MAAM,CAAC,yBAAyB,SAAqB;IACrD,MAAM,CAAC,yBAAyB,MAAM;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,qDACuE;IAEnL,MAAM,CAAC,6BAA6B,SAAoB;IACxD,MAAM,CAAC,6BAA6B,wDAC8E;IAElH,MAAM,CAAC,iBAAiB,SAAqB;IAC7C,MAAM,CAAC,iBAAiB,MAAM;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC,qDAC0C;IAE3F,MAAM,CAAC,+BAA+B,SAAoB;IAC1D,MAAM,CAAC,+BAA+B,MAAM;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,qDACgE;IAElJ,MAAM,CAAC,qBAAqB,SAAqB;IACjD,MAAM,CAAC,qBAAqB,MAAM;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;KAAC,qDAC+C;IAElH,MAAM,CAAC,eAAe,SAAoB;IAC1C,MAAM,CAAC,eAAe,MAAM;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,qDAC+D;IAEvG,MAAM,CAAC,gCAAgC,SAAqB;IAC5D,MAAM,CAAC,gCAAgC,MAAM;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC,qDACyD;IAE7J,MAAM,CAAC,uBAAuB,SAAoB;IAClD,MAAM,CAAC,uBAAuB,MAAO;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,qDAC6H;IAEhL,MAAM,CAAC,oBAAoB,SAAqB;IAChD,MAAM,CAAC,oBAAoB,MAAM;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,qDAC2D;IAE7G,MAAM,CAAC,kCAAkC,SAAqB;IAC9D,MAAM,CAAC,kCAAkC,wDAC8D;IAEvG,MAAM,CAAC,uBAAuB,SAAoB;IAClD,MAAM,CAAC,uBAAuB,MAAO;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,qDACkH;IAErK,oCAAoC;IACpC,OAAO,CAAC,MAAM,CAAC,aAAa;IAY5B,MAAM,CAAC,uBAAuB,SAAqB;IACnD,MAAM,CAAC,uBAAuB,MAAM;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAC,qDAC8C;IAEnH,MAAM,CAAC,6BAA6B,SAAqB;IACzD,MAAM,CAAC,6BAA6B,MAAM;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,qDACsD;IAE/G,MAAM,CAAC,oBAAoB,SAAqB;IAChD,MAAM,CAAC,oBAAoB,MAAM;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,qDAC0B;IAE3E,MAAM,CAAC,qBAAqB,SAAqB;IACjD,MAAM,CAAC,qBAAqB,MAAM;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,qDACI;IAEtD,OAAO,CAAC,MAAM,CAAC,cAAc;IAQ7B,MAAM,CAAC,qBAAqB,SAAqB;IACjD,MAAM,CAAC,qBAAqB,MAAM;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC,qDAC8B;IAElG,MAAM,CAAC,mBAAmB,SAAqB;IAC/C,MAAM,CAAC,mBAAmB,MAAM;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,qDACQ;IAErE,MAAM,CAAC,uBAAuB,SAAqB;IACnD,MAAM,CAAC,uBAAuB,MAAM;QAAC,GAAG,EAAE,MAAM,CAAA;KAAC,qDACJ;IAG7C,MAAM,CAAC,2BAA2B,SAAqB;IACvD,MAAM,CAAC,2BAA2B,MAAM;QAAC,KAAK,EAAE,MAAM,EAAE,CAAA;KAAC,qDACqC;IAE9F,MAAM,CAAC,6BAA6B,SAAqB;IACzD,MAAM,CAAC,6BAA6B,MAAM;QAAC,KAAK,EAAE,MAAM,EAAE,CAAA;KAAC,qDACuC;IAElG,MAAM,CAAC,yBAAyB,SAAqB;IACrD,MAAM,CAAC,yBAAyB,wDACuE;IAEvG,MAAM,CAAC,yBAAyB,SAAqB;IACrD,MAAM,CAAC,yBAAyB,wDACmE;IAEnG,MAAM,CAAC,2BAA2B,SAAqB;IACvD,MAAM,CAAC,2BAA2B,MAAM;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,qDAC4C;IAEhG,MAAM,CAAC,wBAAwB,SAAqB;IACpD,MAAM,CAAC,wBAAwB,MAAM;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,qDACyC;IAE1F,MAAM,CAAC,+BAA+B,SAAqB;IAC3D,MAAM,CAAC,+BAA+B,MAAM;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,qDACgD;IAExG,MAAM,CAAC,mCAAmC,SAAqB;IAC/D,MAAM,CAAC,mCAAmC,MAAM;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,qDACmC;IAEjG,MAAM,CAAC,oCAAoC,SAAqB;IAChE,MAAM,CAAC,oCAAoC,MAAM;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,qDACwD;IAErH,MAAM,CAAC,oBAAoB,SAAqB;IAChD,MAAM,CAAC,oBAAoB,MAAO;QAAE,GAAG,EAAE,MAAM,EAAE,CAAA;KAAE,qDACiD;IAEpG,MAAM,CAAC,wBAAwB,SAAqB;IACpD,MAAM,CAAC,wBAAwB,MAAM;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAC,qDACiD;IAEvH,MAAM,CAAC,kBAAkB,SAAoB;IAC7C,MAAM,CAAC,kBAAkB,MAAO;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,qDAC2D;IAE9H,MAAM,CAAC,yBAAyB,SAAoB;IACpD,MAAM,CAAC,yBAAyB,MAAO;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,qDACkE;IAE5I,MAAM,CAAC,uBAAuB,SAAqB;IACnD,MAAM,CAAC,uBAAuB,MAAO;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,qDAC+D;IAEvI,MAAM,CAAC,4BAA4B,SAAoB;IACvD,MAAM,CAAC,4BAA4B,MAAO;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,qDACsH;IAEpL,MAAM,CAAC,4BAA4B,SAAoB;IACvD,MAAM,CAAC,4BAA4B,MAAO;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,qDAC0H;IAExL,MAAM,CAAC,2BAA2B,SAAqB;IACvD,MAAM,CAAC,2BAA2B,MAAO;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,qDAC+B;IAIrG,MAAM,CAAC,uBAAuB,SAAqB;IACnD,MAAM,CAAC,uBAAuB,MAAO;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,qDAC8E;IAMjI,MAAM,CAAC,8BAA8B,SAA8B;IACnE,MAAM,CAAC,8BAA8B,MAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,qDAC2B;IAE1G,MAAM,CAAC,gCAAgC,SAA4B;IACnE,MAAM,CAAC,gCAAgC,MAAO;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,qDAEmC;IAEjG,MAAM,CAAC,iCAAiC,SAA4B;IACpE,MAAM,CAAC,iCAAiC,MAAO;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,qDAC+C;IAE9G,MAAM,CAAC,0BAA0B,SAA4B;IAC7D,MAAM,CAAC,0BAA0B,MAAO;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,qDAEkC;IAE1F,MAAM,CAAC,8BAA8B,SAA4B;IACjE,MAAM,CAAC,8BAA8B,MAAO;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,qDAEkC;CAE/F"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../src/compiler/messages.ts"],"names":[],"mappings":"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"}
|