@keymanapp/kmc-generate 18.0.174-alpha → 18.0.175-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.
@@ -33,5 +33,17 @@ export declare class GeneratorMessages {
33
33
  static Error_InvalidTarget: (o: {
34
34
  target: string;
35
35
  }) => import("@keymanapp/developer-utils").CompilerEvent;
36
+ static ERROR_InvalidKeymanKeyboardId: number;
37
+ static Error_InvalidKeymanKeyboardId: (o: {
38
+ id: string;
39
+ }) => import("@keymanapp/developer-utils").CompilerEvent;
40
+ static ERROR_InvalidLdmlKeyboardId: number;
41
+ static Error_InvalidLdmlKeyboardId: (o: {
42
+ id: string;
43
+ }) => import("@keymanapp/developer-utils").CompilerEvent;
44
+ static ERROR_InvalidLexicalModelId: number;
45
+ static Error_InvalidLexicalModelId: (o: {
46
+ id: string;
47
+ }) => import("@keymanapp/developer-utils").CompilerEvent;
36
48
  }
37
49
  //# sourceMappingURL=generator-messages.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"generator-messages.d.ts","sourceRoot":"","sources":["../../src/generator-messages.ts"],"names":[],"mappings":"AAeA;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,yBAAyB,SAAqB;IACrD,MAAM,CAAC,yBAAyB,MAAM;QAAC,CAAC,EAAE,GAAG,CAAA;KAAC,wDAE5C;IAEF,MAAM,CAAC,sBAAsB,SAAoB;IACjD,MAAM,CAAC,sBAAsB,MAAM;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,wDAG3D;IAEF,MAAM,CAAC,wBAAwB,SAAqB;IACpD,MAAM,CAAC,wBAAwB,MAAM;QAAC,UAAU,EAAC,MAAM,CAAC;QAAC,CAAC,EAAE,GAAG,CAAA;KAAC,wDAG9D;IAEF,MAAM,CAAC,6BAA6B,SAAqB;IACzD,MAAM,CAAC,6BAA6B,MAAM;QAAC,OAAO,EAAC,MAAM,CAAA;KAAC,wDAGxD;IAEF,MAAM,CAAC,2BAA2B,SAAqB;IACvD,MAAM,CAAC,2BAA2B,MAAM;QAAC,QAAQ,EAAC,MAAM,CAAC;QAAC,CAAC,EAAE,GAAG,CAAA;KAAC,wDAG/D;IAGF,MAAM,CAAC,gDAAgD,SAAoB;IAC3E,MAAM,CAAC,gDAAgD,MAAM;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,wDAKvE;IAEF,MAAM,CAAC,mBAAmB,SAAqB;IAC/C,MAAM,CAAC,mBAAmB,MAAM;QAAC,MAAM,EAAC,MAAM,CAAA;KAAC,wDAG7C;CACH"}
