@keymanapp/kmc 17.0.236-alpha → 17.0.237-alpha

package/build/src/commands/buildClasses/BuildModel.js

@@ -1,31 +1,15 @@
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="0a1fcaf6-da6e-5051-a9b6-7be1af366e4d")}catch(e){}}();
-import * as fs from 'fs';
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="5a59570f-0c41-54f8-9fbf-741b33cc09a0")}catch(e){}}();
 import { BuildActivity } from './BuildActivity.js';
-import { compileModel } from '@keymanapp/kmc-model';
+import { LexicalModelCompiler } from '@keymanapp/kmc-model';
 export class BuildModel extends BuildActivity {
     get name() { return 'Lexical model'; }
     get sourceExtension() { return ".model.ts" /* KeymanFileTypes.Source.Model */; }
     get compiledExtension() { return ".model.js" /* KeymanFileTypes.Binary.Model */; }
     get description() { return 'Build a lexical model'; }
-    async build(infile, callbacks, options) {
-        let outputFilename = this.getOutputFilename(infile, options);
-        let code = null;
-        // Compile:
-        try {
-            code = compileModel(infile, callbacks);
-        }
-        catch (e) {
-            console.error(e);
-            return false;
-        }
-        if (!code) {
-            console.error('Compilation failed.');
-            return false;
-        }
-        // Output:
-        fs.writeFileSync(outputFilename, code, 'utf8');
-        return true;
+    async build(infile, outfile, callbacks, options) {
+        const compiler = new LexicalModelCompiler();
+        return await super.runCompiler(compiler, infile, outfile, callbacks, options);
     }
 }
-//# debugId=0a1fcaf6-da6e-5051-a9b6-7be1af366e4d
+//# debugId=5a59570f-0c41-54f8-9fbf-741b33cc09a0
 //# sourceMappingURL=BuildModel.js.map

package/build/src/commands/buildClasses/BuildModel.js.map

@@ -1 +1 @@
-{"debug_id":"0a1fcaf6-da6e-5051-a9b6-7be1af366e4d","file":"BuildModel.js","mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,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,KAA6B,sDAAoC,CAAC,CAAC;IAC7F,IAAW,iBAAiB,KAA6B,sDAAoC,CAAC,CAAC;IAC/F,IAAW,WAAW,KAAa,OAAO,uBAAuB,CAAC,CAAC,CAAC;IAC7D,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,SAA4B,EAAE,OAAwB;QACvF,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","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildClasses/BuildModel.ts"],"version":3}
+{"debug_id":"5a59570f-0c41-54f8-9fbf-741b33cc09a0","file":"BuildModel.js","mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAG5D,MAAM,OAAO,UAAW,SAAQ,aAAa;IAC3C,IAAW,IAAI,KAAa,OAAO,eAAe,CAAC,CAAC,CAAC;IACrD,IAAW,eAAe,KAA6B,sDAAoC,CAAC,CAAC;IAC7F,IAAW,iBAAiB,KAA6B,sDAAoC,CAAC,CAAC;IAC/F,IAAW,WAAW,KAAa,OAAO,uBAAuB,CAAC,CAAC,CAAC;IAC7D,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,OAAe,EAAE,SAA4B,EAAE,OAAwB;QACxG,MAAM,QAAQ,GAAG,IAAI,oBAAoB,EAAE,CAAC;QAC5C,OAAO,MAAM,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAChF,CAAC;CACF","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildClasses/BuildModel.ts"],"version":3}

package/build/src/commands/buildClasses/BuildModelInfo.d.ts

@@ -1,4 +1,4 @@
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="9a759415-bf84-584d-8adc-4fe4b66cf990")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="999f12e8-76fa-5925-b848-f975183a4599")}catch(e){}}();
 import { BuildActivity } from './BuildActivity.js';
 import { CompilerCallbacks, KeymanFileTypes } from '@keymanapp/common-types';
 import { ExtendedCompilerOptions } from 'src/util/extendedCompilerOptions.js';
@@ -17,7 +17,7 @@ export declare class BuildModelInfo extends BuildActivity {
      * @param options
      * @returns
      */
-    build(infile: string, callbacks: CompilerCallbacks, options: ExtendedCompilerOptions): Promise<boolean>;
+    build(infile: string, _outfile: string, callbacks: CompilerCallbacks, options: ExtendedCompilerOptions): Promise<boolean>;
 }
-//# debugId=9a759415-bf84-584d-8adc-4fe4b66cf990
+//# debugId=999f12e8-76fa-5925-b848-f975183a4599
 //# sourceMappingURL=BuildModelInfo.d.ts.map

package/build/src/commands/buildClasses/BuildModelInfo.d.ts.map

