@keymanapp/kmc-ldml 19.0.56-alpha → 19.0.58-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.
Files changed (33) hide show
  1. package/build/src/compiler/disp.d.ts.map +1 -1
  2. package/build/src/compiler/disp.js +11 -8
  3. package/build/src/compiler/disp.js.map +1 -1
  4. package/build/src/compiler/empty-compiler.d.ts.map +1 -1
  5. package/build/src/compiler/empty-compiler.js +18 -4
  6. package/build/src/compiler/empty-compiler.js.map +1 -1
  7. package/build/src/compiler/keys.d.ts.map +1 -1
  8. package/build/src/compiler/keys.js +14 -12
  9. package/build/src/compiler/keys.js.map +1 -1
  10. package/build/src/compiler/layr.js +4 -4
  11. package/build/src/compiler/layr.js.map +1 -1
  12. package/build/src/compiler/ldml-compiler-messages.d.ts +60 -77
  13. package/build/src/compiler/ldml-compiler-messages.d.ts.map +1 -1
  14. package/build/src/compiler/ldml-compiler-messages.js +29 -108
  15. package/build/src/compiler/ldml-compiler-messages.js.map +1 -1
  16. package/build/src/compiler/linter-keycaps.js +2 -2
  17. package/build/src/compiler/linter-keycaps.js.map +1 -1
  18. package/build/src/compiler/loca.js +1 -1
  19. package/build/src/compiler/loca.js.map +1 -1
  20. package/build/src/compiler/meta.d.ts.map +1 -1
  21. package/build/src/compiler/meta.js +6 -6
  22. package/build/src/compiler/meta.js.map +1 -1
  23. package/build/src/compiler/substitution-tracker.d.ts +8 -7
  24. package/build/src/compiler/substitution-tracker.d.ts.map +1 -1
  25. package/build/src/compiler/substitution-tracker.js +28 -27
  26. package/build/src/compiler/substitution-tracker.js.map +1 -1
  27. package/build/src/compiler/tran.d.ts.map +1 -1
  28. package/build/src/compiler/tran.js +39 -28
  29. package/build/src/compiler/tran.js.map +1 -1
  30. package/build/src/compiler/vars.d.ts.map +1 -1
  31. package/build/src/compiler/vars.js +41 -23
  32. package/build/src/compiler/vars.js.map +1 -1
  33. package/package.json +7 -7