1
+ {"version":3,"file":"generator-messages.d.ts","sourceRoot":"","sources":["../../src/generator-messages.ts"],"names":[],"mappings":"AAeA;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,yBAAyB,SAAqB;IACrD,MAAM,CAAC,yBAAyB,MAAM;QAAC,CAAC,EAAE,GAAG,CAAA;KAAC,wDAE5C;IAEF,MAAM,CAAC,sBAAsB,SAAoB;IACjD,MAAM,CAAC,sBAAsB,MAAM;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,wDAG3D;IAEF,MAAM,CAAC,wBAAwB,SAAqB;IACpD,MAAM,CAAC,wBAAwB,MAAM;QAAC,UAAU,EAAC,MAAM,CAAC;QAAC,CAAC,EAAE,GAAG,CAAA;KAAC,wDAG9D;IAEF,MAAM,CAAC,6BAA6B,SAAqB;IACzD,MAAM,CAAC,6BAA6B,MAAM;QAAC,OAAO,EAAC,MAAM,CAAA;KAAC,wDAGxD;IAEF,MAAM,CAAC,2BAA2B,SAAqB;IACvD,MAAM,CAAC,2BAA2B,MAAM;QAAC,QAAQ,EAAC,MAAM,CAAC;QAAC,CAAC,EAAE,GAAG,CAAA;KAAC,wDAG/D;IAGF,MAAM,CAAC,gDAAgD,SAAoB;IAC3E,MAAM,CAAC,gDAAgD,MAAM;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,wDAKvE;IAEF,MAAM,CAAC,mBAAmB,SAAqB;IAC/C,MAAM,CAAC,mBAAmB,MAAM;QAAC,MAAM,EAAC,MAAM,CAAA;KAAC,wDAG7C;IAEF,MAAM,CAAC,6BAA6B,SAAqB;IACzD,MAAM,CAAC,6BAA6B,MAAM;QAAC,EAAE,EAAC,MAAM,CAAA;KAAC,wDAGnD;IAEF,MAAM,CAAC,2BAA2B,SAAqB;IACvD,MAAM,CAAC,2BAA2B,MAAM;QAAC,EAAE,EAAC,MAAM,CAAA;KAAC,wDAGjD;IAEF,MAAM,CAAC,2BAA2B,SAAqB;IACvD,MAAM,CAAC,2BAA2B,MAAM;QAAC,EAAE,EAAC,MAAM,CAAA;KAAC,wDAGjD;CACH"}
@@ -31,6 +31,12 @@ export class GeneratorMessages {
31
31
  `<author>.<bcp47>.<uniq>`);
32
32
  static ERROR_InvalidTarget = SevError | 0x0007;
33
33
  static Error_InvalidTarget = (o) => m(this.ERROR_InvalidTarget, `The specified target platform '${def(o.target)}' is not a valid target.`);
34
+ static ERROR_InvalidKeymanKeyboardId = SevError | 0x0008;
35
+ static Error_InvalidKeymanKeyboardId = (o) => m(this.ERROR_InvalidKeymanKeyboardId, `The specified keyboard id '${def(o.id)}' contains characters that are not permitted for a .kmn keyboard id or filename.`);
36
+ static ERROR_InvalidLdmlKeyboardId = SevError | 0x0009;
37
+ static Error_InvalidLdmlKeyboardId = (o) => m(this.ERROR_InvalidLdmlKeyboardId, `The specified keyboard id '${def(o.id)}' contains characters that are not permitted for an LDML .xml keyboard id or filename.`);
38
+ static ERROR_InvalidLexicalModelId = SevError | 0x000A;
39
+ static Error_InvalidLexicalModelId = (o) => m(this.ERROR_InvalidLexicalModelId, `The specified lexical model id '${def(o.id)}' contains characters that are not permitted or does not match the required pattern of 'author.bcp47.uniq'.`);
34
40
  }
35
41
  ;
