@keymanapp/kmc 17.0.91-alpha → 17.0.93-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.
Files changed (45) hide show
  1. package/build/src/commands/build/BuildActivity.d.ts +2 -1
  2. package/build/src/commands/build/BuildActivity.d.ts.map +1 -1
  3. package/build/src/commands/build/BuildActivity.js.map +1 -1
  4. package/build/src/commands/build/BuildKmnKeyboard.d.ts +2 -1
  5. package/build/src/commands/build/BuildKmnKeyboard.d.ts.map +1 -1
  6. package/build/src/commands/build/BuildKmnKeyboard.js +1 -3
  7. package/build/src/commands/build/BuildKmnKeyboard.js.map +1 -1
  8. package/build/src/commands/build/BuildLdmlKeyboard.d.ts +2 -1
  9. package/build/src/commands/build/BuildLdmlKeyboard.d.ts.map +1 -1
  10. package/build/src/commands/build/BuildLdmlKeyboard.js +4 -6
  11. package/build/src/commands/build/BuildLdmlKeyboard.js.map +1 -1
  12. package/build/src/commands/build/BuildModel.d.ts +2 -1
  13. package/build/src/commands/build/BuildModel.d.ts.map +1 -1
  14. package/build/src/commands/build/BuildModel.js +2 -2
  15. package/build/src/commands/build/BuildModel.js.map +1 -1
  16. package/build/src/commands/build/BuildPackage.d.ts +2 -1
  17. package/build/src/commands/build/BuildPackage.d.ts.map +1 -1
  18. package/build/src/commands/build/BuildPackage.js +2 -4
  19. package/build/src/commands/build/BuildPackage.js.map +1 -1
  20. package/build/src/commands/build/BuildProject.d.ts +2 -1
  21. package/build/src/commands/build/BuildProject.d.ts.map +1 -1
  22. package/build/src/commands/build/BuildProject.js +13 -15
  23. package/build/src/commands/build/BuildProject.js.map +1 -1
  24. package/build/src/commands/build.d.ts.map +1 -1
  25. package/build/src/commands/build.js +46 -28
  26. package/build/src/commands/build.js.map +1 -1
  27. package/build/src/commands/buildTestData/index.js +1 -1
  28. package/build/src/commands/buildTestData/index.js.map +1 -1
  29. package/build/src/kmlmc.js +3 -1
  30. package/build/src/kmlmc.js.map +1 -1
  31. package/build/src/kmlmi.js +1 -1
  32. package/build/src/kmlmi.js.map +1 -1
  33. package/build/src/kmlmp.js +1 -1
  34. package/build/src/kmlmp.js.map +1 -1
  35. package/build/src/{util → messages}/NodeCompilerCallbacks.d.ts +3 -5
  36. package/build/src/messages/NodeCompilerCallbacks.d.ts.map +1 -0
  37. package/build/src/{util → messages}/NodeCompilerCallbacks.js +4 -13
  38. package/build/src/messages/NodeCompilerCallbacks.js.map +1 -0
  39. package/build/src/messages/messages.d.ts +34 -0
  40. package/build/src/messages/messages.d.ts.map +1 -0
  41. package/build/src/messages/messages.js +26 -0
  42. package/build/src/messages/messages.js.map +1 -0
  43. package/package.json +9 -9
  44. package/build/src/util/NodeCompilerCallbacks.d.ts.map +0 -1
  45. package/build/src/util/NodeCompilerCallbacks.js.map +0 -1
