@keymanapp/kmc-package 18.0.74-alpha → 18.0.76-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/kmp-compiler.js +8 -8
- package/build/src/compiler/kmp-compiler.js.map +1 -1
- package/build/src/compiler/package-compiler-messages.d.ts +1 -1
- package/build/src/compiler/package-compiler-messages.d.ts.map +1 -1
- package/build/src/compiler/package-compiler-messages.js +1 -1
- package/build/src/compiler/package-compiler-messages.js.map +1 -1
- package/build/src/compiler/package-keyboard-target-validator.js +3 -3
- package/build/src/compiler/package-keyboard-target-validator.js.map +1 -1
- package/build/src/compiler/package-metadata-collector.js +6 -6
- package/build/src/compiler/package-metadata-collector.js.map +1 -1
- package/build/src/compiler/package-validation.js +17 -17
- package/build/src/compiler/package-validation.js.map +1 -1
- package/build/src/compiler/package-version-validator.js +5 -5
- package/build/src/compiler/package-version-validator.js.map +1 -1
- package/build/src/compiler/windows-package-installer-compiler.js +4 -4
- package/build/src/compiler/windows-package-installer-compiler.js.map +1 -1
- package/build/src/main.d.ts +1 -1
- package/build/src/main.d.ts.map +1 -1
- package/build/src/main.js +1 -1
- package/build/src/main.js.map +1 -1
- package/package.json +3 -3
|
@@ -2,7 +2,7 @@ import { xml2js } from '@keymanapp/common-types';
|
|
|
2
2
|
import JSZip from 'jszip';
|
|
3
3
|
import KEYMAN_VERSION from "@keymanapp/keyman-version";
|
|
4
4
|
import { SchemaValidators, KeymanFileTypes, KvkFile } from '@keymanapp/common-types';
|
|
5
|
-
import {
|
|
5
|
+
import { PackageCompilerMessages } from './package-compiler-messages.js';
|
|
6
6
|
import { PackageMetadataCollector } from './package-metadata-collector.js';
|
|
7
7
|
import { KmpInfWriter } from './kmp-inf-writer.js';
|
|
8
8
|
import { transcodeToCP1252 } from './cp1252.js';
|
|
@@ -125,7 +125,7 @@ export class KmpCompiler {
|
|
|
125
125
|
// Load the KPS data from XML as JS structured data.
|
|
126
126
|
const buffer = this.callbacks.loadFile(kpsFilename);
|
|
127
127
|
if (!buffer) {
|
|
128
|
-
this.callbacks.reportMessage(
|
|
128
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_FileDoesNotExist({ filename: kpsFilename }));
|
|
129
129
|
return null;
|
|
130
130
|
}
|
|
131
131
|
const data = new TextDecoder().decode(buffer);
|
|
@@ -139,7 +139,7 @@ export class KmpCompiler {
|
|
|
139
139
|
throw e; a = r; });
|
|
140
140
|
}
|
|
141
141
|
catch (e) {
|
|
142
|
-
this.callbacks.reportMessage(
|
|
142
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_InvalidPackageFile({ e }));
|
|
143
143
|
}
|
|
144
144
|
return a;
|
|
145
145
|
})();
|
|
@@ -213,7 +213,7 @@ export class KmpCompiler {
|
|
|
213
213
|
if (!kmp.files.reduce((result, file) => {
|
|
214
214
|
if (!file.name) {
|
|
215
215
|
// as the filename field is missing or blank, we'll try with the description instead
|
|
216
|
-
this.callbacks.reportMessage(
|
|
216
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_FileRecordIsMissingName({ description: file.description ?? '(no description)' }));
|
|
217
217
|
return false;
|
|
218
218
|
}
|
|
219
219
|
return result;
|
|
@@ -415,12 +415,12 @@ export class KmpCompiler {
|
|
|
415
415
|
}
|
|
416
416
|
if (this.callbacks.path.isAbsolute(filename)) {
|
|
417
417
|
// absolute paths are not portable to other computers
|
|
418
|
-
this.callbacks.reportMessage(
|
|
418
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Warn_AbsolutePath({ filename: filename }));
|
|
419
419
|
}
|
|
420
420
|
filename = this.callbacks.resolveFilename(kpsFilename, filename);
|
|
421
421
|
const basename = this.callbacks.path.basename(filename);
|
|
422
422
|
if (!this.callbacks.fs.existsSync(filename)) {
|
|
423
|
-
this.callbacks.reportMessage(
|
|
423
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_FileDoesNotExist({ filename: filename }));
|
|
424
424
|
failed = true;
|
|
425
425
|
return;
|
|
426
426
|
}
|
|
@@ -429,7 +429,7 @@ export class KmpCompiler {
|
|
|
429
429
|
memberFileData = this.callbacks.loadFile(filename);
|
|
430
430
|
}
|
|
431
431
|
catch (e) {
|
|
432
|
-
this.callbacks.reportMessage(
|
|
432
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_FileCouldNotBeRead({ filename: filename, e: e }));
|
|
433
433
|
failed = true;
|
|
434
434
|
return;
|
|
435
435
|
}
|
|
@@ -495,7 +495,7 @@ export class KmpCompiler {
|
|
|
495
495
|
data[1] != KvkFile.KVK_HEADER_IDENTIFIER_BYTES[1] ||
|
|
496
496
|
data[2] != KvkFile.KVK_HEADER_IDENTIFIER_BYTES[2] ||
|
|
497
497
|
data[3] != KvkFile.KVK_HEADER_IDENTIFIER_BYTES[3]) {
|
|
498
|
-
this.callbacks.reportMessage(
|
|
498
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Warn_FileIsNotABinaryKvkFile({ filename: filename }));
|
|
499
499
|
}
|
|
500
500
|
}
|
|
501
501
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kmp-compiler.js","sourceRoot":"","sources":["../../../src/compiler/kmp-compiler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"kmp-compiler.js","sourceRoot":"","sources":["../../../src/compiler/kmp-compiler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-compiler-messages.d.ts","sourceRoot":"","sources":["../../../src/compiler/package-compiler-messages.ts"],"names":[],"mappings":"AASA;;GAEG;AACH,qBAAa,
|
|
1
|
+
{"version":3,"file":"package-compiler-messages.d.ts","sourceRoot":"","sources":["../../../src/compiler/package-compiler-messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ const SevFatal = CompilerErrorSeverity.Fatal | Namespace;
|
|
|
8
8
|
/**
|
|
9
9
|
* @internal
|
|
10
10
|
*/
|
|
11
|
-
export class
|
|
11
|
+
export class PackageCompilerMessages {
|
|
12
12
|
static FATAL_UnexpectedException = SevFatal | 0x0001;
|
|
13
13
|
static Fatal_UnexpectedException = (o) => CompilerMessageSpecWithException(this.FATAL_UnexpectedException, null, o.e ?? 'unknown error');
|
|
14
14
|
static WARN_AbsolutePath = SevWarn | 0x0002;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-compiler-messages.js","sourceRoot":"","sources":["../../../src/compiler/package-compiler-messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,mBAAmB,IAAI,CAAC,EAAE,kBAAkB,IAAI,GAAG,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAC;AAE/K,MAAM,SAAS,GAAG,sBAAsB,CAAC,eAAe,CAAC;AACzD,MAAM,OAAO,GAAG,qBAAqB,CAAC,IAAI,GAAG,SAAS,CAAC;AACvD,MAAM,OAAO,GAAG,qBAAqB,CAAC,IAAI,GAAG,SAAS,CAAC;AACvD,MAAM,OAAO,GAAG,qBAAqB,CAAC,IAAI,GAAG,SAAS,CAAC;AACvD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,KAAK,GAAG,SAAS,CAAC;AACzD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,KAAK,GAAG,SAAS,CAAC;AAEzD;;GAEG;AACH,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"package-compiler-messages.js","sourceRoot":"","sources":["../../../src/compiler/package-compiler-messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { KeymanTargets } from "@keymanapp/common-types";
|
|
2
|
-
import {
|
|
2
|
+
import { PackageCompilerMessages } from "./package-compiler-messages.js";
|
|
3
3
|
export class PackageKeyboardTargetValidator {
|
|
4
4
|
callbacks;
|
|
5
5
|
constructor(callbacks) {
|
|
@@ -13,7 +13,7 @@ export class PackageKeyboardTargetValidator {
|
|
|
13
13
|
hasJS = this.verifyTargets(metadata[keyboard].keyboard, metadata[keyboard].data.targets, kmp);
|
|
14
14
|
}
|
|
15
15
|
if (hasJS && !metadata[keyboard].data.hasTouchLayout) {
|
|
16
|
-
this.callbacks.reportMessage(
|
|
16
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Hint_JsKeyboardFileHasNoTouchTargets({ id: metadata[keyboard].keyboard.id }));
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
}
|
|
@@ -30,7 +30,7 @@ export class PackageKeyboardTargetValidator {
|
|
|
30
30
|
if (targets.some(target => KeymanTargets.TouchKeymanTargets.includes(target))) {
|
|
31
31
|
if (!kmp.files.find(file => this.callbacks.path.basename(file.name ?? '', '.js') == keyboard.id)) {
|
|
32
32
|
// .js version of the keyboard is not found, warn
|
|
33
|
-
this.callbacks.reportMessage(
|
|
33
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Warn_JsKeyboardFileIsMissing({ id: keyboard.id }));
|
|
34
34
|
return false;
|
|
35
35
|
}
|
|
36
36
|
// A js file is included and targeted
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-keyboard-target-validator.js","sourceRoot":"","sources":["../../../src/compiler/package-keyboard-target-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAkC,MAAM,yBAAyB,CAAC;AACxF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"package-keyboard-target-validator.js","sourceRoot":"","sources":["../../../src/compiler/package-keyboard-target-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAkC,MAAM,yBAAyB,CAAC;AACxF,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAIzE,MAAM,OAAO,8BAA8B;IACrB;IAApB,YAAoB,SAA4B;QAA5B,cAAS,GAAT,SAAS,CAAmB;IAAG,CAAC;IAE7C,gBAAgB,CAAC,GAA4B,EAAE,QAAoC;QACxF,KAAI,IAAI,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1C,IAAI,KAAK,GAAG,IAAI,CAAC;YAEjB,IAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACnC,qEAAqE;gBACrE,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YAChG,CAAC;YACD,IAAG,KAAK,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,oCAAoC,CAAC,EAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC;YACnI,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,aAAa,CACnB,QAAyC,EACzC,WAAmB,EACnB,GAA4B;QAE5B,uEAAuE;QACvE,8DAA8D;QAE9D,sEAAsE;QACtE,gCAAgC;QAChC,MAAM,OAAO,GAAG,aAAa,CAAC,uBAAuB,CAAC,WAAW,EAAE,EAAC,aAAa,EAAE,IAAI,EAAC,CAAC,CAAC;QAC1F,IAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YAC7E,IAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,EAAE,KAAK,CAAC,IAAI,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;gBAChG,iDAAiD;gBACjD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,4BAA4B,CAAC,EAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC;gBACtG,OAAO,KAAK,CAAC;YACf,CAAC;YACD,qCAAqC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,qBAAqB;QACrB,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { KmxFileReader, KmxFileReaderError } from '@keymanapp/common-types';
|
|
2
2
|
import { getCompiledKmxKeyboardMetadata } from './kmx-keyboard-metadata.js';
|
|
3
|
-
import {
|
|
3
|
+
import { PackageCompilerMessages } from './package-compiler-messages.js';
|
|
4
4
|
import { getCompiledWebKeyboardMetadata } from './web-keyboard-metadata.js';
|
|
5
5
|
export class PackageMetadataCollector {
|
|
6
6
|
callbacks;
|
|
@@ -28,17 +28,17 @@ export class PackageMetadataCollector {
|
|
|
28
28
|
isJavascript = true;
|
|
29
29
|
file = kmp.files.find(file => this.callbacks.path.basename(file.name ?? '', ".js" /* KeymanFileTypes.Binary.WebKeyboard */) == keyboard.id);
|
|
30
30
|
if (!file) {
|
|
31
|
-
this.callbacks.reportMessage(
|
|
31
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_KeyboardContentFileNotFound({ id: keyboard.id }));
|
|
32
32
|
return null;
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
if (!file.name) {
|
|
36
|
-
this.callbacks.reportMessage(
|
|
36
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_FileRecordIsMissingName({ description: file.description ?? '(no description)' }));
|
|
37
37
|
return null;
|
|
38
38
|
}
|
|
39
39
|
const filename = this.callbacks.resolveFilename(kpsFilename, file.name);
|
|
40
40
|
if (!this.callbacks.fs.existsSync(filename)) {
|
|
41
|
-
this.callbacks.reportMessage(
|
|
41
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_KeyboardFileNotFound({ filename }));
|
|
42
42
|
return null;
|
|
43
43
|
}
|
|
44
44
|
//
|
|
@@ -49,7 +49,7 @@ export class PackageMetadataCollector {
|
|
|
49
49
|
fileData = this.callbacks.loadFile(filename);
|
|
50
50
|
}
|
|
51
51
|
catch (e) {
|
|
52
|
-
this.callbacks.reportMessage(
|
|
52
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_FileCouldNotBeRead({ filename, e }));
|
|
53
53
|
return null;
|
|
54
54
|
}
|
|
55
55
|
if (isJavascript) {
|
|
@@ -65,7 +65,7 @@ export class PackageMetadataCollector {
|
|
|
65
65
|
catch (e) {
|
|
66
66
|
if (e instanceof KmxFileReaderError) {
|
|
67
67
|
// The file couldn't be read, it might not be a .kmx file
|
|
68
|
-
this.callbacks.reportMessage(
|
|
68
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_KeyboardFileNotValid({ filename, e }));
|
|
69
69
|
return null;
|
|
70
70
|
}
|
|
71
71
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-metadata-collector.js","sourceRoot":"","sources":["../../../src/compiler/package-metadata-collector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,aAAa,EAAE,kBAAkB,EAAwB,MAAM,yBAAyB,CAAC;AAClI,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"package-metadata-collector.js","sourceRoot":"","sources":["../../../src/compiler/package-metadata-collector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { KeymanFileTypes } from '@keymanapp/common-types';
|
|
2
|
-
import {
|
|
2
|
+
import { PackageCompilerMessages } from './package-compiler-messages.js';
|
|
3
3
|
import { keymanEngineForWindowsFiles, keymanForWindowsInstallerFiles, keymanForWindowsRedistFiles } from './redist-files.js';
|
|
4
4
|
import { isValidEmail } from '@keymanapp/developer-utils';
|
|
5
5
|
// The keyboard ID SHOULD adhere to this pattern:
|
|
@@ -45,10 +45,10 @@ export class PackageValidation {
|
|
|
45
45
|
let minimalTags = {};
|
|
46
46
|
if (languages.length == 0) {
|
|
47
47
|
if (resourceType == 'keyboard') {
|
|
48
|
-
this.callbacks.reportMessage(
|
|
48
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Warn_KeyboardShouldHaveAtLeastOneLanguage({ id }));
|
|
49
49
|
}
|
|
50
50
|
else {
|
|
51
|
-
this.callbacks.reportMessage(
|
|
51
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_ModelMustHaveAtLeastOneLanguage({ id }));
|
|
52
52
|
return false;
|
|
53
53
|
}
|
|
54
54
|
}
|
|
@@ -58,15 +58,15 @@ export class PackageValidation {
|
|
|
58
58
|
locale = new Intl.Locale(lang.id);
|
|
59
59
|
}
|
|
60
60
|
catch (e) {
|
|
61
|
-
this.callbacks.reportMessage(
|
|
61
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_LanguageTagIsNotValid({ resourceType, id, lang: lang.id, e }));
|
|
62
62
|
return false;
|
|
63
63
|
}
|
|
64
64
|
const minimalTag = locale.minimize().toString();
|
|
65
65
|
if (minimalTag.toLowerCase() !== lang.id.toLowerCase()) {
|
|
66
|
-
this.callbacks.reportMessage(
|
|
66
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Hint_LanguageTagIsNotMinimal({ resourceType, id, actual: lang.id, expected: minimalTag }));
|
|
67
67
|
}
|
|
68
68
|
if (minimalTags[minimalTag]) {
|
|
69
|
-
this.callbacks.reportMessage(
|
|
69
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Hint_PackageShouldNotRepeatLanguages({ resourceType, id, minimalTag, firstTag: lang.id, secondTag: minimalTags[minimalTag] }));
|
|
70
70
|
}
|
|
71
71
|
else {
|
|
72
72
|
minimalTags[minimalTag] = lang.id;
|
|
@@ -76,14 +76,14 @@ export class PackageValidation {
|
|
|
76
76
|
}
|
|
77
77
|
checkForModelsAndKeyboardsInSamePackage(kmpJson) {
|
|
78
78
|
if (kmpJson.lexicalModels?.length > 0 && kmpJson.keyboards?.length > 0) {
|
|
79
|
-
this.callbacks.reportMessage(
|
|
79
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_PackageCannotContainBothModelsAndKeyboards());
|
|
80
80
|
return false;
|
|
81
81
|
}
|
|
82
82
|
if (!kmpJson.lexicalModels?.length && !kmpJson.keyboards?.length) {
|
|
83
83
|
// Note: we require at least 1 keyboard or model in the package. This may
|
|
84
84
|
// change in the future if we start to use packages to distribute, e.g.
|
|
85
85
|
// localizations or themes.
|
|
86
|
-
this.callbacks.reportMessage(
|
|
86
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_PackageMustContainAModelOrAKeyboard());
|
|
87
87
|
return false;
|
|
88
88
|
}
|
|
89
89
|
return true;
|
|
@@ -94,7 +94,7 @@ export class PackageValidation {
|
|
|
94
94
|
}
|
|
95
95
|
filename = this.callbacks.path.basename(filename);
|
|
96
96
|
if (!MODEL_ID_PATTERN_PACKAGE.test(filename)) {
|
|
97
|
-
this.callbacks.reportMessage(
|
|
97
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Warn_PackageNameDoesNotFollowLexicalModelConventions({ filename }));
|
|
98
98
|
}
|
|
99
99
|
for (let model of kmpJson.lexicalModels) {
|
|
100
100
|
if (!this.checkForDuplicatedOrNonMinimalLanguages('model', model.id, model.languages)) {
|
|
@@ -109,7 +109,7 @@ export class PackageValidation {
|
|
|
109
109
|
}
|
|
110
110
|
filename = this.callbacks.path.basename(filename);
|
|
111
111
|
if (!KEYBOARD_ID_PATTERN_PACKAGE.test(filename)) {
|
|
112
|
-
this.callbacks.reportMessage(
|
|
112
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Warn_PackageNameDoesNotFollowKeyboardConventions({ filename }));
|
|
113
113
|
}
|
|
114
114
|
for (let keyboard of kmpJson.keyboards) {
|
|
115
115
|
if (!this.checkForDuplicatedOrNonMinimalLanguages('keyboard', keyboard.id, keyboard.languages)) {
|
|
@@ -134,7 +134,7 @@ export class PackageValidation {
|
|
|
134
134
|
const base = filename.substring(0, filename.length - ext.length);
|
|
135
135
|
if (this.options.checkFilenameConventions) {
|
|
136
136
|
if (!CONTENT_FILE_BASENAME_PATTERN.test(base) || !CONTENT_FILE_EXTENSION_PATTERN.test(ext)) {
|
|
137
|
-
this.callbacks.reportMessage(
|
|
137
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Warn_FileInPackageDoesNotFollowFilenameConventions({ filename }));
|
|
138
138
|
}
|
|
139
139
|
}
|
|
140
140
|
if (!this.checkIfContentFileIsDangerous(file)) {
|
|
@@ -148,11 +148,11 @@ export class PackageValidation {
|
|
|
148
148
|
if (keymanForWindowsInstallerFiles.includes(filename) ||
|
|
149
149
|
keymanForWindowsRedistFiles.includes(filename) ||
|
|
150
150
|
keymanEngineForWindowsFiles.includes(filename)) {
|
|
151
|
-
this.callbacks.reportMessage(
|
|
151
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Warn_RedistFileShouldNotBeInPackage({ filename }));
|
|
152
152
|
}
|
|
153
153
|
// # Test for inclusion of .doc or .docx files
|
|
154
154
|
if (filename.match(/\.doc(x?)$/)) {
|
|
155
|
-
this.callbacks.reportMessage(
|
|
155
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Warn_DocFileDangerous({ filename }));
|
|
156
156
|
}
|
|
157
157
|
// # Test for inclusion of keyboard source files
|
|
158
158
|
//
|
|
@@ -164,13 +164,13 @@ export class PackageValidation {
|
|
|
164
164
|
// which may be valid, not just LDML keyboards
|
|
165
165
|
const fileType = KeymanFileTypes.sourceTypeFromFilename(file.name);
|
|
166
166
|
if (fileType !== null && fileType !== ".xml" /* KeymanFileTypes.Source.LdmlKeyboard */) {
|
|
167
|
-
this.callbacks.reportMessage(
|
|
167
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Hint_PackageContainsSourceFile({ filename: file.name }));
|
|
168
168
|
}
|
|
169
169
|
return true;
|
|
170
170
|
}
|
|
171
171
|
checkPackageInfo(file) {
|
|
172
172
|
if (!file.info || !file.info.name || !file.info.name.description.trim()) {
|
|
173
|
-
this.callbacks.reportMessage(
|
|
173
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_PackageNameCannotBeBlank());
|
|
174
174
|
return false;
|
|
175
175
|
}
|
|
176
176
|
if (file.info?.author?.url) {
|
|
@@ -178,11 +178,11 @@ export class PackageValidation {
|
|
|
178
178
|
const match = file.info.author.url.match(/^(mailto\:)?(.+)$/);
|
|
179
179
|
/* c8 ignore next 3 */
|
|
180
180
|
if (match === null) {
|
|
181
|
-
this.callbacks.reportMessage(
|
|
181
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_InvalidAuthorEmail({ email: file.info.author.url }));
|
|
182
182
|
return null;
|
|
183
183
|
}
|
|
184
184
|
if (!isValidEmail(match[2])) {
|
|
185
|
-
this.callbacks.reportMessage(
|
|
185
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_InvalidAuthorEmail({ email: file.info.author.url }));
|
|
186
186
|
return null;
|
|
187
187
|
}
|
|
188
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-validation.js","sourceRoot":"","sources":["../../../src/compiler/package-validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmD,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC3G,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"package-validation.js","sourceRoot":"","sources":["../../../src/compiler/package-validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmD,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC3G,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,8BAA8B,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAC7H,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,iDAAiD;AACjD,MAAM,2BAA2B,GAAG,+BAA+B,CAAC;AAEpE,8CAA8C;AAC9C,4EAA4E;AAC5E,MAAM,wBAAwB,GAAG,2EAA2E,CAAC;AAC7G,yGAAyG;AACzG,yGAAyG;AACzG,0GAA0G;AAE1G,qEAAqE;AACrE,MAAM,6BAA6B,GAAG,kBAAkB,CAAC,CAAC,qCAAqC;AAC/F,MAAM,8BAA8B,GAAG,oBAAoB,CAAC,CAAE,2CAA2C;AAEzG;;GAEG;AACH,MAAM,OAAO,iBAAiB;IAER;IAAsC;IAA1D,YAAoB,SAA4B,EAAU,OAAwB;QAA9D,cAAS,GAAT,SAAS,CAAmB;QAAU,YAAO,GAAP,OAAO,CAAiB;IAClF,CAAC;IAEM,QAAQ,CAAC,QAAgB,EAAE,OAAgC;QAChE,IAAG,CAAC,IAAI,CAAC,uCAAuC,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1D,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAG,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;YAC3C,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;YAC/C,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;YACpC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;YACnC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,uCAAuC,CAAC,YAAgC,EAAE,EAAU,EAAE,SAA4C;QACxI,IAAI,WAAW,GAA4B,EAAE,CAAC;QAE9C,IAAG,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACzB,IAAG,YAAY,IAAI,UAAU,EAAE,CAAC;gBAC9B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,yCAAyC,CAAC,EAAC,EAAE,EAAC,CAAC,CAAC,CAAC;YACxG,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,qCAAqC,CAAC,EAAC,EAAE,EAAC,CAAC,CAAC,CAAC;gBAClG,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,KAAI,IAAI,IAAI,IAAI,SAAS,EAAE,CAAC;YAC1B,IAAI,MAAM,CAAC;YACX,IAAI,CAAC;gBACH,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACpC,CAAC;YAAC,OAAM,CAAM,EAAE,CAAC;gBACf,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,2BAA2B,CAAC,EAAC,YAAY,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,EAAC,CAAC,CAAC,CAAC;gBACxH,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;YAEhD,IAAG,UAAU,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;gBACtD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,4BAA4B,CAAC,EAAC,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAC,CAAC,CAAC,CAAC;YAChJ,CAAC;YAED,IAAG,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC3B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,oCAAoC,CAAC,EAAC,YAAY,EAAE,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,UAAU,CAAC,EAAC,CAAC,CAAC,CAAC;YACpL,CAAC;iBACI,CAAC;gBACJ,WAAW,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;YACpC,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,uCAAuC,CAAC,OAAgC;QAC9E,IAAG,OAAO,CAAC,aAAa,EAAE,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;YACtE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,gDAAgD,EAAE,CAAC,CAAC;YACzG,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAG,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;YAChE,yEAAyE;YACzE,uEAAuE;YACvE,2BAA2B;YAC3B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,yCAAyC,EAAE,CAAC,CAAC;YAClG,OAAO,KAAK,CAAC;QACf,CAAC;QAID,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,kBAAkB,CAAC,QAAgB,EAAE,OAAgC;QAC3E,IAAG,CAAC,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC/D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAElD,IAAG,CAAC,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,oDAAoD,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;QACzH,CAAC;QAED,KAAI,IAAI,KAAK,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YACvC,IAAG,CAAC,IAAI,CAAC,uCAAuC,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrF,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,cAAc,CAAC,QAAgB,EAAE,OAAgC;QACvE,IAAG,CAAC,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAElD,IAAG,CAAC,2BAA2B,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/C,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,gDAAgD,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;QACrH,CAAC;QAED,KAAI,IAAI,QAAQ,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACtC,IAAG,CAAC,IAAI,CAAC,uCAAuC,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9F,OAAO,KAAK,CAAC;YACf,CAAC;YACD,0EAA0E;YAC1E,iCAAiC;QACnC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,iBAAiB,CAAC,OAAgC;QACxD,KAAI,IAAI,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChC,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,gBAAgB,CAAC,IAAwC;QAC/D,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC/D,IAAG,IAAI,CAAC,OAAO,CAAC,wBAAwB,EAAE,CAAC;YACzC,IAAG,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1F,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,kDAAkD,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;YACvH,CAAC;QACH,CAAC;QAED,IAAG,CAAC,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,6BAA6B,CAAC,IAAwC;QAC5E,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;QAEvE,gDAAgD;QAEhD,IAAG,8BAA8B,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAChD,2BAA2B,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC9C,2BAA2B,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,mCAAmC,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;QACxG,CAAC;QAED,8CAA8C;QAE9C,IAAG,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,qBAAqB,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;QAC1F,CAAC;QAED,gDAAgD;QAChD,EAAE;QACF,sEAAsE;QACtE,yEAAyE;QACzE,eAAe;QACf,EAAE;QACF,mEAAmE;QACnE,8CAA8C;QAC9C,MAAM,QAAQ,GAAG,eAAe,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnE,IAAG,QAAQ,KAAK,IAAI,IAAI,QAAQ,qDAAwC,EAAE,CAAC;YACzE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,8BAA8B,CAAC,EAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAC,CAAC,CAAC,CAAC;QAC9G,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,gBAAgB,CAAC,IAA6B;QACpD,IAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC;YACvE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,8BAA8B,EAAE,CAAC,CAAC;YACvF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;YAC1B,8DAA8D;YAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;YAC9D,sBAAsB;YACtB,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,wBAAwB,CAAC,EAAC,KAAK,EAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAC,CAAC,CAAC,CAAC;gBAC7G,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,uBAAuB,CAAC,wBAAwB,CAAC,EAAC,KAAK,EAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAC,CAAC,CAAC,CAAC;gBAC7G,OAAO,IAAI,CAAC;YACd,CAAC;QAEH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { PackageCompilerMessages } from './package-compiler-messages.js';
|
|
2
2
|
export const DEFAULT_KEYBOARD_VERSION = '1.0';
|
|
3
3
|
export const MIN_LM_FILEVERSION_KMP_JSON = '12.0';
|
|
4
4
|
export const MIN_KBD_FILEVERSION_KMP_JSON = '7.0';
|
|
@@ -55,12 +55,12 @@ export class PackageVersionValidator {
|
|
|
55
55
|
// we don't read from the metadata because we want to ensure we have the
|
|
56
56
|
// most up-to-date keyboard version data here, from the compiled keyboard.
|
|
57
57
|
if (followKeyboardVersion && data.data.keyboardVersion === null) {
|
|
58
|
-
this.callbacks.reportMessage(
|
|
58
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Info_KeyboardFileHasNoKeyboardVersion({ filename: keyboard.id }));
|
|
59
59
|
}
|
|
60
60
|
keyboard.version = data.data.keyboardVersion ?? DEFAULT_KEYBOARD_VERSION;
|
|
61
61
|
if (result && followKeyboardVersion) {
|
|
62
62
|
if (kmp.keyboards[0].version !== keyboard.version) {
|
|
63
|
-
this.callbacks.reportMessage(
|
|
63
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Warn_KeyboardVersionsDoNotMatch({
|
|
64
64
|
keyboard: keyboard.id,
|
|
65
65
|
version: keyboard.version,
|
|
66
66
|
firstKeyboard: kmp.keyboards[0].id,
|
|
@@ -77,11 +77,11 @@ export class PackageVersionValidator {
|
|
|
77
77
|
checkFollowKeyboardVersion(kmp) {
|
|
78
78
|
// Lexical model packages do not allow FollowKeyboardVersion
|
|
79
79
|
if (kmp.lexicalModels && kmp.lexicalModels.length) {
|
|
80
|
-
this.callbacks.reportMessage(
|
|
80
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_FollowKeyboardVersionNotAllowedForModelPackages());
|
|
81
81
|
return false;
|
|
82
82
|
}
|
|
83
83
|
if (!kmp.keyboards || !kmp.keyboards.length) {
|
|
84
|
-
this.callbacks.reportMessage(
|
|
84
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_FollowKeyboardVersionButNoKeyboards());
|
|
85
85
|
return false;
|
|
86
86
|
}
|
|
87
87
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-version-validator.js","sourceRoot":"","sources":["../../../src/compiler/package-version-validator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"package-version-validator.js","sourceRoot":"","sources":["../../../src/compiler/package-version-validator.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
import JSZip from 'jszip';
|
|
13
13
|
import KEYMAN_VERSION from "@keymanapp/keyman-version";
|
|
14
14
|
import { KmpCompiler } from "./kmp-compiler.js";
|
|
15
|
-
import {
|
|
15
|
+
import { PackageCompilerMessages } from "./package-compiler-messages.js";
|
|
16
16
|
const SETUP_INF_FILENAME = 'setup.inf';
|
|
17
17
|
const PRODUCT_NAME = 'Keyman';
|
|
18
18
|
;
|
|
@@ -66,14 +66,14 @@ export class WindowsPackageInstallerCompiler {
|
|
|
66
66
|
// Check existence of required files
|
|
67
67
|
for (const filename of [sources.licenseFilename, sources.msiFilename, sources.setupExeFilename]) {
|
|
68
68
|
if (!this.callbacks.fs.existsSync(filename)) {
|
|
69
|
-
this.callbacks.reportMessage(
|
|
69
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_FileDoesNotExist({ filename }));
|
|
70
70
|
return null;
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
// Check existence of optional files
|
|
74
74
|
for (const filename of [sources.titleImageFilename]) {
|
|
75
75
|
if (filename && !this.callbacks.fs.existsSync(filename)) {
|
|
76
|
-
this.callbacks.reportMessage(
|
|
76
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_FileDoesNotExist({ filename }));
|
|
77
77
|
return null;
|
|
78
78
|
}
|
|
79
79
|
}
|
|
@@ -113,7 +113,7 @@ export class WindowsPackageInstallerCompiler {
|
|
|
113
113
|
async buildZip(kps, kpsFilename, sources) {
|
|
114
114
|
const kmpJson = this.kmpCompiler.transformKpsFileToKmpObject(kpsFilename, kps);
|
|
115
115
|
if (!kmpJson.info?.name?.description) {
|
|
116
|
-
this.callbacks.reportMessage(
|
|
116
|
+
this.callbacks.reportMessage(PackageCompilerMessages.Error_PackageNameCannotBeBlank());
|
|
117
117
|
return null;
|
|
118
118
|
}
|
|
119
119
|
const kmpFilename = this.callbacks.path.basename(kpsFilename, ".kps" /* KeymanFileTypes.Source.Package */) + ".kmp" /* KeymanFileTypes.Binary.Package */;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"windows-package-installer-compiler.js","sourceRoot":"","sources":["../../../src/compiler/windows-package-installer-compiler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,cAAc,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAsB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"windows-package-installer-compiler.js","sourceRoot":"","sources":["../../../src/compiler/windows-package-installer-compiler.ts"],"names":[],"mappings":"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"}
|
package/build/src/main.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { KmpCompiler, KmpCompilerOptions, KmpCompilerResult, KmpCompilerArtifacts } from "./compiler/kmp-compiler.js";
|
|
2
2
|
export { PackageValidation } from "./compiler/package-validation.js";
|
|
3
3
|
export { WindowsPackageInstallerSources, WindowsPackageInstallerCompiler, WindowsPackageInstallerCompilerOptions, WindowsPackageInstallerCompilerResult, WindowsPackageInstallerCompilerArtifacts, } from "./compiler/windows-package-installer-compiler.js";
|
|
4
|
-
export {
|
|
4
|
+
export { PackageCompilerMessages } from './compiler/package-compiler-messages.js';
|
|
5
5
|
//# sourceMappingURL=main.d.ts.map
|
package/build/src/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACtH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EACL,8BAA8B,EAC9B,+BAA+B,EAC/B,sCAAsC,EACtC,qCAAqC,EACrC,wCAAwC,GACzC,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACtH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EACL,8BAA8B,EAC9B,+BAA+B,EAC/B,sCAAsC,EACtC,qCAAqC,EACrC,wCAAwC,GACzC,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC"}
|
package/build/src/main.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { KmpCompiler } from "./compiler/kmp-compiler.js";
|
|
2
2
|
export { PackageValidation } from "./compiler/package-validation.js";
|
|
3
3
|
export { WindowsPackageInstallerCompiler, } from "./compiler/windows-package-installer-compiler.js";
|
|
4
|
-
export {
|
|
4
|
+
export { PackageCompilerMessages } from './compiler/package-compiler-messages.js';
|
|
5
5
|
//# sourceMappingURL=main.js.map
|
package/build/src/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA+D,MAAM,4BAA4B,CAAC;AACtH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAEL,+BAA+B,GAIhC,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA+D,MAAM,4BAA4B,CAAC;AACtH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAEL,+BAA+B,GAIhC,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC"}
|
package/package.json
CHANGED
|
@@ -29,12 +29,12 @@
|
|
|
29
29
|
"url": "https://github.com/keymanapp/keyman/issues"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@keymanapp/common-types": "18.0.
|
|
32
|
+
"@keymanapp/common-types": "18.0.76-alpha",
|
|
33
33
|
"jszip": "^3.7.0",
|
|
34
34
|
"marked": "^7.0.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@keymanapp/developer-test-helpers": "18.0.
|
|
37
|
+
"@keymanapp/developer-test-helpers": "18.0.76-alpha",
|
|
38
38
|
"@types/mocha": "^5.2.7",
|
|
39
39
|
"@types/node": "^20.4.1",
|
|
40
40
|
"c8": "^7.12.0",
|
|
@@ -63,5 +63,5 @@
|
|
|
63
63
|
"type": "git",
|
|
64
64
|
"url": "git+https://github.com/keymanapp/keyman.git"
|
|
65
65
|
},
|
|
66
|
-
"version": "18.0.
|
|
66
|
+
"version": "18.0.76-alpha"
|
|
67
67
|
}
|