@keymanapp/kmc-kmn 17.0.95-alpha → 17.0.97-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/compiler.js +2 -2
- package/build/src/compiler/compiler.js.map +1 -1
- package/build/src/compiler/messages.d.ts +8 -6
- package/build/src/compiler/messages.d.ts.map +1 -1
- package/build/src/compiler/messages.js +10 -14
- package/build/src/compiler/messages.js.map +1 -1
- package/build/src/import/kmcmplib/wasm-host.wasm +0 -0
- package/package.json +5 -4
|
@@ -21,7 +21,7 @@ TODO: implement additional interfaces:
|
|
|
21
21
|
);
|
|
22
22
|
*/
|
|
23
23
|
import loadWasmHost from '../import/kmcmplib/wasm-host.js';
|
|
24
|
-
import { CompilerMessages } from './messages.js';
|
|
24
|
+
import { CompilerMessages, mapErrorFromKmcmplib } from './messages.js';
|
|
25
25
|
;
|
|
26
26
|
const baseOptions = {
|
|
27
27
|
shouldAddCompilerVersion: true,
|
|
@@ -68,7 +68,7 @@ export class Compiler {
|
|
|
68
68
|
return result;
|
|
69
69
|
}
|
|
70
70
|
compilerMessageCallback = (line, code, msg) => {
|
|
71
|
-
this.callbacks.reportMessage(
|
|
71
|
+
this.callbacks.reportMessage(mapErrorFromKmcmplib(line, code, msg));
|
|
72
72
|
return 1;
|
|
73
73
|
};
|
|
74
74
|
runCompiler(infile, outfile, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../src/compiler/compiler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;EAqBE;AAIF,OAAO,YAAY,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../src/compiler/compiler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { CompilerEvent } from "@keymanapp/common-types";
|
|
2
|
+
export declare const enum KmnCompilerMessageRanges {
|
|
3
|
+
RANGE_KMN_COMPILER_MIN = 1,
|
|
4
|
+
RANGE_KMN_COMPILER_MAX = 2047,
|
|
5
|
+
RANGE_LEXICAL_MODEL_MIN = 2048,
|
|
6
|
+
RANGE_LEXICAL_MODEL_MAX = 2303,
|
|
7
|
+
RANGE_CompilerMessage_Min = 4096
|
|
8
|
+
}
|
|
2
9
|
export declare class CompilerMessages {
|
|
3
|
-
static RANGE_KMN_COMPILER_MIN: number;
|
|
4
|
-
static RANGE_KMN_COMPILER_MAX: number;
|
|
5
|
-
static RANGE_LEXICAL_MODEL_MIN: number;
|
|
6
|
-
static RANGE_LEXICAL_MODEL_MAX: number;
|
|
7
|
-
static RANGE_CompilerMessage_Min: number;
|
|
8
10
|
static Fatal_UnexpectedException: (o: {
|
|
9
11
|
e: any;
|
|
10
12
|
}) => CompilerEvent;
|
|
@@ -13,6 +15,6 @@ export declare class CompilerMessages {
|
|
|
13
15
|
static FATAL_MissingWasmModule: number;
|
|
14
16
|
static Fatal_UnableToSetCompilerOptions: () => CompilerEvent;
|
|
15
17
|
static FATAL_UnableToSetCompilerOptions: number;
|
|
16
|
-
static mapErrorFromKmcmplib: (line: number, code: number, msg: string) => CompilerEvent;
|
|
17
18
|
}
|
|
19
|
+
export declare function mapErrorFromKmcmplib(line: number, code: number, msg: string): CompilerEvent;
|
|
18
20
|
//# sourceMappingURL=messages.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/compiler/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiD,aAAa,EAA4B,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/compiler/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiD,aAAa,EAA4B,MAAM,yBAAyB,CAAC;AAiCjI,0BAAkB,wBAAwB;IACxC,sBAAsB,IAAY;IAClC,sBAAsB,OAAY;IAClC,uBAAuB,OAAW;IAClC,uBAAuB,OAAW;IAClC,yBAAyB,OAAS;CACnC;AAMD,qBAAa,gBAAgB;IAC3B,MAAM,CAAC,yBAAyB,MAAM;QAAC,CAAC,EAAE,GAAG,CAAA;KAAC,mBAAmL;IACjO,MAAM,CAAC,yBAAyB,SAAqB;IAErD,MAAM,CAAC,uBAAuB,sBAAwF;IACtH,MAAM,CAAC,uBAAuB,SAAqB;IAEnD,MAAM,CAAC,gCAAgC,sBAAoF;IAC3H,MAAM,CAAC,gCAAgC,SAAqB;CAC7D;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,CAS3F"}
|
|
@@ -21,26 +21,22 @@ const LogLevelToSeverity = {
|
|
|
21
21
|
and the below ranges are reserved.
|
|
22
22
|
*/
|
|
23
23
|
export class CompilerMessages {
|
|
24
|
-
static RANGE_KMN_COMPILER_MIN = 0x0001; // from kmn_compiler_errors.h
|
|
25
|
-
static RANGE_KMN_COMPILER_MAX = 0x07FF; // from kmn_compiler_errors.h
|
|
26
|
-
static RANGE_LEXICAL_MODEL_MIN = 0x0800; // from kmn_compiler_errors.h, deprecated -- this range will not be used in future versions
|
|
27
|
-
static RANGE_LEXICAL_MODEL_MAX = 0x08FF; // from kmn_compiler_errors.h, deprecated -- this range will not be used in future versions
|
|
28
|
-
static RANGE_CompilerMessage_Min = 0x1000; // All compiler messages listed here must be >= this value
|
|
29
24
|
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)}`);
|
|
30
25
|
static FATAL_UnexpectedException = SevFatal | 0x1000;
|
|
31
26
|
static Fatal_MissingWasmModule = () => m(this.FATAL_MissingWasmModule, `Could not instanatiate WASM compiler module`);
|
|
32
27
|
static FATAL_MissingWasmModule = SevFatal | 0x1001;
|
|
33
28
|
static Fatal_UnableToSetCompilerOptions = () => m(this.FATAL_UnableToSetCompilerOptions, `Unable to set compiler options`);
|
|
34
29
|
static FATAL_UnableToSetCompilerOptions = SevFatal | 0x1002;
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
return event;
|
|
30
|
+
}
|
|
31
|
+
export function mapErrorFromKmcmplib(line, code, msg) {
|
|
32
|
+
const severity = LogLevelToSeverity[code & 61440 /* LogLevel.LEVEL_MASK */];
|
|
33
|
+
const baseCode = code & 4095 /* LogLevel.CODE_MASK */;
|
|
34
|
+
const event = {
|
|
35
|
+
line: line,
|
|
36
|
+
code: severity | CompilerErrorNamespace.KmnCompiler | baseCode,
|
|
37
|
+
message: msg
|
|
44
38
|
};
|
|
39
|
+
return event;
|
|
45
40
|
}
|
|
41
|
+
;
|
|
46
42
|
//# sourceMappingURL=messages.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../src/compiler/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAiB,mBAAmB,IAAI,CAAC,EAAE,MAAM,yBAAyB,CAAC;AAEjI,MAAM,SAAS,GAAG,sBAAsB,CAAC,WAAW,CAAC;AACrD,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;AAaxD,CAAC;AAEF;;GAEG;AACH,MAAM,kBAAkB,GAA0B;IAChD,iCAAqB,EAAI,QAAQ;IACjC,iCAAqB,EAAI,QAAQ;IACjC,kCAAuB,EAAE,OAAO;IAChC,+BAAoB,EAAK,OAAO;IAChC,4BAAoB,EAAK,OAAO;CACjC,CAAA;
|
|
1
|
+
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../src/compiler/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAiB,mBAAmB,IAAI,CAAC,EAAE,MAAM,yBAAyB,CAAC;AAEjI,MAAM,SAAS,GAAG,sBAAsB,CAAC,WAAW,CAAC;AACrD,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;AAaxD,CAAC;AAEF;;GAEG;AACH,MAAM,kBAAkB,GAA0B;IAChD,iCAAqB,EAAI,QAAQ;IACjC,iCAAqB,EAAI,QAAQ;IACjC,kCAAuB,EAAE,OAAO;IAChC,+BAAoB,EAAK,OAAO;IAChC,4BAAoB,EAAK,OAAO;CACjC,CAAA;AAUD;;;EAGE;AACF,MAAM,OAAO,gBAAgB;IAC3B,MAAM,CAAC,yBAAyB,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,yBAAyB,EAAE,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;IACjO,MAAM,CAAC,yBAAyB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAErD,MAAM,CAAC,uBAAuB,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,uBAAuB,EAAE,6CAA6C,CAAC,CAAC;IACtH,MAAM,CAAC,uBAAuB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEnD,MAAM,CAAC,gCAAgC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,gCAAgC,EAAE,gCAAgC,CAAC,CAAC;IAC3H,MAAM,CAAC,gCAAgC,GAAG,QAAQ,GAAG,MAAM,CAAC;;AAG9D,MAAM,UAAU,oBAAoB,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW;IAC1E,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,kCAAsB,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,IAAI,gCAAqB,CAAC;IAC3C,MAAM,KAAK,GAAkB;QAC3B,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,QAAQ,GAAG,sBAAsB,CAAC,WAAW,GAAG,QAAQ;QAC9D,OAAO,EAAE,GAAG;KACb,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AAAA,CAAC"}
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -17,7 +17,8 @@
|
|
|
17
17
|
],
|
|
18
18
|
"scripts": {
|
|
19
19
|
"build": "tsc -b",
|
|
20
|
-
"
|
|
20
|
+
"lint": "eslint .",
|
|
21
|
+
"test": "npm run lint && cd test && tsc -b && cd .. && c8 --reporter=lcov --reporter=text mocha",
|
|
21
22
|
"prepublishOnly": "npm run build"
|
|
22
23
|
},
|
|
23
24
|
"author": "Marc Durdin <marc@keyman.com> (https://github.com/mcdurdin)",
|
|
@@ -26,7 +27,7 @@
|
|
|
26
27
|
"url": "https://github.com/keymanapp/keyman/issues"
|
|
27
28
|
},
|
|
28
29
|
"dependencies": {
|
|
29
|
-
"@keymanapp/keyman-version": "17.0.
|
|
30
|
+
"@keymanapp/keyman-version": "17.0.97-alpha"
|
|
30
31
|
},
|
|
31
32
|
"devDependencies": {
|
|
32
33
|
"@types/chai": "^4.1.7",
|
|
@@ -44,7 +45,7 @@
|
|
|
44
45
|
"sinon-chai": "^3.7.0",
|
|
45
46
|
"ts-node": "^9.1.1",
|
|
46
47
|
"typescript": "^4.9.5",
|
|
47
|
-
"@keymanapp/developer-test-helpers": "17.0.
|
|
48
|
+
"@keymanapp/developer-test-helpers": "17.0.97-alpha"
|
|
48
49
|
},
|
|
49
50
|
"mocha": {
|
|
50
51
|
"spec": "build/test/**/test-*.js",
|
|
@@ -67,5 +68,5 @@
|
|
|
67
68
|
"type": "git",
|
|
68
69
|
"url": "git+https://github.com/keymanapp/keyman.git"
|
|
69
70
|
},
|
|
70
|
-
"version": "17.0.
|
|
71
|
+
"version": "17.0.97-alpha"
|
|
71
72
|
}
|