@@ -1 +1 @@
-{"debug_id":"9a759415-bf84-584d-8adc-4fe4b66cf990","file":"BuildModelInfo.d.ts","mappings":";AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAO7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,qBAAa,cAAe,SAAQ,aAAa;IAC/C,IAAW,IAAI,IAAI,MAAM,CAAqC;IAC9D,IAAW,eAAe,IAAI,eAAe,CAAC,MAAM,CAA2C;IAC/F,IAAW,iBAAiB,IAAI,eAAe,CAAC,MAAM,CAA6C;IACnG,IAAW,WAAW,IAAI,MAAM,CAAkD;IAElF;;;;;;;;;OASG;IACU,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC;CAyDrH","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildClasses/BuildModelInfo.ts"],"version":3}
+{"debug_id":"999f12e8-76fa-5925-b848-f975183a4599","file":"BuildModelInfo.d.ts","mappings":";AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAO7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,qBAAa,cAAe,SAAQ,aAAa;IAC/C,IAAW,IAAI,IAAI,MAAM,CAAqC;IAC9D,IAAW,eAAe,IAAI,eAAe,CAAC,MAAM,CAA2C;IAC/F,IAAW,iBAAiB,IAAI,eAAe,CAAC,MAAM,CAA6C;IACnG,IAAW,WAAW,IAAI,MAAM,CAAkD;IAElF;;;;;;;;;OASG;IACU,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC;CAuDvI","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildClasses/BuildModelInfo.ts"],"version":3}

package/build/src/commands/buildClasses/BuildModelInfo.js

@@ -1,5 +1,5 @@
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="527cf704-31fc-5e99-be18-92e26c7440b7")}catch(e){}}();
-import * as fs from 'fs';
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="2f86f821-9505-55e6-886f-7defa7e03a9c")}catch(e){}}();
+import * as path from 'path';
 import { BuildActivity } from './BuildActivity.js';
 import { KeymanFileTypes } from '@keymanapp/common-types';
 import { ModelInfoCompiler } from '@keymanapp/kmc-model-info';
@@ -23,7 +23,7 @@ export class BuildModelInfo extends BuildActivity {
      * @param options
      * @returns
      */
-    async build(infile, callbacks, options) {
+    async build(infile, _outfile, callbacks, options) {
         if (!KeymanFileTypes.filenameIs(infile, ".kpj" /* KeymanFileTypes.Source.Project */)) {
             // Even if the project file does not exist, we use its name as our reference
             // in order to avoid ambiguity
@@ -44,16 +44,19 @@ export class BuildModelInfo extends BuildActivity {
             callbacks.reportMessage(InfrastructureMessages.Error_FileTypeNotFound({ ext: ".kps" /* KeymanFileTypes.Source.Package */ }));
             return false;
         }
-        let kmpCompiler = new KmpCompiler(callbacks);
+        let kmpCompiler = new KmpCompiler();
+        if (!await kmpCompiler.init(callbacks, options)) {
+            // Errors will have been emitted by KmpCompiler
+            return false;
+        }
         let kmpJsonData = kmpCompiler.transformKpsToKmpObject(project.resolveInputFilePath(kps));
         if (!kmpJsonData) {
             // Errors will have been emitted by KmpCompiler
             return false;
         }
         const lastCommitDate = getLastGitCommitDate(project.projectPath);
-        const compiler = new ModelInfoCompiler(callbacks);
-        const data = compiler.writeModelMetadataFile({
-            model_id: callbacks.path.basename(project.projectPath, ".kpj" /* KeymanFileTypes.Source.Project */),
+        const sources = {
+            model_id: path.basename(project.projectPath, ".kpj" /* KeymanFileTypes.Source.Project */),
             kmpJsonData,
             sourcePath: calculateSourcePath(infile),
             modelFileName: project.resolveOutputFilePath(model, ".model.ts" /* KeymanFileTypes.Source.Model */, ".model.js" /* KeymanFileTypes.Binary.Model */),
@@ -61,14 +64,12 @@ export class BuildModelInfo extends BuildActivity {
             kpsFilename: project.resolveInputFilePath(kps),
             lastCommitDate,
             forPublishing: !!options.forPublishing,
-        });
-        if (data == null) {
-            // Error messages have already been emitted by writeModelMetadataFile
-            return false;
-        }
-        fs.writeFileSync(project.getOutputFilePath(".model_info" /* KeymanFileTypes.Binary.ModelInfo */), data);
-        return true;
+        };
+        // Note: should we always ignore the passed-in output filename for .model_info?
+        const outputFilename = project.getOutputFilePath(".model_info" /* KeymanFileTypes.Binary.ModelInfo */);
+        const compiler = new ModelInfoCompiler();
+        return await super.runCompiler(compiler, infile, outputFilename, callbacks, { ...options, sources });
     }
 }
-//# debugId=527cf704-31fc-5e99-be18-92e26c7440b7
+//# debugId=2f86f821-9505-55e6-886f-7defa7e03a9c
 //# sourceMappingURL=BuildModelInfo.js.map

package/build/src/commands/buildClasses/BuildModelInfo.js.map

@@ -1 +1 @@
-{"debug_id":"527cf704-31fc-5e99-be18-92e26c7440b7","file":"BuildModelInfo.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildClasses/BuildModelInfo.ts"],"version":3}
+{"debug_id":"2f86f821-9505-55e6-886f-7defa7e03a9c","file":"BuildModelInfo.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildClasses/BuildModelInfo.ts"],"version":3}

package/build/src/commands/buildClasses/BuildPackage.d.ts

@@ -1,4 +1,4 @@
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="ef12d528-2e7d-58e7-8a87-8a7ff338f7fe")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="16bd9053-bf64-5ef7-9413-43fb14f63d3d")}catch(e){}}();
 import { BuildActivity } from './BuildActivity.js';
 import { CompilerCallbacks, CompilerOptions, KeymanFileTypes } from '@keymanapp/common-types';
 export declare class BuildPackage extends BuildActivity {
@@ -6,7 +6,7 @@ export declare class BuildPackage extends BuildActivity {
     get sourceExtension(): KeymanFileTypes.Source;
     get compiledExtension(): KeymanFileTypes.Binary;
     get description(): string;
-    build(infile: string, callbacks: CompilerCallbacks, options: CompilerOptions): Promise<boolean>;
+    build(infile: string, outfile: string, callbacks: CompilerCallbacks, options: CompilerOptions): Promise<boolean>;
 }
-//# debugId=ef12d528-2e7d-58e7-8a87-8a7ff338f7fe
+//# debugId=16bd9053-bf64-5ef7-9413-43fb14f63d3d
 //# sourceMappingURL=BuildPackage.d.ts.map

package/build/src/commands/buildClasses/BuildPackage.d.ts.map

@@ -1 +1 @@
-{"debug_id":"ef12d528-2e7d-58e7-8a87-8a7ff338f7fe","file":"BuildPackage.d.ts","mappings":";AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG9F,qBAAa,YAAa,SAAQ,aAAa;IAC7C,IAAW,IAAI,IAAI,MAAM,CAAsB;IAC/C,IAAW,eAAe,IAAI,eAAe,CAAC,MAAM,CAA2C;IAC/F,IAAW,iBAAiB,IAAI,eAAe,CAAC,MAAM,CAA2C;IACjG,IAAW,WAAW,IAAI,MAAM,CAAsC;IACzD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;CAmC7G","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildClasses/BuildPackage.ts"],"version":3}
+{"debug_id":"16bd9053-bf64-5ef7-9413-43fb14f63d3d","file":"BuildPackage.d.ts","mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG9F,qBAAa,YAAa,SAAQ,aAAa;IAC7C,IAAW,IAAI,IAAI,MAAM,CAAsB;IAC/C,IAAW,eAAe,IAAI,eAAe,CAAC,MAAM,CAA2C;IAC/F,IAAW,iBAAiB,IAAI,eAAe,CAAC,MAAM,CAA2C;IACjG,IAAW,WAAW,IAAI,MAAM,CAAsC;IACzD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;CAI9H","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildClasses/BuildPackage.ts"],"version":3}

