@keymanapp/kmc-ldml 17.0.164-alpha → 17.0.166-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 +2 -2
- package/build/src/compiler/disp.d.ts.map +1 -1
- package/build/src/compiler/disp.js +37 -7
- package/build/src/compiler/disp.js.map +1 -1
- package/build/src/compiler/messages.d.ts +11 -3
- package/build/src/compiler/messages.d.ts.map +1 -1
- package/build/src/compiler/messages.js +20 -3
- package/build/src/compiler/messages.js.map +1 -1
- package/package.json +5 -5
|
@@ -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]="cfef7bca-cb64-5af6-b2d4-a15c2adab770")}catch(e){}}();
|
|
2
2
|
import { KMXPlus, LDMLKeyboard } from '@keymanapp/common-types';
|
|
3
3
|
import { SectionCompiler } from "./section-compiler.js";
|
|
4
4
|
import DependencySections = KMXPlus.DependencySections;
|
|
@@ -10,5 +10,5 @@ export declare class DispCompiler extends SectionCompiler {
|
|
|
10
10
|
validate(): boolean;
|
|
11
11
|
compile(sections: DependencySections): Disp;
|
|
12
12
|
}
|
|
13
|
-
//# debugId=
|
|
13
|
+
//# debugId=cfef7bca-cb64-5af6-b2d4-a15c2adab770
|
|
14
14
|
//# sourceMappingURL=disp.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"cfef7bca-cb64-5af6-b2d4-a15c2adab770","file":"disp.d.ts","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;IAOtF,IAAW,EAAE,8DAEZ;IAEM,QAAQ,IAAI,OAAO;IAgCnB,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;CA4BnD","names":[],"sourceRoot":"","sources":["../../../src/compiler/disp.ts"],"version":3}
|
|
@@ -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]="ecd53986-dd3a-509a-a68b-4568e28429bf")}catch(e){}}();
|
|
2
2
|
import { constants } from "@keymanapp/ldml-keyboard-constants";
|
|
3
3
|
import { KMXPlus, MarkerParser } from '@keymanapp/common-types';
|
|
4
4
|
import { CompilerMessages } from "./messages.js";
|
|
@@ -8,6 +8,7 @@ import { MarkerUse } from "./marker-tracker.js";
|
|
|
8
8
|
export class DispCompiler extends SectionCompiler {
|
|
9
9
|
static validateMarkers(keyboard, mt) {
|
|
10
10
|
keyboard.displays?.display?.forEach(({ to }) => mt.add(MarkerUse.match, MarkerParser.allReferences(to)));
|
|
11
|
+
// no marker references in 'id'
|
|
11
12
|
return true;
|
|
12
13
|
}
|
|
13
14
|
get id() {
|
|
@@ -16,13 +17,31 @@ export class DispCompiler extends SectionCompiler {
|
|
|
16
17
|
validate() {
|
|
17
18
|
let valid = true;
|
|
18
19
|
const tos = new Set();
|
|
20
|
+
const ids = new Set();
|
|
19
21
|
if (this.keyboard.displays?.display) {
|
|
20
|
-
for (const { to } of this.keyboard.displays?.display) {
|
|
21
|
-
if (
|
|
22
|
-
this.callbacks.reportMessage(CompilerMessages.
|
|
22
|
+
for (const { to, id } of this.keyboard.displays?.display) {
|
|
23
|
+
if ((to && id) || (!to && !id)) {
|
|
24
|
+
this.callbacks.reportMessage(CompilerMessages.Error_DisplayNeedsToOrId({ to, id }));
|
|
23
25
|
return false;
|
|
24
26
|
}
|
|
25
|
-
|
|
27
|
+
else if (to) {
|
|
28
|
+
if (tos.has(to)) {
|
|
29
|
+
this.callbacks.reportMessage(CompilerMessages.Error_DisplayIsRepeated({ to }));
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
tos.add(to);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
else if (id) {
|
|
37
|
+
if (ids.has(id)) {
|
|
38
|
+
this.callbacks.reportMessage(CompilerMessages.Error_DisplayIsRepeated({ id }));
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
ids.add(id);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
26
45
|
}
|
|
27
46
|
}
|
|
28
47
|
return valid;
|
|
@@ -35,11 +54,22 @@ export class DispCompiler extends SectionCompiler {
|
|
|
35
54
|
// displays
|
|
36
55
|
result.disps = this.keyboard.displays?.display.map(display => ({
|
|
37
56
|
to: sections.strs.allocAndUnescapeString(sections.vars.substituteMarkerString(display.to)),
|
|
57
|
+
id: sections.strs.allocString(display.id),
|
|
38
58
|
display: sections.strs.allocAndUnescapeString(display.display),
|
|
39
59
|
})) || []; // TODO-LDML: need coverage for the []
|
|
40
|
-
result.disps.sort((a, b) =>
|
|
60
|
+
result.disps.sort((a, b) => {
|
|
61
|
+
// sort 'id' first (empty string will be lower)
|
|
62
|
+
const idDiff = a.id.compareTo(b.id);
|
|
63
|
+
if (idDiff != 0) {
|
|
64
|
+
return idDiff;
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
// sort by 'to'
|
|
68
|
+
return a.to.compareTo(b.to);
|
|
69
|
+
}
|
|
70
|
+
});
|
|
41
71
|
return result;
|
|
42
72
|
}
|
|
43
73
|
}
|
|
44
|
-
//# debugId=
|
|
74
|
+
//# debugId=ecd53986-dd3a-509a-a68b-4568e28429bf
|
|
45
75
|
//# sourceMappingURL=disp.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"ecd53986-dd3a-509a-a68b-4568e28429bf","file":"disp.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/disp.ts"],"version":3}
|
|
@@ -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]="da2c8950-80e6-540e-94fa-17d91124497f")}catch(e){}}();
|
|
2
2
|
export declare class CompilerMessages {
|
|
3
3
|
static Error_InvalidNormalization: (o: {
|
|
4
4
|
form: string;
|
|
@@ -61,8 +61,11 @@ export declare class CompilerMessages {
|
|
|
61
61
|
sect: string;
|
|
62
62
|
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
63
63
|
static FATAL_SectionCompilerFailed: number;
|
|
64
|
+
/** annotate the to= or id= entry */
|
|
65
|
+
private static toOrId;
|
|
64
66
|
static Error_DisplayIsRepeated: (o: {
|
|
65
|
-
to
|
|
67
|
+
to?: string;
|
|
68
|
+
id?: string;
|
|
66
69
|
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
67
70
|
static ERROR_DisplayIsRepeated: number;
|
|
68
71
|
static Error_KeyMissingToGapOrSwitch: (o: {
|
|
@@ -130,6 +133,11 @@ export declare class CompilerMessages {
|
|
|
130
133
|
ids: string[];
|
|
131
134
|
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
132
135
|
static ERROR_MissingMarkers: number;
|
|
136
|
+
static Error_DisplayNeedsToOrId: (o: {
|
|
137
|
+
to?: string;
|
|
138
|
+
id?: string;
|
|
139
|
+
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
140
|
+
static ERROR_DisplayNeedsToOrId: number;
|
|
133
141
|
}
|
|
134
|
-
//# debugId=
|
|
142
|
+
//# debugId=da2c8950-80e6-540e-94fa-17d91124497f
|
|
135
143
|
//# sourceMappingURL=messages.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"da2c8950-80e6-540e-94fa-17d91124497f","file":"messages.d.ts","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/messages.ts"],"version":3}
|
|
@@ -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]="a8403746-8560-5e33-89e0-a47de222bd75")}catch(e){}}();
|
|
2
2
|
import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m } from "@keymanapp/common-types";
|
|
3
3
|
const SevInfo = CompilerErrorSeverity.Info | CompilerErrorNamespace.LdmlKeyboardCompiler;
|
|
4
4
|
const SevHint = CompilerErrorSeverity.Hint | CompilerErrorNamespace.LdmlKeyboardCompiler;
|
|
@@ -36,7 +36,22 @@ export class CompilerMessages {
|
|
|
36
36
|
static ERROR_MustBeAtLeastOneLayerElement = SevError | 0x000E;
|
|
37
37
|
static Fatal_SectionCompilerFailed = (o) => m(this.FATAL_SectionCompilerFailed, null, `The compiler for '${o.sect}' failed unexpectedly.`);
|
|
38
38
|
static FATAL_SectionCompilerFailed = SevFatal | 0x000F;
|
|
39
|
-
|
|
39
|
+
/** annotate the to= or id= entry */
|
|
40
|
+
static toOrId(o) {
|
|
41
|
+
if (o.to && o.id) {
|
|
42
|
+
return `to='${o.to}' id='${o.id}'`;
|
|
43
|
+
}
|
|
44
|
+
else if (o.id) {
|
|
45
|
+
return `id='${o.id}'`;
|
|
46
|
+
}
|
|
47
|
+
else if (o.to) {
|
|
48
|
+
return `to='${o.to}'`;
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
return '';
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
static Error_DisplayIsRepeated = (o) => m(this.ERROR_DisplayIsRepeated, `display ${CompilerMessages.toOrId(o)} has more than one display entry.`);
|
|
40
55
|
static ERROR_DisplayIsRepeated = SevError | 0x0010;
|
|
41
56
|
static Error_KeyMissingToGapOrSwitch = (o) => m(this.ERROR_KeyMissingToGapOrSwitch, `key id='${o.keyId}' must have either to=, gap=, or switch=.`);
|
|
42
57
|
static ERROR_KeyMissingToGapOrSwitch = SevError | 0x0011;
|
|
@@ -74,6 +89,8 @@ export class CompilerMessages {
|
|
|
74
89
|
static ERROR_CantReferenceSetFromUnicodeSet = SevError | 0x0020;
|
|
75
90
|
static Error_MissingMarkers = (o) => m(this.ERROR_MissingMarkers, `Markers used for matching but not defined: ${o.ids?.join(',')}`);
|
|
76
91
|
static ERROR_MissingMarkers = SevError | 0x0021;
|
|
92
|
+
static Error_DisplayNeedsToOrId = (o) => m(this.ERROR_DisplayNeedsToOrId, `display ${CompilerMessages.toOrId(o)} needs to= or id=, but not both`);
|
|
93
|
+
static ERROR_DisplayNeedsToOrId = SevError | 0x0022;
|
|
77
94
|
}
|
|
78
|
-
//# debugId=
|
|
95
|
+
//# debugId=a8403746-8560-5e33-89e0-a47de222bd75
|
|
79
96
|
//# sourceMappingURL=messages.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"a8403746-8560-5e33-89e0-a47de222bd75","file":"messages.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/messages.ts"],"version":3}
|
package/package.json
CHANGED
|
@@ -26,16 +26,16 @@
|
|
|
26
26
|
"url": "https://github.com/keymanapp/keyman/issues"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@keymanapp/keyman-version": "17.0.
|
|
30
|
-
"@keymanapp/kmc-kmn": "17.0.
|
|
31
|
-
"@keymanapp/ldml-keyboard-constants": "17.0.
|
|
29
|
+
"@keymanapp/keyman-version": "17.0.166-alpha",
|
|
30
|
+
"@keymanapp/kmc-kmn": "17.0.166-alpha",
|
|
31
|
+
"@keymanapp/ldml-keyboard-constants": "17.0.166-alpha",
|
|
32
32
|
"ajv": "^8.11.0",
|
|
33
33
|
"restructure": "git+https://github.com/keymanapp/dependency-restructure.git#7a188a1e26f8f36a175d95b67ffece8702363dfc",
|
|
34
34
|
"semver": "^7.5.2",
|
|
35
35
|
"xml2js": "git+https://github.com/keymanapp/dependency-node-xml2js#535fe732dc408d697e0f847c944cc45f0baf0829"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@keymanapp/developer-test-helpers": "17.0.
|
|
38
|
+
"@keymanapp/developer-test-helpers": "17.0.166-alpha",
|
|
39
39
|
"@types/chai": "^4.1.7",
|
|
40
40
|
"@types/mocha": "^5.2.7",
|
|
41
41
|
"@types/node": "^20.4.1",
|
|
@@ -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.166-alpha"
|
|
72
72
|
}
|