@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
@@ -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(LdmlCompilerMessages.Hint_NoDisplayForSwitch({ id: id.value }));
31
+ this.callbacks.reportMessage(LdmlCompilerMessages.Hint_NoDisplayForSwitch({ id: id.value }, key));
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(LdmlCompilerMessages.Hint_NoDisplayForMarker({ id: id.value }));
38
+ this.callbacks.reportMessage(LdmlCompilerMessages.Hint_NoDisplayForMarker({ id: id.value }, key));
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,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,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,iBAAiB,CAAC,YAAY,CAAC,gBAAgB,EAAC,GAAG,CAAC,CAAC;QACzF,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
+ {"version":3,"file":"linter-keycaps.js","sourceRoot":"","sources":["../../../src/compiler/linter-keycaps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,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,iBAAiB,CAAC,YAAY,CAAC,gBAAgB,EAAC,GAAG,CAAC,CAAC;QACzF,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,EAAE,GAAG,CAAC,CAAC,CAAC;gBACtG,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,EAAE,GAAG,CAAC,CAAC,CAAC;gBACtG,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
@@ -59,7 +59,7 @@ export class LocaCompiler extends SectionCompiler {
59
59
  // yet include `getCanonicalLocales` but node 16 does include it so we can
60
60
  // safely use it. Also well supported in modern browsers.
61
61
  const canonicalLocales = Intl.getCanonicalLocales(locales);
62
- result.locales = canonicalLocales.map(locale => sections.strs.allocString(locale));
62
+ result.locales = canonicalLocales.map(locale => sections.strs.allocString(locale, { x: this.contextForLocale(locale) }));
63
63
  if (result.locales.length < locales.length) {
64
64
  this.callbacks.reportMessage(LdmlCompilerMessages.Hint_OneOrMoreRepeatedLocales(this.keyboard3?.locales));
65
65
  }
@@ -1 +1 @@
1
- {"version":3,"file":"loca.js","sourceRoot":"","sources":["../../../src/compiler/loca.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"loca.js","sourceRoot":"","sources":["../../../src/compiler/loca.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../src/compiler/meta.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAa,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGlD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAG3B,qBAAa,YAAa,SAAQ,eAAe;IAE/C,IAAW,EAAE,iBAEZ;IAEM,QAAQ,IAAI,OAAO;IAS1B,OAAO,CAAC,eAAe;IAevB,OAAO,CAAC,qBAAqB;IAO7B,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAG3C;IAEM,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;CAYnD"}
1
+ {"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../src/compiler/meta.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAa,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGlD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAG3B,qBAAa,YAAa,SAAQ,eAAe;IAE/C,IAAW,EAAE,iBAEZ;IAEM,QAAQ,IAAI,OAAO;IAS1B,OAAO,CAAC,eAAe;IAevB,OAAO,CAAC,qBAAqB;IAO7B,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAG3C;IAEM,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;CAkBnD"}
@@ -41,12 +41,12 @@ export class MetaCompiler extends SectionCompiler {
41
41
  }
42
42
  compile(sections) {
43
43
  const result = new Meta();
44
- result.author = sections.strs.allocString(this.keyboard3.info?.author);
45
- result.conform = sections.strs.allocString(this.keyboard3.conformsTo);
46
- result.layout = sections.strs.allocString(this.keyboard3.info?.layout);
47
- result.name = sections.strs.allocString(this.keyboard3.info?.name);
48
- result.indicator = sections.strs.allocString(this.keyboard3.info?.indicator);
49
- result.version = sections.strs.allocString(this.keyboard3.version?.number ?? "0.0.0");
44
+ result.author = sections.strs.allocString(this.keyboard3.info?.author, { x: this.keyboard3.info });
45
+ result.conform = sections.strs.allocString(this.keyboard3.conformsTo, { x: this.keyboard3 });
46
+ result.layout = sections.strs.allocString(this.keyboard3.info?.layout, { x: this.keyboard3.info });
47
+ result.name = sections.strs.allocString(this.keyboard3.info?.name, { x: this.keyboard3.info });
48
+ result.indicator = sections.strs.allocString(this.keyboard3.info?.indicator, { x: this.keyboard3.info });
49
+ result.version = sections.strs.allocString(this.keyboard3.version?.number ?? "0.0.0", { x: this.keyboard3.version });
50
50
  result.settings =
51
51
  (this.keyboard3.settings?.normalization == "disabled" ? KeyboardSettings.normalizationDisabled : 0);
52
52
  return result;
@@ -1 +1 @@
1
- {"version":3,"file":"meta.js","sourceRoot":"","sources":["../../../src/compiler/meta.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"meta.js","sourceRoot":"","sources":["../../../src/compiler/meta.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import { ObjectWithMetadata } from "@keymanapp/developer-utils";
1
2
  /**
2
3
  * Verb for SubstitutionTracker.add()
3
4
  */
@@ -11,7 +12,7 @@ export declare enum SubstitutionUse {
11
12
  /** variable definition: might consume, emit, or match. */
12
13
  variable = 3
13
14
  }
14
- type SubstitutionSet = Set<string>;
15
+ type SubstitutionSet = Map<string, ObjectWithMetadata>;
15
16
  /** Tracks usage of markers */
16
17
  export declare class SubstitutionTracker {
17
18
  /** markers that were emitted */
@@ -28,18 +29,18 @@ export declare class SubstitutionTracker {
28
29
  * @param verb what kind of use we are adding
29
30
  * @param markers list of substitutions to add
30
31
  */
31
- add(verb: SubstitutionUse, markers: string[]): void;
32
+ add(verb: SubstitutionUse, markers: string[], x?: ObjectWithMetadata): void;
32
33
  }
33
34
  /** rollup of several substitution types */
34
35
  export declare class Substitutions {
35
- addSetAndStringSubtitution(verb: SubstitutionUse, str?: string): void;
36
+ addSetAndStringSubtitution(verb: SubstitutionUse, str?: string, x?: ObjectWithMetadata): void;
36
37
  /** add a string that can have string var substitutions or markers */
37
- addStringAndMarkerSubstitution(verb: SubstitutionUse, str?: string): void;
38
- addStringSubstitution(verb: SubstitutionUse, str?: string): void;
38
+ addStringAndMarkerSubstitution(verb: SubstitutionUse, str?: string, x?: ObjectWithMetadata): void;
39
+ addStringSubstitution(verb: SubstitutionUse, str?: string, x?: ObjectWithMetadata): void;
39
40
  /** add a string that's just markers */
40
- addMarkers(verb: SubstitutionUse, str?: string): void;
41
+ addMarkers(verb: SubstitutionUse, str?: string, x?: ObjectWithMetadata): void;
41
42
  markers: SubstitutionTracker;
42
- badMarkers: Set<string>;
43
+ badMarkers: SubstitutionSet;
43
44
  set: SubstitutionTracker;
44
45
  string: SubstitutionTracker;
45
46
  uset: SubstitutionTracker;
@@ -1 +1 @@
1
- {"version":3,"file":"substitution-tracker.d.ts","sourceRoot":"","sources":["../../../src/compiler/substitution-tracker.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,oBAAY,eAAe;IACzB,uEAAuE;IACvE,IAAI,IAAA;IACJ,qEAAqE;IACrE,OAAO,IAAA;IACP,iEAAiE;IACjE,KAAK,IAAA;IACL,0DAA0D;IAC1D,QAAQ,IAAA;CACT;AAED,KAAK,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;AAEnC,8BAA8B;AAC9B,qBAAa,mBAAmB;IAC9B,gCAAgC;IAChC,OAAO,EAAE,eAAe,CAAC;IACzB,8DAA8D;IAC9D,QAAQ,EAAE,eAAe,CAAC;IAC1B,8DAA8D;IAC9D,OAAO,EAAE,eAAe,CAAC;IACzB,kBAAkB;IAClB,GAAG,EAAE,eAAe,CAAC;;IASrB;;;;OAIG;IACH,GAAG,CAAC,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE;CAgC7C;AAED,2CAA2C;AAC3C,qBAAa,aAAa;IACxB,0BAA0B,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,MAAM;IAI9D,qEAAqE;IACrE,8BAA8B,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,MAAM;IAIlE,qBAAqB,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,MAAM;IAGzD,uCAAuC;IACvC,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,MAAM;IAK9C,OAAO,EAAE,mBAAmB,CAAC;IAE7B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAExB,GAAG,EAAE,mBAAmB,CAAC;IAEzB,MAAM,EAAE,mBAAmB,CAAC;IAE5B,IAAI,EAAE,mBAAmB,CAAC;;CAS3B"}
1
+ {"version":3,"file":"substitution-tracker.d.ts","sourceRoot":"","sources":["../../../src/compiler/substitution-tracker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE;;GAEG;AACH,oBAAY,eAAe;IACzB,uEAAuE;IACvE,IAAI,IAAA;IACJ,qEAAqE;IACrE,OAAO,IAAA;IACP,iEAAiE;IACjE,KAAK,IAAA;IACL,0DAA0D;IAC1D,QAAQ,IAAA;CACT;AAED,KAAK,eAAe,GAAG,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;AAEvD,8BAA8B;AAC9B,qBAAa,mBAAmB;IAC9B,gCAAgC;IAChC,OAAO,EAAE,eAAe,CAAC;IACzB,8DAA8D;IAC9D,QAAQ,EAAE,eAAe,CAAC;IAC1B,8DAA8D;IAC9D,OAAO,EAAE,eAAe,CAAC;IACzB,kBAAkB;IAClB,GAAG,EAAE,eAAe,CAAC;;IASrB;;;;OAIG;IACH,GAAG,CAAC,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,kBAAkB;CAiCrE;AAED,2CAA2C;AAC3C,qBAAa,aAAa;IACxB,0BAA0B,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,kBAAkB;IAItF,qEAAqE;IACrE,8BAA8B,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,kBAAkB;IAI1F,qBAAqB,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,kBAAkB;IAGjF,uCAAuC;IACvC,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,kBAAkB;IAKtE,OAAO,EAAE,mBAAmB,CAAC;IAE7B,UAAU,EAAE,eAAe,CAAC;IAE5B,GAAG,EAAE,mBAAmB,CAAC;IAEzB,MAAM,EAAE,mBAAmB,CAAC;IAE5B,IAAI,EAAE,mBAAmB,CAAC;;CAS3B"}
@@ -24,45 +24,46 @@ export class SubstitutionTracker {
24
24
  /** all markers */
25
25
  all;
26
26
  constructor() {
27
- this.emitted = new Set();
28
- this.consumed = new Set();
29
- this.matched = new Set();
30
- this.all = new Set();
27
+ this.emitted = new Map();
28
+ this.consumed = new Map();
29
+ this.matched = new Map();
30
+ this.all = new Map();
31
31
  }
32
32
  /**
33
33
  *
34
34
  * @param verb what kind of use we are adding
35
35
  * @param markers list of substitutions to add
36
36
  */
37
- add(verb, markers) {
37
+ add(verb, markers, x) {
38
38
  if (!markers.length) {
39
39
  return; // skip if empty
40
40
  }
41
+ x = x || {}; // need at least an empty object
41
42
  if (verb == SubstitutionUse.emit) {
42
43
  markers.forEach((m) => {
43
- this.emitted.add(m);
44
- this.all.add(m);
44
+ this.emitted.set(m, x);
45
+ this.all.set(m, x);
45
46
  });
46
47
  }
47
48
  else if (verb == SubstitutionUse.consume) {
48
49
  markers.forEach((m) => {
49
- this.consumed.add(m);
50
- this.all.add(m);
50
+ this.consumed.set(m, x);
51
+ this.all.set(m, x);
51
52
  });
52
53
  }
53
54
  else if (verb == SubstitutionUse.match) {
54
55
  markers.forEach((m) => {
55
- this.matched.add(m);
56
- this.all.add(m);
56
+ this.matched.set(m, x);
57
+ this.all.set(m, x);
57
58
  });
58
59
  }
59
60
  else if (verb == SubstitutionUse.variable) {
60
61
  markers.forEach((m) => {
61
62
  // we don't know, so add it to all three
62
- this.matched.add(m);
63
- this.emitted.add(m);
64
- this.consumed.add(m);
65
- this.all.add(m);
63
+ this.matched.set(m, x);
64
+ this.emitted.set(m, x);
65
+ this.consumed.set(m, x);
66
+ this.all.set(m, x);
66
67
  });
67
68
  /* c8 skip next 3 */
68
69
  }
@@ -73,22 +74,22 @@ export class SubstitutionTracker {
73
74
  }
74
75
  /** rollup of several substitution types */
75
76
  export class Substitutions {
76
- addSetAndStringSubtitution(verb, str) {
77
- this.set.add(verb, LdmlKeyboardTypes.VariableParser.allSetReferences(str));
78
- this.addStringAndMarkerSubstitution(verb, str);
77
+ addSetAndStringSubtitution(verb, str, x) {
78
+ this.set.add(verb, LdmlKeyboardTypes.VariableParser.allSetReferences(str), x);
79
+ this.addStringAndMarkerSubstitution(verb, str, x);
79
80
  }
80
81
  /** add a string that can have string var substitutions or markers */
81
- addStringAndMarkerSubstitution(verb, str) {
82
- this.addMarkers(verb, str);
83
- this.addStringSubstitution(verb, str);
82
+ addStringAndMarkerSubstitution(verb, str, x) {
83
+ this.addMarkers(verb, str, x);
84
+ this.addStringSubstitution(verb, str, x);
84
85
  }
85
- addStringSubstitution(verb, str) {
86
- this.string.add(verb, LdmlKeyboardTypes.VariableParser.allStringReferences(str));
86
+ addStringSubstitution(verb, str, x) {
87
+ this.string.add(verb, LdmlKeyboardTypes.VariableParser.allStringReferences(str), x);
87
88
  }
88
89
  /** add a string that's just markers */
89
- addMarkers(verb, str) {
90
- this.markers.add(verb, LdmlKeyboardTypes.MarkerParser.allReferences(str));
91
- LdmlKeyboardTypes.MarkerParser.allBrokenReferences(str).forEach(m => this.badMarkers.add(m));
90
+ addMarkers(verb, str, x) {
91
+ this.markers.add(verb, LdmlKeyboardTypes.MarkerParser.allReferences(str), x);
92
+ LdmlKeyboardTypes.MarkerParser.allBrokenReferences(str).forEach(m => this.badMarkers.set(m, x));
92
93
  }
93
94
  // all valid markers
94
95
  markers;
@@ -105,7 +106,7 @@ export class Substitutions {
105
106
  this.set = new SubstitutionTracker();
106
107
  this.string = new SubstitutionTracker();
107
108
  this.uset = new SubstitutionTracker();
108
- this.badMarkers = new Set();
109
+ this.badMarkers = new Map();
109
110
  }
110
111
  }
111
112
  //# sourceMappingURL=substitution-tracker.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"substitution-tracker.js","sourceRoot":"","sources":["../../../src/compiler/substitution-tracker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"substitution-tracker.js","sourceRoot":"","sources":["../../../src/compiler/substitution-tracker.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"tran.d.ts","sourceRoot":"","sources":["../../../src/compiler/tran.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAA2B,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAC3B,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAI3B,OAAO,yBAAyB,GAAG,YAAY,CAAC,yBAAyB,CAAC;AAO1E,OAAO,EAAE,aAAa,EAAmB,MAAM,2BAA2B,CAAC;AAG3E,KAAK,qBAAqB,GAAG,QAAQ,GAAG,WAAW,CAAC;AAEpD,8BAAsB,iBAAiB,CAAC,CAAC,SAAS,qBAAqB,EAAE,QAAQ,SAAS,IAAI,CAAE,SAAQ,eAAe;IAErH,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO;IAwB3F,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;gBAEN,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAIpE,QAAQ,IAAI,OAAO;IAyC1B,uCAAuC;IACvC,SAAS,CAAC,OAAO,IAAI,QAAQ;IAI7B,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,qBAAqB;IAe7B,OAAO,CAAC,yBAAyB;IAUjC,OAAO,CAAC,gBAAgB;IAwFxB;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAQjB;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAkCpB,OAAO,CAAC,uBAAuB;IAU/B,OAAO,CAAC,cAAc;IAqBf,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,QAAQ;IAStD,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAW3C;IAED;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAgBpB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;CA2FpB;AAED,qBAAa,YAAa,SAAQ,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAgB;gBACpE,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAI3E,SAAS,CAAC,OAAO,IAAI,IAAI;IAGzB,IAAW,EAAE,iBAEZ;CACF;AAED,qBAAa,YAAa,SAAQ,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAgB;gBACvE,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAI3E,SAAS,CAAC,OAAO,IAAI,IAAI;IAGzB,IAAW,EAAE,iBAEZ;IACD,OAAO;IACA,QAAQ,IAAI,OAAO;CAG3B"}
1
+ {"version":3,"file":"tran.d.ts","sourceRoot":"","sources":["../../../src/compiler/tran.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAA2B,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAsB,MAAM,4BAA4B,CAAC;AACjG,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAC3B,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAI3B,OAAO,yBAAyB,GAAG,YAAY,CAAC,yBAAyB,CAAC;AAO1E,OAAO,EAAE,aAAa,EAAmB,MAAM,2BAA2B,CAAC;AAI3E,KAAK,qBAAqB,GAAG,QAAQ,GAAG,WAAW,CAAC;AAEpD,8BAAsB,iBAAiB,CAAC,CAAC,SAAS,qBAAqB,EAAE,QAAQ,SAAS,IAAI,CAAE,SAAQ,eAAe;IAErH,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO;IA0B3F,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;gBAEN,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAIpE,QAAQ,IAAI,OAAO;IAyC1B,uCAAuC;IACvC,SAAS,CAAC,OAAO,IAAI,QAAQ;IAI7B,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,qBAAqB;IAe7B,OAAO,CAAC,yBAAyB;IAUjC,OAAO,CAAC,gBAAgB;IA4FxB;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAQjB;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAkCpB,OAAO,CAAC,uBAAuB;IAU/B,OAAO,CAAC,cAAc;IAqBf,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,QAAQ;IAStD,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAW3C;IAED;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAqBpB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;CA2FpB;AAED,qBAAa,YAAa,SAAQ,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAgB;gBACpE,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAI3E,SAAS,CAAC,OAAO,IAAI,IAAI;IAGzB,IAAW,EAAE,iBAEZ;CACF;AAED,qBAAa,YAAa,SAAQ,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAgB;gBACvE,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAI3E,SAAS,CAAC,OAAO,IAAI,IAAI;IAGzB,IAAW,EAAE,iBAEZ;IACD,OAAO;IACA,QAAQ,IAAI,OAAO;CAG3B"}
@@ -12,22 +12,24 @@ import { transform_from_parse, transform_to_parse } from "../util/abnf/abnf.js";
12
12
  export class TransformCompiler extends SectionCompiler {
13
13
  static validateSubstitutions(keyboard, st) {
14
14
  keyboard?.transforms?.forEach(transforms => transforms.transformGroup.forEach(transformGroup => {
15
- transformGroup.transform?.forEach(({ to, from }) => {
16
- st.addSetAndStringSubtitution(SubstitutionUse.consume, from);
17
- st.addSetAndStringSubtitution(SubstitutionUse.emit, to);
15
+ transformGroup.transform?.forEach((transform) => {
16
+ const { to, from } = transform;
17
+ st.addSetAndStringSubtitution(SubstitutionUse.consume, from, transform);
18
+ st.addSetAndStringSubtitution(SubstitutionUse.emit, to, transform);
18
19
  const mapFrom = LdmlKeyboardTypes.VariableParser.CAPTURE_SET_REFERENCE.exec(from);
19
20
  const mapTo = LdmlKeyboardTypes.VariableParser.MAPPED_SET_REFERENCE.exec(to || '');
20
21
  if (mapFrom) {
21
22
  // add the 'from' as a match
22
- st.set.add(SubstitutionUse.consume, [mapFrom[1]]);
23
+ st.set.add(SubstitutionUse.consume, [mapFrom[1]], transform);
23
24
  }
24
25
  if (mapTo) {
25
26
  // add the 'from' as a match
26
- st.set.add(SubstitutionUse.emit, [mapTo[1]]);
27
+ st.set.add(SubstitutionUse.emit, [mapTo[1]], transform);
27
28
  }
28
29
  });
29
- transformGroup.reorder?.forEach(({ before }) => {
30
- st.addStringSubstitution(SubstitutionUse.consume, before);
30
+ transformGroup.reorder?.forEach((reorder) => {
31
+ const { before } = reorder;
32
+ st.addStringSubstitution(SubstitutionUse.consume, before, reorder);
31
33
  });
32
34
  }));
33
35
  return true;
@@ -112,6 +114,8 @@ export class TransformCompiler extends SectionCompiler {
112
114
  return result;
113
115
  }
114
116
  compileTransform(sections, transform) {
117
+ // we have lots of strings to allocate, that will all have these options
118
+ const stropts = { x: transform };
115
119
  const result = new TranTransform();
116
120
  // setup for serializing
117
121
  result._from = transform.from;
@@ -119,7 +123,7 @@ export class TransformCompiler extends SectionCompiler {
119
123
  let cookedFrom = transform.from;
120
124
  // check for incorrect \uXXXX escapes. Do this before substituting markers or sets.
121
125
  // We run this first because it's more helpful than the ABNF.
122
- cookedFrom = this.checkEscapes(cookedFrom); // check for \uXXXX escapes before normalizing
126
+ cookedFrom = this.checkEscapes(cookedFrom, transform); // check for \uXXXX escapes before normalizing
123
127
  if (cookedFrom === '') {
124
128
  this.callbacks.reportMessage(LdmlCompilerMessages.Error_TransformFromMatchesNothing({ from: cookedFrom }, transform));
125
129
  return null;
@@ -128,12 +132,12 @@ export class TransformCompiler extends SectionCompiler {
128
132
  const mapFrom = LdmlKeyboardTypes.VariableParser.CAPTURE_SET_REFERENCE.exec(cookedFrom);
129
133
  const mapTo = LdmlKeyboardTypes.VariableParser.MAPPED_SET_REFERENCE.exec(transform.to || '');
130
134
  if (mapFrom && mapTo) { // TODO-LDML: error cases
131
- result.mapFrom = sections.strs.allocString(mapFrom[1]); // var name
132
- result.mapTo = sections.strs.allocString(mapTo[1]); // var name
135
+ result.mapFrom = sections.strs.allocString(mapFrom[1], stropts); // var name
136
+ result.mapTo = sections.strs.allocString(mapTo[1], stropts); // var name
133
137
  }
134
138
  else {
135
- result.mapFrom = sections.strs.allocString('');
136
- result.mapTo = sections.strs.allocString('');
139
+ result.mapFrom = sections.strs.allocString('', stropts);
140
+ result.mapTo = sections.strs.allocString('', stropts);
137
141
  // validate 'to' here
138
142
  if (!this.isValidTo(transform.to || '')) {
139
143
  return null;
@@ -164,7 +168,7 @@ export class TransformCompiler extends SectionCompiler {
164
168
  }
165
169
  }
166
170
  catch (e) {
167
- this.callbacks.reportMessage(LdmlCompilerMessages.Error_UnparseableTransformFrom({ from: cookedFrom, message: e.toString() }));
171
+ this.callbacks.reportMessage(LdmlCompilerMessages.Error_UnparseableTransformFrom({ from: cookedFrom, message: e.toString() }, transform));
168
172
  return null;
169
173
  }
170
174
  // run the parser here next, on the original to
@@ -172,12 +176,13 @@ export class TransformCompiler extends SectionCompiler {
172
176
  transform_to_parse(transform.to || '');
173
177
  }
174
178
  catch (e) {
175
- this.callbacks.reportMessage(LdmlCompilerMessages.Error_UnparseableTransformTo({ to: transform.to || '', message: e.toString() }));
179
+ this.callbacks.reportMessage(LdmlCompilerMessages.Error_UnparseableTransformTo({ to: transform.to || '', message: e.toString() }, transform));
176
180
  return null;
177
181
  }
178
182
  // cookedFrom is cooked above, since there's some special treatment
179
183
  result.from = sections.strs.allocString(cookedFrom, {
180
184
  unescape: false,
185
+ x: transform,
181
186
  }, sections);
182
187
  // 'to' is handled via allocString
183
188
  result.to = sections.strs.allocString(transform.to, {
@@ -185,6 +190,7 @@ export class TransformCompiler extends SectionCompiler {
185
190
  markers: true,
186
191
  unescape: true,
187
192
  nfd: true,
193
+ x: transform,
188
194
  }, sections);
189
195
  return result;
190
196
  }
@@ -193,9 +199,9 @@ export class TransformCompiler extends SectionCompiler {
193
199
  * We have already checked that it's not a mapTo,
194
200
  * so there should not be any illegal substitutions.
195
201
  */
196
- isValidTo(to) {
202
+ isValidTo(to, x) {
197
203
  if (/(?<!\\)(?:\\\\)*\$\[/.test(to)) {
198
- this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformToUset({ to }));
204
+ this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformToUset({ to }, x));
199
205
  return false;
200
206
  }
201
207
  return true;
@@ -206,18 +212,18 @@ export class TransformCompiler extends SectionCompiler {
206
212
  * @param from the original from - for error reporting
207
213
  * @returns true if OK
208
214
  */
209
- isValidRegex(cookedFrom, from) {
215
+ isValidRegex(cookedFrom, from, x) {
210
216
  // check for any unescaped dollar sign here
211
217
  if (/(?<!\\)(?:\\\\)*\$/.test(cookedFrom)) {
212
- this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformDollarsign({ from }));
218
+ this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformDollarsign({ from }, x));
213
219
  return false;
214
220
  }
215
221
  if (/(?<!\\)(?:\\\\)*\*/.test(cookedFrom)) {
216
- this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformAsterisk({ from }));
222
+ this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformAsterisk({ from }, x));
217
223
  return false;
218
224
  }
219
225
  if (/(?<!\\)(?:\\\\)*\+/.test(cookedFrom)) {
220
- this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformPlus({ from }));
226
+ this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformPlus({ from }, x));
221
227
  return false;
222
228
  }
223
229
  // Verify that the regex is syntactically valid
@@ -226,7 +232,7 @@ export class TransformCompiler extends SectionCompiler {
226
232
  // Tests against the regex:
227
233
  // does it match an empty string?
228
234
  if (rg.test('')) {
229
- this.callbacks.reportMessage(LdmlCompilerMessages.Error_TransformFromMatchesNothing({ from }));
235
+ this.callbacks.reportMessage(LdmlCompilerMessages.Error_TransformFromMatchesNothing({ from }, x));
230
236
  return false;
231
237
  }
232
238
  }
@@ -234,7 +240,7 @@ export class TransformCompiler extends SectionCompiler {
234
240
  // We're exposing the internal regex error message here.
235
241
  // In the future, CLDR plans to expose the EBNF for the transform,
236
242
  // at which point we would have more precise validation prior to getting to this point.
237
- this.callbacks.reportMessage(LdmlCompilerMessages.Error_UnparseableTransformFrom({ from, message: e.message }));
243
+ this.callbacks.reportMessage(LdmlCompilerMessages.Error_UnparseableTransformFrom({ from, message: e.message }, x));
238
244
  return false;
239
245
  }
240
246
  return true;
@@ -255,14 +261,14 @@ export class TransformCompiler extends SectionCompiler {
255
261
  result._before = reorder.before;
256
262
  result._from = reorder.from;
257
263
  result._order = reorder.order;
258
- if (reorder.from && this.checkEscapes(reorder.from) === null) {
264
+ if (reorder.from && this.checkEscapes(reorder.from, reorder) === null) {
259
265
  return null; // error'ed
260
266
  }
261
- if (reorder.before && this.checkEscapes(reorder.before) === null) {
267
+ if (reorder.before && this.checkEscapes(reorder.before, reorder) === null) {
262
268
  return null; // error'ed
263
269
  }
264
- result.elements = sections.elem.allocElementString(sections, reorder.from, reorder.order, reorder.tertiary, reorder.tertiaryBase, reorder.preBase);
265
- result.before = sections.elem.allocElementString(sections, reorder.before);
270
+ result.elements = sections.elem.allocElementString(sections, { x: reorder }, reorder.from, reorder.order, reorder.tertiary, reorder.tertiaryBase, reorder.preBase);
271
+ result.before = sections.elem.allocElementString(sections, { x: reorder }, reorder.before);
266
272
  if (!result.elements || !result.before) {
267
273
  return null; // already error'ed
268
274
  }
@@ -302,10 +308,15 @@ export class TransformCompiler extends SectionCompiler {
302
308
  return cookedFrom;
303
309
  // should not follow marker prefix, nor marker prefix with range
304
310
  const anyQuad = /(?<!\\uffff\\u0008(?:\[[0-9a-fA-F\\u-]*)?)\\u([0-9a-fA-F]{4})/g;
305
- for (const [, sub] of cookedFrom.matchAll(anyQuad)) {
311
+ for (const [matched, sub] of cookedFrom.matchAll(anyQuad)) {
306
312
  const s = util.unescapeOne(sub);
307
313
  if (s !== '\uffff' && s !== '\u0008') { // markers
308
- this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidQuadEscape({ cp: s.codePointAt(0) }, transform));
314
+ const codepoint = s.codePointAt(0);
315
+ const cp = matched; // the original match from the file
316
+ const recommended = `\\u{${codepoint.toString(16)}}`;
317
+ this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidQuadEscape({
318
+ cp, recommended
319
+ }, transform));
309
320
  return null; // exit on the first error
310
321
  }
311
322
  }
@@ -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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"}
@@ -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,EAAqB,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC7E,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,EAAmB,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC3E,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;IAQ1B,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,YAAY;IAqIpB,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,wBAAwB;IAqChC,qBAAqB,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAG,aAAa,GAAI,OAAO;IAS/E,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAiClD,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;IAe/E,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,IAAI;CASxF"}
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,EAAqB,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAsB,MAAM,4BAA4B,CAAC;AACjG,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,EAAmB,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC3E,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;IAQ1B,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,YAAY;IAqIpB,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,wBAAwB;IAwChC,qBAAqB,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAG,aAAa,GAAI,OAAO;IAa/E,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAyClD,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;IAe/E,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,IAAI;CASxF"}