package/build/src/commands/buildClasses/BuildPackage.js

@@ -1,39 +1,15 @@
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="20e6d3a0-9ca1-5ae5-914e-6909c46b0e6f")}catch(e){}}();
-import * as fs from 'fs';
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="a9183d53-e0bc-5242-af15-86636b27f4d8")}catch(e){}}();
 import { BuildActivity } from './BuildActivity.js';
-import { KmpCompiler, PackageValidation } from '@keymanapp/kmc-package';
+import { KmpCompiler } from '@keymanapp/kmc-package';
 export class BuildPackage extends BuildActivity {
     get name() { return 'Package'; }
     get sourceExtension() { return ".kps" /* KeymanFileTypes.Source.Package */; }
     get compiledExtension() { return ".kmp" /* KeymanFileTypes.Binary.Package */; }
     get description() { return 'Build a Keyman package'; }
-    async build(infile, callbacks, options) {
-        const outfile = this.getOutputFilename(infile, options);
-        //
-        // Load .kps source data
-        //
-        const kmpCompiler = new KmpCompiler(callbacks);
-        const kmpJsonData = kmpCompiler.transformKpsToKmpObject(infile);
-        if (!kmpJsonData) {
-            return false;
-        }
-        //
-        // Validate the package file
-        //
-        const validation = new PackageValidation(callbacks, options);
-        if (!validation.validate(infile, kmpJsonData)) {
-            return false;
-        }
-        //
-        // Build the .kmp package file
-        //
-        const data = await kmpCompiler.buildKmpFile(infile, kmpJsonData);
-        if (!data) {
-            return false;
-        }
-        fs.writeFileSync(outfile, data, 'binary');
-        return true;
+    async build(infile, outfile, callbacks, options) {
+        const compiler = new KmpCompiler();
+        return await super.runCompiler(compiler, infile, outfile, callbacks, options);
     }
 }
-//# debugId=20e6d3a0-9ca1-5ae5-914e-6909c46b0e6f
+//# debugId=a9183d53-e0bc-5242-af15-86636b27f4d8
 //# sourceMappingURL=BuildPackage.js.map

package/build/src/commands/buildClasses/BuildPackage.js.map

@@ -1 +1 @@
-{"debug_id":"20e6d3a0-9ca1-5ae5-914e-6909c46b0e6f","file":"BuildPackage.js","mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAExE,MAAM,OAAO,YAAa,SAAQ,aAAa;IAC7C,IAAW,IAAI,KAAa,OAAO,SAAS,CAAC,CAAC,CAAC;IAC/C,IAAW,eAAe,KAA6B,mDAAsC,CAAC,CAAC;IAC/F,IAAW,iBAAiB,KAA6B,mDAAsC,CAAC,CAAC;IACjG,IAAW,WAAW,KAAc,OAAO,wBAAwB,CAAC,CAAC,CAAC;IAC/D,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,SAA4B,EAAE,OAAwB;QAEvF,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAExD,EAAE;QACF,wBAAwB;QACxB,EAAE;QAEF,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,WAAW,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAChE,IAAG,CAAC,WAAW,EAAE;YACf,OAAO,KAAK,CAAC;SACd;QAED,EAAE;QACF,4BAA4B;QAC5B,EAAE;QAEF,MAAM,UAAU,GAAG,IAAI,iBAAiB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7D,IAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE;YAC5C,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","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildClasses/BuildPackage.ts"],"version":3}
+{"debug_id":"a9183d53-e0bc-5242-af15-86636b27f4d8","file":"BuildPackage.js","mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,MAAM,OAAO,YAAa,SAAQ,aAAa;IAC7C,IAAW,IAAI,KAAa,OAAO,SAAS,CAAC,CAAC,CAAC;IAC/C,IAAW,eAAe,KAA6B,mDAAsC,CAAC,CAAC;IAC/F,IAAW,iBAAiB,KAA6B,mDAAsC,CAAC,CAAC;IACjG,IAAW,WAAW,KAAc,OAAO,wBAAwB,CAAC,CAAC,CAAC;IAC/D,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,OAAe,EAAE,SAA4B,EAAE,OAAwB;QACxG,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;QACnC,OAAO,MAAM,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAChF,CAAC;CACF","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildClasses/BuildPackage.ts"],"version":3}