36
42
  //# sourceMappingURL=generator-messages.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"generator-messages.js","sourceRoot":"","sources":["../../src/generator-messages.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,mBAAmB,IAAI,CAAC,EAAE,kBAAkB,IAAI,GAAG,EAAE,gCAAgC,EAAE,MAAM,4BAA4B,CAAC;AAElL,MAAM,SAAS,GAAG,sBAAsB,CAAC,SAAS,CAAC;AACnD,MAAM,OAAO,GAAG,qBAAqB,CAAC,IAAI,GAAG,SAAS,CAAC;AACvD,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;;GAEG;AACH,MAAM,OAAO,iBAAiB;IAC5B,MAAM,CAAC,yBAAyB,GAAG,QAAQ,GAAG,MAAM,CAAC;IACrD,MAAM,CAAC,yBAAyB,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,CAClD,IAAI,CAAC,yBAAyB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,eAAe,CAC7D,CAAC;IAEF,MAAM,CAAC,sBAAsB,GAAG,OAAO,GAAG,MAAM,CAAC;IACjD,MAAM,CAAC,sBAAsB,GAAG,CAAC,CAA4B,EAAE,EAAE,CAAC,CAAC,CACjE,IAAI,CAAC,sBAAsB,EAC3B,8BAA8B,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CACjE,CAAC;IAEF,MAAM,CAAC,wBAAwB,GAAG,QAAQ,GAAG,MAAM,CAAC;IACpD,MAAM,CAAC,wBAAwB,GAAG,CAAC,CAA6B,EAAE,EAAE,CAAC,gCAAgC,CACnG,IAAI,CAAC,wBAAwB,EAAE,IAAI,EACnC,2BAA2B,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,eAAe,EAAE,CAC1E,CAAC;IAEF,MAAM,CAAC,6BAA6B,GAAG,QAAQ,GAAG,MAAM,CAAC;IACzD,MAAM,CAAC,6BAA6B,GAAG,CAAC,CAAkB,EAAE,EAAE,CAAC,CAAC,CAC9D,IAAI,CAAC,6BAA6B,EAClC,eAAe,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,kCAAkC,CAChE,CAAC;IAEF,MAAM,CAAC,2BAA2B,GAAG,QAAQ,GAAG,MAAM,CAAC;IACvD,MAAM,CAAC,2BAA2B,GAAG,CAAC,CAA2B,EAAE,EAAE,CAAC,gCAAgC,CACpG,IAAI,CAAC,2BAA2B,EAAE,IAAI,EACtC,wBAAwB,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,eAAe,EAAE,CACrE,CAAC;IAEF,wFAAwF;IACxF,MAAM,CAAC,gDAAgD,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3E,MAAM,CAAC,gDAAgD,GAAG,CAAC,CAAc,EAAE,EAAE,CAAC,CAAC,CAC7E,IAAI,CAAC,gDAAgD,EACrD,UAAU,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,0FAA0F;QAC7G,iHAAiH;QACjH,yBAAyB,CAC1B,CAAC;IAEF,MAAM,CAAC,mBAAmB,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC/C,MAAM,CAAC,mBAAmB,GAAG,CAAC,CAAiB,EAAE,EAAE,CAAC,CAAC,CACnD,IAAI,CAAC,mBAAmB,EACxB,kCAAkC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,0BAA0B,CAC1E,CAAC;;AACH,CAAC"}
