@keymanapp/kmc-package 17.0.90-alpha → 17.0.91-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/kmp-compiler.d.ts +9 -0
- package/build/src/kmp-compiler.d.ts.map +1 -1
- package/build/src/kmp-compiler.js +37 -3
- package/build/src/kmp-compiler.js.map +1 -1
- package/build/src/messages.d.ts +24 -0
- package/build/src/messages.d.ts.map +1 -0
- package/build/src/messages.js +21 -0
- package/build/src/messages.js.map +1 -0
- package/package.json +13 -1
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import type { KmpJsonFile } from './kmp-json-file.js';
|
|
2
|
+
import { CompilerCallbacks } from '@keymanapp/common-types';
|
|
2
3
|
export { type KmpJsonFile } from './kmp-json-file.js';
|
|
3
4
|
export default class KmpCompiler {
|
|
5
|
+
private callbacks;
|
|
6
|
+
constructor(callbacks: CompilerCallbacks);
|
|
4
7
|
transformKpsToKmpObject(kpsString: string, kpsPath: string): KmpJsonFile;
|
|
5
8
|
private kpsInfoToKmpInfo;
|
|
6
9
|
private arrayWrap;
|
|
@@ -14,5 +17,11 @@ export default class KmpCompiler {
|
|
|
14
17
|
* @param kmpJsonData - The kmp.json Object
|
|
15
18
|
*/
|
|
16
19
|
buildKmpFile(kpsFilename: string, kmpJsonData: KmpJsonFile): Promise<string>;
|
|
20
|
+
/**
|
|
21
|
+
* Legacy .kmp compiler would transform xml-format .kvk files into a binary .kvk file; now
|
|
22
|
+
* we want that to remain the responsibility of the keyboard compiler, so we'll warn the
|
|
23
|
+
* few users who are still doing this
|
|
24
|
+
*/
|
|
25
|
+
private warnIfKvkFileIsNotBinary;
|
|
17
26
|
}
|
|
18
27
|
//# sourceMappingURL=kmp-compiler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kmp-compiler.d.ts","sourceRoot":"","sources":["../../src/kmp-compiler.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAA4D,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"kmp-compiler.d.ts","sourceRoot":"","sources":["../../src/kmp-compiler.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAA4D,MAAM,oBAAoB,CAAC;AAChH,OAAO,EAAE,iBAAiB,EAAW,MAAM,yBAAyB,CAAC;AAGrE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAItD,MAAM,CAAC,OAAO,OAAO,WAAW;IAElB,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,iBAAiB;IAGzC,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,WAAW;IAiJ/E,OAAO,CAAC,gBAAgB;IAqBxB,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,0BAA0B;IAIlC,OAAO,CAAC,6BAA6B;IAcrC,OAAO,CAAC,cAAc;IAWtB;;;;;OAKG;IACI,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAwEnF;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;CAKjC"}
|
|
@@ -3,8 +3,14 @@ import * as path from 'path';
|
|
|
3
3
|
import * as xml2js from 'xml2js';
|
|
4
4
|
import JSZip from 'jszip';
|
|
5
5
|
import KEYMAN_VERSION from "@keymanapp/keyman-version";
|
|
6
|
+
import { KvkFile } from '@keymanapp/common-types';
|
|
7
|
+
import { CompilerMessages } from './messages.js';
|
|
6
8
|
const FILEVERSION_KMP_JSON = '12.0';
|
|
7
9
|
export default class KmpCompiler {
|
|
10
|
+
callbacks;
|
|
11
|
+
constructor(callbacks) {
|
|
12
|
+
this.callbacks = callbacks;
|
|
13
|
+
}
|
|
8
14
|
transformKpsToKmpObject(kpsString, kpsPath) {
|
|
9
15
|
// Load the KPS data from XML as JS structured data.
|
|
10
16
|
let kpsPackage = (() => {
|
|
@@ -195,7 +201,8 @@ export default class KmpCompiler {
|
|
|
195
201
|
if (!data.files) {
|
|
196
202
|
data.files = [];
|
|
197
203
|
}
|
|
198
|
-
|
|
204
|
+
let failed = false;
|
|
205
|
+
data.files.forEach((value) => {
|
|
199
206
|
// Get the path of the file
|
|
200
207
|
let filename = value.name;
|
|
201
208
|
// We add this separately after zipping all other files
|
|
@@ -205,7 +212,7 @@ export default class KmpCompiler {
|
|
|
205
212
|
if (path.isAbsolute(value.name)) {
|
|
206
213
|
// absolute paths are not very cross-platform compatible -- we are going to have trouble
|
|
207
214
|
// with path separators and roots
|
|
208
|
-
|
|
215
|
+
this.callbacks.reportMessage(CompilerMessages.Warn_AbsolutePath({ filename: value.name }));
|
|
209
216
|
}
|
|
210
217
|
else {
|
|
211
218
|
// Transform separators to platform separators -- kps files may use
|
|
@@ -219,14 +226,41 @@ export default class KmpCompiler {
|
|
|
219
226
|
filename = path.resolve(basePath, filename);
|
|
220
227
|
}
|
|
221
228
|
const basename = path.basename(filename);
|
|
222
|
-
|
|
229
|
+
if (!fs.existsSync(filename)) {
|
|
230
|
+
this.callbacks.reportMessage(CompilerMessages.Error_FileDoesNotExist({ filename: filename }));
|
|
231
|
+
failed = true;
|
|
232
|
+
return;
|
|
233
|
+
}
|
|
234
|
+
let data;
|
|
235
|
+
try {
|
|
236
|
+
data = fs.readFileSync(filename);
|
|
237
|
+
}
|
|
238
|
+
catch (e) {
|
|
239
|
+
this.callbacks.reportMessage(CompilerMessages.Error_FileCouldNotBeRead({ filename: filename, e: e }));
|
|
240
|
+
failed = true;
|
|
241
|
+
return;
|
|
242
|
+
}
|
|
243
|
+
this.warnIfKvkFileIsNotBinary(filename, data);
|
|
223
244
|
zip.file(basename, data);
|
|
224
245
|
// Remove path data from files before JSON save
|
|
225
246
|
value.name = basename;
|
|
226
247
|
});
|
|
248
|
+
if (failed) {
|
|
249
|
+
return null;
|
|
250
|
+
}
|
|
227
251
|
zip.file(kmpJsonFileName, JSON.stringify(data, null, 2));
|
|
228
252
|
// Generate kmp file
|
|
229
253
|
return zip.generateAsync({ type: 'binarystring', compression: 'DEFLATE' });
|
|
230
254
|
}
|
|
255
|
+
/**
|
|
256
|
+
* Legacy .kmp compiler would transform xml-format .kvk files into a binary .kvk file; now
|
|
257
|
+
* we want that to remain the responsibility of the keyboard compiler, so we'll warn the
|
|
258
|
+
* few users who are still doing this
|
|
259
|
+
*/
|
|
260
|
+
warnIfKvkFileIsNotBinary(filename, data) {
|
|
261
|
+
if (filename.match(/\.kvk$/) && data.compare(Buffer.from(KvkFile.KVK_HEADER_IDENTIFIER_BYTES), 0, 3, 0, 3) != 0) {
|
|
262
|
+
this.callbacks.reportMessage(CompilerMessages.Warn_FileIsNotABinaryKvkFile({ filename: filename }));
|
|
263
|
+
}
|
|
264
|
+
}
|
|
231
265
|
}
|
|
232
266
|
//# sourceMappingURL=kmp-compiler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kmp-compiler.js","sourceRoot":"","sources":["../../src/kmp-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,cAAc,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"kmp-compiler.js","sourceRoot":"","sources":["../../src/kmp-compiler.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
export declare class CompilerMessages {
|
|
2
|
+
static Fatal_UnexpectedException: (o: {
|
|
3
|
+
e: any;
|
|
4
|
+
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
5
|
+
static FATAL_UnexpectedException: number;
|
|
6
|
+
static Warn_AbsolutePath: (o: {
|
|
7
|
+
filename: string;
|
|
8
|
+
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
9
|
+
static WARN_AbsolutePath: number;
|
|
10
|
+
static Error_FileDoesNotExist: (o: {
|
|
11
|
+
filename: string;
|
|
12
|
+
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
13
|
+
static ERROR_FileDoesNotExist: number;
|
|
14
|
+
static Error_FileCouldNotBeRead: (o: {
|
|
15
|
+
filename: string;
|
|
16
|
+
e: any;
|
|
17
|
+
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
18
|
+
static ERROR_FileCouldNotBeRead: number;
|
|
19
|
+
static Warn_FileIsNotABinaryKvkFile: (o: {
|
|
20
|
+
filename: string;
|
|
21
|
+
}) => import("@keymanapp/common-types").CompilerEvent;
|
|
22
|
+
static WARN_FileIsNotABinaryKvkFile: number;
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=messages.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/messages.ts"],"names":[],"mappings":"AASA,qBAAa,gBAAgB;IAC3B,MAAM,CAAC,yBAAyB,MAAM;QAAC,CAAC,EAAE,GAAG,CAAA;KAAC,qDACgG;IAC9I,MAAM,CAAC,yBAAyB,SAAqB;IAErD,MAAM,CAAC,iBAAiB,MAAM;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,qDAAkG;IAClJ,MAAM,CAAC,iBAAiB,SAAoB;IAE5C,MAAM,CAAC,sBAAsB,MAAM;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,qDAA0E;IAC/H,MAAM,CAAC,sBAAsB,SAAqB;IAElD,MAAM,CAAC,wBAAwB,MAAM;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,GAAG,CAAA;KAAC,qDACoB;IACnF,MAAM,CAAC,wBAAwB,SAAqB;IAEpD,MAAM,CAAC,4BAA4B,MAAM;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,qDAEwB;IACnF,MAAM,CAAC,4BAA4B,SAAoB;CACxD"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m } from "@keymanapp/common-types";
|
|
2
|
+
const Namespace = CompilerErrorNamespace.PackageCompiler;
|
|
3
|
+
// const SevInfo = CompilerErrorSeverity.Info | Namespace;
|
|
4
|
+
// const SevHint = CompilerErrorSeverity.Hint | Namespace;
|
|
5
|
+
const SevWarn = CompilerErrorSeverity.Warn | Namespace;
|
|
6
|
+
const SevError = CompilerErrorSeverity.Error | Namespace;
|
|
7
|
+
const SevFatal = CompilerErrorSeverity.Fatal | Namespace;
|
|
8
|
+
export class CompilerMessages {
|
|
9
|
+
static Fatal_UnexpectedException = (o) => m(this.FATAL_UnexpectedException, `Unexpected exception: ${(o.e ?? 'unknown error').toString()}\n\nCall stack:\n${(o.e instanceof Error ? o.e.stack : (new Error()).stack)}`);
|
|
10
|
+
static FATAL_UnexpectedException = SevFatal | 0x0001;
|
|
11
|
+
static Warn_AbsolutePath = (o) => m(this.WARN_AbsolutePath, `File ${o.filename} has an absolute path, which is not portable.`);
|
|
12
|
+
static WARN_AbsolutePath = SevWarn | 0x0002;
|
|
13
|
+
static Error_FileDoesNotExist = (o) => m(this.ERROR_FileDoesNotExist, `File ${o.filename} does not exist.`);
|
|
14
|
+
static ERROR_FileDoesNotExist = SevError | 0x0003;
|
|
15
|
+
static Error_FileCouldNotBeRead = (o) => m(this.ERROR_FileCouldNotBeRead, `File ${o.filename} could not be read: ${(o.e ?? 'unknown error').toString()}.`);
|
|
16
|
+
static ERROR_FileCouldNotBeRead = SevError | 0x0004;
|
|
17
|
+
static Warn_FileIsNotABinaryKvkFile = (o) => m(this.WARN_FileIsNotABinaryKvkFile, `File ${o.filename} does not appear to be a valid binary .kvk file; this may be an old package that includes an xml-format .kvk file. ` +
|
|
18
|
+
`You must update the package to include the compiled .kvk file in the package.`);
|
|
19
|
+
static WARN_FileIsNotABinaryKvkFile = SevWarn | 0x0005;
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=messages.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,mBAAmB,IAAI,CAAC,EAAE,MAAM,yBAAyB,CAAC;AAElH,MAAM,SAAS,GAAG,sBAAsB,CAAC,eAAe,CAAC;AACzD,0DAA0D;AAC1D,0DAA0D;AAC1D,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,MAAM,OAAO,gBAAgB;IAC3B,MAAM,CAAC,yBAAyB,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,yBAAyB,EACjF,yBAAyB,CAAC,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC9I,MAAM,CAAC,yBAAyB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAErD,MAAM,CAAC,iBAAiB,GAAG,CAAC,CAAoB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC,QAAQ,+CAA+C,CAAC,CAAC;IAClJ,MAAM,CAAC,iBAAiB,GAAG,OAAO,GAAG,MAAM,CAAC;IAE5C,MAAM,CAAC,sBAAsB,GAAG,CAAC,CAAoB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC,QAAQ,kBAAkB,CAAC,CAAC;IAC/H,MAAM,CAAC,sBAAsB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAElD,MAAM,CAAC,wBAAwB,GAAG,CAAC,CAA4B,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,EACjG,QAAQ,CAAC,CAAC,QAAQ,uBAAuB,CAAC,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACnF,MAAM,CAAC,wBAAwB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEpD,MAAM,CAAC,4BAA4B,GAAG,CAAC,CAAoB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,4BAA4B,EACjG,QAAQ,CAAC,CAAC,QAAQ,qHAAqH;QACvI,+EAA+E,CAAC,CAAC;IACnF,MAAM,CAAC,4BAA4B,GAAG,OAAO,GAAG,MAAM,CAAC"}
|
package/package.json
CHANGED
|
@@ -49,9 +49,21 @@
|
|
|
49
49
|
"source-map-support/register"
|
|
50
50
|
]
|
|
51
51
|
},
|
|
52
|
+
"c8": {
|
|
53
|
+
"all": true,
|
|
54
|
+
"src": [
|
|
55
|
+
"src/"
|
|
56
|
+
],
|
|
57
|
+
"exclude-after-remap": true,
|
|
58
|
+
"exclude": [
|
|
59
|
+
"test/",
|
|
60
|
+
"src/kmp-json-file.ts",
|
|
61
|
+
"src/kps-file.ts"
|
|
62
|
+
]
|
|
63
|
+
},
|
|
52
64
|
"repository": {
|
|
53
65
|
"type": "git",
|
|
54
66
|
"url": "git+https://github.com/keymanapp/keyman.git"
|
|
55
67
|
},
|
|
56
|
-
"version": "17.0.
|
|
68
|
+
"version": "17.0.91-alpha"
|
|
57
69
|
}
|