package/build/src/commands/buildClasses/BuildProject.d.ts

@@ -1,4 +1,4 @@
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="d8e93b14-c1ff-5b38-83f6-b8f409feca15")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="d9872c51-4829-5de3-8501-c988c0c3baa2")}catch(e){}}();
 import { CompilerCallbacks, KeymanFileTypes } from '@keymanapp/common-types';
 import { BuildActivity } from './BuildActivity.js';
 import { ExtendedCompilerOptions } from 'src/util/extendedCompilerOptions.js';
@@ -7,7 +7,7 @@ export declare class BuildProject extends BuildActivity {
     get sourceExtension(): KeymanFileTypes.Source;
     get compiledExtension(): KeymanFileTypes.Binary;
     get description(): string;
-    build(infile: string, callbacks: CompilerCallbacks, options: ExtendedCompilerOptions): Promise<boolean>;
+    build(infile: string, outfile: string, callbacks: CompilerCallbacks, options: ExtendedCompilerOptions): Promise<boolean>;
 }
-//# debugId=d8e93b14-c1ff-5b38-83f6-b8f409feca15
+//# debugId=d9872c51-4829-5de3-8501-c988c0c3baa2
 //# sourceMappingURL=BuildProject.d.ts.map

package/build/src/commands/buildClasses/BuildProject.d.ts.map

@@ -1 +1 @@
-{"debug_id":"d8e93b14-c1ff-5b38-83f6-b8f409feca15","file":"BuildProject.d.ts","mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAyG,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACpL,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAInD,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,qBAAa,YAAa,SAAQ,aAAa;IAC7C,IAAW,IAAI,IAAI,MAAM,CAAsB;IAC/C,IAAW,eAAe,IAAI,eAAe,CAAC,MAAM,CAA2C;IAC/F,IAAW,iBAAiB,IAAI,eAAe,CAAC,MAAM,CAAiB;IACvE,IAAW,WAAW,IAAI,MAAM,CAAyD;IAC5E,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC;CAIrH","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildClasses/BuildProject.ts"],"version":3}
+{"debug_id":"d9872c51-4829-5de3-8501-c988c0c3baa2","file":"BuildProject.d.ts","mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAyG,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACpL,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAInD,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAG9E,qBAAa,YAAa,SAAQ,aAAa;IAC7C,IAAW,IAAI,IAAI,MAAM,CAAsB;IAC/C,IAAW,eAAe,IAAI,eAAe,CAAC,MAAM,CAA2C;IAC/F,IAAW,iBAAiB,IAAI,eAAe,CAAC,MAAM,CAAiB;IACvE,IAAW,WAAW,IAAI,MAAM,CAAyD;IAC5E,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC;CAStI","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildClasses/BuildProject.ts"],"version":3}

package/build/src/commands/buildClasses/BuildProject.js

@@ -1,4 +1,4 @@
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="7fafc9e2-531e-54a1-bb09-86f270c6778f")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="09ea0055-a21a-538d-b7e7-39d1613686c3")}catch(e){}}();
 import * as path from 'path';
 import * as fs from 'fs';
 import { CompilerFileCallbacks, KeymanDeveloperProjectType } from '@keymanapp/common-types';