1
+ {"version":3,"file":"generator-messages.js","sourceRoot":"","sources":["../../src/generator-messages.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"keyman-keyboard-generator.d.ts","sourceRoot":"","sources":["../../src/keyman-keyboard-generator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAG,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAsB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;GAIG;AACH,qBAAa,uBAAwB,SAAQ,cAAe,YAAW,cAAc;IAUnF,MAAM,CAAC,QAAQ,CAAC,cAAc,cAAc;IAC5C,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAAwF;IACzH,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAAiF;IAClH,MAAM,CAAC,QAAQ,CAAC,kBAAkB,SAAwF;IAC1H,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAAqF;IACtH,MAAM,CAAC,QAAQ,CAAC,aAAa,SAA6D;IAE1F;;;;;;OAMG;IACG,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC;IAsDrC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAE9B;IAED,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyE;IACjG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqE;IAC5F,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqE;IAC5F,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA+D;IAI9F,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IAEvC,OAAO,CAAC,SAAS;CAKlB"}
1
+ {"version":3,"file":"keyman-keyboard-generator.d.ts","sourceRoot":"","sources":["../../src/keyman-keyboard-generator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAa,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAsB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD;;;;GAIG;AACH,qBAAa,uBAAwB,SAAQ,cAAe,YAAW,cAAc;IAUnF,MAAM,CAAC,QAAQ,CAAC,cAAc,cAAc;IAC5C,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAAwF;IACzH,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAAiF;IAClH,MAAM,CAAC,QAAQ,CAAC,kBAAkB,SAAwF;IAC1H,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAAqF;IACtH,MAAM,CAAC,QAAQ,CAAC,aAAa,SAA6D;IAE1F;;;;;;OAMG;IACG,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC;IA2DrC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAE9B;IAED,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyE;IACjG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqE;IAC5F,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqE;IAC5F,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA+D;IAI9F,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IAEvC,OAAO,CAAC,SAAS;CAKlB"}
@@ -4,7 +4,9 @@
4
4
  * Generate a Keyman keyboard project (.kmn source)
5
5
  */
6
6
  import { KeymanTargets } from '@keymanapp/common-types';
7
+ import { ValidIds, } from '@keymanapp/developer-utils';
7
8
  import { BasicGenerator } from './basic-generator.js';
9
+ import { GeneratorMessages } from './generator-messages.js';
8
10
  /**
9
11
  * @public
10
12
  * Generate a Keyman keyboard project. The generator does not read or write from
@@ -33,6 +35,10 @@ export class KeymanKeyboardGenerator extends BasicGenerator {
33
35
  * @returns Binary artifacts on success, null on failure.
34
36
  */
35
37
  async run() {
38
+ if (!ValidIds.isValidKeymanKeyboardId(this.options.id)) {
39
+ this.callbacks.reportMessage(GeneratorMessages.Error_InvalidKeymanKeyboardId({ id: this.options.id }));
40
+ return null;
41
+ }
36
42
  if (!this.preGenerate()) {
37
43
  // errors will have been reported in preGenerate
38
44
  return null;
@@ -1 +1 @@
1
- {"version":3,"file":"keyman-keyboard-generator.js","sourceRoot":"","sources":["../../src/keyman-keyboard-generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"keyman-keyboard-generator.js","sourceRoot":"","sources":["../../src/keyman-keyboard-generator.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"ldml-keyboard-generator.d.ts","sourceRoot":"","sources":["../../src/ldml-keyboard-generator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAG,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAsB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;GAIG;AACH,qBAAa,qBAAsB,SAAQ,cAAe,YAAW,cAAc;IACjF,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,cAAc;IACtD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAAsF;IACvH,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAiF;IAC9G,MAAM,CAAC,QAAQ,CAAC,aAAa,SAA6D;IAE1F;;;;;;OAMG;IACG,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC;IAyBrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuD;IAC5F,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAWzC;CACF"}
1
+ {"version":3,"file":"ldml-keyboard-generator.d.ts","sourceRoot":"","sources":["../../src/ldml-keyboard-generator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAa,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAsB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD;;;;GAIG;AACH,qBAAa,qBAAsB,SAAQ,cAAe,YAAW,cAAc;IACjF,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,cAAc;IACtD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAAsF;IACvH,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAiF;IAC9G,MAAM,CAAC,QAAQ,CAAC,aAAa,SAA6D;IAE1F;;;;;;OAMG;IACG,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC;IA8BrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuD;IAC5F,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAWzC;CACF"}
@@ -3,7 +3,9 @@
3
3
  *
4
4
  * Generate a Keyman LDML keyboard project (.xml source)
5
5
  */
6
+ import { ValidIds, } from '@keymanapp/developer-utils';
6
7
  import { BasicGenerator } from './basic-generator.js';
8
+ import { GeneratorMessages } from './generator-messages.js';
7
9
  /**
8
10
  * @public
9
11
  * Generate a LDML keyboard project. The generator does not read or write from
@@ -22,6 +24,10 @@ export class LdmlKeyboardGenerator extends BasicGenerator {
22
24
  * @returns Binary artifacts on success, null on failure.
23
25
  */
24
26
  async run() {
27
+ if (!ValidIds.isValidLdmlKeyboardId(this.options.id)) {
28
+ this.callbacks.reportMessage(GeneratorMessages.Error_InvalidLdmlKeyboardId({ id: this.options.id }));
29
+ return null;
30
+ }
25
31
  if (!this.preGenerate()) {
26
32
  // errors will have been reported in preGenerate
27
33
  return null;
@@ -1 +1 @@
1
- {"version":3,"file":"ldml-keyboard-generator.js","sourceRoot":"","sources":["../../src/ldml-keyboard-generator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;GAIG;AACH,MAAM,OAAO,qBAAsB,SAAQ,cAAc;IAC7C,MAAM,CAAU,cAAc,GAAG,UAAU,CAAC;IACtD,MAAM,CAAU,iBAAiB,GAAG,GAAG,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,cAAc,GAAG,gDAAmC,EAAE,CAAC;IACvH,MAAM,CAAU,aAAa,GAAG,GAAG,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,cAAc,GAAG,2CAA8B,EAAE,CAAC;IAC9G,MAAM,CAAU,aAAa,GAAG,GAAG,IAAI,CAAC,cAAc,GAAG,2CAA8B,EAAE,CAAC;IAE1F;;;;;;OAMG;IACH,KAAK,CAAC,GAAG;QACP,IAAG,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACvB,gDAAgD;YAChD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,SAAS,GAAuB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9D,IAAI,CAAC,YAAY,GAAG,eAAe,CAAC;QACpC,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,aAAa,CAAC;YACnD,IAAI,CAAC,OAAO,CAAC,EAAE,8CAA+B,CAAC;QACjD,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,iBAAiB,CAAC;YACvD,qBAAqB,CAAC,YAAY,GAAC,IAAI,CAAC,OAAO,CAAC,EAAE,mDAAoC,CAAC;QACzF,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,aAAa,CAAC;YACnD,qBAAqB,CAAC,YAAY,GAAC,IAAI,CAAC,OAAO,CAAC,EAAE,8CAA+B,CAAC;QAEpF,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACzD,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAE1E,IAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,EAAC,SAAS,EAAC,CAAC;IACrB,CAAC;IAEgB,oBAAoB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC;IAC3E,yBAAyB,GAAG,GAAG,EAAE;QAChD,IAAG,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,MAAM,GACV,eAAe;YACf,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,mBAAmB,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YAC9E,gBAAgB,CAAC;QAEnB,OAAO,MAAM,CAAC;IAChB,CAAC,CAAA"}
1
+ {"version":3,"file":"ldml-keyboard-generator.js","sourceRoot":"","sources":["../../src/ldml-keyboard-generator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAkB,QAAQ,GAAG,MAAM,4BAA4B,CAAC;AAEvE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D;;;;GAIG;AACH,MAAM,OAAO,qBAAsB,SAAQ,cAAc;IAC7C,MAAM,CAAU,cAAc,GAAG,UAAU,CAAC;IACtD,MAAM,CAAU,iBAAiB,GAAG,GAAG,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,cAAc,GAAG,gDAAmC,EAAE,CAAC;IACvH,MAAM,CAAU,aAAa,GAAG,GAAG,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,cAAc,GAAG,2CAA8B,EAAE,CAAC;IAC9G,MAAM,CAAU,aAAa,GAAG,GAAG,IAAI,CAAC,cAAc,GAAG,2CAA8B,EAAE,CAAC;IAE1F;;;;;;OAMG;IACH,KAAK,CAAC,GAAG;QACP,IAAG,CAAC,QAAQ,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,iBAAiB,CAAC,2BAA2B,CAAC,EAAC,EAAE,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC;YAClG,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAG,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACvB,gDAAgD;YAChD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,SAAS,GAAuB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9D,IAAI,CAAC,YAAY,GAAG,eAAe,CAAC;QACpC,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,aAAa,CAAC;YACnD,IAAI,CAAC,OAAO,CAAC,EAAE,8CAA+B,CAAC;QACjD,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,iBAAiB,CAAC;YACvD,qBAAqB,CAAC,YAAY,GAAC,IAAI,CAAC,OAAO,CAAC,EAAE,mDAAoC,CAAC;QACzF,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,aAAa,CAAC;YACnD,qBAAqB,CAAC,YAAY,GAAC,IAAI,CAAC,OAAO,CAAC,EAAE,8CAA+B,CAAC;QAEpF,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACzD,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAE1E,IAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,EAAC,SAAS,EAAC,CAAC;IACrB,CAAC;IAEgB,oBAAoB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC;IAC3E,yBAAyB,GAAG,GAAG,EAAE;QAChD,IAAG,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,MAAM,GACV,eAAe;YACf,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,mBAAmB,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YAC9E,gBAAgB,CAAC;QAEnB,OAAO,MAAM,CAAC;IAChB,CAAC,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"lexical-model-generator.d.ts","sourceRoot":"","sources":["../../src/lexical-model-generator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAA0B,MAAM,4BAA4B,CAAC;AACpF,OAAO,EAAsB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD;;;;;GAKG;AACH,qBAAa,qBAAsB,SAAQ,cAAe,YAAW,cAAc;IACjF,MAAM,CAAC,QAAQ,CAAC,WAAW,WAAW;IACtC,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAgD;IAC7E,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAAsC;IACvE,MAAM,CAAC,QAAQ,CAAC,aAAa,SAA0D;IACvF,MAAM,CAAC,QAAQ,CAAC,aAAa,SAA8E;IAE3G;;;;;;OAMG;IACG,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC;CA8BtC"}
1
+ {"version":3,"file":"lexical-model-generator.d.ts","sourceRoot":"","sources":["../../src/lexical-model-generator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAoC,MAAM,4BAA4B,CAAC;AAC9F,OAAO,EAAsB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD;;;;;GAKG;AACH,qBAAa,qBAAsB,SAAQ,cAAe,YAAW,cAAc;IACjF,MAAM,CAAC,QAAQ,CAAC,WAAW,WAAW;IACtC,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAgD;IAC7E,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAAsC;IACvE,MAAM,CAAC,QAAQ,CAAC,aAAa,SAA0D;IACvF,MAAM,CAAC,QAAQ,CAAC,aAAa,SAA8E;IAE3G;;;;;;OAMG;IACG,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC;CAmCtC"}
@@ -3,7 +3,7 @@
3
3
  *
4
4
  * Generate a Keyman lexical model project
5
5
  */
6
- import { SourceFilenamePatterns } from '@keymanapp/developer-utils';
6
+ import { SourceFilenamePatterns, ValidIds } from '@keymanapp/developer-utils';
7
7
  import { BasicGenerator } from './basic-generator.js';
8
8
  import { GeneratorMessages } from './generator-messages.js';
9
9
  /**
@@ -26,6 +26,10 @@ export class LexicalModelGenerator extends BasicGenerator {
26
26
  * @returns Binary artifacts on success, null on failure.
27
27
  */
28
28
  async run() {
29
+ if (!ValidIds.isValidLexicalModelId(this.options.id)) {
30
+ this.callbacks.reportMessage(GeneratorMessages.Error_InvalidLexicalModelId({ id: this.options.id }));
31
+ return null;
32
+ }
29
33
  if (!this.preGenerate()) {
30
34
  // errors will have been reported in preGenerate
31
35
  return null;
@@ -1 +1 @@
1
- {"version":3,"file":"lexical-model-generator.js","sourceRoot":"","sources":["../../src/lexical-model-generator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAkB,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpF,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D;;;;;GAKG;AACH,MAAM,OAAO,qBAAsB,SAAQ,cAAc;IACvD,MAAM,CAAU,WAAW,GAAG,OAAO,CAAC;IACtC,MAAM,CAAU,aAAa,GAAG,GAAG,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,KAAK,CAAC;IAC7E,MAAM,CAAU,iBAAiB,GAAG,GAAG,IAAI,CAAC,YAAY,cAAc,CAAC;IACvE,MAAM,CAAU,aAAa,GAAG,GAAG,IAAI,CAAC,WAAW,GAAG,2CAA8B,EAAE,CAAC;IACvF,MAAM,CAAU,aAAa,GAAG,GAAG,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,GAAG,2CAA8B,EAAE,CAAC;IAE3G;;;;;;OAMG;IACH,KAAK,CAAC,GAAG;QACP,IAAG,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACvB,gDAAgD;YAChD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,SAAS,GAAuB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE9D,IAAI,CAAC,YAAY,GAAG,wBAAwB,CAAC;QAC7C,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,aAAa,CAAC;YACnD,IAAI,CAAC,OAAO,CAAC,EAAE,8CAA+B,CAAC;QACjD,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,aAAa,CAAC;YACnD,qBAAqB,CAAC,YAAY,GAAC,IAAI,CAAC,OAAO,CAAC,EAAE,iDAA6B,CAAC;QAClF,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,iBAAiB,CAAC;YACvD,qBAAqB,CAAC,iBAAiB,CAAC;QAE1C,4DAA4D;QAC5D,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,GAAC,QAAQ,8CAA+B,CAAC;QAChF,IAAG,CAAC,sBAAsB,CAAC,wBAAwB,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;YAC1E,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,iBAAiB,CAAC,gDAAgD,CAAC,EAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC;QAC1H,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,aAAa,CAAC,GAAG,qBAAqB,CAAC,YAAY,GAAC,eAAe,CAAC;QAE3G,IAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,EAAC,SAAS,EAAC,CAAC;IACrB,CAAC"}
1
+ {"version":3,"file":"lexical-model-generator.js","sourceRoot":"","sources":["../../src/lexical-model-generator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAkB,sBAAsB,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAE9F,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D;;;;;GAKG;AACH,MAAM,OAAO,qBAAsB,SAAQ,cAAc;IACvD,MAAM,CAAU,WAAW,GAAG,OAAO,CAAC;IACtC,MAAM,CAAU,aAAa,GAAG,GAAG,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,KAAK,CAAC;IAC7E,MAAM,CAAU,iBAAiB,GAAG,GAAG,IAAI,CAAC,YAAY,cAAc,CAAC;IACvE,MAAM,CAAU,aAAa,GAAG,GAAG,IAAI,CAAC,WAAW,GAAG,2CAA8B,EAAE,CAAC;IACvF,MAAM,CAAU,aAAa,GAAG,GAAG,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,GAAG,2CAA8B,EAAE,CAAC;IAE3G;;;;;;OAMG;IACH,KAAK,CAAC,GAAG;QACP,IAAG,CAAC,QAAQ,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,iBAAiB,CAAC,2BAA2B,CAAC,EAAC,EAAE,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC;YAClG,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAG,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACvB,gDAAgD;YAChD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,SAAS,GAAuB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE9D,IAAI,CAAC,YAAY,GAAG,wBAAwB,CAAC;QAC7C,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,aAAa,CAAC;YACnD,IAAI,CAAC,OAAO,CAAC,EAAE,8CAA+B,CAAC;QACjD,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,aAAa,CAAC;YACnD,qBAAqB,CAAC,YAAY,GAAC,IAAI,CAAC,OAAO,CAAC,EAAE,iDAA6B,CAAC;QAClF,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,iBAAiB,CAAC;YACvD,qBAAqB,CAAC,iBAAiB,CAAC;QAE1C,4DAA4D;QAC5D,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,GAAC,QAAQ,8CAA+B,CAAC;QAChF,IAAG,CAAC,sBAAsB,CAAC,wBAAwB,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;YAC1E,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,iBAAiB,CAAC,gDAAgD,CAAC,EAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC;QAC1H,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,aAAa,CAAC,GAAG,qBAAqB,CAAC,YAAY,GAAC,eAAe,CAAC;QAE3G,IAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,EAAC,SAAS,EAAC,CAAC;IACrB,CAAC"}
package/package.json CHANGED
@@ -25,13 +25,13 @@
25
25
  "url": "https://github.com/keymanapp/keyman/issues"
26
26
  },
27
27
  "dependencies": {
28
- "@keymanapp/common-types": "18.0.174-alpha",
29
- "@keymanapp/developer-utils": "18.0.174-alpha",
30
- "@keymanapp/keyman-version": "18.0.174-alpha"
28
+ "@keymanapp/common-types": "18.0.175-alpha",
29
+ "@keymanapp/developer-utils": "18.0.175-alpha",
30
+ "@keymanapp/keyman-version": "18.0.175-alpha"
31
31
  },
32
32
  "devDependencies": {
33
- "@keymanapp/developer-test-helpers": "18.0.174-alpha",
34
- "@keymanapp/resources-gosh": "18.0.174-alpha",
33
+ "@keymanapp/developer-test-helpers": "18.0.175-alpha",
34
+ "@keymanapp/resources-gosh": "18.0.175-alpha",
35
35
  "@types/mocha": "^10.0.0",
36
36
  "@types/node": "^20.4.1",
37
37
  "@types/semver": "^7.3.12",
@@ -54,12 +54,13 @@
54
54
  "exclude-after-remap": true,
55
55
  "exclude": [
56
56
  "test/",
57
- "src/template/"
57
+ "src/template/",
58
+ "src/main.ts"
58
59
  ]
59
60
  },
60
61
  "repository": {
61
62
  "type": "git",
62
63
  "url": "git+https://github.com/keymanapp/keyman.git"
63
64
  },
64
- "version": "18.0.174-alpha"
65
+ "version": "18.0.175-alpha"
65
66
  }