@keymanapp/kmc-kmn 17.0.206-alpha → 17.0.207-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/import/kmcmplib/wasm-host.wasm +0 -0
- package/build/src/kmw-compiler/constants.d.ts +6 -3
- package/build/src/kmw-compiler/constants.d.ts.map +1 -1
- package/build/src/kmw-compiler/constants.js +24 -5
- package/build/src/kmw-compiler/constants.js.map +1 -1
- package/build/src/kmw-compiler/validate-layout-file.d.ts +2 -2
- package/build/src/kmw-compiler/validate-layout-file.d.ts.map +1 -1
- package/build/src/kmw-compiler/validate-layout-file.js +24 -6
- package/build/src/kmw-compiler/validate-layout-file.js.map +1 -1
- package/package.json +4 -4
|
Binary file
|
|
@@ -1,16 +1,19 @@
|
|
|
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]="261cee49-fd35-5ecc-a9f5-0e79fda4d83c")}catch(e){}}();
|
|
2
2
|
export declare enum TRequiredKey {
|
|
3
3
|
K_LOPT = "K_LOPT",
|
|
4
4
|
K_BKSP = "K_BKSP",
|
|
5
5
|
K_ENTER = "K_ENTER"
|
|
6
6
|
}
|
|
7
7
|
export declare const CRequiredKeys: TRequiredKey[];
|
|
8
|
-
export declare const CSpecialText10: string, CSpecialText14: string, CSpecialText14ZWNJ: string, CSpecialText14Map: string[][];
|
|
8
|
+
export declare const CSpecialText10: string, CSpecialText14: string, CSpecialText14ZWNJ: string, CSpecialText14Map: string[][], CSpecialText17: string, CSpecialText17ZWNJ: string, CSpecialText17Map: string[][];
|
|
9
|
+
export declare const CSpecialText: Map<number, string>;
|
|
10
|
+
export declare const CSpecialTextMinVer = 2560;
|
|
11
|
+
export declare const CSpecialTextMaxVer = 4352;
|
|
9
12
|
export declare const KMXCodeNames: string[];
|
|
10
13
|
export declare const USEnglishUnshift: string, USEnglishShift: string, USEnglishValues: string, UnreachableKeyCodes: number[];
|
|
11
14
|
/**
|
|
12
15
|
* The character set that we allow for identifiers for JavaScript
|
|
13
16
|
*/
|
|
14
17
|
export declare const SValidIdentifierCharSet: RegExp;
|
|
15
|
-
//# debugId=
|
|
18
|
+
//# debugId=261cee49-fd35-5ecc-a9f5-0e79fda4d83c
|
|
16
19
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"261cee49-fd35-5ecc-a9f5-0e79fda4d83c","file":"constants.d.ts","mappings":";AAEA,oBAAY,YAAY;IACtB,MAAM,WAAS;IAAE,MAAM,WAAS;IAAE,OAAO,YAAU;CACpD;AAED,eAAO,MACL,aAAa,EAAE,YAAY,EAAqE,CAAC;AAGnG,eAAO,MACL,cAAc,EAAE,MAC8D,EAE9E,cAAc,EAAE,MAAuH,EACvI,kBAAkB,EAAE,MAA2C,EAC/D,iBAAiB,EAAE,MAAM,EAAE,EAU1B,EAED,cAAc,EAAE,MAC6D,EAC7E,kBAAkB,EAAE,MAAwB,EAC5C,iBAAiB,EAAE,MAAM,EAAE,EAE1B,CAAC;AAGF,eAAO,MAAM,YAAY,qBASvB,CAAC;AACH,eAAO,MAAM,kBAAkB,OAA0B,CAAC;AAC1D,eAAO,MAAM,kBAAkB,OAA0B,CAAC;AAG5D,eAAO,MACP,YAAY,EAAE,MAAM,EAOY,CAAC;AAGjC,eAAO,MACL,gBAAgB,EAAE,MAAkJ,EACpK,cAAc,EAAE,MAAwJ,EACxK,eAAe,EAAE,MAAoM,EACrN,mBAAmB,EAAE,MAAM,EAsB1B,CAAC;AAEJ;;GAEG;AACH,eAAO,MAAM,uBAAuB,QAAiB,CAAC","names":[],"sourceRoot":"","sources":["../../../src/kmw-compiler/constants.ts"],"version":3}
|
|
@@ -1,4 +1,5 @@
|
|
|
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]="9504e40d-e321-57f2-b1e6-e407e77a864a")}catch(e){}}();
|
|
2
|
+
import { KMX } from "@keymanapp/common-types";
|
|
2
3
|
export var TRequiredKey;
|
|
3
4
|
(function (TRequiredKey) {
|
|
4
5
|
TRequiredKey["K_LOPT"] = "K_LOPT";
|
|
@@ -9,9 +10,9 @@ export var TRequiredKey;
|
|
|
9
10
|
export const CRequiredKeys = [TRequiredKey.K_LOPT, TRequiredKey.K_BKSP, TRequiredKey.K_ENTER]; // I4447
|
|
10
11
|
// See also builder.js: specialCharacters; web/source/osk/oskKey.ts: specialCharacters
|
|
11
12
|
export const CSpecialText10 = '*Shift*\0*Enter*\0*Tab*\0*BkSp*\0*Menu*\0*Hide*\0*Alt*\0*Ctrl*\0*Caps*\0' +
|
|
12
|
-
'*ABC*\0*abc*\0*123*\0*Symbol*\0*Currency*\0*Shifted*\0*AltGr*\0*TabLeft
|
|
13
|
+
'*ABC*\0*abc*\0*123*\0*Symbol*\0*Currency*\0*Shifted*\0*AltGr*\0*TabLeft*\0',
|
|
13
14
|
// these names were added in Keyman 14
|
|
14
|
-
CSpecialText14 = '*LTREnter*\0*LTRBkSp*\0*RTLEnter*\0*RTLBkSp*\0*ShiftLock*\0*ShiftedLock*\0*ZWNJ*\0*ZWNJiOS*\0*ZWNJAndroid
|
|
15
|
+
CSpecialText14 = '*LTREnter*\0*LTRBkSp*\0*RTLEnter*\0*RTLBkSp*\0*ShiftLock*\0*ShiftedLock*\0*ZWNJ*\0*ZWNJiOS*\0*ZWNJAndroid*\0', CSpecialText14ZWNJ = '*ZWNJ*\0*ZWNJiOS*\0*ZWNJAndroid*', CSpecialText14Map = [
|
|
15
16
|
['*LTREnter*', '*Enter*'],
|
|
16
17
|
['*LTRBkSp*', '*BkSp*'],
|
|
17
18
|
['*RTLEnter*', '*Enter*'],
|
|
@@ -20,8 +21,26 @@ CSpecialText14 = '*LTREnter*\0*LTRBkSp*\0*RTLEnter*\0*RTLBkSp*\0*ShiftLock*\0*Sh
|
|
|
20
21
|
['*ShiftedLock*', '*Shifted*'],
|
|
21
22
|
['*ZWNJ*', '<|>'],
|
|
22
23
|
['*ZWNJiOS*', '<|>'],
|
|
23
|
-
['*ZWNJAndroid*', '<|>']
|
|
24
|
+
['*ZWNJAndroid*', '<|>'],
|
|
25
|
+
],
|
|
26
|
+
// these names were added in Keyman 17
|
|
27
|
+
CSpecialText17 = '*Sp*\0*NBSp*\0*NarNBSp*\0*EnQ*\0*EmQ*\0*EnSp*\0*EmSp*\0*PunctSp*\0' +
|
|
28
|
+
'*ThSp*\0*HSp*\0*ZWSp*\0*ZWJ*\0*WJ*\0*CGJ*\0*LTRM*\0*RTLM*\0*SH*\0*HTab*\0', CSpecialText17ZWNJ = '*ZWNJGeneric*', CSpecialText17Map = [
|
|
29
|
+
['*ZWNJGeneric*', '<|>']
|
|
24
30
|
];
|
|
31
|
+
// Map for checking minimum versions and Special Text
|
|
32
|
+
export const CSpecialText = new Map([
|
|
33
|
+
[KMX.KMXFile.VERSION_100, CSpecialText10],
|
|
34
|
+
// [KMX.KMXFile.VERSION_110, CSpecialText10], - this file version does not exist
|
|
35
|
+
// [KMX.KMXFile.VERSION_120, CSpecialText10], - this file version does not exist
|
|
36
|
+
// [KMX.KMXFile.VERSION_130, CSpecialText10], - this file version does not exist
|
|
37
|
+
[KMX.KMXFile.VERSION_140, CSpecialText14 + CSpecialText10],
|
|
38
|
+
[KMX.KMXFile.VERSION_150, CSpecialText14 + CSpecialText10],
|
|
39
|
+
[KMX.KMXFile.VERSION_160, CSpecialText14 + CSpecialText10],
|
|
40
|
+
[KMX.KMXFile.VERSION_170, CSpecialText17 + CSpecialText14 + CSpecialText10]
|
|
41
|
+
]);
|
|
42
|
+
export const CSpecialTextMinVer = KMX.KMXFile.VERSION_100;
|
|
43
|
+
export const CSpecialTextMaxVer = KMX.KMXFile.VERSION_170;
|
|
25
44
|
// These correspond to TSS_ values in kmx.ts
|
|
26
45
|
export const KMXCodeNames = [
|
|
27
46
|
'',
|
|
@@ -58,5 +77,5 @@ export const USEnglishUnshift = ' `' + '1234567890' + '-' + '=' + 'qwertyuiop' +
|
|
|
58
77
|
* The character set that we allow for identifiers for JavaScript
|
|
59
78
|
*/
|
|
60
79
|
export const SValidIdentifierCharSet = /[A-Za-z0-9_]/;
|
|
61
|
-
//# debugId=
|
|
80
|
+
//# debugId=9504e40d-e321-57f2-b1e6-e407e77a864a
|
|
62
81
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"9504e40d-e321-57f2-b1e6-e407e77a864a","file":"constants.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/kmw-compiler/constants.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]="363f3ba9-633c-5994-bd80-22d7232b79eb")}catch(e){}}();
|
|
2
2
|
import { KMX, Osk } from "@keymanapp/common-types";
|
|
3
3
|
interface VLFOutput {
|
|
4
4
|
output: string;
|
|
@@ -6,5 +6,5 @@ interface VLFOutput {
|
|
|
6
6
|
}
|
|
7
7
|
export declare function ValidateLayoutFile(fk: KMX.KEYBOARD, FDebug: boolean, sLayoutFile: string, sVKDictionary: string, displayMap: Osk.PuaMap): VLFOutput;
|
|
8
8
|
export {};
|
|
9
|
-
//# debugId=
|
|
9
|
+
//# debugId=363f3ba9-633c-5994-bd80-22d7232b79eb
|
|
10
10
|
//# sourceMappingURL=validate-layout-file.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"
|
|
1
|
+
{"debug_id":"363f3ba9-633c-5994-bd80-22d7232b79eb","file":"validate-layout-file.d.ts","mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAA6D,MAAM,yBAAyB,CAAC;AAQ9G,UAAU,SAAS;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;CACjB;AA+MD,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC,MAAM,GAAG,SAAS,CA6FnJ","names":[],"sourceRoot":"","sources":["../../../src/kmw-compiler/validate-layout-file.ts"],"version":3}
|
|
@@ -1,8 +1,8 @@
|
|
|
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]="65817f2f-0629-5ece-8d1e-2d278373bd22")}catch(e){}}();
|
|
2
2
|
import { Osk, TouchLayout, TouchLayoutFileReader, TouchLayoutFileWriter } from "@keymanapp/common-types";
|
|
3
|
-
import { callbacks, IsKeyboardVersion14OrLater, IsKeyboardVersion15OrLater } from "./compiler-globals.js";
|
|
3
|
+
import { callbacks, fk, IsKeyboardVersion14OrLater, IsKeyboardVersion15OrLater, IsKeyboardVersion17OrLater } from "./compiler-globals.js";
|
|
4
4
|
import { JavaScript_Key } from "./javascript-strings.js";
|
|
5
|
-
import { TRequiredKey, CRequiredKeys,
|
|
5
|
+
import { TRequiredKey, CRequiredKeys, CSpecialText, CSpecialText14Map, CSpecialText17Map, CSpecialTextMinVer, CSpecialTextMaxVer } from "./constants.js";
|
|
6
6
|
import { KeymanWebTouchStandardKeyNames, KMWAdditionalKeyNames, VKeyNames } from "./keymanweb-key-codes.js";
|
|
7
7
|
import { KmwCompilerMessages } from "./kmw-compiler-messages.js";
|
|
8
8
|
;
|
|
@@ -118,8 +118,9 @@ function CheckKey(platformId, FPlatform, layer, FId, FText, FNextLayer, FKeyType
|
|
|
118
118
|
// Keyman versions before 14 do not support '*special*' labels on non-special keys.
|
|
119
119
|
// ZWNJ use, however, is safe because it will be transformed in function
|
|
120
120
|
// TransformSpecialKeys14 to '<|>', which does not require the custom OSK font.
|
|
121
|
-
|
|
122
|
-
|
|
121
|
+
const mapVersion = Math.max(Math.min(fk.fileVersion, CSpecialTextMaxVer), CSpecialTextMinVer);
|
|
122
|
+
const specialText = CSpecialText.get(mapVersion);
|
|
123
|
+
if (specialText.includes(FText) &&
|
|
123
124
|
!IsKeyboardVersion14OrLater() &&
|
|
124
125
|
!([TouchLayout.TouchLayoutKeySp.special, TouchLayout.TouchLayoutKeySp.specialActive].includes(FKeyType))) {
|
|
125
126
|
callbacks.reportMessage(KmwCompilerMessages.Warn_TouchLayoutSpecialLabelOnNormalKey({
|
|
@@ -167,6 +168,22 @@ function TransformSpecialKeys14(FDebug, sLayoutFile) {
|
|
|
167
168
|
}
|
|
168
169
|
return sLayoutFile;
|
|
169
170
|
}
|
|
171
|
+
function TransformSpecialKeys17(FDebug, sLayoutFile) {
|
|
172
|
+
// Rewrite Special key labels that are only supported in Keyman 17+
|
|
173
|
+
// This code is a little ugly but effective.
|
|
174
|
+
if (!IsKeyboardVersion17OrLater()) {
|
|
175
|
+
for (let i = 0; i < CSpecialText17Map.length; i++) {
|
|
176
|
+
// Assumes the JSON output format will not change
|
|
177
|
+
if (FDebug) {
|
|
178
|
+
sLayoutFile = sLayoutFile.replaceAll('"text": "' + CSpecialText17Map[i][0] + '"', '"text": this._v>16 ? "' + CSpecialText17Map[i][0] + '" : "' + CSpecialText17Map[i][1] + '"');
|
|
179
|
+
}
|
|
180
|
+
else {
|
|
181
|
+
sLayoutFile = sLayoutFile.replaceAll('"text":"' + CSpecialText17Map[i][0] + '"', '"text":this._v>16?"' + CSpecialText17Map[i][0] + '":"' + CSpecialText17Map[i][1] + '"');
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
return sLayoutFile;
|
|
186
|
+
}
|
|
170
187
|
export function ValidateLayoutFile(fk, FDebug, sLayoutFile, sVKDictionary, displayMap) {
|
|
171
188
|
let FDictionary = sVKDictionary.split(/\s+/);
|
|
172
189
|
CheckDictionaryKeyValidity(fk, FDictionary); // I4142
|
|
@@ -241,10 +258,11 @@ export function ValidateLayoutFile(fk, FDebug, sLayoutFile, sVKDictionary, displ
|
|
|
241
258
|
let writer = new TouchLayoutFileWriter({ formatted: FDebug });
|
|
242
259
|
sLayoutFile = writer.compile(data);
|
|
243
260
|
sLayoutFile = TransformSpecialKeys14(FDebug, sLayoutFile);
|
|
261
|
+
sLayoutFile = TransformSpecialKeys17(FDebug, sLayoutFile);
|
|
244
262
|
return {
|
|
245
263
|
output: sLayoutFile,
|
|
246
264
|
result
|
|
247
265
|
};
|
|
248
266
|
}
|
|
249
|
-
//# debugId=
|
|
267
|
+
//# debugId=65817f2f-0629-5ece-8d1e-2d278373bd22
|
|
250
268
|
//# sourceMappingURL=validate-layout-file.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"debug_id":"e9112e58-9cf5-551b-83d0-2b19868c38de","file":"validate-layout-file.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/kmw-compiler/validate-layout-file.ts"],"version":3}
|
|
1
|
+
{"debug_id":"65817f2f-0629-5ece-8d1e-2d278373bd22","file":"validate-layout-file.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/kmw-compiler/validate-layout-file.ts"],"version":3}
|
package/package.json
CHANGED
|
@@ -26,11 +26,11 @@
|
|
|
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.
|
|
29
|
+
"@keymanapp/keyman-version": "17.0.207-alpha",
|
|
30
|
+
"@keymanapp/kmc-kmn": "17.0.207-alpha"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
|
-
"@keymanapp/developer-test-helpers": "17.0.
|
|
33
|
+
"@keymanapp/developer-test-helpers": "17.0.207-alpha",
|
|
34
34
|
"@types/chai": "^4.1.7",
|
|
35
35
|
"@types/mocha": "^5.2.7",
|
|
36
36
|
"@types/node": "^20.4.1",
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"type": "git",
|
|
68
68
|
"url": "git+https://github.com/keymanapp/keyman.git"
|
|
69
69
|
},
|
|
70
|
-
"version": "17.0.
|
|
70
|
+
"version": "17.0.207-alpha"
|
|
71
71
|
}
|