@@ -6,12 +6,17 @@ import { BuildActivity } from './BuildActivity.js';
 import { buildActivities, buildKeyboardInfoActivity, buildModelInfoActivity } from './buildActivities.js';
 import { InfrastructureMessages } from '../../messages/infrastructureMessages.js';
 import { loadProject } from '../../util/projectLoader.js';
+import { getOption } from '@keymanapp/developer-utils';
 export class BuildProject extends BuildActivity {
     get name() { return 'Project'; }
     get sourceExtension() { return ".kpj" /* KeymanFileTypes.Source.Project */; }
     get compiledExtension() { return null; }
     get description() { return 'Build a keyboard or lexical model project'; }
-    async build(infile, callbacks, options) {
+    async build(infile, outfile, callbacks, options) {
+        if (outfile) {
+            callbacks.reportMessage(InfrastructureMessages.Error_OutFileNotValidForProjects());
+            return false;
+        }
         let builder = new ProjectBuilder(infile, callbacks, options);
         return builder.run();
     }
@@ -27,17 +32,15 @@ class ProjectBuilder {
         this.options = options;
     }
     async run() {
-        if (this.options.outFile) {
-            this.callbacks.reportMessage(InfrastructureMessages.Error_OutFileNotValidForProjects());
-            return false;
-        }
         this.project = loadProject(this.infile, this.callbacks);
         if (!this.project) {
             return false;
         }
         // Give a hint if the project is v1.0
         if (this.project.options.version != '2.0') {
-            this.callbacks.reportMessage(InfrastructureMessages.Hint_ProjectIsVersion10());
+            if (getOption("prompt to upgrade projects", true)) {
+                this.callbacks.reportMessage(InfrastructureMessages.Hint_ProjectIsVersion10());
+            }
         }
         // Go through the various file types and build them
         for (let builder of buildActivities) {
@@ -91,14 +94,14 @@ class ProjectBuilder {
     }
     async buildTarget(file, activity) {
         const options = { ...this.options };
-        options.outFile = this.project.resolveOutputFilePath(file, activity.sourceExtension, activity.compiledExtension);
+        const outfile = this.project.resolveOutputFilePath(file, activity.sourceExtension, activity.compiledExtension);
         options.checkFilenameConventions = this.project.options.checkFilenameConventions ?? this.options.checkFilenameConventions;
         const infile = this.project.resolveInputFilePath(file);
         const buildFilename = path.relative(process.cwd(), infile).replace(/\\/g, '/');
         const callbacks = new CompilerFileCallbacks(buildFilename, options, this.callbacks);
         callbacks.reportMessage(InfrastructureMessages.Info_BuildingFile({ filename: infile, relativeFilename: buildFilename }));
-        fs.mkdirSync(path.dirname(options.outFile), { recursive: true });
-        let result = await activity.build(infile, callbacks, options);
+        fs.mkdirSync(path.dirname(outfile), { recursive: true });
+        let result = await activity.build(infile, outfile, callbacks, options);
         // check if we had a message that causes the build to be a failure
         // note: command line option here, if set, overrides project setting
         result = result && !callbacks.hasFailureMessage(this.options.compilerWarningsAsErrors ?? this.project.options.compilerWarningsAsErrors);
@@ -111,5 +114,5 @@ class ProjectBuilder {
         return result;
     }
 }
-//# debugId=7fafc9e2-531e-54a1-bb09-86f270c6778f
+//# debugId=09ea0055-a21a-538d-b7e7-39d1613686c3
 //# sourceMappingURL=BuildProject.js.map

package/build/src/commands/buildClasses/BuildProject.js.map

@@ -1 +1 @@
-{"debug_id":"7fafc9e2-531e-54a1-bb09-86f270c6778f","file":"BuildProject.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildClasses/BuildProject.ts"],"version":3}
+{"debug_id":"09ea0055-a21a-538d-b7e7-39d1613686c3","file":"BuildProject.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildClasses/BuildProject.ts"],"version":3}

package/build/src/commands/buildTestData/index.d.ts

@@ -1,4 +1,4 @@
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="f493c4ee-cad3-5bde-ab71-2e5c909cc372")}catch(e){}}();
-export declare function buildTestData(infile: string, _options: any, commander: any): void;
-//# debugId=f493c4ee-cad3-5bde-ab71-2e5c909cc372
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="d01f27ec-6663-53fe-b1c4-795eb5ae6fba")}catch(e){}}();
+export declare function buildTestData(infile: string, _options: any, commander: any): Promise<void>;
+//# debugId=d01f27ec-6663-53fe-b1c4-795eb5ae6fba
 //# sourceMappingURL=index.d.ts.map

package/build/src/commands/buildTestData/index.d.ts.map

@@ -1 +1 @@
-{"debug_id":"f493c4ee-cad3-5bde-ab71-2e5c909cc372","file":"index.d.ts","mappings":";AAOA,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,QAwB1E","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildTestData/index.ts"],"version":3}
+{"debug_id":"d01f27ec-6663-53fe-b1c4-795eb5ae6fba","file":"index.d.ts","mappings":";AAQA,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,iBAwBhF","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildTestData/index.ts"],"version":3}

