@keymanapp/kmc 17.0.83-alpha → 17.0.84-alpha

package/build/src/activities/buildKmnKeyboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildKmnKeyboard.d.ts","sourceRoot":"","sources":["../../../src/activities/buildKmnKeyboard.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG3D,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CAgDrG"}
+{"version":3,"file":"buildKmnKeyboard.d.ts","sourceRoot":"","sources":["../../../src/activities/buildKmnKeyboard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAI3D,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CAmBrG"}

package/build/src/activities/buildKmnKeyboard.js

@@ -1,45 +1,35 @@
-import { spawnSync } from 'child_process';
 import * as path from 'path';
-import { getDeveloperBinPath } from '../util/getDeveloperBinPath.js';
+import { Compiler } from '@keymanapp/kmc-kmn';
+import { platform } from 'os';
 export async function buildKmnKeyboard(infile, options) {
-    // We'll call out to kmcomp.exe to build a .kmn keyboard into a .kmx Note:
-    // kmcomp.exe will also build a .js if it is required, and may not actually
-    // generate a .kmx if the output target defined in the .kmn is mobile/web
-    // only. kmcomp.exe will also build the .kvk file.
-    const binRoot = getDeveloperBinPath();
-    if (binRoot == null) {
-        console.error('Could not locate Keyman Developer bin path');
+    let compiler = new Compiler();
+    if (!await compiler.init()) {
         return false;
     }
-    let args = ['-nologo'];
-    if (options.debug) {
-        args.push('-d');
-    }
-    args.push(path.win32.normalize(infile));
-    // .* target file name option allows us to specify .kmx output file and the
-    // .js output file will also be generated as required, in the same way as when
-    // we build a project. Note: this is a stop gap as we work to deprecate
-    // kmcomp.exe and replace it with kmcmp (cross-platform .kmx compiler in C++)
-    // + kmc-kmw (KMX->KMW transpiler in TypeScript) + kmc-kvk (KVK compiler in
-    // TypeScript).
-    let outfile = (options.outFile ?? infile).replace(/\\/g, '/');
-    // For now, we normalize to posix, and then renormalize to win32 for launching
-    // kmcomp, until we have a cross-platform alternative to use
-    outfile = path.win32.normalize(options.outFile).replace(/\.km.$/i, '.*');
-    args.push(outfile);
-    const kmcomp = path.join(binRoot, 'kmcomp.exe');
-    // We won't attempt to make this call cross-platform, yet.
-    let child = spawnSync(kmcomp, args, {
-        encoding: 'utf8'
+    // We need to resolve paths to absolute paths before calling kmc-kmn
+    let outfile = (options.outFile ?? infile).replace(/\.km.$/i, '.kmx');
+    infile = getPosixAbsolutePath(infile);
+    outfile = getPosixAbsolutePath(outfile);
+    // TODO: Currently this only builds .kmn->.kmx, and targeting .js is as-yet unsupported
+    // TODO: Support additional options compilerWarningsAsErrors, warnDeprecatedCode
+    return compiler.run(infile, outfile, {
+        saveDebug: options.debug,
+        shouldAddCompilerVersion: options.compilerVersion,
     });
-    if (child.error) {
-        console.error(child.error);
-        return false;
+}
+function getPosixAbsolutePath(filename) {
+    if (platform() == 'win32') {
+        // On Win32, we need to use backslashes for path.resolve to work
+        filename = filename.replace(/\//g, '\\');
     }
-    console.log(child.stdout);
-    if (child.stderr) {
-        console.error(child.stderr);
+    // Resolve to a fully qualified absolute path
+    filename = path.resolve(filename);
+    if (platform() == 'win32') {
+        // Ensure that we convert the result back to posix-style paths which is what
+        // kmc-kmn expects. On posix platforms, we assume paths have forward slashes
+        // already
+        filename = filename.replace(/\\/g, '/');
     }
-    return child.status === 0;
+    return filename;
 }
 //# sourceMappingURL=buildKmnKeyboard.js.map

package/build/src/activities/buildKmnKeyboard.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildKmnKeyboard.js","sourceRoot":"","sources":["../../../src/activities/buildKmnKeyboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,MAAc,EAAE,OAA4B;IACjF,0EAA0E;IAC1E,2EAA2E;IAC3E,yEAAyE;IACzE,kDAAkD;IAClD,MAAM,OAAO,GAAG,mBAAmB,EAAE,CAAC;IACtC,IAAG,OAAO,IAAI,IAAI,EAAE;QAClB,OAAO,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAC5D,OAAO,KAAK,CAAC;KACd;IAED,IAAI,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IACvB,IAAG,OAAO,CAAC,KAAK,EAAE;QAChB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACjB;IAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAExC,2EAA2E;IAC3E,8EAA8E;IAC9E,uEAAuE;IACvE,6EAA6E;IAC7E,2EAA2E;IAC3E,eAAe;IACf,IAAI,OAAO,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC9D,8EAA8E;IAC9E,4DAA4D;IAC5D,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACzE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAEnB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAEhD,0DAA0D;IAC1D,IAAI,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE;QAClC,QAAQ,EAAE,MAAM;KACjB,CAAC,CAAC;IAEH,IAAG,KAAK,CAAC,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC3B,OAAO,KAAK,CAAC;KACd;IAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,IAAG,KAAK,CAAC,MAAM,EAAE;QACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;KAC7B;IAED,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"buildKmnKeyboard.js","sourceRoot":"","sources":["../../../src/activities/buildKmnKeyboard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAE9B,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,MAAc,EAAE,OAA4B;IAEjF,IAAI,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC9B,IAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE;QACzB,OAAO,KAAK,CAAC;KACd;IAED,oEAAoE;IACpE,IAAI,OAAO,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAErE,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACtC,OAAO,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAExC,uFAAuF;IACvF,gFAAgF;IAChF,OAAO,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE;QACnC,SAAS,EAAE,OAAO,CAAC,KAAK;QACxB,wBAAwB,EAAE,OAAO,CAAC,eAAe;KAClD,CAAC,CAAC;AACL,CAAC;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"}

package/package.json

@@ -69,5 +69,5 @@
     "type": "git",
     "url": "git+https://github.com/keymanapp/keyman.git"
   },
-  "version": "17.0.83-alpha"
+  "version": "17.0.84-alpha"
 }