@keymanapp/kmc-ldml 18.0.7-alpha → 18.0.9-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/README.md +9 -0
- package/build/src/compiler/disp.d.ts +2 -2
- package/build/src/compiler/disp.d.ts.map +1 -1
- package/build/src/compiler/disp.js +9 -6
- package/build/src/compiler/disp.js.map +1 -1
- package/build/src/compiler/keys.d.ts +2 -2
- package/build/src/compiler/keys.d.ts.map +1 -1
- package/build/src/compiler/keys.js +8 -9
- package/build/src/compiler/keys.js.map +1 -1
- package/build/src/compiler/messages.d.ts +40 -40
- package/build/src/compiler/messages.d.ts.map +1 -1
- package/build/src/compiler/messages.js +43 -43
- package/build/src/compiler/messages.js.map +1 -1
- package/build/src/compiler/substitution-tracker.d.ts +48 -0
- package/build/src/compiler/substitution-tracker.d.ts.map +1 -0
- package/build/src/compiler/{marker-tracker.js → substitution-tracker.js} +47 -17
- package/build/src/compiler/substitution-tracker.js.map +1 -0
- package/build/src/compiler/tran.d.ts +2 -2
- package/build/src/compiler/tran.d.ts.map +1 -1
- package/build/src/compiler/tran.js +19 -6
- package/build/src/compiler/tran.js.map +1 -1
- package/build/src/compiler/vars.d.ts +5 -5
- package/build/src/compiler/vars.d.ts.map +1 -1
- package/build/src/compiler/vars.js +88 -85
- package/build/src/compiler/vars.js.map +1 -1
- package/package.json +6 -6
- package/build/src/compiler/marker-tracker.d.ts +0 -34
- package/build/src/compiler/marker-tracker.d.ts.map +0 -1
- package/build/src/compiler/marker-tracker.js.map +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="
|
|
1
|
+
!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="8694b724-addc-5c24-b95e-7f11dd19203d")}catch(e){}}();
|
|
2
2
|
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
3
3
|
import { KMXPlus, MarkerParser } from '@keymanapp/common-types';
|
|
4
4
|
import { VariableParser } from '@keymanapp/common-types';
|
|
@@ -11,7 +11,7 @@ import { CompilerMessages } from "./messages.js";
|
|
|
11
11
|
import { KeysCompiler } from "./keys.js";
|
|
12
12
|
import { TransformCompiler } from "./tran.js";
|
|
13
13
|
import { DispCompiler } from "./disp.js";
|
|
14
|
-
import {
|
|
14
|
+
import { SubstitutionUse, Substitutions } from "./substitution-tracker.js";
|
|
15
15
|
export class VarsCompiler extends SectionCompiler {
|
|
16
16
|
get id() {
|
|
17
17
|
return constants.section.vars;
|
|
@@ -30,16 +30,12 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
30
30
|
}
|
|
31
31
|
validate() {
|
|
32
32
|
let valid = true;
|
|
33
|
-
valid = this.
|
|
34
|
-
valid = this.validateMarkers() && valid; // accumulate validity
|
|
33
|
+
valid = this.validateAllSubstitutions() && valid; // accumulate validity
|
|
35
34
|
return valid;
|
|
36
35
|
}
|
|
37
|
-
validateVars() {
|
|
36
|
+
validateVars(st) {
|
|
38
37
|
let valid = true;
|
|
39
38
|
const variables = this.keyboard3?.variables;
|
|
40
|
-
if (!variables) {
|
|
41
|
-
return true; // nothing to check
|
|
42
|
-
}
|
|
43
39
|
// Check for duplicate ids
|
|
44
40
|
const allIds = new Set();
|
|
45
41
|
const dups = new Set();
|
|
@@ -58,71 +54,53 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
58
54
|
allIds.add(id);
|
|
59
55
|
}
|
|
60
56
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
valid = false;
|
|
69
|
-
this.callbacks.reportMessage(CompilerMessages.Error_MissingStringVariable({ id: id2 }));
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
// Sets
|
|
74
|
-
for (const { id, value } of variables.set) {
|
|
75
|
-
addId(id);
|
|
76
|
-
allSets.add(id);
|
|
77
|
-
// check for illegal references, here.
|
|
78
|
-
const stringrefs = VariableParser.allStringReferences(value);
|
|
79
|
-
for (const id2 of stringrefs) {
|
|
80
|
-
if (!allStrings.has(id2)) {
|
|
81
|
-
valid = false;
|
|
82
|
-
this.callbacks.reportMessage(CompilerMessages.Error_MissingStringVariable({ id: id2 }));
|
|
83
|
-
}
|
|
57
|
+
if (variables) {
|
|
58
|
+
// Strings
|
|
59
|
+
for (const { id, value } of variables.string) {
|
|
60
|
+
addId(id);
|
|
61
|
+
allStrings.add(id);
|
|
62
|
+
const stringrefs = VariableParser.allStringReferences(value);
|
|
63
|
+
st.string.add(SubstitutionUse.variable, stringrefs);
|
|
84
64
|
}
|
|
85
|
-
//
|
|
86
|
-
const
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
}
|
|
65
|
+
// Sets
|
|
66
|
+
for (const { id, value } of variables.set) {
|
|
67
|
+
addId(id);
|
|
68
|
+
allSets.add(id);
|
|
69
|
+
// check for illegal references, here.
|
|
70
|
+
const stringrefs = VariableParser.allStringReferences(value);
|
|
71
|
+
st.string.add(SubstitutionUse.variable, stringrefs);
|
|
72
|
+
// Now split into spaces.
|
|
73
|
+
const items = VariableParser.setSplitter(value);
|
|
74
|
+
for (const item of items) {
|
|
75
|
+
const setrefs = VariableParser.allSetReferences(item);
|
|
76
|
+
if (setrefs.length > 1) {
|
|
77
|
+
// this is the form $[seta]$[setb]
|
|
78
|
+
valid = false;
|
|
79
|
+
this.callbacks.reportMessage(CompilerMessages.Error_NeedSpacesBetweenSetVariables({ item }));
|
|
100
80
|
}
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
// UnicodeSets
|
|
106
|
-
for (const { id, value } of variables.unicodeSet) {
|
|
107
|
-
addId(id);
|
|
108
|
-
allUnicodeSets.add(id);
|
|
109
|
-
const stringrefs = VariableParser.allStringReferences(value);
|
|
110
|
-
for (const id2 of stringrefs) {
|
|
111
|
-
if (!allStrings.has(id2)) {
|
|
112
|
-
valid = false;
|
|
113
|
-
this.callbacks.reportMessage(CompilerMessages.Error_MissingStringVariable({ id: id2 }));
|
|
81
|
+
else {
|
|
82
|
+
st.set.add(SubstitutionUse.variable, setrefs); // the reference to a 'map'
|
|
83
|
+
}
|
|
84
|
+
// TODO-LDML: Are there other illegal cases here? what about "x$[set]"?
|
|
114
85
|
}
|
|
115
86
|
}
|
|
116
|
-
|
|
117
|
-
for (const
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
87
|
+
// UnicodeSets
|
|
88
|
+
for (const { id, value } of variables.uset) {
|
|
89
|
+
addId(id);
|
|
90
|
+
allUnicodeSets.add(id);
|
|
91
|
+
const stringrefs = VariableParser.allStringReferences(value);
|
|
92
|
+
st.string.add(SubstitutionUse.variable, stringrefs);
|
|
93
|
+
const setrefs = VariableParser.allSetReferences(value);
|
|
94
|
+
for (const id2 of setrefs) {
|
|
95
|
+
if (!allUnicodeSets.has(id2)) {
|
|
96
|
+
valid = false;
|
|
97
|
+
if (allSets.has(id2)) {
|
|
98
|
+
// $[set] in a UnicodeSet must be another UnicodeSet.
|
|
99
|
+
this.callbacks.reportMessage(CompilerMessages.Error_CantReferenceSetFromUnicodeSet({ id: id2 }));
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
st.uset.add(SubstitutionUse.variable, [id2]);
|
|
103
|
+
}
|
|
126
104
|
}
|
|
127
105
|
}
|
|
128
106
|
}
|
|
@@ -134,22 +112,44 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
134
112
|
}));
|
|
135
113
|
valid = false;
|
|
136
114
|
}
|
|
115
|
+
// check for any missing vars
|
|
116
|
+
for (const id of st.set.all) {
|
|
117
|
+
// note: we check the uset list also. we don't know until later which was
|
|
118
|
+
// intended. collisions are handled separately.
|
|
119
|
+
if (!allSets.has(id) && !allUnicodeSets.has(id)) {
|
|
120
|
+
valid = false;
|
|
121
|
+
this.callbacks.reportMessage(CompilerMessages.Error_MissingSetVariable({ id }));
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
for (const id of st.string.all) {
|
|
125
|
+
if (!allStrings.has(id)) {
|
|
126
|
+
valid = false;
|
|
127
|
+
this.callbacks.reportMessage(CompilerMessages.Error_MissingStringVariable({ id }));
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
for (const id of st.uset.all) {
|
|
131
|
+
if (!allUnicodeSets.has(id)) {
|
|
132
|
+
valid = false;
|
|
133
|
+
this.callbacks.reportMessage(CompilerMessages.Error_MissingUnicodeSetVariable({ id }));
|
|
134
|
+
}
|
|
135
|
+
}
|
|
137
136
|
return valid;
|
|
138
137
|
}
|
|
139
|
-
|
|
138
|
+
collectSubstitutions(st) {
|
|
140
139
|
let valid = true;
|
|
141
140
|
// call our friends to validate
|
|
142
|
-
valid = this.
|
|
143
|
-
valid = KeysCompiler.
|
|
144
|
-
valid = TransformCompiler.
|
|
145
|
-
valid = DispCompiler.
|
|
141
|
+
valid = this.validateSubstitutions(this.keyboard3, st) && valid; // accumulate validity
|
|
142
|
+
valid = KeysCompiler.validateSubstitutions(this.keyboard3, st) && valid; // accumulate validity
|
|
143
|
+
valid = TransformCompiler.validateSubstitutions(this.keyboard3, st) && valid; // accumulate validity
|
|
144
|
+
valid = DispCompiler.validateSubstitutions(this.keyboard3, st) && valid; // accumulate validity
|
|
146
145
|
return valid;
|
|
147
146
|
}
|
|
148
|
-
|
|
149
|
-
const
|
|
150
|
-
let valid = this.
|
|
151
|
-
// see if there are any matched-but-not-emitted
|
|
147
|
+
validateAllSubstitutions() {
|
|
148
|
+
const st = new Substitutions();
|
|
149
|
+
let valid = this.collectSubstitutions(st);
|
|
150
|
+
// see if there are any matched-but-not-emitted markers
|
|
152
151
|
const matchedNotEmitted = new Set();
|
|
152
|
+
const mt = st.markers;
|
|
153
153
|
for (const m of mt.matched.values()) {
|
|
154
154
|
if (m === MarkerParser.ANY_MARKER_ID)
|
|
155
155
|
continue; // match-all marker
|
|
@@ -169,10 +169,12 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
169
169
|
this.callbacks.reportMessage(CompilerMessages.Error_MissingMarkers({ ids: Array.from(matchedNotEmitted.values()).sort() }));
|
|
170
170
|
valid = false;
|
|
171
171
|
}
|
|
172
|
+
// now, validate the variables.
|
|
173
|
+
valid = this.validateVars(st) && valid;
|
|
172
174
|
return valid;
|
|
173
175
|
}
|
|
174
|
-
|
|
175
|
-
keyboard?.variables?.string?.forEach(({ value }) =>
|
|
176
|
+
validateSubstitutions(keyboard, st) {
|
|
177
|
+
keyboard?.variables?.string?.forEach(({ value }) => st.markers.add(SubstitutionUse.variable, MarkerParser.allReferences(value)));
|
|
176
178
|
return true;
|
|
177
179
|
}
|
|
178
180
|
compile(sections) {
|
|
@@ -186,10 +188,11 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
186
188
|
// first, strings.
|
|
187
189
|
variables?.string?.forEach((e) => this.addString(result, e, sections));
|
|
188
190
|
variables?.set?.forEach((e) => this.addSet(result, e, sections));
|
|
189
|
-
variables?.
|
|
191
|
+
variables?.uset?.forEach((e) => this.addUnicodeSet(result, e, sections));
|
|
190
192
|
// reload markers - TODO-LDML: double work!
|
|
191
|
-
const
|
|
192
|
-
this.
|
|
193
|
+
const st = new Substitutions();
|
|
194
|
+
this.collectSubstitutions(st);
|
|
195
|
+
const mt = st.markers;
|
|
193
196
|
// collect all markers, excluding the match-all
|
|
194
197
|
const allMarkers = Array.from(mt.all).filter(m => m !== MarkerParser.ANY_MARKER_ID).sort();
|
|
195
198
|
result.markers = sections.list.allocList(allMarkers, {}, sections);
|
|
@@ -218,8 +221,8 @@ export class VarsCompiler extends SectionCompiler {
|
|
|
218
221
|
let { value } = e;
|
|
219
222
|
value = result.substituteStrings(value, sections);
|
|
220
223
|
value = result.substituteUnicodeSets(value, sections);
|
|
221
|
-
result.
|
|
224
|
+
result.usets.push(new UnicodeSetItem(id, value, sections, sections.usetparser));
|
|
222
225
|
}
|
|
223
226
|
}
|
|
224
|
-
//# debugId=
|
|
227
|
+
//# debugId=8694b724-addc-5c24-b95e-7f11dd19203d
|
|
225
228
|
//# sourceMappingURL=vars.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"8694b724-addc-5c24-b95e-7f11dd19203d","file":"vars.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/vars.ts"],"version":3}
|
package/package.json
CHANGED
|
@@ -25,15 +25,15 @@
|
|
|
25
25
|
"url": "https://github.com/keymanapp/keyman/issues"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@keymanapp/keyman-version": "18.0.
|
|
29
|
-
"@keymanapp/kmc-kmn": "18.0.
|
|
30
|
-
"@keymanapp/ldml-keyboard-constants": "18.0.
|
|
28
|
+
"@keymanapp/keyman-version": "18.0.9-alpha",
|
|
29
|
+
"@keymanapp/kmc-kmn": "18.0.9-alpha",
|
|
30
|
+
"@keymanapp/ldml-keyboard-constants": "18.0.9-alpha",
|
|
31
31
|
"restructure": "git+https://github.com/keymanapp/dependency-restructure.git#7a188a1e26f8f36a175d95b67ffece8702363dfc",
|
|
32
32
|
"semver": "^7.5.2"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"@keymanapp/developer-test-helpers": "18.0.
|
|
36
|
-
"@keymanapp/resources-gosh": "18.0.
|
|
35
|
+
"@keymanapp/developer-test-helpers": "18.0.9-alpha",
|
|
36
|
+
"@keymanapp/resources-gosh": "18.0.9-alpha",
|
|
37
37
|
"@types/chai": "^4.1.7",
|
|
38
38
|
"@types/mocha": "^5.2.7",
|
|
39
39
|
"@types/node": "^20.4.1",
|
|
@@ -65,5 +65,5 @@
|
|
|
65
65
|
"type": "git",
|
|
66
66
|
"url": "git+https://github.com/keymanapp/keyman.git"
|
|
67
67
|
},
|
|
68
|
-
"version": "18.0.
|
|
68
|
+
"version": "18.0.9-alpha"
|
|
69
69
|
}
|
|
@@ -1,34 +0,0 @@
|
|
|
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
|
|
@@ -1 +0,0 @@
|
|
|
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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"debug_id":"aae20e50-3663-5361-b1fa-24e504c123f1","file":"marker-tracker.js","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","names":[],"sourceRoot":"","sources":["../../../src/compiler/marker-tracker.ts"],"version":3}
|