package/build/src/commands/buildTestData/index.js

@@ -1,11 +1,11 @@
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="20c1f888-8893-5a95-8083-0ac301ad2d53")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="10309162-22b5-5fb1-8df2-f6025ea7127d")}catch(e){}}();
 import * as fs from 'fs';
 import * as path from 'path';
 import * as kmcLdml from '@keymanapp/kmc-ldml';
 import { defaultCompilerOptions, LDMLKeyboardXMLSourceFileReader } from '@keymanapp/common-types';
 import { NodeCompilerCallbacks } from '../../util/NodeCompilerCallbacks.js';
 import { fileURLToPath } from 'url';
-export function buildTestData(infile, _options, commander) {
+export async function buildTestData(infile, _options, commander) {
     const options = commander.optsWithGlobals();
     let compilerOptions = {
         ...defaultCompilerOptions,
@@ -16,7 +16,7 @@ export function buildTestData(infile, _options, commander) {
             importsPath: fileURLToPath(new URL(...LDMLKeyboardXMLSourceFileReader.defaultImportsURL))
         }
     };
-    let testData = loadTestData(infile, compilerOptions);
+    let testData = await loadTestData(infile, compilerOptions);
     if (!testData) {
         return;
     }
@@ -27,14 +27,13 @@ export function buildTestData(infile, _options, commander) {
     console.log(`Writing JSON test data to ${outFileJson}`);
     fs.writeFileSync(outFileJson, JSON.stringify(testData, null, '  '));
 }
-function loadTestData(inputFilename, options) {
+async function loadTestData(inputFilename, options) {
     const callbacks = new NodeCompilerCallbacks(options);
-    const k = new kmcLdml.LdmlKeyboardCompiler(callbacks, options);
-    let source = k.loadTestData(inputFilename);
-    if (!source) {
+    const k = new kmcLdml.LdmlKeyboardCompiler();
+    if (!await k.init(callbacks, options)) {
         return null;
     }
-    return source;
+    return await k.loadTestData(inputFilename);
 }
-//# debugId=20c1f888-8893-5a95-8083-0ac301ad2d53
+//# debugId=10309162-22b5-5fb1-8df2-f6025ea7127d
 //# sourceMappingURL=index.js.map

package/build/src/commands/buildTestData/index.js.map

@@ -1 +1 @@
-{"debug_id":"20c1f888-8893-5a95-8083-0ac301ad2d53","file":"index.js","mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAA0C,sBAAsB,EAAqC,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;AAC7K,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,UAAU,aAAa,CAAC,MAAc,EAAE,QAAa,EAAE,SAAc;IACzE,MAAM,OAAO,GAAwB,SAAS,CAAC,eAAe,EAAE,CAAC;IAEjE,IAAI,eAAe,GAAgC;QACjD,GAAG,sBAAsB;QACzB,GAAG,OAAO;QACV,SAAS,EAAE,KAAK;QAChB,wBAAwB,EAAE,KAAK;QAC/B,aAAa,EAAE;YACb,WAAW,EAAE,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,+BAA+B,CAAC,iBAAiB,CAAC,CAAC;SAC1F;KACF,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,OAAoC;IAC/E,MAAM,SAAS,GAAsB,IAAI,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/D,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","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildTestData/index.ts"],"version":3}
+{"debug_id":"10309162-22b5-5fb1-8df2-f6025ea7127d","file":"index.js","mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAqB,sBAAsB,EAAqC,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;AACxJ,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAGpC,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAc,EAAE,QAAa,EAAE,SAAc;IAC/E,MAAM,OAAO,GAA2B,SAAS,CAAC,eAAe,EAAE,CAAC;IAEpE,IAAI,eAAe,GAAgC;QACjD,GAAG,sBAAsB;QACzB,GAAG,OAAO;QACV,SAAS,EAAE,KAAK;QAChB,wBAAwB,EAAE,KAAK;QAC/B,aAAa,EAAE;YACb,WAAW,EAAE,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,+BAA+B,CAAC,iBAAiB,CAAC,CAAC;SAC1F;KACF,CAAC;IAEF,IAAI,QAAQ,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC3D,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,KAAK,UAAU,YAAY,CAAC,aAAqB,EAAE,OAAoC;IACrF,MAAM,SAAS,GAAsB,IAAI,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAC7C,IAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE;QACpC,OAAO,IAAI,CAAC;KACb;IACD,OAAO,MAAM,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;AAC7C,CAAC","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildTestData/index.ts"],"version":3}

package/build/src/commands/buildWindowsPackageInstaller/index.d.ts

@@ -1,4 +1,4 @@
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="5a84bb31-b450-5407-903d-c137001a89c4")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="c40b6f54-ca58-57bc-8098-64ca95083cce")}catch(e){}}();
 export declare function buildWindowsPackageInstaller(infile: string, _options: any, commander: any): Promise<void>;
-//# debugId=5a84bb31-b450-5407-903d-c137001a89c4
+//# debugId=c40b6f54-ca58-57bc-8098-64ca95083cce
 //# sourceMappingURL=index.d.ts.map

package/build/src/commands/buildWindowsPackageInstaller/index.d.ts.map