@@ -1,3 +1,4 @@
1
+ import { CompilerCallbacks } from "@keymanapp/common-types";
1
2
  export interface BuildActivityOptions {
2
3
  debug?: boolean;
3
4
  outFile?: string;
@@ -10,7 +11,7 @@ export declare abstract class BuildActivity {
10
11
  abstract get sourceExtension(): string;
11
12
  abstract get compiledExtension(): string;
12
13
  abstract get description(): string;
13
- abstract build(infile: string, options: BuildActivityOptions): Promise<boolean>;
14
+ abstract build(infile: string, callbacks: CompilerCallbacks, options: BuildActivityOptions): Promise<boolean>;
14
15
  protected getOutputFilename(infile: string, options: BuildActivityOptions): string;
15
16
  }
16
17
  //# sourceMappingURL=BuildActivity.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"BuildActivity.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/BuildActivity.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC;AAED,8BAAsB,aAAa;IACjC,aAAoB,IAAI,IAAI,MAAM,CAAC;IACnC,aAAoB,eAAe,IAAI,MAAM,CAAC;IAC9C,aAAoB,iBAAiB,IAAI,MAAM,CAAC;IAChD,aAAoB,WAAW,IAAI,MAAM,CAAC;aAC1B,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IACtF,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,MAAM;CAKnF"}
1
+ {"version":3,"file":"BuildActivity.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/BuildActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC;AAED,8BAAsB,aAAa;IACjC,aAAoB,IAAI,IAAI,MAAM,CAAC;IACnC,aAAoB,eAAe,IAAI,MAAM,CAAC;IAC9C,aAAoB,iBAAiB,IAAI,MAAM,CAAC;IAChD,aAAoB,WAAW,IAAI,MAAM,CAAC;aAC1B,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IACpH,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,MAAM;CAKnF"}
@@ -1 +1 @@
1
- {"version":3,"file":"BuildActivity.js","sourceRoot":"","sources":["../../../../src/commands/build/BuildActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAQzD,CAAC;AAEF,MAAM,OAAgB,aAAa;IAMvB,iBAAiB,CAAC,MAAc,EAAE,OAA6B;QACvE,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC;YACtB,OAAO,CAAC,OAAO,CAAC,CAAC;YACjB,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAChG,CAAC;CACF;AAAA,CAAC"}
1
+ {"version":3,"file":"BuildActivity.js","sourceRoot":"","sources":["../../../../src/commands/build/BuildActivity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAQzD,CAAC;AAEF,MAAM,OAAgB,aAAa;IAMvB,iBAAiB,CAAC,MAAc,EAAE,OAA6B;QACvE,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC;YACtB,OAAO,CAAC,OAAO,CAAC,CAAC;YACjB,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAChG,CAAC;CACF;AAAA,CAAC"}
@@ -1,9 +1,10 @@
1
1
  import { BuildActivity, BuildActivityOptions } from './BuildActivity.js';
2
+ import { CompilerCallbacks } from '@keymanapp/common-types';
2
3
  export declare class BuildKmnKeyboard extends BuildActivity {
3
4
  get name(): string;
4
5
  get sourceExtension(): string;
5
6
  get compiledExtension(): string;
6
7
  get description(): string;
7
- build(infile: string, options: BuildActivityOptions): Promise<boolean>;
8
+ build(infile: string, callbacks: CompilerCallbacks, options: BuildActivityOptions): Promise<boolean>;
8
9
  }
9
10
  //# sourceMappingURL=BuildKmnKeyboard.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"BuildKmnKeyboard.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/BuildKmnKeyboard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAKzE,qBAAa,gBAAiB,SAAQ,aAAa;IACjD,IAAW,IAAI,IAAI,MAAM,CAA8B;IACvD,IAAW,eAAe,IAAI,MAAM,CAAmB;IACvD,IAAW,iBAAiB,IAAI,MAAM,CAAmB;IACzD,IAAW,WAAW,IAAI,MAAM,CAAsC;IACzD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;CAwBpF"}
1
+ {"version":3,"file":"BuildKmnKeyboard.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/BuildKmnKeyboard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAGzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,qBAAa,gBAAiB,SAAQ,aAAa;IACjD,IAAW,IAAI,IAAI,MAAM,CAA8B;IACvD,IAAW,eAAe,IAAI,MAAM,CAAmB;IACvD,IAAW,iBAAiB,IAAI,MAAM,CAAmB;IACzD,IAAW,WAAW,IAAI,MAAM,CAAsC;IACzD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsBlH"}
@@ -2,18 +2,16 @@ import * as path from 'path';
2
2
  import { BuildActivity } from './BuildActivity.js';
3
3
  import { Compiler } from '@keymanapp/kmc-kmn';
4
4
  import { platform } from 'os';
5
- import { NodeCompilerCallbacks } from '../../util/NodeCompilerCallbacks.js';
6
5
  export class BuildKmnKeyboard extends BuildActivity {
7
6
  get name() { return 'Keyman keyboard'; }
8
7
  get sourceExtension() { return '.kmn'; }
9
8
  get compiledExtension() { return '.kmx'; }
10
9
  get description() { return 'Build a Keyman keyboard'; }
11
- async build(infile, options) {
10
+ async build(infile, callbacks, options) {
12
11
  let compiler = new Compiler();
13
12
  if (!await compiler.init()) {
14
13
  return false;
15
14
  }
16
- const callbacks = new NodeCompilerCallbacks();
17
15
  // We need to resolve paths to absolute paths before calling kmc-kmn
18
16
  let outfile = this.getOutputFilename(infile, options);
19
17
  infile = getPosixAbsolutePath(infile);
@@ -1 +1 @@
1
- {"version":3,"file":"BuildKmnKeyboard.js","sourceRoot":"","sources":["../../../../src/commands/build/BuildKmnKeyboard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAwB,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,MAAM,OAAO,gBAAiB,SAAQ,aAAa;IACjD,IAAW,IAAI,KAAa,OAAO,iBAAiB,CAAC,CAAC,CAAC;IACvD,IAAW,eAAe,KAAa,OAAO,MAAM,CAAC,CAAC,CAAC;IACvD,IAAW,iBAAiB,KAAa,OAAO,MAAM,CAAC,CAAC,CAAC;IACzD,IAAW,WAAW,KAAa,OAAO,yBAAyB,CAAC,CAAC,CAAC;IAC/D,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,OAA6B;QAC9D,IAAI,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE;YACzB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,SAAS,GAAG,IAAI,qBAAqB,EAAE,CAAC;QAE9C,oEAAoE;QACpE,IAAI,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACtC,OAAO,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAExC,uFAAuF;QACvF,gFAAgF;QAChF,OAAO,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAC9C;YACE,SAAS,EAAE,OAAO,CAAC,KAAK;YACxB,wBAAwB,EAAE,OAAO,CAAC,eAAe;YACjD,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;YAC9C,wBAAwB,EAAE,OAAO,CAAC,wBAAwB;SAC3D,CAAC,CAAC;IACL,CAAC;CACF;AAED,SAAS,oBAAoB,CAAC,QAAgB;IAC5C,IAAG,QAAQ,EAAE,IAAI,OAAO,EAAE;QACxB,gEAAgE;QAChE,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;KAC1C;IAED,6CAA6C;IAC7C,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAElC,IAAG,QAAQ,EAAE,IAAI,OAAO,EAAE;QACxB,4EAA4E;QAC5E,4EAA4E;QAC5E,UAAU;QACV,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;KACzC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
1
+ {"version":3,"file":"BuildKmnKeyboard.js","sourceRoot":"","sources":["../../../../src/commands/build/BuildKmnKeyboard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAwB,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAG9B,MAAM,OAAO,gBAAiB,SAAQ,aAAa;IACjD,IAAW,IAAI,KAAa,OAAO,iBAAiB,CAAC,CAAC,CAAC;IACvD,IAAW,eAAe,KAAa,OAAO,MAAM,CAAC,CAAC,CAAC;IACvD,IAAW,iBAAiB,KAAa,OAAO,MAAM,CAAC,CAAC,CAAC;IACzD,IAAW,WAAW,KAAa,OAAO,yBAAyB,CAAC,CAAC,CAAC;IAC/D,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,SAA4B,EAAE,OAA6B;QAC5F,IAAI,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE;YACzB,OAAO,KAAK,CAAC;SACd;QAED,oEAAoE;QACpE,IAAI,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACtC,OAAO,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAExC,uFAAuF;QACvF,gFAAgF;QAChF,OAAO,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAC9C;YACE,SAAS,EAAE,OAAO,CAAC,KAAK;YACxB,wBAAwB,EAAE,OAAO,CAAC,eAAe;YACjD,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;YAC9C,wBAAwB,EAAE,OAAO,CAAC,wBAAwB;SAC3D,CAAC,CAAC;IACL,CAAC;CACF;AAED,SAAS,oBAAoB,CAAC,QAAgB;IAC5C,IAAG,QAAQ,EAAE,IAAI,OAAO,EAAE;QACxB,gEAAgE;QAChE,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;KAC1C;IAED,6CAA6C;IAC7C,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAElC,IAAG,QAAQ,EAAE,IAAI,OAAO,EAAE;QACxB,4EAA4E;QAC5E,4EAA4E;QAC5E,UAAU;QACV,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;KACzC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
@@ -1,9 +1,10 @@
1
+ import { CompilerCallbacks } from '@keymanapp/common-types';
1
2
  import { BuildActivity, BuildActivityOptions } from './BuildActivity.js';
2
3
  export declare class BuildLdmlKeyboard extends BuildActivity {
3
4
  get name(): string;
4
5
  get sourceExtension(): string;
5
6
  get compiledExtension(): string;
6
7
  get description(): string;
7
- build(infile: string, options: BuildActivityOptions): Promise<boolean>;
8
+ build(infile: string, callbacks: CompilerCallbacks, options: BuildActivityOptions): Promise<boolean>;
8
9
  }
9
10
  //# sourceMappingURL=BuildLdmlKeyboard.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"BuildLdmlKeyboard.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/BuildLdmlKeyboard.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAEzE,qBAAa,iBAAkB,SAAQ,aAAa;IAClD,IAAW,IAAI,IAAI,MAAM,CAA4B;IACrD,IAAW,eAAe,IAAI,MAAM,CAAmB;IACvD,IAAW,iBAAiB,IAAI,MAAM,CAAmB;IACzD,IAAW,WAAW,IAAI,MAAM,CAAoC;IACvD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;CA+BpF"}
1
+ {"version":3,"file":"BuildLdmlKeyboard.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/BuildLdmlKeyboard.ts"],"names":[],"mappings":"AAGA,OAAO,EAAiB,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAEzE,qBAAa,iBAAkB,SAAQ,aAAa;IAClD,IAAW,IAAI,IAAI,MAAM,CAA4B;IACrD,IAAW,eAAe,IAAI,MAAM,CAAmB;IACvD,IAAW,iBAAiB,IAAI,MAAM,CAAmB;IACzD,IAAW,WAAW,IAAI,MAAM,CAAoC;IACvD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;CA+BlH"}
@@ -2,17 +2,16 @@ import * as path from 'path';
2
2
  import * as fs from 'fs';
3
3
  import * as kmc from '@keymanapp/kmc-keyboard';
4
4
  import { KvkFileWriter } from '@keymanapp/common-types';
5
- import { NodeCompilerCallbacks } from '../../util/NodeCompilerCallbacks.js';
6
5
  import { BuildActivity } from './BuildActivity.js';
7
6
  export class BuildLdmlKeyboard extends BuildActivity {
8
7
  get name() { return 'LDML keyboard'; }
9
8
  get sourceExtension() { return '.xml'; }
10
9
  get compiledExtension() { return '.kmx'; }
11
10
  get description() { return 'Build a LDML keyboard'; }
12
- async build(infile, options) {
11
+ async build(infile, callbacks, options) {
13
12
  // TODO-LDML: consider hardware vs touch -- touch-only layout will not have a .kvk
14
13
  // Compile:
15
- let [kmx, kvk, kmw] = buildLdmlKeyboardToMemory(infile, options);
14
+ let [kmx, kvk, kmw] = buildLdmlKeyboardToMemory(infile, callbacks, options);
16
15
  // Output:
17
16
  const fileBaseName = options.outFile ?? infile;
18
17
  const outFileBase = path.basename(fileBaseName, path.extname(fileBaseName));
@@ -37,15 +36,14 @@ export class BuildLdmlKeyboard extends BuildActivity {
37
36
  return true;
38
37
  }
39
38
  }
40
- function buildLdmlKeyboardToMemory(inputFilename, options) {
39
+ function buildLdmlKeyboardToMemory(inputFilename, callbacks, options) {
41
40
  let compilerOptions = {
42
41
  debug: options.debug ?? false,
43
42
  addCompilerVersion: options.compilerVersion ?? true,
44
43
  // TODO: warnDeprecatedCode: options.warnDeprecatedCode,
45
44
  // TODO: treatWarningsAsErrors: options.treatWarningsAsErrors,
46
45
  };
47
- const c = new NodeCompilerCallbacks();
48
- const k = new kmc.Compiler(c, options);
46
+ const k = new kmc.Compiler(callbacks, options);
49
47
  let source = k.load(inputFilename);
50
48
  if (!source) {
51
49
  return [null, null, null];
@@ -1 +1 @@
1
- {"version":3,"file":"BuildLdmlKeyboard.js","sourceRoot":"","sources":["../../../../src/commands/build/BuildLdmlKeyboard.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BuildLdmlKeyboard.js","sourceRoot":"","sources":["../../../../src/commands/build/BuildLdmlKeyboard.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,10 @@
1
1
  import { BuildActivity, BuildActivityOptions } from './BuildActivity.js';
2
+ import { CompilerCallbacks } from '@keymanapp/common-types';
2
3
  export declare class BuildModel extends BuildActivity {
3
4
  get name(): string;
4
5
  get sourceExtension(): string;
5
6
  get compiledExtension(): string;
6
7
  get description(): string;
7
- build(infile: string, options: BuildActivityOptions): Promise<boolean>;
8
+ build(infile: string, callbacks: CompilerCallbacks, options: BuildActivityOptions): Promise<boolean>;
8
9
  }
9
10
  //# sourceMappingURL=BuildModel.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"BuildModel.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/BuildModel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAGzE,qBAAa,UAAW,SAAQ,aAAa;IAC3C,IAAW,IAAI,IAAI,MAAM,CAA4B;IACrD,IAAW,eAAe,IAAI,MAAM,CAAwB;IAC5D,IAAW,iBAAiB,IAAI,MAAM,CAAwB;IAC9D,IAAW,WAAW,IAAI,MAAM,CAAoC;IACvD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsBpF"}
1
+ {"version":3,"file":"BuildModel.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/BuildModel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAEzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,qBAAa,UAAW,SAAQ,aAAa;IAC3C,IAAW,IAAI,IAAI,MAAM,CAA4B;IACrD,IAAW,eAAe,IAAI,MAAM,CAAwB;IAC5D,IAAW,iBAAiB,IAAI,MAAM,CAAwB;IAC9D,IAAW,WAAW,IAAI,MAAM,CAAoC;IACvD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsBlH"}
@@ -6,12 +6,12 @@ export class BuildModel extends BuildActivity {
6
6
  get sourceExtension() { return '.model.ts'; }
7
7
  get compiledExtension() { return '.model.js'; }
8
8
  get description() { return 'Build a lexical model'; }
9
- async build(infile, options) {
9
+ async build(infile, callbacks, options) {
10
10
  let outputFilename = this.getOutputFilename(infile, options);
11
11
  let code = null;
12
12
  // Compile:
13
13
  try {
14
- code = compileModel(infile);
14
+ code = compileModel(infile, callbacks);
15
15
  }
16
16
  catch (e) {
17
17
  console.error(e);
@@ -1 +1 @@
1
- {"version":3,"file":"BuildModel.js","sourceRoot":"","sources":["../../../../src/commands/build/BuildModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,aAAa,EAAwB,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,MAAM,OAAO,UAAW,SAAQ,aAAa;IAC3C,IAAW,IAAI,KAAa,OAAO,eAAe,CAAC,CAAC,CAAC;IACrD,IAAW,eAAe,KAAa,OAAO,WAAW,CAAC,CAAC,CAAC;IAC5D,IAAW,iBAAiB,KAAa,OAAO,WAAW,CAAC,CAAC,CAAC;IAC9D,IAAW,WAAW,KAAa,OAAO,uBAAuB,CAAC,CAAC,CAAC;IAC7D,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,OAA6B;QAC9D,IAAI,cAAc,GAAW,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACrE,IAAI,IAAI,GAAG,IAAI,CAAC;QAEhB,WAAW;QACX,IAAI;YACF,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;SAC7B;QAAC,OAAM,CAAC,EAAE;YACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,OAAO,KAAK,CAAC;SACd;QAED,IAAG,CAAC,IAAI,EAAE;YACR,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;YACpC,OAAO,KAAK,CAAC;SACd;QAED,UAAU;QACV,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
1
+ {"version":3,"file":"BuildModel.js","sourceRoot":"","sources":["../../../../src/commands/build/BuildModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,aAAa,EAAwB,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,MAAM,OAAO,UAAW,SAAQ,aAAa;IAC3C,IAAW,IAAI,KAAa,OAAO,eAAe,CAAC,CAAC,CAAC;IACrD,IAAW,eAAe,KAAa,OAAO,WAAW,CAAC,CAAC,CAAC;IAC5D,IAAW,iBAAiB,KAAa,OAAO,WAAW,CAAC,CAAC,CAAC;IAC9D,IAAW,WAAW,KAAa,OAAO,uBAAuB,CAAC,CAAC,CAAC;IAC7D,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,SAA4B,EAAE,OAA6B;QAC5F,IAAI,cAAc,GAAW,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACrE,IAAI,IAAI,GAAG,IAAI,CAAC;QAEhB,WAAW;QACX,IAAI;YACF,IAAI,GAAG,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;SACxC;QAAC,OAAM,CAAC,EAAE;YACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,OAAO,KAAK,CAAC;SACd;QAED,IAAG,CAAC,IAAI,EAAE;YACR,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;YACpC,OAAO,KAAK,CAAC;SACd;QAED,UAAU;QACV,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
@@ -1,9 +1,10 @@
1
1
  import { BuildActivity, BuildActivityOptions } from './BuildActivity.js';
2
+ import { CompilerCallbacks } from '@keymanapp/common-types';
2
3
  export declare class BuildPackage extends BuildActivity {
3
4
  get name(): string;
4
5
  get sourceExtension(): string;
5
6
  get compiledExtension(): string;
6
7
  get description(): string;
7
- build(infile: string, options: BuildActivityOptions): Promise<boolean>;
8
+ build(infile: string, callbacks: CompilerCallbacks, options: BuildActivityOptions): Promise<boolean>;
8
9
  }
9
10
  //# sourceMappingURL=BuildPackage.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"BuildPackage.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/BuildPackage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAKzE,qBAAa,YAAa,SAAQ,aAAa;IAC7C,IAAW,IAAI,IAAI,MAAM,CAAsB;IAC/C,IAAW,eAAe,IAAI,MAAM,CAAmB;IACvD,IAAW,iBAAiB,IAAI,MAAM,CAAmB;IACzD,IAAW,WAAW,IAAI,MAAM,CAAsC;IACzD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;CA4BpF"}
1
+ {"version":3,"file":"BuildPackage.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/BuildPackage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAEzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,qBAAa,YAAa,SAAQ,aAAa;IAC7C,IAAW,IAAI,IAAI,MAAM,CAAsB;IAC/C,IAAW,eAAe,IAAI,MAAM,CAAmB;IACvD,IAAW,iBAAiB,IAAI,MAAM,CAAmB;IACzD,IAAW,WAAW,IAAI,MAAM,CAAsC;IACzD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;CA2BlH"}
@@ -1,20 +1,18 @@
1
1
  import * as fs from 'fs';
2
2
  import { BuildActivity } from './BuildActivity.js';
3
3
  import KmpCompiler from '@keymanapp/kmc-package';
4
- import { NodeCompilerCallbacks } from 'src/util/NodeCompilerCallbacks.js';
5
4
  export class BuildPackage extends BuildActivity {
6
5
  get name() { return 'Package'; }
7
6
  get sourceExtension() { return '.kps'; }
8
7
  get compiledExtension() { return '.kmp'; }
9
8
  get description() { return 'Build a Keyman package'; }
10
- async build(infile, options) {
11
- const c = new NodeCompilerCallbacks();
9
+ async build(infile, callbacks, options) {
12
10
  const outfile = this.getOutputFilename(infile, options);
13
11
  //
14
12
  // Load .kps source data
15
13
  //
16
14
  const kpsString = fs.readFileSync(infile, 'utf8');
17
- const kmpCompiler = new KmpCompiler(c);
15
+ const kmpCompiler = new KmpCompiler(callbacks);
18
16
  const kmpJsonData = kmpCompiler.transformKpsToKmpObject(kpsString, infile);
19
17
  if (!kmpJsonData) {
20
18
  return false;
@@ -1 +1 @@
1
- {"version":3,"file":"BuildPackage.js","sourceRoot":"","sources":["../../../../src/commands/build/BuildPackage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,aAAa,EAAwB,MAAM,oBAAoB,CAAC;AACzE,OAAO,WAAW,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,MAAM,OAAO,YAAa,SAAQ,aAAa;IAC7C,IAAW,IAAI,KAAa,OAAO,SAAS,CAAC,CAAC,CAAC;IAC/C,IAAW,eAAe,KAAa,OAAO,MAAM,CAAC,CAAC,CAAC;IACvD,IAAW,iBAAiB,KAAa,OAAO,MAAM,CAAC,CAAC,CAAC;IACzD,IAAW,WAAW,KAAc,OAAO,wBAAwB,CAAC,CAAC,CAAC;IAC/D,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,OAA6B;QAC9D,MAAM,CAAC,GAAsB,IAAI,qBAAqB,EAAE,CAAC;QAEzD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAExD,EAAE;QACF,wBAAwB;QACxB,EAAE;QAEF,MAAM,SAAS,GAAW,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,WAAW,GAAG,WAAW,CAAC,uBAAuB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC3E,IAAG,CAAC,WAAW,EAAE;YACf,OAAO,KAAK,CAAC;SACd;QAED,EAAE;QACF,8BAA8B;QAC9B,EAAE;QAEF,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACjE,IAAG,CAAC,IAAI,EAAE;YACR,OAAO,KAAK,CAAC;SACd;QAED,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
1
+ {"version":3,"file":"BuildPackage.js","sourceRoot":"","sources":["../../../../src/commands/build/BuildPackage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,aAAa,EAAwB,MAAM,oBAAoB,CAAC;AACzE,OAAO,WAAW,MAAM,wBAAwB,CAAC;AAGjD,MAAM,OAAO,YAAa,SAAQ,aAAa;IAC7C,IAAW,IAAI,KAAa,OAAO,SAAS,CAAC,CAAC,CAAC;IAC/C,IAAW,eAAe,KAAa,OAAO,MAAM,CAAC,CAAC,CAAC;IACvD,IAAW,iBAAiB,KAAa,OAAO,MAAM,CAAC,CAAC,CAAC;IACzD,IAAW,WAAW,KAAc,OAAO,wBAAwB,CAAC,CAAC,CAAC;IAC/D,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,SAA4B,EAAE,OAA6B;QAE5F,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAExD,EAAE;QACF,wBAAwB;QACxB,EAAE;QAEF,MAAM,SAAS,GAAW,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,WAAW,CAAC,uBAAuB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC3E,IAAG,CAAC,WAAW,EAAE;YACf,OAAO,KAAK,CAAC;SACd;QAED,EAAE;QACF,8BAA8B;QAC9B,EAAE;QAEF,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACjE,IAAG,CAAC,IAAI,EAAE;YACR,OAAO,KAAK,CAAC;SACd;QAED,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
@@ -1,9 +1,10 @@
1
+ import { CompilerCallbacks } from '@keymanapp/common-types';
1
2
  import { BuildActivity, BuildActivityOptions } from './BuildActivity.js';
2
3
  export declare class BuildProject extends BuildActivity {
3
4
  get name(): string;
4
5
  get sourceExtension(): string;
5
6
  get compiledExtension(): string;
6
7
  get description(): string;
7
- build(infile: string, options: BuildActivityOptions): Promise<boolean>;
8
+ build(infile: string, callbacks: CompilerCallbacks, options: BuildActivityOptions): Promise<boolean>;
8
9
  }
9
10
  //# sourceMappingURL=BuildProject.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"BuildProject.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/BuildProject.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAKzE,qBAAa,YAAa,SAAQ,aAAa;IAC7C,IAAW,IAAI,IAAI,MAAM,CAAsB;IAC/C,IAAW,eAAe,IAAI,MAAM,CAA8B;IAClE,IAAW,iBAAiB,IAAI,MAAM,CAAiB;IACvD,IAAW,WAAW,IAAI,MAAM,CAAyD;IAC5E,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;CAIpF"}
1
+ {"version":3,"file":"BuildProject.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/BuildProject.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAyC,MAAM,yBAAyB,CAAC;AAEnG,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAMzE,qBAAa,YAAa,SAAQ,aAAa;IAC7C,IAAW,IAAI,IAAI,MAAM,CAAsB;IAC/C,IAAW,eAAe,IAAI,MAAM,CAA8B;IAClE,IAAW,iBAAiB,IAAI,MAAM,CAAiB;IACvD,IAAW,WAAW,IAAI,MAAM,CAAyD;IAC5E,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;CAIlH"}
@@ -1,33 +1,33 @@
1
1
  import * as path from 'path';
2
2
  import * as fs from 'fs';
3
3
  import { KeymanDeveloperProject, KPJFileReader } from '@keymanapp/common-types';
4
- import { NodeCompilerCallbacks } from '../../util/NodeCompilerCallbacks.js';
5
4
  import { BuildActivity } from './BuildActivity.js';
6
5
  import { buildActivities } from './buildActivities.js';
6
+ import { InfrastructureMessages } from '../../messages/messages.js';
7
7
  const PROJECT_EXTENSION = '.kpj';
8
8
  export class BuildProject extends BuildActivity {
9
9
  get name() { return 'Project'; }
10
10
  get sourceExtension() { return PROJECT_EXTENSION; }
11
11
  get compiledExtension() { return null; }
12
12
  get description() { return 'Build a keyboard or lexical model project'; }
13
- async build(infile, options) {
14
- let builder = new ProjectBuilder(infile, options);
13
+ async build(infile, callbacks, options) {
14
+ let builder = new ProjectBuilder(infile, callbacks, options);
15
15
  return builder.run();
16
16
  }
17
17
  }
18
18
  class ProjectBuilder {
19
- callbacks = new NodeCompilerCallbacks();
19
+ callbacks;
20
20
  infile;
21
21
  options;
22
22
  project;
23
- constructor(infile, options) {
23
+ constructor(infile, callbacks, options) {
24
24
  this.infile = path.resolve(infile);
25
+ this.callbacks = callbacks;
25
26
  this.options = options;
26
27
  }
27
28
  async run() {
28
29
  if (this.options.outFile) {
29
- // TODO: callbacks.reportMessage
30
- console.error('--out-file should not be specified for project builds');
30
+ this.callbacks.reportMessage(InfrastructureMessages.Error_OutFileNotValidForProjects());
31
31
  return false;
32
32
  }
33
33
  this.project = this.loadProject();
@@ -72,13 +72,12 @@ class ProjectBuilder {
72
72
  const kpjData = this.callbacks.loadFile(null, this.infile);
73
73
  const reader = new KPJFileReader();
74
74
  const kpj = reader.read(kpjData);
75
- const schema = this.callbacks.loadKpjJsonSchema();
75
+ const schema = this.callbacks.loadSchema('kpj');
76
76
  try {
77
77
  reader.validate(kpj, schema);
78
78
  }
79
79
  catch (e) {
80
- // TODO: callbacks.reportMessage
81
- console.error(e);
80
+ this.callbacks.reportMessage(InfrastructureMessages.Error_InvalidProjectFile({ message: (e ?? '').toString() }));
82
81
  return null;
83
82
  }
84
83
  const project = reader.transform(this.infile, kpj);
@@ -97,15 +96,14 @@ class ProjectBuilder {
97
96
  const options = { ...this.options };
98
97
  options.outFile = this.project.resolveOutputFilePath(this.infile, file, activity.sourceExtension, activity.compiledExtension);
99
98
  const infile = this.project.resolveInputFilePath(this.infile, file);
100
- // TODO: callbacks.reportMessage, improve logging and make consistent
101
- console.log(`Building ${infile}\n Output ${options.outFile}`);
99
+ this.callbacks.reportMessage(InfrastructureMessages.Info_BuildingFile({ filename: infile }));
102
100
  fs.mkdirSync(path.dirname(options.outFile), { recursive: true });
103
- let result = await activity.build(infile, options);
101
+ let result = await activity.build(infile, this.callbacks, options);
104
102
  if (result) {
105
- console.log(`${path.basename(infile)} built successfully.`);
103
+ this.callbacks.reportMessage(InfrastructureMessages.Info_FileBuiltSuccessfully({ filename: path.basename(infile) }));
106
104
  }
107
105
  else {
108
- console.log(`${path.basename(infile)} failed to build.`);
106
+ this.callbacks.reportMessage(InfrastructureMessages.Info_FileNotBuiltSuccessfully({ filename: path.basename(infile) }));
109
107
  }
110
108
  return result;
111
109
  }
@@ -1 +1 @@
1
- {"version":3,"file":"BuildProject.js","sourceRoot":"","sources":["../../../../src/commands/build/BuildProject.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BuildProject.js","sourceRoot":"","sources":["../../../../src/commands/build/BuildProject.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/build.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,QAoB5C"}
1
+ {"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/build.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,QAwB5C"}
@@ -1,6 +1,8 @@
1
1
  import * as fs from 'fs';
2
2
  import { buildActivities } from './build/buildActivities.js';
3
3
  import { BuildProject } from './build/BuildProject.js';
4
+ import { NodeCompilerCallbacks } from '../messages/NodeCompilerCallbacks.js';
5
+ import { InfrastructureMessages } from '../messages/messages.js';
4
6
  export function declareBuild(program) {
5
7
  program
6
8
  .command('build [infile...]')
@@ -10,39 +12,55 @@ export function declareBuild(program) {
10
12
  .option('--no-compiler-version', 'Exclude compiler version metadata from output')
11
13
  .option('-w, --compiler-warnings-as-errors', 'Causes warnings to fail the build')
12
14
  .option('--no-warn-deprecated-code', 'Turn off warnings for deprecated code styles')
13
- .action((infiles, options) => {
14
- let p = [];
15
- if (!infiles.length) {
16
- console.debug('Assuming infile == .');
17
- p.push(build('.', options));
15
+ .action(async (filenames, options) => {
16
+ if (!filenames.length) {
17
+ // If there are no filenames provided, then we are building the current
18
+ // folder ('.') as a project-style build
19
+ filenames.push('.');
18
20
  }
19
- for (let infile of infiles) {
20
- p.push(build(infile, options));
21
+ for (let filename of filenames) {
22
+ if (!await build(filename, options)) {
23
+ // Once a file fails to build, we bail on subsequent builds
24
+ // TODO: is this the most appropriate semantics?
25
+ process.exit(1);
26
+ }
21
27
  }
22
- return Promise.all(p).then();
23
28
  });
24
29
  }
25
- async function build(infile, options) {
26
- console.log(`Building ${infile}`);
27
- if (!fs.existsSync(infile)) {
28
- // TODO: consolidate errors
29
- console.error(`File ${infile} does not exist`);
30
- process.exit(2);
31
- }
32
- // If infile is a directory, then we treat that as a project and build it
33
- if (fs.statSync(infile).isDirectory()) {
34
- return (new BuildProject()).build(infile, options);
35
- }
36
- // Otherwise, if it's one of our known file extensions, we build it
37
- let extensions = [];
38
- for (let build of buildActivities) {
39
- if (infile.toLowerCase().endsWith(build.sourceExtension)) {
40
- return build.build(infile, options);
30
+ async function build(filename, options) {
31
+ let callbacks = new NodeCompilerCallbacks();
32
+ try {
33
+ callbacks.reportMessage(InfrastructureMessages.Info_BuildingFile({ filename }));
34
+ if (!fs.existsSync(filename)) {
35
+ callbacks.reportMessage(InfrastructureMessages.Error_FileDoesNotExist({ filename }));
36
+ return false;
37
+ }
38
+ let builder = null;
39
+ // If infile is a directory, then we treat that as a project and build it
40
+ if (fs.statSync(filename).isDirectory()) {
41
+ builder = new BuildProject();
42
+ }
43
+ else {
44
+ // Otherwise, if it's one of our known file extensions, we build it
45
+ let extensions = [];
46
+ builder = buildActivities.find(build => { extensions.push(build.sourceExtension); return filename.toLowerCase().endsWith(build.sourceExtension); });
47
+ if (!builder) {
48
+ callbacks.reportMessage(InfrastructureMessages.Error_FileTypeNotRecognized({ filename, extensions: extensions.join(', ') }));
49
+ return false;
50
+ }
41
51
  }
42
- extensions.push(build.sourceExtension);
52
+ let result = await builder.build(filename, callbacks, options);
53
+ if (result) {
54
+ callbacks.reportMessage(InfrastructureMessages.Info_FileBuiltSuccessfully({ filename }));
55
+ }
56
+ else {
57
+ callbacks.reportMessage(InfrastructureMessages.Info_FileNotBuiltSuccessfully({ filename }));
58
+ }
59
+ return result;
60
+ }
61
+ catch (e) {
62
+ callbacks.reportMessage(InfrastructureMessages.Fatal_UnexpectedException({ e }));
63
+ return false;
43
64
  }
44
- // TODO: consolidate errors
45
- console.error(`Unrecognised input file ${infile}, expecting ${extensions.join(', ')}, or project folder`);
46
- process.exit(2);
47
65
  }
48
66
  //# sourceMappingURL=build.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/commands/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAGzB,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,MAAM,UAAU,YAAY,CAAC,OAAgB;IAC3C,OAAO;SACJ,OAAO,CAAC,mBAAmB,CAAC;SAC5B,WAAW,CAAC,uCAAuC,CAAC;SACpD,MAAM,CAAC,aAAa,EAAE,qCAAqC,CAAC;SAC5D,MAAM,CAAC,2BAA2B,EAAE,4DAA4D,CAAC;SACjG,MAAM,CAAC,uBAAuB,EAAE,+CAA+C,CAAC;SAChF,MAAM,CAAC,mCAAmC,EAAE,mCAAmC,CAAC;SAChF,MAAM,CAAC,2BAA2B,EAAE,8CAA8C,CAAC;SACnF,MAAM,CAAC,CAAC,OAAiB,EAAE,OAAY,EAAE,EAAE;QAC1C,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,IAAG,CAAC,OAAO,CAAC,MAAM,EAAE;YAClB,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YACtC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;SAC7B;QACD,KAAI,IAAI,MAAM,IAAI,OAAO,EAAE;YACzB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;SAChC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,KAAK,CAAC,MAAc,EAAE,OAA6B;IAChE,OAAO,CAAC,GAAG,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC;IAElC,IAAG,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QACzB,2BAA2B;QAC3B,OAAO,CAAC,KAAK,CAAC,QAAQ,MAAM,iBAAiB,CAAC,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,yEAAyE;IACzE,IAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE;QACpC,OAAO,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACpD;IAED,mEAAmE;IACnE,IAAI,UAAU,GAAa,EAAE,CAAC;IAC9B,KAAI,IAAI,KAAK,IAAI,eAAe,EAAE;QAChC,IAAG,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE;YACvD,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACrC;QACD,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;KACxC;IAED,2BAA2B;IAC3B,OAAO,CAAC,KAAK,CAAC,2BAA2B,MAAM,eAAe,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC1G,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC"}
1
+ {"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/commands/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAGzB,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,MAAM,UAAU,YAAY,CAAC,OAAgB;IAC3C,OAAO;SACJ,OAAO,CAAC,mBAAmB,CAAC;SAC5B,WAAW,CAAC,uCAAuC,CAAC;SACpD,MAAM,CAAC,aAAa,EAAE,qCAAqC,CAAC;SAC5D,MAAM,CAAC,2BAA2B,EAAE,4DAA4D,CAAC;SACjG,MAAM,CAAC,uBAAuB,EAAE,+CAA+C,CAAC;SAChF,MAAM,CAAC,mCAAmC,EAAE,mCAAmC,CAAC;SAChF,MAAM,CAAC,2BAA2B,EAAE,8CAA8C,CAAC;SACnF,MAAM,CAAC,KAAK,EAAE,SAAmB,EAAE,OAAY,EAAE,EAAE;QAClD,IAAG,CAAC,SAAS,CAAC,MAAM,EAAE;YACpB,uEAAuE;YACvE,wCAAwC;YACxC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACrB;QAED,KAAI,IAAI,QAAQ,IAAI,SAAS,EAAE;YAC7B,IAAG,CAAC,MAAM,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE;gBAClC,2DAA2D;gBAC3D,gDAAgD;gBAChD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;SACF;IACH,CAAC,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,KAAK,CAAC,QAAgB,EAAE,OAA6B;IAClE,IAAI,SAAS,GAAG,IAAI,qBAAqB,EAAE,CAAC;IAE5C,IAAI;QACF,SAAS,CAAC,aAAa,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;QAE9E,IAAG,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC3B,SAAS,CAAC,aAAa,CAAC,sBAAsB,CAAC,sBAAsB,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;YACnF,OAAO,KAAK,CAAC;SACd;QAED,IAAI,OAAO,GAAG,IAAI,CAAC;QAEnB,yEAAyE;QACzE,IAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE;YACtC,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;SAC9B;aAAM;YACL,mEAAmE;YACnE,IAAI,UAAU,GAAa,EAAE,CAAC;YAC9B,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;YACnJ,IAAG,CAAC,OAAO,EAAE;gBACX,SAAS,CAAC,aAAa,CAAC,sBAAsB,CAAC,2BAA2B,CAAC,EAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAC,CAAC,CAAC,CAAC;gBAC3H,OAAO,KAAK,CAAC;aACd;SACF;QAED,IAAI,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/D,IAAG,MAAM,EAAE;YACT,SAAS,CAAC,aAAa,CAAC,sBAAsB,CAAC,0BAA0B,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;SACxF;aAAM;YACL,SAAS,CAAC,aAAa,CAAC,sBAAsB,CAAC,6BAA6B,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;SAC3F;QAED,OAAO,MAAM,CAAC;KACf;IAAC,OAAM,CAAC,EAAE;QACT,SAAS,CAAC,aAAa,CAAC,sBAAsB,CAAC,yBAAyB,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC,CAAC;QAC/E,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}
@@ -1,7 +1,7 @@
1
1
  import * as fs from 'fs';
2
2
  import * as path from 'path';
3
3
  import * as kmc from '@keymanapp/kmc-keyboard';
4
- import { NodeCompilerCallbacks } from '../../util/NodeCompilerCallbacks.js';
4
+ import { NodeCompilerCallbacks } from '../../messages/NodeCompilerCallbacks.js';
5
5
  ;
6
6
  export function buildTestData(infile, options) {
7
7
  let compilerOptions = {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/buildTestData/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,yBAAyB,CAAC;AAE/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAI3E,CAAC;AAEF,MAAM,UAAU,aAAa,CAAC,MAAc,EAAE,OAA6B;IACzE,IAAI,eAAe,GAAwB;QACzC,KAAK,EAAE,KAAK;QACZ,kBAAkB,EAAE,KAAK;KAC1B,CAAC;IAEF,IAAI,QAAQ,GAAG,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACrD,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO;KACR;IAED,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC;IAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;IAC5E,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,6BAA6B,WAAW,EAAE,CAAC,CAAC;IACxD,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,YAAY,CAAC,aAAqB,EAAE,OAA4B;IACvE,MAAM,CAAC,GAAsB,IAAI,qBAAqB,EAAE,CAAC;IACzD,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IACvC,IAAI,MAAM,GAAG,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,IAAI,CAAC;KACb;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/buildTestData/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,yBAAyB,CAAC;AAE/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAI/E,CAAC;AAEF,MAAM,UAAU,aAAa,CAAC,MAAc,EAAE,OAA6B;IACzE,IAAI,eAAe,GAAwB;QACzC,KAAK,EAAE,KAAK;QACZ,kBAAkB,EAAE,KAAK;KAC1B,CAAC;IAEF,IAAI,QAAQ,GAAG,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACrD,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO;KACR;IAED,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC;IAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;IAC5E,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,6BAA6B,WAAW,EAAE,CAAC,CAAC;IACxD,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,YAAY,CAAC,aAAqB,EAAE,OAA4B;IACvE,MAAM,CAAC,GAAsB,IAAI,qBAAqB,EAAE,CAAC;IACzD,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IACvC,IAAI,MAAM,GAAG,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,IAAI,CAAC;KACb;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
@@ -6,6 +6,7 @@ import * as fs from 'fs';
6
6
  import { Command } from 'commander';
7
7
  import { compileModel } from '@keymanapp/kmc-model';
8
8
  import KEYMAN_VERSION from "@keymanapp/keyman-version";
9
+ import { NodeCompilerCallbacks } from './messages/NodeCompilerCallbacks.js';
9
10
  let inputFilename;
10
11
  const program = new Command();
11
12
  /* Arguments */
@@ -20,10 +21,11 @@ program.parse(process.argv);
20
21
  if (!inputFilename) {
21
22
  exitDueToUsageError('Must provide a lexical model source file.');
22
23
  }
24
+ const callbacks = new NodeCompilerCallbacks();
23
25
  let code = null;
24
26
  // Compile:
25
27
  try {
26
- code = compileModel(inputFilename);
28
+ code = compileModel(inputFilename, callbacks);
27
29
  }
28
30
  catch (e) {
29
31
  console.error(e);
@@ -1 +1 @@
1
- {"version":3,"file":"kmlmc.js","sourceRoot":"","sources":["../../src/kmlmc.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,cAAc,MAAM,2BAA2B,CAAC;AAEvD,IAAI,aAAqB,CAAC;AAC1B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,eAAe;AACf,OAAO;KACJ,WAAW,CAAC,gCAAgC,CAAC;KAC7C,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC;KACxC,SAAS,CAAC,UAAU,CAAC;KACrB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC;KACxC,MAAM,CAAC,0BAA0B,EAAE,kCAAkC,CAAC,CAAC;AAE1E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,6BAA6B;AAC7B,IAAI,CAAC,aAAa,EAAE;IAClB,mBAAmB,CAAC,2CAA2C,CAAC,CAAC;CAClE;AAED,IAAI,IAAI,GAAG,IAAI,CAAC;AAChB,WAAW;AACX,IAAI;IACF,IAAI,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;CACpC;AAAC,OAAM,CAAC,EAAE;IACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,IAAI,8BAAqB,CAAC;CACnC;AAED,IAAG,CAAC,IAAI,EAAE;IACR,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACpC,OAAO,CAAC,IAAI,8BAAqB,CAAC;CACnC;AAED,UAAU;AACV,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE;IAC1B,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;CACxD;KAAM;IACL,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;CACnB;AAED,SAAS,mBAAmB,CAAC,OAAe;IAC1C,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,KAAK,OAAO,EAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,KAAK,EAAE,CAAC;IAChB,OAAO,CAAC,UAAU,EAAE,CAAC;IACrB,OAAO,OAAO,CAAC,IAAI,4BAAmB,CAAC;AACzC,CAAC"}
1
+ {"version":3,"file":"kmlmc.js","sourceRoot":"","sources":["../../src/kmlmc.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,cAAc,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,IAAI,aAAqB,CAAC;AAC1B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,eAAe;AACf,OAAO;KACJ,WAAW,CAAC,gCAAgC,CAAC;KAC7C,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC;KACxC,SAAS,CAAC,UAAU,CAAC;KACrB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC;KACxC,MAAM,CAAC,0BAA0B,EAAE,kCAAkC,CAAC,CAAC;AAE1E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,6BAA6B;AAC7B,IAAI,CAAC,aAAa,EAAE;IAClB,mBAAmB,CAAC,2CAA2C,CAAC,CAAC;CAClE;AAED,MAAM,SAAS,GAAG,IAAI,qBAAqB,EAAE,CAAC;AAE9C,IAAI,IAAI,GAAG,IAAI,CAAC;AAChB,WAAW;AACX,IAAI;IACF,IAAI,GAAG,YAAY,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;CAC/C;AAAC,OAAM,CAAC,EAAE;IACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,IAAI,8BAAqB,CAAC;CACnC;AAED,IAAG,CAAC,IAAI,EAAE;IACR,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACpC,OAAO,CAAC,IAAI,8BAAqB,CAAC;CACnC;AAED,UAAU;AACV,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE;IAC1B,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;CACxD;KAAM;IACL,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;CACnB;AAED,SAAS,mBAAmB,CAAC,OAAe;IAC1C,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,KAAK,OAAO,EAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,KAAK,EAAE,CAAC;IAChB,OAAO,CAAC,UAAU,EAAE,CAAC;IACrB,OAAO,OAAO,CAAC,IAAI,4BAAmB,CAAC;AACzC,CAAC"}
@@ -8,7 +8,7 @@ import { Command } from 'commander';
8
8
  import KmpCompiler from '@keymanapp/kmc-package';
9
9
  import { writeMergedModelMetadataFile } from '@keymanapp/kmc-model-info';
10
10
  import KEYMAN_VERSION from "@keymanapp/keyman-version";
11
- import { NodeCompilerCallbacks } from './util/NodeCompilerCallbacks.js';
11
+ import { NodeCompilerCallbacks } from './messages/NodeCompilerCallbacks.js';
12
12
  let inputFilename;
13
13
  const program = new Command();
14
14
  /* Arguments */
@@ -1 +1 @@
1
- {"version":3,"file":"kmlmi.js","sourceRoot":"","sources":["../../src/kmlmi.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"kmlmi.js","sourceRoot":"","sources":["../../src/kmlmi.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,7 @@ import * as fs from 'fs';
6
6
  import { Command } from 'commander';
7
7
  import KmpCompiler from '@keymanapp/kmc-package';
8
8
  import KEYMAN_VERSION from "@keymanapp/keyman-version";
9
- import { NodeCompilerCallbacks } from './util/NodeCompilerCallbacks.js';
9
+ import { NodeCompilerCallbacks } from './messages/NodeCompilerCallbacks.js';
10
10
  let inputFilename;
11
11
  const program = new Command();
12
12
  /* Arguments */
@@ -1 +1 @@
1
- {"version":3,"file":"kmlmp.js","sourceRoot":"","sources":["../../src/kmlmp.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,WAAW,MAAM,wBAAwB,CAAC;AAEjD,OAAO,cAAc,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAExE,IAAI,aAAqB,CAAC;AAC1B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,eAAe;AACf,OAAO;KACJ,WAAW,CAAC,wCAAwC,CAAC;KACrD,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC;KACxC,SAAS,CAAC,UAAU,CAAC;KACrB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC;KACxC,MAAM,CAAC,0BAA0B,EAAE,kCAAkC,CAAC,CAAC;AAE1E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,6BAA6B;AAE7B,IAAI,CAAC,aAAa,EAAE;IAClB,mBAAmB,CAAC,mDAAmD,CAAC,CAAC;CAC1E;AAED,IAAI,cAAc,GAAW,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAEvH,EAAE;AACF,wBAAwB;AACxB,EAAE;AAEF,MAAM,SAAS,GAAG,IAAI,qBAAqB,EAAE,CAAC;AAC9C,IAAI,SAAS,GAAW,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;AAC7C,IAAI,WAAW,GAAG,WAAW,CAAC,uBAAuB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AAEhF,EAAE;AACF,8BAA8B;AAC9B,EAAE;AAEF,IAAI,OAAO,GAAG,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;AACnE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;IAClB,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;IACf,wCAAwC;IACxC,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEH,SAAS,mBAAmB,CAAC,OAAe;IAC1C,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,KAAK,OAAO,EAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,KAAK,EAAE,CAAC;IAChB,OAAO,CAAC,UAAU,EAAE,CAAC;IACrB,OAAO,OAAO,CAAC,IAAI,4BAAmB,CAAC;AACzC,CAAC"}
1
+ {"version":3,"file":"kmlmp.js","sourceRoot":"","sources":["../../src/kmlmp.ts"],"names":[],"mappings":";AACA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,WAAW,MAAM,wBAAwB,CAAC;AAEjD,OAAO,cAAc,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,IAAI,aAAqB,CAAC;AAC1B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,eAAe;AACf,OAAO;KACJ,WAAW,CAAC,wCAAwC,CAAC;KACrD,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC;KACxC,SAAS,CAAC,UAAU,CAAC;KACrB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC;KACxC,MAAM,CAAC,0BAA0B,EAAE,kCAAkC,CAAC,CAAC;AAE1E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,6BAA6B;AAE7B,IAAI,CAAC,aAAa,EAAE;IAClB,mBAAmB,CAAC,mDAAmD,CAAC,CAAC;CAC1E;AAED,IAAI,cAAc,GAAW,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAEvH,EAAE;AACF,wBAAwB;AACxB,EAAE;AAEF,MAAM,SAAS,GAAG,IAAI,qBAAqB,EAAE,CAAC;AAC9C,IAAI,SAAS,GAAW,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;AAC7C,IAAI,WAAW,GAAG,WAAW,CAAC,uBAAuB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AAEhF,EAAE;AACF,8BAA8B;AAC9B,EAAE;AAEF,IAAI,OAAO,GAAG,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;AACnE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;IAClB,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;IACf,wCAAwC;IACxC,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEH,SAAS,mBAAmB,CAAC,OAAe;IAC1C,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,KAAK,OAAO,EAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,KAAK,EAAE,CAAC;IAChB,OAAO,CAAC,UAAU,EAAE,CAAC;IACrB,OAAO,OAAO,CAAC,IAAI,4BAAmB,CAAC;AACzC,CAAC"}
@@ -1,14 +1,12 @@
1
1
  /// <reference types="node" resolution-mode="require"/>
2
- import { CompilerCallbacks, CompilerEvent } from '@keymanapp/common-types';
2
+ import { CompilerCallbacks, CompilerSchema, CompilerEvent } from '@keymanapp/common-types';
3
3
  /**
4
4
  * Concrete implementation for CLI use
5
5
  */
6
6
  export declare class NodeCompilerCallbacks implements CompilerCallbacks {
7
7
  loadFile(baseFilename: string, filename: string | URL): Buffer;
8
8
  reportMessage(event: CompilerEvent): void;
9
- loadLdmlKeyboardSchema(): Buffer;
10
- loadLdmlKeyboardTestSchema(): Buffer;
11
- loadKvksJsonSchema(): Buffer;
12
- loadKpjJsonSchema(): Buffer;
9
+ debug(msg: string): void;
10
+ loadSchema(schema: CompilerSchema): Buffer;
13
11
  }
14
12
  //# sourceMappingURL=NodeCompilerCallbacks.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"NodeCompilerCallbacks.d.ts","sourceRoot":"","sources":["../../../src/messages/NodeCompilerCallbacks.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAA6B,MAAM,yBAAyB,CAAC;AAEtH;;GAEG;AACH,qBAAa,qBAAsB,YAAW,iBAAiB;IAC7D,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,GAAG,GAAG,MAAM;IAa9D,aAAa,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IASzC,KAAK,CAAC,GAAG,EAAE,MAAM;IAIjB,UAAU,CAAC,MAAM,EAAE,cAAc;CAIlC"}
@@ -27,20 +27,11 @@ export class NodeCompilerCallbacks {
27
27
  console.log(`${compilerErrorSeverityName(event.code)} ${code}: ${event.message}`);
28
28
  }
29
29
  }
30
- loadLdmlKeyboardSchema() {
31
- let schemaPath = new URL('ldml-keyboard.schema.json', import.meta.url);
32
- return fs.readFileSync(schemaPath);
33
- }
34
- loadLdmlKeyboardTestSchema() {
35
- let schemaPath = new URL('ldml-keyboardtest.schema.json', import.meta.url);
36
- return fs.readFileSync(schemaPath);
37
- }
38
- loadKvksJsonSchema() {
39
- let schemaPath = new URL('kvks.schema.json', import.meta.url);
40
- return fs.readFileSync(schemaPath);
30
+ debug(msg) {
31
+ console.debug(msg);
41
32
  }
42
- loadKpjJsonSchema() {
43
- let schemaPath = new URL('kpj.schema.json', import.meta.url);
33
+ loadSchema(schema) {
34
+ let schemaPath = new URL('../util/' + schema + '.schema.json', import.meta.url);
44
35
  return fs.readFileSync(schemaPath);
45
36
  }
46
37
  }
@@ -0,0 +1 @@
1
+ {"version":3,"file":"NodeCompilerCallbacks.js","sourceRoot":"","sources":["../../../src/messages/NodeCompilerCallbacks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAoD,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAEtH;;GAEG;AACH,MAAM,OAAO,qBAAqB;IAChC,QAAQ,CAAC,YAAoB,EAAE,QAAsB;QACnD,qDAAqD;QACrD,IAAI;YACF,OAAO,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;SAClC;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACvB,OAAO,IAAI,CAAC;aACb;iBAAM;gBACL,MAAM,CAAC,CAAC;aACT;SACF;IACH,CAAC;IAED,aAAa,CAAC,KAAoB;QAChC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACrC,IAAG,KAAK,CAAC,IAAI,EAAE;YACb,OAAO,CAAC,GAAG,CAAC,GAAG,yBAAyB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,KAAK,CAAC,IAAI,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;SACnG;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,GAAG,yBAAyB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;SACnF;IACH,CAAC;IAED,KAAK,CAAC,GAAW;QACf,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;IAED,UAAU,CAAC,MAAsB;QAC/B,IAAI,UAAU,GAAG,IAAI,GAAG,CAAC,UAAU,GAAG,MAAM,GAAG,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChF,OAAO,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;CACF"}
@@ -0,0 +1,34 @@
1
+ export declare class InfrastructureMessages {
2
+ static Fatal_UnexpectedException: (o: {
3
+ e: any;
4
+ }) => import("@keymanapp/common-types").CompilerEvent;
5
+ static FATAL_UnexpectedException: number;
6
+ static Info_BuildingFile: (o: {
7
+ filename: string;
8
+ }) => import("@keymanapp/common-types").CompilerEvent;
9
+ static INFO_BuildingFile: number;
10
+ static Error_FileDoesNotExist: (o: {
11
+ filename: string;
12
+ }) => import("@keymanapp/common-types").CompilerEvent;
13
+ static ERROR_FileDoesNotExist: number;
14
+ static Error_FileTypeNotRecognized: (o: {
15
+ filename: string;
16
+ extensions: string;
17
+ }) => import("@keymanapp/common-types").CompilerEvent;
18
+ static ERROR_FileTypeNotRecognized: number;
19
+ static Error_OutFileNotValidForProjects: () => import("@keymanapp/common-types").CompilerEvent;
20
+ static ERROR_OutFileNotValidForProjects: number;
21
+ static Info_FileBuiltSuccessfully: (o: {
22
+ filename: string;
23
+ }) => import("@keymanapp/common-types").CompilerEvent;
24
+ static INFO_FileBuiltSuccessfully: number;
25
+ static Info_FileNotBuiltSuccessfully: (o: {
26
+ filename: string;
27
+ }) => import("@keymanapp/common-types").CompilerEvent;
28
+ static INFO_FileNotBuiltSuccessfully: number;
29
+ static Error_InvalidProjectFile: (o: {
30
+ message: string;
31
+ }) => import("@keymanapp/common-types").CompilerEvent;
32
+ static ERROR_InvalidProjectFile: number;
33
+ }
34
+ //# sourceMappingURL=messages.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/messages/messages.ts"],"names":[],"mappings":"AASA,qBAAa,sBAAsB;IACjC,MAAM,CAAC,yBAAyB,MAAM;QAAC,CAAC,EAAE,GAAG,CAAA;KAAC,qDACgG;IAC9I,MAAM,CAAC,yBAAyB,SAAqB;IAErD,MAAM,CAAC,iBAAiB,MAAM;QAAC,QAAQ,EAAC,MAAM,CAAA;KAAC,qDACnB;IAC5B,MAAM,CAAC,iBAAiB,SAAoB;IAE5C,MAAM,CAAC,sBAAsB,MAAM;QAAC,QAAQ,EAAC,MAAM,CAAA;KAAC,qDACb;IACvC,MAAM,CAAC,sBAAsB,SAAqB;IAElD,MAAM,CAAC,2BAA2B,MAAM;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAC,qDACW;IACzF,MAAM,CAAC,2BAA2B,SAAqB;IAEvD,MAAM,CAAC,gCAAgC,wDACoB;IAC3D,MAAM,CAAC,gCAAgC,SAAqB;IAE5D,MAAM,CAAC,0BAA0B,MAAM;QAAC,QAAQ,EAAC,MAAM,CAAA;KAAC,qDACjB;IACvC,MAAM,CAAC,0BAA0B,SAAoB;IAErD,MAAM,CAAC,6BAA6B,MAAM;QAAC,QAAQ,EAAC,MAAM,CAAA;KAAC,qDACvB;IACpC,MAAM,CAAC,6BAA6B,SAAoB;IAExD,MAAM,CAAC,wBAAwB,MAAM;QAAC,OAAO,EAAC,MAAM,CAAA;KAAC,qDACR;IAC7C,MAAM,CAAC,wBAAwB,SAAqB;CACrD"}
@@ -0,0 +1,26 @@
1
+ import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m } from "@keymanapp/common-types";
2
+ const Namespace = CompilerErrorNamespace.Infrastructure;
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 InfrastructureMessages {
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 Info_BuildingFile = (o) => m(this.INFO_BuildingFile, `Building ${o.filename}`);
12
+ static INFO_BuildingFile = SevInfo | 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_FileTypeNotRecognized = (o) => m(this.ERROR_FileTypeNotRecognized, `Unrecognised input file ${o.filename}, expecting ${o.extensions}, or project folder`);
16
+ static ERROR_FileTypeNotRecognized = SevError | 0x0004;
17
+ static Error_OutFileNotValidForProjects = () => m(this.ERROR_OutFileNotValidForProjects, `--out-file should not be specified for project builds`);
18
+ static ERROR_OutFileNotValidForProjects = SevError | 0x0005;
19
+ static Info_FileBuiltSuccessfully = (o) => m(this.INFO_FileBuiltSuccessfully, `${o.filename} built successfully.`);
20
+ static INFO_FileBuiltSuccessfully = SevInfo | 0x0006;
21
+ static Info_FileNotBuiltSuccessfully = (o) => m(this.INFO_FileNotBuiltSuccessfully, `${o.filename} failed to build.`);
22
+ static INFO_FileNotBuiltSuccessfully = SevInfo | 0x0007;
23
+ static Error_InvalidProjectFile = (o) => m(this.ERROR_InvalidProjectFile, `Project file is not valid: ${o.message}`);
24
+ static ERROR_InvalidProjectFile = SevError | 0x0008;
25
+ }
26
+ //# sourceMappingURL=messages.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../src/messages/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,mBAAmB,IAAI,CAAC,EAAE,MAAM,yBAAyB,CAAC;AAElH,MAAM,SAAS,GAAG,sBAAsB,CAAC,cAAc,CAAC;AACxD,MAAM,OAAO,GAAG,qBAAqB,CAAC,IAAI,GAAG,SAAS,CAAC;AACvD,0DAA0D;AAC1D,0DAA0D;AAC1D,MAAM,QAAQ,GAAG,qBAAqB,CAAC,KAAK,GAAG,SAAS,CAAC;AACzD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,KAAK,GAAG,SAAS,CAAC;AAEzD,MAAM,OAAO,sBAAsB;IACjC,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,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAC1E,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC5B,MAAM,CAAC,iBAAiB,GAAG,OAAO,GAAG,MAAM,CAAC;IAE5C,MAAM,CAAC,sBAAsB,GAAG,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,EACpF,QAAQ,CAAC,CAAC,QAAQ,iBAAiB,CAAC,CAAC;IACvC,MAAM,CAAC,sBAAsB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAElD,MAAM,CAAC,2BAA2B,GAAG,CAAC,CAAwC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,2BAA2B,EACnH,2BAA2B,CAAC,CAAC,QAAQ,eAAe,CAAC,CAAC,UAAU,qBAAqB,CAAC,CAAC;IACzF,MAAM,CAAC,2BAA2B,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEvD,MAAM,CAAC,gCAAgC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,gCAAgC,EACrF,uDAAuD,CAAC,CAAC;IAC3D,MAAM,CAAC,gCAAgC,GAAG,QAAQ,GAAG,MAAM,CAAC;IAE5D,MAAM,CAAC,0BAA0B,GAAG,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,0BAA0B,EAC5F,GAAG,CAAC,CAAC,QAAQ,sBAAsB,CAAC,CAAC;IACvC,MAAM,CAAC,0BAA0B,GAAG,OAAO,GAAG,MAAM,CAAC;IAErD,MAAM,CAAC,6BAA6B,GAAG,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,6BAA6B,EAClG,GAAG,CAAC,CAAC,QAAQ,mBAAmB,CAAC,CAAC;IACpC,MAAM,CAAC,6BAA6B,GAAG,OAAO,GAAG,MAAM,CAAC;IAExD,MAAM,CAAC,wBAAwB,GAAG,CAAC,CAAkB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,EACvF,8BAA8B,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7C,MAAM,CAAC,wBAAwB,GAAG,QAAQ,GAAG,MAAM,CAAC"}
package/package.json CHANGED
@@ -37,14 +37,14 @@
37
37
  "kmlmi": "build/src/kmlmi.js"
38
38
  },
39
39
  "dependencies": {
40
- "@keymanapp/keyman-version": "17.0.91-alpha",
41
- "@keymanapp/common-types": "17.0.91-alpha",
42
- "@keymanapp/kmc-keyboard": "17.0.91-alpha",
43
- "@keymanapp/kmc-kmn": "17.0.91-alpha",
44
- "@keymanapp/kmc-model": "17.0.91-alpha",
45
- "@keymanapp/kmc-model-info": "17.0.91-alpha",
46
- "@keymanapp/kmc-package": "17.0.91-alpha",
47
- "@keymanapp/models-types": "17.0.91-alpha",
40
+ "@keymanapp/keyman-version": "17.0.93-alpha",
41
+ "@keymanapp/common-types": "17.0.93-alpha",
42
+ "@keymanapp/kmc-keyboard": "17.0.93-alpha",
43
+ "@keymanapp/kmc-kmn": "17.0.93-alpha",
44
+ "@keymanapp/kmc-model": "17.0.93-alpha",
45
+ "@keymanapp/kmc-model-info": "17.0.93-alpha",
46
+ "@keymanapp/kmc-package": "17.0.93-alpha",
47
+ "@keymanapp/models-types": "17.0.93-alpha",
48
48
  "commander": "^10.0.0"
49
49
  },
50
50
  "files": [
@@ -83,5 +83,5 @@
83
83
  "type": "git",
84
84
  "url": "git+https://github.com/keymanapp/keyman.git"
85
85
  },
86
- "version": "17.0.91-alpha"
86
+ "version": "17.0.93-alpha"
87
87
  }
@@ -1 +0,0 @@
1
- {"version":3,"file":"NodeCompilerCallbacks.d.ts","sourceRoot":"","sources":["../../../src/util/NodeCompilerCallbacks.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAA6B,MAAM,yBAAyB,CAAC;AAEtG;;GAEG;AACH,qBAAa,qBAAsB,YAAW,iBAAiB;IAC7D,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,GAAG,GAAG,MAAM;IAa9D,aAAa,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IASzC,sBAAsB,IAAI,MAAM;IAIhC,0BAA0B,IAAI,MAAM;IAIpC,kBAAkB,IAAI,MAAM;IAI5B,iBAAiB,IAAI,MAAM;CAI5B"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"NodeCompilerCallbacks.js","sourceRoot":"","sources":["../../../src/util/NodeCompilerCallbacks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAoC,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAEtG;;GAEG;AACH,MAAM,OAAO,qBAAqB;IAChC,QAAQ,CAAC,YAAoB,EAAE,QAAsB;QACnD,qDAAqD;QACrD,IAAI;YACF,OAAO,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;SAClC;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACvB,OAAO,IAAI,CAAC;aACb;iBAAM;gBACL,MAAM,CAAC,CAAC;aACT;SACF;IACH,CAAC;IAED,aAAa,CAAC,KAAoB;QAChC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACrC,IAAG,KAAK,CAAC,IAAI,EAAE;YACb,OAAO,CAAC,GAAG,CAAC,GAAG,yBAAyB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,KAAK,CAAC,IAAI,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;SACnG;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,GAAG,yBAAyB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;SACnF;IACH,CAAC;IAED,sBAAsB;QACpB,IAAI,UAAU,GAAG,IAAI,GAAG,CAAC,2BAA2B,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvE,OAAO,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;IACD,0BAA0B;QACxB,IAAI,UAAU,GAAG,IAAI,GAAG,CAAC,+BAA+B,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3E,OAAO,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;IACD,kBAAkB;QAChB,IAAI,UAAU,GAAG,IAAI,GAAG,CAAC,kBAAkB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9D,OAAO,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;IACD,iBAAiB;QACf,IAAI,UAAU,GAAG,IAAI,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7D,OAAO,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;CACF"}