package/build/src/compiler/disp.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"disp.d.ts","sourceRoot":"","sources":["../../../src/compiler/disp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGlD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAE3B,OAAO,EAAmB,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE3E,qBAAa,YAAa,SAAQ,eAAe;IAC/C,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAG,aAAa,GAAG,OAAO;IAS5F,IAAW,EAAE,8DAEZ;IAEM,QAAQ,IAAI,OAAO;IAiCnB,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;CAiCnD"}
1
+ {"version":3,"file":"disp.d.ts","sourceRoot":"","sources":["../../../src/compiler/disp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGlD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAE3B,OAAO,EAAmB,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE3E,qBAAa,YAAa,SAAQ,eAAe;IAC/C,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAG,aAAa,GAAG,OAAO;IAU5F,IAAW,EAAE,8DAEZ;IAEM,QAAQ,IAAI,OAAO;IAiCnB,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;CAmCnD"}
package/build/src/compiler/disp.js CHANGED
@@ -6,9 +6,10 @@ var Disp = KMXPlus.Disp;
6
6
  import { SubstitutionUse } from "./substitution-tracker.js";
7
7
  export class DispCompiler extends SectionCompiler {
8
8
  static validateSubstitutions(keyboard, st) {
9
- keyboard.displays?.display?.forEach(({ display, output }) => {
10
- st.addStringAndMarkerSubstitution(SubstitutionUse.match, output);
11
- st.addStringSubstitution(SubstitutionUse.emit, display);
9
+ keyboard.displays?.display?.forEach((e) => {
10
+ const { display, output } = e;
11
+ st.addStringAndMarkerSubstitution(SubstitutionUse.match, output, e);
12
+ st.addStringSubstitution(SubstitutionUse.emit, display, e);
12
13
  });
13
14
  // no marker references in 'id'
14
15
  return true;
@@ -24,12 +25,12 @@ export class DispCompiler extends SectionCompiler {
24
25
  for (const display of this.keyboard3.displays?.display) {
25
26
  const { output, keyId } = display;
26
27
  if ((output && keyId) || (!output && !keyId)) {
27
- this.callbacks.reportMessage(LdmlCompilerMessages.Error_DisplayNeedsToOrId({ output, keyId }, display));
28
+ this.callbacks.reportMessage(LdmlCompilerMessages.Error_DisplayNeedsToOrId({ display: display.display }, display));
28
29
  return false;
29
30
  }
30
31
  else if (output) {
31
32
  if (tos.has(output)) {
32
- this.callbacks.reportMessage(LdmlCompilerMessages.Error_DisplayIsRepeated({ output }, display));
33
+ this.callbacks.reportMessage(LdmlCompilerMessages.Error_DisplayIsRepeated({ display: display.display }, display));
33
34
  return false;
34
35
  }
35
36
  else {
@@ -38,7 +39,7 @@ export class DispCompiler extends SectionCompiler {
38
39
  }
39
40
  else if (keyId) {
40
41
  if (ids.has(keyId)) {
41
- this.callbacks.reportMessage(LdmlCompilerMessages.Error_DisplayIsRepeated({ keyId }, display));
42
+ this.callbacks.reportMessage(LdmlCompilerMessages.Error_DisplayIsRepeated({ display: display.display }, display));
42
43
  return false;
43
44
  }
44
45
  else {
@@ -52,18 +53,20 @@ export class DispCompiler extends SectionCompiler {
52
53
  compile(sections) {
53
54
  const result = new Disp();
54
55
  // displayOptions
55
- result.baseCharacter = sections.strs.allocString(this.keyboard3.displays?.displayOptions?.baseCharacter, { unescape: true });
56
+ result.baseCharacter = sections.strs.allocString(this.keyboard3.displays?.displayOptions?.baseCharacter, { unescape: true, x: this.keyboard3?.displays?.displayOptions });
56
57
  // displays
57
58
  result.disps = this.keyboard3.displays?.display.map(display => ({
58
59
  to: sections.strs.allocString(display.output, {
59
60
  stringVariables: true,
60
61
  markers: true,
61
62
  unescape: true,
63
+ x: display,
62
64
  }, sections),
63
- id: sections.strs.allocString(display.keyId), // not escaped, not substituted
65
+ id: sections.strs.allocString(display.keyId, { x: display }), // not escaped, not substituted
64
66
  display: sections.strs.allocString(display.display, {
65
67
  stringVariables: true,
66
68
  unescape: true,
69
+ x: display,
67
70
  }, sections),
68
71
  })) || []; // TODO-LDML: need coverage for the []
69
72
  result.disps.sort((a, b) => {
package/build/src/compiler/disp.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"disp.js","sourceRoot":"","sources":["../../../src/compiler/disp.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"disp.js","sourceRoot":"","sources":["../../../src/compiler/disp.ts"],"names":[],"mappings":"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"}
package/build/src/compiler/empty-compiler.d.ts.map CHANGED
@@ -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,EAAQ,OAAO,EAAqB,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAGzC;;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;IAG9D,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,OAAO;CAiDxD;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
+ {"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,EAAQ,OAAO,EAAqB,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAsB,MAAM,4BAA4B,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAGzC;;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;IAG9D,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,OAAO;CAiExD;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"}
package/build/src/compiler/empty-compiler.js CHANGED
@@ -28,13 +28,27 @@ export class StrsCompiler extends EmptyCompiler {
28
28
  }
29
29
  postValidate(section) {
30
30
  const strs = section;
31
+ /** attempt to find a context object for the string */
32
+ function findContextForString(s) {
33
+ // try exact match
34
+ for (const str of strs.strings) {
35
+ if (str.value == s)
36
+ return str.context;
37
+ }
38
+ // try substring match
39
+ for (const str of strs.strings) {
40
+ if (str.value.includes(s))
41
+ return str.context;
42
+ }
43
+ return null;
44
+ }
31
45
  if (strs) {
32
46
  const badStringAnalyzer = new util.BadStringAnalyzer();
33
47
  const CONTAINS_MARKER_REGEX = new RegExp(LdmlKeyboardTypes.MarkerParser.ANY_MARKER_MATCH);
34
48
  for (let s of strs.allProcessedStrings.values()) {
35
49
  // stop at the first denormalized string
36
50
  if (!util.isNormalized(s)) {
37
- this.callbacks.reportMessage(LdmlCompilerMessages.Warn_StringDenorm({ s }));
51
+ this.callbacks.reportMessage(LdmlCompilerMessages.Warn_StringDenorm({ s }, findContextForString(s)));
38
52
  }
39
53
  // replace all \\uXXXX with the actual code point.
40
54
  // this lets us analyze whether there are PUA, unassigned, etc.
@@ -58,16 +72,16 @@ export class StrsCompiler extends EmptyCompiler {
58
72
  const illegals = m.get(util.BadStringType.illegal);
59
73
  if (puas) {
60
74
  const [count, lowestCh] = [puas.size, Array.from(puas.values()).sort((a, b) => a - b)[0]];
61
- this.callbacks.reportMessage(LdmlCompilerMessages.Hint_PUACharacters({ count, lowestCh }));
75
+ this.callbacks.reportMessage(LdmlCompilerMessages.Hint_PUACharacters({ count, lowestCh: util.describeCodepoint(lowestCh) }, findContextForString(String.fromCodePoint(lowestCh))));
62
76
  }
63
77
  if (unassigneds) {
64
78
  const [count, lowestCh] = [unassigneds.size, Array.from(unassigneds.values()).sort((a, b) => a - b)[0]];
65
- this.callbacks.reportMessage(LdmlCompilerMessages.Warn_UnassignedCharacters({ count, lowestCh }));
79
+ this.callbacks.reportMessage(LdmlCompilerMessages.Warn_UnassignedCharacters({ count, lowestCh: util.describeCodepoint(lowestCh) }, findContextForString(String.fromCodePoint(lowestCh))));
66
80
  }
67
81
  if (illegals) {
68
82
  // do this last, because we will return false.
69
83
  const [count, lowestCh] = [illegals.size, Array.from(illegals.values()).sort((a, b) => a - b)[0]];
70
- this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalCharacters({ count, lowestCh }));
84
+ this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalCharacters({ count, lowestCh: util.describeCodepoint(lowestCh) }, findContextForString(String.fromCodePoint(lowestCh))));
71
85
  return false;
72
86
  }
73
87
  }
package/build/src/compiler/empty-compiler.js.map CHANGED
@@ -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,EAAE,IAAI,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE3E,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,iBAAiB,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;YAC1F,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,EAAE,CAAC;gBAChD,wCAAwC;gBACxC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC,CAAC;gBAC5E,CAAC;gBACD,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,iBAAiB,CAAC,YAAY,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;oBAC9F,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
+ {"version":3,"file":"empty-compiler.js","sourceRoot":"","sources":["../../../src/compiler/empty-compiler.ts"],"names":[],"mappings":"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"}
package/build/src/compiler/keys.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../../src/compiler/keys.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../../src/compiler/keys.ts"],"names":[],"mappings":"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"}
package/build/src/compiler/keys.js CHANGED
@@ -28,7 +28,7 @@ export class KeysCompiler extends SectionCompiler {
28
28
  const key = keyBag.get(keyId);
29
29
  if (!key)
30
30
  continue; // key not found is handled elsewhere.
31
- st.addStringAndMarkerSubstitution(SubstitutionUse.emit, key.output);
31
+ st.addStringAndMarkerSubstitution(SubstitutionUse.emit, key.output, key);
32
32
  }
33
33
  return true;
34
34
  }
@@ -269,11 +269,12 @@ export class KeysCompiler extends SectionCompiler {
269
269
  if (!flick)
270
270
  continue; // already reported by validate()
271
271
  // allocate the in-memory <flick id=…>
272
- const flicks = new KeysFlicks(sections.strs.allocString(flickId));
272
+ const flicks = new KeysFlicks(sections.strs.allocString(flickId, { x: flick }));
273
273
  // add data from each segment
274
- for (const { keyId, directions } of flick.flickSegment) {
275
- const keyIdStr = sections.strs.allocString(keyId);
276
- const directionsList = sections.list.allocListFromSpaces(directions, {}, sections);
274
+ for (const flickSegment of flick.flickSegment) {
275
+ const { keyId, directions } = flickSegment;
276
+ const keyIdStr = sections.strs.allocString(keyId, { x: flickSegment });
277
+ const directionsList = sections.list.allocListFromSpaces(directions, { x: flickSegment }, sections);
277
278
  flicks.flicks.push({
278
279
  directions: directionsList,
279
280
  keyId: keyIdStr,
@@ -305,11 +306,11 @@ export class KeysCompiler extends SectionCompiler {
305
306
  if (!!gap) {
306
307
  flags |= constants.keys_key_flags_gap;
307
308
  }
308
- const id = sections.strs.allocString(key.id);
309
- const longPress = sections.list.allocListFromSpaces(longPressKeyIds, {}, sections);
310
- const longPressDefault = sections.strs.allocString(longPressDefaultKeyId, {}, sections);
311
- const multiTap = sections.list.allocListFromSpaces(multiTapKeyIds, {}, sections);
312
- const keySwitch = sections.strs.allocString(layerId); // 'switch' is a reserved word
309
+ const id = sections.strs.allocString(key.id, { x: key });
310
+ const longPress = sections.list.allocListFromSpaces(longPressKeyIds, { x: key }, sections);
311
+ const longPressDefault = sections.strs.allocString(longPressDefaultKeyId, { x: key }, sections);
312
+ const multiTap = sections.list.allocListFromSpaces(multiTapKeyIds, { x: key }, sections);
313
+ const keySwitch = sections.strs.allocString(layerId, { x: key }); // 'switch' is a reserved word
313
314
  const toRaw = output;
314
315
  let toCooked = sections.vars.substituteStrings(toRaw, sections);
315
316
  toCooked = sections.vars.substituteMarkerString(toCooked);
@@ -319,6 +320,7 @@ export class KeysCompiler extends SectionCompiler {
319
320
  unescape: true,
320
321
  singleOk: true,
321
322
  nfd: true,
323
+ x: key,
322
324
  }, sections);
323
325
  if (!to.isOneChar) {
324
326
  flags |= constants.keys_key_flags_extend;
@@ -371,7 +373,7 @@ export class KeysCompiler extends SectionCompiler {
371
373
  let valid = true;
372
374
  const { modifiers } = layer;
373
375
  if (!validModifier(modifiers)) {
374
- this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidModifier({ modifiers, id: layer.id }, layer));
376
+ this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidModifier({ modifiers }, layer));
375
377
  valid = false;
376
378
  }
377
379
  if (layer.row.length > keymap.length) {
@@ -385,7 +387,7 @@ export class KeysCompiler extends SectionCompiler {
385
387
  this.callbacks.reportMessage(LdmlCompilerMessages.Error_RowOnHardwareLayerHasTooManyKeys({
386
388
  row: y + 1,
387
389
  hardware: layers.formId,
388
- modifiers,
390
+ modifiers: modifiers || 'none',
389
391
  }, row));
390
392
  valid = false;
391
393
  }
package/build/src/compiler/keys.js.map CHANGED
@@ -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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"}
package/build/src/compiler/layr.js CHANGED
@@ -47,7 +47,7 @@ export class LayrCompiler extends SectionCompiler {
47
47
  const { modifiers } = layer;
48
48
  totalLayerCount++;
49
49
  if (!validModifier(modifiers)) {
50
- this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidModifier({ modifiers, id: layer.id }, layer));
50
+ this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidModifier({ modifiers }, layer));
51
51
  valid = false;
52
52
  }
53
53
  });
@@ -62,13 +62,13 @@ export class LayrCompiler extends SectionCompiler {
62
62
  compile(sections) {
63
63
  const sect = new Layr();
64
64
  sect.lists = this.keyboard3.layers.map((layers) => {
65
- const hardware = sections.strs.allocString(layers.formId);
65
+ const hardware = sections.strs.allocString(layers.formId, { x: layers });
66
66
  // Already validated in validate
67
67
  const layerEntries = [];
68
68
  for (const layer of layers.layer) {
69
69
  const rows = layer.row.map((row) => {
70
70
  const erow = {
71
- keys: row.keys.trim().split(/[ \t]+/).map((id) => sections.strs.allocString(id)),
71
+ keys: row.keys.trim().split(/[ \t]+/).map((id) => sections.strs.allocString(id, { x: row })),
72
72
  };
73
73
  // include linenumber info for row
74
74
  return SectionCompiler.copySymbols(erow, row);
@@ -77,7 +77,7 @@ export class LayrCompiler extends SectionCompiler {
77
77
  // push a layer entry for each modifier set
78
78
  for (const mod of mods) {
79
79
  layerEntries.push({
80
- id: sections.strs.allocString(layer.id),
80
+ id: sections.strs.allocString(layer.id, { x: layer }),
81
81
  mod,
82
82
  rows,
83
83
  });
package/build/src/compiler/layr.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"layr.js","sourceRoot":"","sources":["../../../src/compiler/layr.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"layr.js","sourceRoot":"","sources":["../../../src/compiler/layr.ts"],"names":[],"mappings":"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"}