@@ -1 +1 @@
-{"debug_id":"5a84bb31-b450-5407-903d-c137001a89c4","file":"index.d.ts","mappings":";AAgBA,wBAAsB,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,iBA8B/F","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildWindowsPackageInstaller/index.ts"],"version":3}
+{"debug_id":"c40b6f54-ca58-57bc-8098-64ca95083cce","file":"index.d.ts","mappings":";AAiBA,wBAAsB,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,iBAwC/F","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildWindowsPackageInstaller/index.ts"],"version":3}

package/build/src/commands/buildWindowsPackageInstaller/index.js

@@ -1,4 +1,4 @@
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="bd33fae0-e93a-54bb-93c3-3a1f3e265777")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="7e0342c2-9857-5ef7-9a07-a75a83e8bea2")}catch(e){}}();
 import * as fs from 'fs';
 import * as path from 'path';
 import { defaultCompilerOptions } from '@keymanapp/common-types';
@@ -6,6 +6,8 @@ import { NodeCompilerCallbacks } from '../../util/NodeCompilerCallbacks.js';
 import { WindowsPackageInstallerCompiler } from '@keymanapp/kmc-package';
 ;
 export async function buildWindowsPackageInstaller(infile, _options, commander) {
+    // TODO(lowpri): we probably should cleanup the options management here, move
+    // translation of command line options to kmc-* options into a separate module
     const options = commander.optsWithGlobals();
     const sources = {
         licenseFilename: options.license,
@@ -16,21 +18,27 @@ export async function buildWindowsPackageInstaller(infile, _options, commander)
         appName: options.appName,
         titleImageFilename: options.titleImage
     };
+    const outfile = options.outFile;
     // Normalize case for the filename and expand the path; this avoids false
     // positive case mismatches on input filenames and glommed paths
     infile = fs.realpathSync.native(infile);
     const callbacks = new NodeCompilerCallbacks({ ...defaultCompilerOptions, ...options });
-    const compiler = new WindowsPackageInstallerCompiler(callbacks);
-    const buffer = await compiler.compile(infile, sources);
-    if (!buffer) {
-        // errors will have been reported already
+    const compiler = new WindowsPackageInstallerCompiler();
+    if (!await compiler.init(callbacks, { ...options, sources })) {
         process.exit(1);
     }
-    const fileBaseName = options.outFile ?? infile;
+    const fileBaseName = outfile ?? infile;
     const outFileBase = path.basename(fileBaseName, path.extname(fileBaseName));
     const outFileDir = path.dirname(fileBaseName);
     const outFileExe = path.join(outFileDir, outFileBase + '.exe');
-    fs.writeFileSync(outFileExe, buffer);
+    const result = await compiler.run(infile, outFileExe);
+    if (!result) {
+        // errors will have been reported already
+        process.exit(1);
+    }
+    if (!await compiler.write(result.artifacts)) {
+        process.exit(1);
+    }
 }
-//# debugId=bd33fae0-e93a-54bb-93c3-3a1f3e265777
+//# debugId=7e0342c2-9857-5ef7-9a07-a75a83e8bea2
 //# sourceMappingURL=index.js.map

package/build/src/commands/buildWindowsPackageInstaller/index.js.map

@@ -1 +1 @@
-{"debug_id":"bd33fae0-e93a-54bb-93c3-3a1f3e265777","file":"index.js","mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAA0C,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACzG,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,+BAA+B,EAAkC,MAAM,wBAAwB,CAAC;AAUxG,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,MAAc,EAAE,QAAa,EAAE,SAAc;IAC9F,MAAM,OAAO,GAAmC,SAAS,CAAC,eAAe,EAAE,CAAC;IAC5E,MAAM,OAAO,GAAmC;QAC9C,eAAe,EAAE,OAAO,CAAC,OAAO;QAChC,WAAW,EAAE,OAAO,CAAC,GAAG;QACxB,gBAAgB,EAAE,OAAO,CAAC,GAAG;QAC7B,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;QACtD,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,kBAAkB,EAAE,OAAO,CAAC,UAAU;KACvC,CAAA;IAED,yEAAyE;IACzE,gEAAgE;IAChE,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAExC,MAAM,SAAS,GAAsB,IAAI,qBAAqB,CAAC,EAAC,GAAG,sBAAsB,EAAE,GAAG,OAAO,EAAC,CAAC,CAAC;IACxG,MAAM,QAAQ,GAAG,IAAI,+BAA+B,CAAC,SAAS,CAAC,CAAC;IAEhE,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvD,IAAG,CAAC,MAAM,EAAE;QACV,yCAAyC;QACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;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,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,MAAM,CAAC,CAAC;IAC/D,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildWindowsPackageInstaller/index.ts"],"version":3}
+{"debug_id":"7e0342c2-9857-5ef7-9a07-a75a83e8bea2","file":"index.js","mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAqB,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,+BAA+B,EAAkC,MAAM,wBAAwB,CAAC;AAWxG,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,MAAc,EAAE,QAAa,EAAE,SAAc;IAC9F,6EAA6E;IAC7E,8EAA8E;IAC9E,MAAM,OAAO,GAA8C,SAAS,CAAC,eAAe,EAAE,CAAC;IACvF,MAAM,OAAO,GAAmC;QAC9C,eAAe,EAAE,OAAO,CAAC,OAAO;QAChC,WAAW,EAAE,OAAO,CAAC,GAAG;QACxB,gBAAgB,EAAE,OAAO,CAAC,GAAG;QAC7B,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;QACtD,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,kBAAkB,EAAE,OAAO,CAAC,UAAU;KACvC,CAAA;IAED,MAAM,OAAO,GAAW,OAAO,CAAC,OAAO,CAAC;IAExC,yEAAyE;IACzE,gEAAgE;IAChE,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAExC,MAAM,SAAS,GAAsB,IAAI,qBAAqB,CAAC,EAAC,GAAG,sBAAsB,EAAE,GAAG,OAAO,EAAC,CAAC,CAAC;IACxG,MAAM,QAAQ,GAAG,IAAI,+BAA+B,EAAE,CAAC;IACvD,IAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,EAAC,GAAG,OAAO,EAAE,OAAO,EAAC,CAAC,EAAE;QACzD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,MAAM,YAAY,GAAG,OAAO,IAAI,MAAM,CAAC;IACvC,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,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,MAAM,CAAC,CAAC;IAE/D,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACtD,IAAG,CAAC,MAAM,EAAE;QACV,yCAAyC;QACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,IAAG,CAAC,MAAM,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC1C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC","names":[],"sourceRoot":"","sources":["../../../../src/commands/buildWindowsPackageInstaller/index.ts"],"version":3}

