@keymanapp/kmc-ldml 17.0.150-alpha → 17.0.152-alpha
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/src/compiler/disp.d.ts +3 -1
- package/build/src/compiler/disp.d.ts.map +1 -1
- package/build/src/compiler/disp.js +8 -2
- package/build/src/compiler/disp.js.map +1 -1
- package/build/src/compiler/empty-compiler.d.ts +3 -2
- package/build/src/compiler/empty-compiler.d.ts.map +1 -1
- package/build/src/compiler/empty-compiler.js +3 -2
- package/build/src/compiler/empty-compiler.js.map +1 -1
- package/build/src/compiler/keys.d.ts +2 -0
- package/build/src/compiler/keys.d.ts.map +1 -1
- package/build/src/compiler/keys.js +40 -14
- package/build/src/compiler/keys.js.map +1 -1
- package/build/src/compiler/marker-tracker.d.ts +34 -0
- package/build/src/compiler/marker-tracker.d.ts.map +1 -0
- package/build/src/compiler/marker-tracker.js +73 -0
- package/build/src/compiler/marker-tracker.js.map +1 -0
- package/build/src/compiler/messages.d.ts +4 -0
- package/build/src/compiler/messages.d.ts.map +1 -1
- package/build/src/compiler/messages.js +2 -0
- package/build/src/compiler/messages.js.map +1 -1
- package/build/src/compiler/section-compiler.d.ts.map +1 -1
- package/build/src/compiler/section-compiler.js +2 -1
- package/build/src/compiler/section-compiler.js.map +1 -1
- package/build/src/compiler/tran.d.ts +3 -1
- package/build/src/compiler/tran.d.ts.map +1 -1
- package/build/src/compiler/tran.js +15 -2
- package/build/src/compiler/tran.js.map +1 -1
- package/build/src/compiler/vars.d.ts +4 -0
- package/build/src/compiler/vars.d.ts.map +1 -1
- package/build/src/compiler/vars.js +54 -3
- package/build/src/compiler/vars.js.map +1 -1
- package/package.json +5 -5
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import { KMXPlus } from '@keymanapp/common-types';
|
|
1
|
+
import { KMXPlus, LDMLKeyboard } from '@keymanapp/common-types';
|
|
2
2
|
import { SectionCompiler } from "./section-compiler.js";
|
|
3
3
|
import DependencySections = KMXPlus.DependencySections;
|
|
4
4
|
import Disp = KMXPlus.Disp;
|
|
5
|
+
import { MarkerTracker } from "./marker-tracker.js";
|
|
5
6
|
export declare class DispCompiler extends SectionCompiler {
|
|
7
|
+
static validateMarkers(keyboard: LDMLKeyboard.LKKeyboard, mt: MarkerTracker): boolean;
|
|
6
8
|
get id(): import("@keymanapp/ldml-keyboard-constants").SectionIdent;
|
|
7
9
|
validate(): boolean;
|
|
8
10
|
compile(sections: DependencySections): Disp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"disp.d.ts","sourceRoot":"","sources":["../../../src/compiler/disp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"disp.d.ts","sourceRoot":"","sources":["../../../src/compiler/disp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAgB,MAAM,yBAAyB,CAAC;AAG9E,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,EAAE,aAAa,EAAa,MAAM,qBAAqB,CAAC;AAE/D,qBAAa,YAAa,SAAQ,eAAe;IAC/C,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAG,aAAa,GAAG,OAAO;IAMtF,IAAW,EAAE,8DAEZ;IAEM,QAAQ,IAAI,OAAO;IAkBnB,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;CAkBnD"}
|
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
2
|
-
import { KMXPlus } from '@keymanapp/common-types';
|
|
2
|
+
import { KMXPlus, MarkerParser } from '@keymanapp/common-types';
|
|
3
3
|
import { CompilerMessages } from "./messages.js";
|
|
4
4
|
import { SectionCompiler } from "./section-compiler.js";
|
|
5
5
|
var Disp = KMXPlus.Disp;
|
|
6
|
+
import { MarkerUse } from "./marker-tracker.js";
|
|
6
7
|
export class DispCompiler extends SectionCompiler {
|
|
8
|
+
static validateMarkers(keyboard, mt) {
|
|
9
|
+
keyboard.displays?.display?.forEach(({ to }) => mt.add(MarkerUse.match, MarkerParser.allReferences(to)));
|
|
10
|
+
return true;
|
|
11
|
+
}
|
|
7
12
|
get id() {
|
|
8
13
|
return constants.section.disp;
|
|
9
14
|
}
|
|
@@ -25,9 +30,10 @@ export class DispCompiler extends SectionCompiler {
|
|
|
25
30
|
let result = new Disp();
|
|
26
31
|
// displayOptions
|
|
27
32
|
result.baseCharacter = sections.strs.allocAndUnescapeString(this.keyboard.displays?.displayOptions?.baseCharacter);
|
|
33
|
+
// TODO-LDML: substitute variables!
|
|
28
34
|
// displays
|
|
29
35
|
result.disps = this.keyboard.displays?.display.map(display => ({
|
|
30
|
-
to: sections.strs.allocAndUnescapeString(display.to),
|
|
36
|
+
to: sections.strs.allocAndUnescapeString(sections.vars.substituteMarkerString(display.to)),
|
|
31
37
|
display: sections.strs.allocAndUnescapeString(display.display),
|
|
32
38
|
})) || []; // TODO-LDML: need coverage for the []
|
|
33
39
|
result.disps.sort((a, b) => a.to.compareTo(b.to));
|
|
@@ -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,EAAE,MAAM,yBAAyB,CAAC;
|
|
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,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,IAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAE3B,OAAO,EAAiB,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE/D,MAAM,OAAO,YAAa,SAAQ,eAAe;IAC/C,MAAM,CAAC,eAAe,CAAC,QAAiC,EAAE,EAAkB;QAC1E,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAC7C,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAW,EAAE;QACX,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;IAChC,CAAC;IAEM,QAAQ;QACb,IAAI,KAAK,GAAG,IAAI,CAAC;QAEjB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;QAEtB,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE;YACnC,KAAK,MAAM,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE;gBACpD,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;oBACf,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;oBAC/E,OAAO,KAAK,CAAC;iBACd;gBACD,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aACb;SACF;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,OAAO,CAAC,QAA4B;QACzC,IAAI,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QAExB,iBAAiB;QACjB,MAAM,CAAC,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;QAEnH,mCAAmC;QAEnC,WAAW;QACX,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC7D,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC1F,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,OAAO,CAAC;SAC/D,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,sCAAsC;QAEjD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,CAAW,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEtE,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { SectionIdent } from '@keymanapp/ldml-keyboard-constants';
|
|
2
2
|
import { SectionCompiler } from "./section-compiler.js";
|
|
3
3
|
import { LDMLKeyboard, KMXPlus, CompilerCallbacks } from "@keymanapp/common-types";
|
|
4
|
+
import { VarsCompiler } from './vars.js';
|
|
4
5
|
/**
|
|
5
6
|
* Compiler for typrs that don't actually consume input XML
|
|
6
7
|
*/
|
|
@@ -30,7 +31,7 @@ export declare class UsetCompiler extends EmptyCompiler {
|
|
|
30
31
|
get dependencies(): Set<SectionIdent>;
|
|
31
32
|
}
|
|
32
33
|
/**
|
|
33
|
-
* For test use. The top
|
|
34
|
+
* For test use. The top compilers.
|
|
34
35
|
*/
|
|
35
|
-
export declare const BASIC_DEPENDENCIES: (typeof StrsCompiler)[];
|
|
36
|
+
export declare const BASIC_DEPENDENCIES: (typeof VarsCompiler | typeof StrsCompiler)[];
|
|
36
37
|
//# sourceMappingURL=empty-compiler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"empty-compiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/empty-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAa,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"empty-compiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/empty-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAa,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC;;GAEG;AACH,8BAAsB,aAAc,SAAQ,eAAe;IACzD,OAAO,CAAC,GAAG,CAAe;gBACd,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAK1G,IAAW,EAAE,IAAI,YAAY,CAE5B;IACD,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAE3C;CACF;AAED,qBAAa,YAAa,SAAQ,aAAa;gBACjC,MAAM,EAAE,YAAY,CAAC,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAGjF,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,OAAO;CAGtE;AAED,qBAAa,YAAa,SAAQ,aAAa;gBACjC,MAAM,EAAE,YAAY,CAAC,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAGjF,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,OAAO;IAGrE,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAG3C;CACF;AAED,qBAAa,YAAa,SAAQ,aAAa;gBACjC,MAAM,EAAE,YAAY,CAAC,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAGjF,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,OAAO;IAGrE,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAG3C;CACF;AAED,qBAAa,YAAa,SAAQ,aAAa;gBACjC,MAAM,EAAE,YAAY,CAAC,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAGjF,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,OAAO;IAGrE,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAG3C;CACF;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,+CAA6D,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { constants } from '@keymanapp/ldml-keyboard-constants';
|
|
2
2
|
import { SectionCompiler } from "./section-compiler.js";
|
|
3
3
|
import { KMXPlus } from "@keymanapp/common-types";
|
|
4
|
+
import { VarsCompiler } from './vars.js';
|
|
4
5
|
/**
|
|
5
6
|
* Compiler for typrs that don't actually consume input XML
|
|
6
7
|
*/
|
|
@@ -62,7 +63,7 @@ export class UsetCompiler extends EmptyCompiler {
|
|
|
62
63
|
}
|
|
63
64
|
}
|
|
64
65
|
/**
|
|
65
|
-
* For test use. The top
|
|
66
|
+
* For test use. The top compilers.
|
|
66
67
|
*/
|
|
67
|
-
export const BASIC_DEPENDENCIES = [StrsCompiler, ListCompiler, ElemCompiler];
|
|
68
|
+
export const BASIC_DEPENDENCIES = [StrsCompiler, ListCompiler, ElemCompiler, VarsCompiler];
|
|
68
69
|
//# sourceMappingURL=empty-compiler.js.map
|
|
@@ -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,MAAM,yBAAyB,CAAC;
|
|
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,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC;;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;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"}
|
|
@@ -2,7 +2,9 @@ import { LDMLKeyboard, KMXPlus } from '@keymanapp/common-types';
|
|
|
2
2
|
import { SectionCompiler } from "./section-compiler.js";
|
|
3
3
|
import DependencySections = KMXPlus.DependencySections;
|
|
4
4
|
import Keys = KMXPlus.Keys;
|
|
5
|
+
import { MarkerTracker } from './marker-tracker.js';
|
|
5
6
|
export declare class KeysCompiler extends SectionCompiler {
|
|
7
|
+
static validateMarkers(keyboard: LDMLKeyboard.LKKeyboard, mt: MarkerTracker): boolean;
|
|
6
8
|
get id(): import("@keymanapp/ldml-keyboard-constants").SectionIdent;
|
|
7
9
|
/**
|
|
8
10
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../../src/compiler/keys.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../../src/compiler/keys.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,OAAO,EAA2B,MAAM,yBAAyB,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAI3B,OAAO,EAAE,aAAa,EAAa,MAAM,qBAAqB,CAAC;AAE/D,qBAAa,YAAa,SAAQ,eAAe;IAC/C,MAAM,CAAC,eAAe,CACpB,QAAQ,EAAE,YAAY,CAAC,UAAU,EACjC,EAAE,EAAE,aAAa,GAChB,OAAO;IAOV,IAAW,EAAE,8DAEZ;IAED;;;OAGG;IACI,cAAc;IAId,QAAQ;IA6CR,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAmC3C,UAAU,CAAC,QAAQ,EAAE,kBAAkB,EAAE,IAAI,EAAE,IAAI;IA4BnD,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,EAAE,IAAI,EAAE,IAAI;IAuDxD;;;;;;OAMG;IACH,OAAO,CAAC,4BAA4B;IA6EpC,OAAO,CAAC,0BAA0B;CA+BnC"}
|
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
import { constants } from '@keymanapp/ldml-keyboard-constants';
|
|
2
|
-
import { KMXPlus, Constants } from '@keymanapp/common-types';
|
|
2
|
+
import { KMXPlus, Constants, MarkerParser } from '@keymanapp/common-types';
|
|
3
3
|
import { CompilerMessages } from './messages.js';
|
|
4
4
|
import { SectionCompiler } from "./section-compiler.js";
|
|
5
5
|
var Keys = KMXPlus.Keys;
|
|
6
6
|
var KeysFlicks = KMXPlus.KeysFlicks;
|
|
7
7
|
import { allUsedKeyIdsInLayers, calculateUniqueKeys, translateLayerAttrToModifier, validModifier } from '../util/util.js';
|
|
8
|
+
import { MarkerUse } from './marker-tracker.js';
|
|
8
9
|
export class KeysCompiler extends SectionCompiler {
|
|
10
|
+
static validateMarkers(keyboard, mt) {
|
|
11
|
+
keyboard.keys?.key?.forEach(({ to }) => mt.add(MarkerUse.emit, MarkerParser.allReferences(to)));
|
|
12
|
+
return true;
|
|
13
|
+
}
|
|
9
14
|
get id() {
|
|
10
15
|
return constants.section.keys;
|
|
11
16
|
}
|
|
@@ -14,7 +19,7 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
14
19
|
* @returns just the non-touch layers.
|
|
15
20
|
*/
|
|
16
21
|
hardwareLayers() {
|
|
17
|
-
return this.keyboard.layers?.filter(({ form }) => form !==
|
|
22
|
+
return this.keyboard.layers?.filter(({ form }) => form !== "touch");
|
|
18
23
|
}
|
|
19
24
|
validate() {
|
|
20
25
|
let valid = true;
|
|
@@ -30,7 +35,7 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
30
35
|
if (!flicks) {
|
|
31
36
|
continue; // no flicks
|
|
32
37
|
}
|
|
33
|
-
const flickEntry = this.keyboard.keys?.flicks?.find(x => x.id === flicks);
|
|
38
|
+
const flickEntry = this.keyboard.keys?.flicks?.find((x) => x.id === flicks);
|
|
34
39
|
if (!flickEntry) {
|
|
35
40
|
valid = false;
|
|
36
41
|
this.callbacks.reportMessage(CompilerMessages.Error_MissingFlicks({ flicks, id }));
|
|
@@ -43,7 +48,8 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
43
48
|
// validate all errors
|
|
44
49
|
for (let layers of hardwareLayers) {
|
|
45
50
|
for (let layer of layers.layer) {
|
|
46
|
-
valid =
|
|
51
|
+
valid =
|
|
52
|
+
this.validateHardwareLayerForKmap(layers.form, layer) && valid; // note: always validate even if previously invalid results found
|
|
47
53
|
}
|
|
48
54
|
}
|
|
49
55
|
// TODO-LDML: } else { touch?
|
|
@@ -91,6 +97,7 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
91
97
|
flicks.flicks.push({
|
|
92
98
|
directions,
|
|
93
99
|
flags,
|
|
100
|
+
// TODO-LDML: markers,variables
|
|
94
101
|
to,
|
|
95
102
|
});
|
|
96
103
|
}
|
|
@@ -110,15 +117,24 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
110
117
|
if (!!key.gap) {
|
|
111
118
|
flags |= constants.keys_key_flags_gap;
|
|
112
119
|
}
|
|
113
|
-
if (key.transform ===
|
|
120
|
+
if (key.transform === "no") {
|
|
114
121
|
flags |= constants.keys_key_flags_notransform;
|
|
115
122
|
}
|
|
116
123
|
const id = sections.strs.allocString(key.id);
|
|
117
|
-
const longPress = sections.list.allocListFromEscapedSpaces(sections.strs,
|
|
118
|
-
|
|
119
|
-
|
|
124
|
+
const longPress = sections.list.allocListFromEscapedSpaces(sections.strs,
|
|
125
|
+
// TODO-LDML: markers,variables
|
|
126
|
+
key.longPress);
|
|
127
|
+
const longPressDefault = sections.strs.allocAndUnescapeString(
|
|
128
|
+
// TODO-LDML: markers,variables
|
|
129
|
+
key.longPressDefault);
|
|
130
|
+
const multiTap = sections.list.allocListFromEscapedSpaces(sections.strs,
|
|
131
|
+
// TODO-LDML: markers,variables
|
|
132
|
+
key.multiTap);
|
|
120
133
|
const keySwitch = sections.strs.allocString(key.switch); // 'switch' is a reserved word
|
|
121
|
-
const
|
|
134
|
+
const toRaw = key.to;
|
|
135
|
+
// TODO-LDML: variables
|
|
136
|
+
let toCooked = sections.vars.substituteMarkerString(toRaw);
|
|
137
|
+
const to = sections.strs.allocAndUnescapeString(toCooked, true);
|
|
122
138
|
if (!to.isOneChar) {
|
|
123
139
|
flags |= constants.keys_key_flags_extend;
|
|
124
140
|
}
|
|
@@ -163,17 +179,27 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
163
179
|
valid = false;
|
|
164
180
|
}
|
|
165
181
|
for (let y = 0; y < layer.row.length && y < keymap.length; y++) {
|
|
166
|
-
const keys = layer.row[y].keys.split(
|
|
182
|
+
const keys = layer.row[y].keys.split(" ");
|
|
167
183
|
if (keys.length > keymap[y].length) {
|
|
168
|
-
this.callbacks.reportMessage(CompilerMessages.Error_RowOnHardwareLayerHasTooManyKeys({
|
|
184
|
+
this.callbacks.reportMessage(CompilerMessages.Error_RowOnHardwareLayerHasTooManyKeys({
|
|
185
|
+
row: y + 1,
|
|
186
|
+
hardware,
|
|
187
|
+
modifier,
|
|
188
|
+
}));
|
|
169
189
|
valid = false;
|
|
170
190
|
}
|
|
171
191
|
let x = -1;
|
|
172
192
|
for (let key of keys) {
|
|
173
193
|
x++;
|
|
174
|
-
let keydef = uniqueKeys.find(x => x.id == key);
|
|
194
|
+
let keydef = uniqueKeys.find((x) => x.id == key);
|
|
175
195
|
if (!keydef) {
|
|
176
|
-
this.callbacks.reportMessage(CompilerMessages.Error_KeyNotFoundInKeyBag({
|
|
196
|
+
this.callbacks.reportMessage(CompilerMessages.Error_KeyNotFoundInKeyBag({
|
|
197
|
+
keyId: key,
|
|
198
|
+
col: x + 1,
|
|
199
|
+
row: y + 1,
|
|
200
|
+
layer: layer.id,
|
|
201
|
+
form: "hardware",
|
|
202
|
+
}));
|
|
177
203
|
valid = false;
|
|
178
204
|
continue;
|
|
179
205
|
}
|
|
@@ -192,7 +218,7 @@ export class KeysCompiler extends SectionCompiler {
|
|
|
192
218
|
let y = -1;
|
|
193
219
|
for (let row of layer.row) {
|
|
194
220
|
y++;
|
|
195
|
-
const keys = row.keys.split(
|
|
221
|
+
const keys = row.keys.split(" ");
|
|
196
222
|
let x = -1;
|
|
197
223
|
for (let key of keys) {
|
|
198
224
|
x++;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../../src/compiler/keys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAgB,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../../src/compiler/keys.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Verb for MarkerTracker.add()
|
|
3
|
+
*/
|
|
4
|
+
export declare enum MarkerUse {
|
|
5
|
+
/** outputs this marker into context (e.g. transform to= or key to=) */
|
|
6
|
+
emit = 0,
|
|
7
|
+
/** consumes this marker out of the context (e.g. transform from=) */
|
|
8
|
+
consume = 1,
|
|
9
|
+
/** matches the marker, but doesn't consume (e.g. display to=) */
|
|
10
|
+
match = 2,
|
|
11
|
+
/** variable definition: might consume, emit, or match. */
|
|
12
|
+
variable = 3
|
|
13
|
+
}
|
|
14
|
+
type MarkerSet = Set<string>;
|
|
15
|
+
/** Tracks usage of markers */
|
|
16
|
+
export declare class MarkerTracker {
|
|
17
|
+
/** markers that were emitted */
|
|
18
|
+
emitted: MarkerSet;
|
|
19
|
+
/** markers that were consumed and removed from the context */
|
|
20
|
+
consumed: MarkerSet;
|
|
21
|
+
/** markers that were matched, but not necessarily consumed */
|
|
22
|
+
matched: MarkerSet;
|
|
23
|
+
/** all markers */
|
|
24
|
+
all: MarkerSet;
|
|
25
|
+
constructor();
|
|
26
|
+
/**
|
|
27
|
+
*
|
|
28
|
+
* @param verb what kind of use we are adding
|
|
29
|
+
* @param markers list of markers to add
|
|
30
|
+
*/
|
|
31
|
+
add(verb: MarkerUse, markers: string[]): void;
|
|
32
|
+
}
|
|
33
|
+
export {};
|
|
34
|
+
//# sourceMappingURL=marker-tracker.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"marker-tracker.d.ts","sourceRoot":"","sources":["../../../src/compiler/marker-tracker.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,oBAAY,SAAS;IACnB,uEAAuE;IACvE,IAAI,IAAA;IACJ,qEAAqE;IACrE,OAAO,IAAA;IACP,iEAAiE;IACjE,KAAK,IAAA;IACL,0DAA0D;IAC1D,QAAQ,IAAA;CACT;AAED,KAAK,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;AAE7B,8BAA8B;AAC9B,qBAAa,aAAa;IACxB,gCAAgC;IAChC,OAAO,EAAE,SAAS,CAAC;IACnB,8DAA8D;IAC9D,QAAQ,EAAE,SAAS,CAAC;IACpB,8DAA8D;IAC9D,OAAO,EAAE,SAAS,CAAC;IACnB,kBAAkB;IAClB,GAAG,EAAE,SAAS,CAAC;;IASf;;;;OAIG;IACH,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE;CAgCvC"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Verb for MarkerTracker.add()
|
|
3
|
+
*/
|
|
4
|
+
export var MarkerUse;
|
|
5
|
+
(function (MarkerUse) {
|
|
6
|
+
/** outputs this marker into context (e.g. transform to= or key to=) */
|
|
7
|
+
MarkerUse[MarkerUse["emit"] = 0] = "emit";
|
|
8
|
+
/** consumes this marker out of the context (e.g. transform from=) */
|
|
9
|
+
MarkerUse[MarkerUse["consume"] = 1] = "consume";
|
|
10
|
+
/** matches the marker, but doesn't consume (e.g. display to=) */
|
|
11
|
+
MarkerUse[MarkerUse["match"] = 2] = "match";
|
|
12
|
+
/** variable definition: might consume, emit, or match. */
|
|
13
|
+
MarkerUse[MarkerUse["variable"] = 3] = "variable";
|
|
14
|
+
})(MarkerUse || (MarkerUse = {}));
|
|
15
|
+
/** Tracks usage of markers */
|
|
16
|
+
export class MarkerTracker {
|
|
17
|
+
/** markers that were emitted */
|
|
18
|
+
emitted;
|
|
19
|
+
/** markers that were consumed and removed from the context */
|
|
20
|
+
consumed;
|
|
21
|
+
/** markers that were matched, but not necessarily consumed */
|
|
22
|
+
matched;
|
|
23
|
+
/** all markers */
|
|
24
|
+
all;
|
|
25
|
+
constructor() {
|
|
26
|
+
this.emitted = new Set();
|
|
27
|
+
this.consumed = new Set();
|
|
28
|
+
this.matched = new Set();
|
|
29
|
+
this.all = new Set();
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
*
|
|
33
|
+
* @param verb what kind of use we are adding
|
|
34
|
+
* @param markers list of markers to add
|
|
35
|
+
*/
|
|
36
|
+
add(verb, markers) {
|
|
37
|
+
if (!markers.length) {
|
|
38
|
+
return; // skip if empty
|
|
39
|
+
}
|
|
40
|
+
if (verb == MarkerUse.emit) {
|
|
41
|
+
markers.forEach((m) => {
|
|
42
|
+
this.emitted.add(m);
|
|
43
|
+
this.all.add(m);
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
else if (verb == MarkerUse.consume) {
|
|
47
|
+
markers.forEach((m) => {
|
|
48
|
+
this.consumed.add(m);
|
|
49
|
+
this.all.add(m);
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
else if (verb == MarkerUse.match) {
|
|
53
|
+
markers.forEach((m) => {
|
|
54
|
+
this.matched.add(m);
|
|
55
|
+
this.all.add(m);
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
else if (verb == MarkerUse.variable) {
|
|
59
|
+
markers.forEach((m) => {
|
|
60
|
+
// we don't know, so add it to all three
|
|
61
|
+
this.matched.add(m);
|
|
62
|
+
this.emitted.add(m);
|
|
63
|
+
this.consumed.add(m);
|
|
64
|
+
this.all.add(m);
|
|
65
|
+
});
|
|
66
|
+
/* c8 skip next 3 */
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
throw Error(`Internal error: unsupported verb ${verb} for match`);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=marker-tracker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"marker-tracker.js","sourceRoot":"","sources":["../../../src/compiler/marker-tracker.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAN,IAAY,SASX;AATD,WAAY,SAAS;IACnB,uEAAuE;IACvE,yCAAI,CAAA;IACJ,qEAAqE;IACrE,+CAAO,CAAA;IACP,iEAAiE;IACjE,2CAAK,CAAA;IACL,0DAA0D;IAC1D,iDAAQ,CAAA;AACV,CAAC,EATW,SAAS,KAAT,SAAS,QASpB;AAID,8BAA8B;AAC9B,MAAM,OAAO,aAAa;IACxB,gCAAgC;IAChC,OAAO,CAAY;IACnB,8DAA8D;IAC9D,QAAQ,CAAY;IACpB,8DAA8D;IAC9D,OAAO,CAAY;IACnB,kBAAkB;IAClB,GAAG,CAAY;IAEf;QACE,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QACjC,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACH,GAAG,CAAC,IAAe,EAAE,OAAiB;QACpC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACnB,OAAO,CAAC,gBAAgB;SACzB;QACD,IAAI,IAAI,IAAI,SAAS,CAAC,IAAI,EAAE;YAC1B,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,IAAI,IAAI,SAAS,CAAC,OAAO,EAAE;YACpC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACrB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,IAAI,IAAI,SAAS,CAAC,KAAK,EAAE;YAClC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,IAAI,IAAI,SAAS,CAAC,QAAQ,EAAE;YACrC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,wCAAwC;gBACxC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACrB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;YACH,oBAAoB;SACrB;aAAM;YACL,MAAM,KAAK,CAAC,oCAAoC,IAAI,YAAY,CAAC,CAAC;SACnE;IACH,CAAC;CACF"}
|
|
@@ -125,5 +125,9 @@ export declare class CompilerMessages {
|
|
|
125
125
|
id: string;
|
|
126
126
|
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
127
127
|
static ERROR_CantReferenceSetFromUnicodeSet: number;
|
|
128
|
+
static Error_MissingMarkers: (o: {
|
|
129
|
+
ids: string[];
|
|
130
|
+
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
131
|
+
static ERROR_MissingMarkers: number;
|
|
128
132
|
}
|
|
129
133
|
//# sourceMappingURL=messages.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/compiler/messages.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/compiler/messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,5 +71,7 @@ export class CompilerMessages {
|
|
|
71
71
|
static ERROR_NeedSpacesBetweenSetVariables = SevError | 0x001F;
|
|
72
72
|
static Error_CantReferenceSetFromUnicodeSet = (o) => m(this.ERROR_CantReferenceSetFromUnicodeSet, `Illegal use of set variable from within UnicodeSet: \$[${o.id}]`);
|
|
73
73
|
static ERROR_CantReferenceSetFromUnicodeSet = SevError | 0x0020;
|
|
74
|
+
static Error_MissingMarkers = (o) => m(this.ERROR_MissingMarkers, `Markers used for matching but not defined: ${o.ids?.join(',')}`);
|
|
75
|
+
static ERROR_MissingMarkers = SevError | 0x0021;
|
|
74
76
|
}
|
|
75
77
|
//# sourceMappingURL=messages.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../src/compiler/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,mBAAmB,IAAI,CAAC,EAAE,MAAM,yBAAyB,CAAC;AAElH,MAAM,OAAO,GAAG,qBAAqB,CAAC,IAAI,GAAG,sBAAsB,CAAC,oBAAoB,CAAC;AACzF,MAAM,OAAO,GAAG,qBAAqB,CAAC,IAAI,GAAG,sBAAsB,CAAC,oBAAoB,CAAC;AACzF,4FAA4F;AAC5F,MAAM,QAAQ,GAAG,qBAAqB,CAAC,KAAK,GAAG,sBAAsB,CAAC,oBAAoB,CAAC;AAC3F,MAAM,QAAQ,GAAG,qBAAqB,CAAC,KAAK,GAAG,sBAAsB,CAAC,oBAAoB,CAAC;AAE3F,MAAM,OAAO,gBAAgB;IAC3B,MAAM,CAAC,0BAA0B,GAAG,CAAC,CAAgB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,0BAA0B,EAAE,+BAA+B,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACtI,MAAM,CAAC,0BAA0B,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEtD,MAAM,CAAC,mBAAmB,GAAG,CAAC,CAAe,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,EAAE,+BAA+B,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;IACvH,MAAM,CAAC,mBAAmB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAE/C,MAAM,CAAC,iCAAiC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,iCAAiC,EAAE,oCAAoC,CAAC,CAAC;IACjI,MAAM,CAAC,iCAAiC,GAAG,QAAQ,GAAG,MAAM,CAAC;IAE7D,MAAM,CAAC,sCAAsC,GAAG,CAAC,CAAmD,EAAE,EAAE,CAAE,CAAC,CAAC,IAAI,CAAC,sCAAsC,EAAE,QAAQ,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,QAAQ,uBAAuB,CAAC,CAAC,QAAQ,IAAI,MAAM,oBAAoB,CAAC,CAAC;IACnQ,MAAM,CAAC,sCAAsC,GAAG,QAAQ,GAAG,MAAM,CAAC;IAElE,MAAM,CAAC,yBAAyB,GAAG,CAAC,CAAwE,EAAE,EAAE,CAC7G,CAAC,CAAC,IAAI,CAAC,yBAAyB,EAAE,QAAQ,CAAC,CAAC,KAAK,kBAAkB,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC,IAAI,wBAAwB,CAAC,CAAC;IAC3J,MAAM,CAAC,yBAAyB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAErD,MAAM,CAAC,6BAA6B,GAAG,GAAG,EAAE,CAC1C,CAAC,CAAC,IAAI,CAAC,6BAA6B,EAAE,0EAA0E,CAAC,CAAC;IACpH,MAAM,CAAC,6BAA6B,GAAG,OAAO,GAAG,MAAM,CAAC;IAExD,MAAM,CAAC,iBAAiB,GAAG,CAAC,CAAqB,EAAE,EAAE,CACnD,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,6CAA6C,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;IACxF,MAAM,CAAC,iBAAiB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAE7C,MAAM,CAAC,+BAA+B,GAAG,CAAC,CAAwC,EAAE,EAAE,CACpF,CAAC,CAAC,IAAI,CAAC,+BAA+B,EAAE,WAAW,CAAC,CAAC,YAAY,0DAA0D,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAC1I,MAAM,CAAC,+BAA+B,GAAG,OAAO,GAAG,MAAM,CAAC;IAE1D,MAAM,CAAC,mBAAmB,GAAG,CAAC,CAAgB,EAAE,EAAE,CAChD,CAAC,CAAC,IAAI,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAC,IAAI,6CAA6C,CAAC,CAAC;IACnG,MAAM,CAAC,mBAAmB,GAAG,OAAO,GAAG,MAAM,CAAC;IAE9C,MAAM,CAAC,oBAAoB,GAAG,CAAC,CAAgB,EAAE,EAAE,CACjD,CAAC,CAAC,IAAI,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,CAAC,IAAI,4CAA4C,CAAC,CAAC;IACnG,MAAM,CAAC,oBAAoB,GAAG,OAAO,GAAG,MAAM,CAAC;IAE/C,MAAM,CAAC,oBAAoB,GAAG,CAAC,CAAgB,EAAE,EAAE,CACjD,CAAC,CAAC,IAAI,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,CAAC,IAAI,iCAAiC,CAAC,CAAC;IACxF,MAAM,CAAC,oBAAoB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEhD,MAAM,CAAC,gCAAgC,GAAG,CAAC,CAAgB,EAAE,EAAE,CAC7D,CAAC,CAAC,IAAI,CAAC,gCAAgC,EAAE,uBAAuB,CAAC,CAAC,IAAI,wDAAwD,CAAC,CAAC;IAClI,MAAM,CAAC,gCAAgC,GAAG,OAAO,GAAG,MAAM,CAAC;IAE3D,MAAM,CAAC,oBAAoB,GAAG,CAAC,CAAmB,EAAE,EAAE,CACpD,CAAC,CAAC,IAAI,CAAC,oBAAoB,EAAE,mBAAmB,CAAC,CAAC,OAAO,6CAA6C,CAAC,CAAC;IAC1G,MAAM,CAAC,oBAAoB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEhD,MAAM,CAAC,kCAAkC,GAAG,GAAG,EAAE,CAC/C,CAAC,CAAC,IAAI,CAAC,kCAAkC,EAAE,0DAA0D,CAAC,CAAC;IACzG,MAAM,CAAC,kCAAkC,GAAG,QAAQ,GAAG,MAAM,CAAC;IAE9D,MAAM,CAAC,2BAA2B,GAAG,CAAC,CAAgB,EAAE,EAAE,CACxD,CAAC,CAAC,IAAI,CAAC,2BAA2B,EAAE,qBAAqB,CAAC,CAAC,IAAI,wBAAwB,CAAC,CAAC;IAC3F,MAAM,CAAC,2BAA2B,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEvD,MAAM,CAAC,uBAAuB,GAAG,CAAC,CAAc,EAAE,EAAE,CAClD,CAAC,CAAC,IAAI,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAC,EAAE,oCAAoC,CAAC,CAAC;IAC3F,MAAM,CAAC,uBAAuB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEnD,MAAM,CAAC,6BAA6B,GAAG,CAAC,CAAiB,EAAE,EAAE,CAC7D,CAAC,CAAC,IAAI,CAAC,6BAA6B,EAAE,WAAW,CAAC,CAAC,KAAK,2CAA2C,CAAC,CAAC;IACrG,MAAM,CAAC,6BAA6B,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEzD,MAAM,CAAC,oBAAoB,GAAG,CAAC,CAAgB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,EAC7E,eAAe,CAAC,CAAC,IAAI,yCAAyC,CAAC,CAAC;IAClE,MAAM,CAAC,oBAAoB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEhD,MAAM,CAAC,qBAAqB,GAAG,CAAC,CAAgB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,EAC/E,iCAAiC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7C;;OAEG;IACH,MAAM,CAAC,qBAAqB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEjD,MAAM,CAAC,qBAAqB,GAAG,CAAC,CAAmC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,EAClG,+BAA+B,CAAC,CAAC,QAAQ,iBAAiB,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IACvE,MAAM,CAAC,qBAAqB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEjD,MAAM,CAAC,mBAAmB,GAAG,CAAC,CAA8B,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,EACzF,UAAU,CAAC,CAAC,EAAE,6BAA6B,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IACzD,MAAM,CAAC,mBAAmB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAE/C,MAAM,CAAC,uBAAuB,GAAG,CAAC,CAAe,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,uBAAuB,EAChF,2BAA2B,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IACxC,MAAM,CAAC,uBAAuB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEnD,6BAA6B;IAC7B,MAAM,CAAC,2BAA2B,GAAG,CAAC,CAAmB,EAAE,EAAE,CAC7D,CAAC,CAAC,IAAI,CAAC,2BAA2B,EAAE,8BAA8B,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzF,MAAM,CAAC,2BAA2B,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEvD,MAAM,CAAC,6BAA6B,GAAG,CAAC,CAAmB,EAAE,EAAE,CAC/D,CAAC,CAAC,IAAI,CAAC,6BAA6B,EAAE,gCAAgC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7F,MAAM,CAAC,6BAA6B,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEzD,MAAM,CAAC,yBAAyB,GAAG,GAAG,EAAE,CACxC,CAAC,CAAC,IAAI,CAAC,yBAAyB,EAAE,mEAAmE,CAAC,CAAC;IACvG,MAAM,CAAC,yBAAyB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAErD,MAAM,CAAC,yBAAyB,GAAG,GAAG,EAAE,CACxC,CAAC,CAAC,IAAI,CAAC,yBAAyB,EAAE,+DAA+D,CAAC,CAAC;IACnG,MAAM,CAAC,yBAAyB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAErD,MAAM,CAAC,2BAA2B,GAAG,CAAC,CAAc,EAAE,EAAE,CACxD,CAAC,CAAC,IAAI,CAAC,2BAA2B,EAAE,8CAA8C,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC3F,MAAM,CAAC,2BAA2B,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEvD,MAAM,CAAC,wBAAwB,GAAG,CAAC,CAAc,EAAE,EAAE,CACrD,CAAC,CAAC,IAAI,CAAC,wBAAwB,EAAE,2CAA2C,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACrF,MAAM,CAAC,wBAAwB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEpD,MAAM,CAAC,+BAA+B,GAAG,CAAC,CAAc,EAAE,EAAE,CAC5D,CAAC,CAAC,IAAI,CAAC,+BAA+B,EAAE,kDAAkD,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACnG,MAAM,CAAC,+BAA+B,GAAG,QAAQ,GAAG,MAAM,CAAC;IAE3D,MAAM,CAAC,mCAAmC,GAAG,CAAC,CAAgB,EAAE,EAAE,CAClE,CAAC,CAAC,IAAI,CAAC,mCAAmC,EAAE,sCAAsC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5F,MAAM,CAAC,mCAAmC,GAAG,QAAQ,GAAG,MAAM,CAAC;IAE/D,MAAM,CAAC,oCAAoC,GAAG,CAAC,CAAc,EAAE,EAAE,CACjE,CAAC,CAAC,IAAI,CAAC,oCAAoC,EAAE,0DAA0D,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAChH,MAAM,CAAC,oCAAoC,GAAG,QAAQ,GAAG,MAAM,CAAC"}
|
|
1
|
+
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../src/compiler/messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"section-compiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/section-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAa,MAAM,oCAAoC,CAAC;AAG7E,qBAAa,eAAe;IAC1B,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC;gBAEpC,MAAM,EAAE,YAAY,CAAC,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAMxF,IAAW,EAAE,IAAI,YAAY,CAE5B;IAEM,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,OAAO;IAI9D,QAAQ,IAAI,OAAO;IAI1B;;;OAGG;IACH,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"section-compiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/section-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAa,MAAM,oCAAoC,CAAC;AAG7E,qBAAa,eAAe;IAC1B,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC;gBAEpC,MAAM,EAAE,YAAY,CAAC,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAMxF,IAAW,EAAE,IAAI,YAAY,CAE5B;IAEM,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,OAAO;IAI9D,QAAQ,IAAI,OAAO;IAI1B;;;OAGG;IACH,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAQ3C;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"section-compiler.js","sourceRoot":"","sources":["../../../src/compiler/section-compiler.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE7E,0BAA0B;AAC1B,MAAM,OAAO,eAAe;IACP,QAAQ,CAA0B;IAClC,SAAS,CAAoB;IAEhD,YAAY,MAA8C,EAAE,SAA4B;QACtF,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,uBAAuB;IACvB,IAAW,EAAE;QACX,MAAM,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACtD,CAAC;IAEM,OAAO,CAAC,QAAoC;QACjD,MAAM,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC3D,CAAC;IAEM,QAAQ;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,IAAW,YAAY;QACrB,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAiB;YACvC,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;SACvB,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"section-compiler.js","sourceRoot":"","sources":["../../../src/compiler/section-compiler.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE7E,0BAA0B;AAC1B,MAAM,OAAO,eAAe;IACP,QAAQ,CAA0B;IAClC,SAAS,CAAoB;IAEhD,YAAY,MAA8C,EAAE,SAA4B;QACtF,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,uBAAuB;IACvB,IAAW,EAAE;QACX,MAAM,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACtD,CAAC;IAEM,OAAO,CAAC,QAAoC;QACjD,MAAM,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC3D,CAAC;IAEM,QAAQ;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,IAAW,YAAY;QACrB,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAiB;YACvC,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;SACvB,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF"}
|
|
@@ -5,8 +5,10 @@ import Bksp = KMXPlus.Bksp;
|
|
|
5
5
|
import DependencySections = KMXPlus.DependencySections;
|
|
6
6
|
import Tran = KMXPlus.Tran;
|
|
7
7
|
import LDMLKeyboardXMLSourceFile = LDMLKeyboard.LDMLKeyboardXMLSourceFile;
|
|
8
|
+
import { MarkerTracker } from "./marker-tracker.js";
|
|
8
9
|
type TransformCompilerType = 'simple' | 'backspace';
|
|
9
|
-
declare class TransformCompiler<T extends TransformCompilerType, TranBase extends Tran> extends SectionCompiler {
|
|
10
|
+
export declare class TransformCompiler<T extends TransformCompilerType, TranBase extends Tran> extends SectionCompiler {
|
|
11
|
+
static validateMarkers(keyboard: LDMLKeyboard.LKKeyboard, mt: MarkerTracker): boolean;
|
|
10
12
|
protected type: T;
|
|
11
13
|
constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
|
|
12
14
|
validate(): boolean;
|
|
@@ -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,EAAE,YAAY,EAAE,iBAAiB,
|
|
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,EAAE,YAAY,EAAE,iBAAiB,EAAgC,MAAM,yBAAyB,CAAC;AACjH,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,EAAa,MAAM,qBAAqB,CAAC;AAE/D,KAAK,qBAAqB,GAAG,QAAQ,GAAG,WAAW,CAAC;AAEpD,qBAAa,iBAAiB,CAAC,CAAC,SAAS,qBAAqB,EAAE,QAAQ,SAAS,IAAI,CAAE,SAAQ,eAAe;IAE5G,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAG,aAAa,GAAG,OAAO;IAUtF,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;IAWzB,OAAO,CAAC,qBAAqB;IAe7B,OAAO,CAAC,yBAAyB;IASjC,OAAO,CAAC,gBAAgB;IAgCxB,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,cAAc;IAOf,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,QAAQ;IAStD,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAU3C;CACF;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;CACF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
2
|
-
import { KMXPlus, VariableParser } from '@keymanapp/common-types';
|
|
2
|
+
import { KMXPlus, VariableParser, MarkerParser } from '@keymanapp/common-types';
|
|
3
3
|
import { SectionCompiler } from "./section-compiler.js";
|
|
4
4
|
var Bksp = KMXPlus.Bksp;
|
|
5
5
|
var Tran = KMXPlus.Tran;
|
|
@@ -7,7 +7,17 @@ var TranReorder = KMXPlus.TranReorder;
|
|
|
7
7
|
var TranTransform = KMXPlus.TranTransform;
|
|
8
8
|
import { verifyValidAndUnique } from "../util/util.js";
|
|
9
9
|
import { CompilerMessages } from "./messages.js";
|
|
10
|
-
|
|
10
|
+
import { MarkerUse } from "./marker-tracker.js";
|
|
11
|
+
export class TransformCompiler extends SectionCompiler {
|
|
12
|
+
static validateMarkers(keyboard, mt) {
|
|
13
|
+
keyboard?.transforms?.forEach(transforms => transforms.transformGroup.forEach(transformGroup => {
|
|
14
|
+
transformGroup.transform?.forEach(({ to, from }) => {
|
|
15
|
+
mt.add(MarkerUse.emit, MarkerParser.allReferences(to));
|
|
16
|
+
mt.add(MarkerUse.consume, MarkerParser.allReferences(from));
|
|
17
|
+
});
|
|
18
|
+
}));
|
|
19
|
+
return true;
|
|
20
|
+
}
|
|
11
21
|
type;
|
|
12
22
|
constructor(source, callbacks) {
|
|
13
23
|
super(source, callbacks);
|
|
@@ -104,6 +114,9 @@ class TransformCompiler extends SectionCompiler {
|
|
|
104
114
|
if (cookedTo) {
|
|
105
115
|
cookedTo = sections.vars.substituteStrings(cookedTo, sections);
|
|
106
116
|
}
|
|
117
|
+
// add in markers. idempotent if no markers.
|
|
118
|
+
cookedFrom = sections.vars.substituteMarkerString(cookedFrom); // TODO-LDML: need to support \m{.} here, maybe other edge cases
|
|
119
|
+
cookedTo = sections.vars.substituteMarkerString(cookedTo);
|
|
107
120
|
result.from = sections.strs.allocAndUnescapeString(cookedFrom); // TODO-LDML: not unescaped here, done previously
|
|
108
121
|
result.to = sections.strs.allocAndUnescapeString(cookedTo); // TODO-LDML: not unescaped here, done previously
|
|
109
122
|
return result;
|
|
@@ -1 +1 @@
|
|
|
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,EAAmC,cAAc,EAAE,MAAM,yBAAyB,CAAC;
|
|
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,EAAmC,cAAc,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACjH,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,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAiB,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAI/D,MAAM,OAAO,iBAA0E,SAAQ,eAAe;IAE5G,MAAM,CAAC,eAAe,CAAC,QAAiC,EAAE,EAAkB;QAC1E,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,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;gBACvD,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;YAC9D,CAAC,CAAC,CAAA;QAAA,CAAC,CAAC,CAAC,CAAC;QACV,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;QAExE,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,MAAM,UAAU,GAAG,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC;QAC9C,IAAI,UAAU,EAAE;YACd,MAAM,KAAK,GAAc,UAAU,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;YAC1D,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAC7B,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EACjF,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,EAChC,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE;gBAClF,KAAK,GAAG,KAAK,CAAC;aACf;YAED,yBAAyB;YACzB,IAAI,KAAK,GAAG,KAAK,CAAC;YAClB,IAAI,KAAK,GAAG,KAAK,CAAC;YAClB,UAAU,CAAC,OAAO,CAAC,CAAC,EAAC,cAAc,EAAC,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;gBACjF,IAAI,cAAc,CAAC,OAAO,EAAE,MAAM,IAAI,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE;oBACtE,KAAK,GAAG,IAAI,CAAC;iBACd;gBACD,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE;oBACxE,KAAK,GAAG,IAAI,CAAC;iBACd;YACH,CAAC,CAAC,CAAC,CAAC;YACJ,IAAI,KAAK,EAAE;gBACT,KAAK,GAAG,KAAK,CAAC;gBACd,aAAa,CAAC,gBAAgB,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAC,mBAAmB;aACjF;YACD,IAAI,KAAK,EAAE;gBACT,KAAK,GAAG,KAAK,CAAC;gBACd,aAAa,CAAC,gBAAgB,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAC,mBAAmB;aACjF;YAED,0GAA0G;YAC1G,wHAAwH;SACzH;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,sBAAsB;IACtB,uCAAuC;IAC7B,OAAO;QACf,MAAM,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC3D,CAAC;IAEO,iBAAiB,CAAC,QAA4B,EAAE,UAAwB;QAC9E,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE5B,IAAI,UAAU,EAAE,cAAc,EAAE;YAC9B,KAAK,IAAI,cAAc,IAAI,UAAU,CAAC,cAAc,EAAE;gBACpD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;aAC1E;SACF;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;YACpE,sBAAsB;YACtB,sCAAsC;YACtC,MAAM,KAAK,CAAC,yEAAyE,CAAC,CAAC;SACxF;aAAM,IAAI,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE;YACxC,OAAO,IAAI,CAAC,uBAAuB,CAAC,QAAQ,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;SACvE;aAAM,IAAI,cAAc,CAAC,SAAS,CAAC,MAAM,EAAE;YAC1C,OAAO,IAAI,CAAC,yBAAyB,CAAC,QAAQ,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;SAC3E;aAAM;YACL,oBAAoB;YACpB,MAAM,KAAK,CAAC,4EAA4E,CAAC,CAAC;SAC3F;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,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,gBAAgB,CAAC,QAA4B,EAAE,SAAsB;QAC3E,IAAI,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QACjC,IAAI,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC;QAChC,IAAI,QAAQ,GAAG,SAAS,CAAC,EAAE,CAAC;QAE5B,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACnE,0BAA0B;QAC1B,MAAM,OAAO,GAAG,cAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtE,MAAM,KAAK,GAAG,cAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QACvE,IAAI,OAAO,IAAI,KAAK,EAAE,EAAE,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;SAChE;aAAM;YACL,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY;YAC5D,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY;SAC3D;QAED,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAEpE,IAAI,QAAQ,EAAE;YACZ,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;SAChE;QAED,4CAA4C;QAC5C,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC,CAAC,gEAAgE;QAC/H,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QAE1D,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC,CAAC,iDAAiD;QACjH,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,iDAAiD;QAC7G,OAAO,MAAM,CAAC;IAChB,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,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,cAAc,CAAC,QAA4B,EAAE,OAAkB;QACrE,IAAI,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC/B,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,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,OAAO,CAAC,QAA4B;QACzC,KAAI,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE;YACrC,IAAG,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;gBACtB,kDAAkD;gBAClD,OAAO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;aAC5C;SACF;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;SACvB,CAAC,CAAC;QACH,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzB,OAAO,QAAQ,CAAC;IAClB,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;CACF;AAAA,CAAC"}
|
|
@@ -4,11 +4,15 @@ import { SectionCompiler } from "./section-compiler.js";
|
|
|
4
4
|
import Vars = KMXPlus.Vars;
|
|
5
5
|
import DependencySections = KMXPlus.DependencySections;
|
|
6
6
|
import LDMLKeyboardXMLSourceFile = LDMLKeyboard.LDMLKeyboardXMLSourceFile;
|
|
7
|
+
import { MarkerTracker } from "./marker-tracker.js";
|
|
7
8
|
export declare class VarsCompiler extends SectionCompiler {
|
|
8
9
|
get id(): SectionIdent;
|
|
9
10
|
get dependencies(): Set<SectionIdent>;
|
|
10
11
|
constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
|
|
11
12
|
validate(): boolean;
|
|
13
|
+
private collectMarkers;
|
|
14
|
+
private validateMarkers;
|
|
15
|
+
validateVarsMarkers(keyboard: LDMLKeyboard.LKKeyboard, mt: MarkerTracker): boolean;
|
|
12
16
|
compile(sections: DependencySections): Vars;
|
|
13
17
|
addString(result: Vars, e: LDMLKeyboard.LKString, sections: DependencySections): void;
|
|
14
18
|
addSet(result: Vars, e: LDMLKeyboard.LKSet, sections: DependencySections): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vars.d.ts","sourceRoot":"","sources":["../../../src/compiler/vars.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAa,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"vars.d.ts","sourceRoot":"","sources":["../../../src/compiler/vars.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAa,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAgB,MAAM,yBAAyB,CAAC;AAEjG,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAI3B,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,yBAAyB,GAAG,YAAY,CAAC,yBAAyB,CAAC;AAK1E,OAAO,EAAE,aAAa,EAAa,MAAM,qBAAqB,CAAC;AAC/D,qBAAa,YAAa,SAAQ,eAAe;IAC/C,IAAW,EAAE,iBAEZ;IAED,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAQ3C;gBAEW,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAIpE,QAAQ,IAAI,OAAO;IA4G1B,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,eAAe;IA0BvB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAG,aAAa,GAAI,OAAO;IAM7E,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAgClD,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAOrF,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAU/E,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,YAAY,EAAE,QAAQ,EAAE,kBAAkB,GAAG,IAAI;CAS9F"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
2
|
-
import { KMXPlus } from '@keymanapp/common-types';
|
|
2
|
+
import { KMXPlus, MarkerParser } from '@keymanapp/common-types';
|
|
3
3
|
import { VariableParser } from '@keymanapp/common-types';
|
|
4
4
|
import { SectionCompiler } from "./section-compiler.js";
|
|
5
5
|
var Vars = KMXPlus.Vars;
|
|
@@ -7,6 +7,10 @@ var StringVarItem = KMXPlus.StringVarItem;
|
|
|
7
7
|
var SetVarItem = KMXPlus.SetVarItem;
|
|
8
8
|
var UnicodeSetItem = KMXPlus.UnicodeSetItem;
|
|
9
9
|
import { CompilerMessages } from "./messages.js";
|
|
10
|
+
import { KeysCompiler } from "./keys.js";
|
|
11
|
+
import { TransformCompiler } from "./tran.js";
|
|
12
|
+
import { DispCompiler } from "./disp.js";
|
|
13
|
+
import { MarkerTracker, MarkerUse } from "./marker-tracker.js";
|
|
10
14
|
export class VarsCompiler extends SectionCompiler {
|
|
11
15
|
get id() {
|
|
12
16
|
return constants.section.vars;
|
|
@@ -14,7 +18,8 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
14
18
|
get dependencies() {
|
|
15
19
|
const defaults = new Set([
|
|
16
20
|
constants.section.strs,
|
|
17
|
-
constants.section.elem
|
|
21
|
+
constants.section.elem,
|
|
22
|
+
constants.section.list,
|
|
18
23
|
]);
|
|
19
24
|
defaults.delete(this.id);
|
|
20
25
|
return defaults;
|
|
@@ -24,7 +29,6 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
24
29
|
}
|
|
25
30
|
validate() {
|
|
26
31
|
let valid = true;
|
|
27
|
-
// TODO-LDML scan for markers?
|
|
28
32
|
// Check for duplicate ids
|
|
29
33
|
const allIds = new Set();
|
|
30
34
|
const dups = new Set();
|
|
@@ -122,11 +126,52 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
122
126
|
}));
|
|
123
127
|
valid = false;
|
|
124
128
|
}
|
|
129
|
+
valid = this.validateMarkers() && valid; // accumulate validity
|
|
125
130
|
return valid;
|
|
126
131
|
}
|
|
132
|
+
collectMarkers(mt) {
|
|
133
|
+
let valid = true;
|
|
134
|
+
// call our friends to validate
|
|
135
|
+
valid = this.validateVarsMarkers(this.keyboard, mt) && valid; // accumulate validity
|
|
136
|
+
valid = KeysCompiler.validateMarkers(this.keyboard, mt) && valid; // accumulate validity
|
|
137
|
+
valid = TransformCompiler.validateMarkers(this.keyboard, mt) && valid; // accumulate validity
|
|
138
|
+
valid = DispCompiler.validateMarkers(this.keyboard, mt) && valid; // accumulate validity
|
|
139
|
+
return valid;
|
|
140
|
+
}
|
|
141
|
+
validateMarkers() {
|
|
142
|
+
const mt = new MarkerTracker();
|
|
143
|
+
let valid = this.collectMarkers(mt);
|
|
144
|
+
// see if there are any matched-but-not-emitted
|
|
145
|
+
const matchedNotEmitted = new Set();
|
|
146
|
+
for (const m of mt.matched.values()) {
|
|
147
|
+
if (m === MarkerParser.ANY_MARKER_ID)
|
|
148
|
+
continue; // match-all marker
|
|
149
|
+
if (!mt.emitted.has(m)) {
|
|
150
|
+
matchedNotEmitted.add(m);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
for (const m of mt.consumed.values()) {
|
|
154
|
+
if (m === MarkerParser.ANY_MARKER_ID)
|
|
155
|
+
continue; // match-all marker
|
|
156
|
+
if (!mt.emitted.has(m)) {
|
|
157
|
+
matchedNotEmitted.add(m);
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
// report once
|
|
161
|
+
if (matchedNotEmitted.size > 0) {
|
|
162
|
+
this.callbacks.reportMessage(CompilerMessages.Error_MissingMarkers({ ids: Array.from(matchedNotEmitted.values()).sort() }));
|
|
163
|
+
valid = false;
|
|
164
|
+
}
|
|
165
|
+
return valid;
|
|
166
|
+
}
|
|
167
|
+
validateVarsMarkers(keyboard, mt) {
|
|
168
|
+
keyboard?.variables?.string?.forEach(({ value }) => mt.add(MarkerUse.variable, MarkerParser.allReferences(value)));
|
|
169
|
+
return true;
|
|
170
|
+
}
|
|
127
171
|
compile(sections) {
|
|
128
172
|
const result = new Vars();
|
|
129
173
|
const variables = this.keyboard?.variables;
|
|
174
|
+
// we always have vars, it's depended on by other sections
|
|
130
175
|
if (!variables)
|
|
131
176
|
return result; // Empty vars, to simplify other sections
|
|
132
177
|
// we already know the variables do not conflict with each other
|
|
@@ -137,6 +182,12 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
137
182
|
variables?.string?.forEach((e) => this.addString(result, e, sections));
|
|
138
183
|
variables?.set?.forEach((e) => this.addSet(result, e, sections));
|
|
139
184
|
variables?.unicodeSet?.forEach((e) => this.addUnicodeSet(result, e, sections));
|
|
185
|
+
// reload markers - TODO-LDML: double work!
|
|
186
|
+
const mt = new MarkerTracker();
|
|
187
|
+
this.collectMarkers(mt);
|
|
188
|
+
// collect all markers, excluding the match-all
|
|
189
|
+
const allMarkers = Array.from(mt.all).filter(m => m !== MarkerParser.ANY_MARKER_ID).sort();
|
|
190
|
+
result.markers = sections.list.allocList(sections.strs, allMarkers);
|
|
140
191
|
return result.valid() ? result : null;
|
|
141
192
|
}
|
|
142
193
|
// routines for initializing Vars remain here, in the compiler.
|
|
@@ -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,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"vars.js","sourceRoot":"","sources":["../../../src/compiler/vars.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -26,9 +26,9 @@
|
|
|
26
26
|
"url": "https://github.com/keymanapp/keyman/issues"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@keymanapp/kmc-kmn": "17.0.
|
|
30
|
-
"@keymanapp/keyman-version": "17.0.
|
|
31
|
-
"@keymanapp/ldml-keyboard-constants": "17.0.
|
|
29
|
+
"@keymanapp/kmc-kmn": "17.0.152-alpha",
|
|
30
|
+
"@keymanapp/keyman-version": "17.0.152-alpha",
|
|
31
|
+
"@keymanapp/ldml-keyboard-constants": "17.0.152-alpha",
|
|
32
32
|
"ajv": "^8.11.0",
|
|
33
33
|
"restructure": "git+https://github.com/keymanapp/dependency-restructure.git#49d129cf0916d082a7278bb09296fb89cecfcc50",
|
|
34
34
|
"semver": "^7.5.2",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"mocha": "^8.4.0",
|
|
47
47
|
"ts-node": "^9.1.1",
|
|
48
48
|
"typescript": "^4.9.5",
|
|
49
|
-
"@keymanapp/developer-test-helpers": "17.0.
|
|
49
|
+
"@keymanapp/developer-test-helpers": "17.0.152-alpha"
|
|
50
50
|
},
|
|
51
51
|
"mocha": {
|
|
52
52
|
"spec": "build/test/**/test-*.js",
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"type": "git",
|
|
69
69
|
"url": "git+https://github.com/keymanapp/keyman.git"
|
|
70
70
|
},
|
|
71
|
-
"version": "17.0.
|
|
71
|
+
"version": "17.0.152-alpha"
|
|
72
72
|
}
|