package/build/src/kmlmc.js

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="60740b2e-6a5e-5b06-9fe2-2b40902c9159")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="43f89963-a77d-5aba-9360-e3bdd8749051")}catch(e){}}();
 /**
  * kmlmc - Keyman Lexical Model Compiler
  */
-import * as fs from 'fs';
 import { Command } from 'commander';
-import { compileModel } from '@keymanapp/kmc-model';
+import { LexicalModelCompiler } from '@keymanapp/kmc-model';
 import KEYMAN_VERSION from "@keymanapp/keyman-version";
 import { NodeCompilerCallbacks } from './util/NodeCompilerCallbacks.js';
 let inputFilename;
@@ -23,10 +22,15 @@ if (!inputFilename) {
     exitDueToUsageError('Must provide a lexical model source file.');
 }
 const callbacks = new NodeCompilerCallbacks({ logLevel: 'info' });
+const compiler = new LexicalModelCompiler();
+if (!await compiler.init(callbacks, null)) {
+    console.error('Initialization failed.');
+    process.exit(65 /* SysExits.EX_DATAERR */);
+}
 let code = null;
 // Compile:
 try {
-    code = compileModel(inputFilename, callbacks);
+    code = await compiler.run(inputFilename, program.opts().outFile);
 }
 catch (e) {
     console.error(e);
@@ -38,10 +42,13 @@ if (!code) {
 }
 // Output:
 if (program.opts().outFile) {
-    fs.writeFileSync(program.opts().outFile, code, 'utf8');
+    compiler.write(code.artifacts);
 }
 else {
-    console.log(code);
+    // TODO(lowpri): if writing to console then log messages should all be to stderr?
+    const decoder = new TextDecoder();
+    const text = decoder.decode(code.artifacts.js.data);
+    console.log(text);
 }
 function exitDueToUsageError(message) {
     console.error(`${program.name()}: ${message}`);
@@ -49,5 +56,5 @@ function exitDueToUsageError(message) {
     program.outputHelp();
     return process.exit(64 /* SysExits.EX_USAGE */);
 }
-//# debugId=60740b2e-6a5e-5b06-9fe2-2b40902c9159
+//# debugId=43f89963-a77d-5aba-9360-e3bdd8749051
 //# sourceMappingURL=kmlmc.js.map

package/build/src/kmlmc.js.map

@@ -1 +1 @@
-{"debug_id":"60740b2e-6a5e-5b06-9fe2-2b40902c9159","file":"kmlmc.js","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,iCAAiC,CAAC;AAExE,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,CAAC,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC,CAAC;AAEhE,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","names":[],"sourceRoot":"","sources":["../../src/kmlmc.ts"],"version":3}
+{"debug_id":"43f89963-a77d-5aba-9360-e3bdd8749051","file":"kmlmc.js","mappings":";;AACA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,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,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,CAAC,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC,CAAC;AAEhE,MAAM,QAAQ,GAAG,IAAI,oBAAoB,EAAE,CAAC;AAC5C,IAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE;IACxC,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IACxC,OAAO,CAAC,IAAI,8BAAqB,CAAC;CACnC;AAED,IAAI,IAAI,GAAG,IAAI,CAAC;AAChB,WAAW;AACX,IAAI;IACF,IAAI,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC;CAClE;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,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;CAChC;KAAM;IACL,iFAAiF;IACjF,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAClC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IACpD,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","names":[],"sourceRoot":"","sources":["../../src/kmlmc.ts"],"version":3}