@keymanapp/kmc 17.0.293-beta → 17.0.294-beta

package/build/src/util/getDeveloperBinPath.js

@@ -1,38 +1,36 @@
-!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]="08eca393-fa84-54a6-9451-5b9774b35d54")}catch(e){}}();
-import { fileURLToPath } from 'url';
-import * as path from 'path';
-import * as fs from 'fs';
-/**
- * Locates the Keyman Developer bin folder, checking first if this is running
- * from the source repository (using the presence of the KEYMAN_ROOT environment
- * variable), and if not, checking for the presence of kmconvert.exe in each
- * parent folder recursively until we reach the root of the filesystem.
- * @returns string | null
- */
-export function getDeveloperBinPath() {
-    // if running in source repo, then we always look in developer/bin/
-    const keymanRoot = process.env['KEYMAN_ROOT'];
-    if (keymanRoot) {
-        // https://stackoverflow.com/a/45242825/1836776 (imperfect due to
-        // possibility of '..foo', but good enough)
-        const rel = path.relative(keymanRoot, import.meta.url);
-        if (rel && !rel.startsWith('..') && !path.isAbsolute(rel)) {
-            return path.join(keymanRoot, 'developer', 'bin');
-        }
-    }
-    // Otherwise, we will look in parent folders until we find kmconvert.exe
-    // TODO: if we eliminate kmconvert.exe, we'll need to do this some other way?
-    let p = fileURLToPath(import.meta.url);
-    const root = path.parse(p).root.toLowerCase(); // lower-case for drive letter on Windows
-    p = path.dirname(p);
-    do {
-        if (fs.existsSync(path.join(p, 'kmconvert.exe'))) {
-            return p;
-        }
-        p = path.dirname(p);
-    } while (p.toLowerCase() != root);
-    // kmconvert.exe was not found on the path
-    return null;
-}
-//# debugId=08eca393-fa84-54a6-9451-5b9774b35d54
-//# sourceMappingURL=getDeveloperBinPath.js.map
+import { fileURLToPath } from 'url';
+import * as path from 'path';
+import * as fs from 'fs';
+/**
+ * Locates the Keyman Developer bin folder, checking first if this is running
+ * from the source repository (using the presence of the KEYMAN_ROOT environment
+ * variable), and if not, checking for the presence of kmconvert.exe in each
+ * parent folder recursively until we reach the root of the filesystem.
+ * @returns string | null
+ */
+export function getDeveloperBinPath() {
+    // if running in source repo, then we always look in developer/bin/
+    const keymanRoot = process.env['KEYMAN_ROOT'];
+    if (keymanRoot) {
+        // https://stackoverflow.com/a/45242825/1836776 (imperfect due to
+        // possibility of '..foo', but good enough)
+        const rel = path.relative(keymanRoot, import.meta.url);
+        if (rel && !rel.startsWith('..') && !path.isAbsolute(rel)) {
+            return path.join(keymanRoot, 'developer', 'bin');
+        }
+    }
+    // Otherwise, we will look in parent folders until we find kmconvert.exe
+    // TODO: if we eliminate kmconvert.exe, we'll need to do this some other way?
+    let p = fileURLToPath(import.meta.url);
+    const root = path.parse(p).root.toLowerCase(); // lower-case for drive letter on Windows
+    p = path.dirname(p);
+    do {
+        if (fs.existsSync(path.join(p, 'kmconvert.exe'))) {
+            return p;
+        }
+        p = path.dirname(p);
+    } while (p.toLowerCase() != root);
+    // kmconvert.exe was not found on the path
+    return null;
+}
+//# sourceMappingURL=getDeveloperBinPath.js.map

package/build/src/util/getDeveloperBinPath.js.map

@@ -1 +1 @@
-{"debug_id":"08eca393-fa84-54a6-9451-5b9774b35d54","file":"getDeveloperBinPath.js","mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEzB;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB;IACjC,mEAAmE;IACnE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC9C,IAAI,UAAU,EAAE;QACd,iEAAiE;QACjE,2CAA2C;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACzD,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;SAClD;KACF;IAED,wEAAwE;IACxE,6EAA6E;IAC7E,IAAI,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,yCAAyC;IACxF,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,GAAG;QACD,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,EAAE;YAChD,OAAO,CAAC,CAAC;SACV;QACD,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KACrB,QAAQ,CAAC,CAAC,WAAW,EAAE,IAAI,IAAI,EAAE;IAElC,0CAA0C;IAC1C,OAAO,IAAI,CAAC;AACd,CAAC","names":[],"sourceRoot":"","sources":["../../../src/util/getDeveloperBinPath.ts"],"version":3}
+{"version":3,"file":"getDeveloperBinPath.js","sourceRoot":"","sources":["../../../src/util/getDeveloperBinPath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEzB;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB;IACjC,mEAAmE;IACnE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC9C,IAAI,UAAU,EAAE;QACd,iEAAiE;QACjE,2CAA2C;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACzD,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;SAClD;KACF;IAED,wEAAwE;IACxE,6EAA6E;IAC7E,IAAI,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,yCAAyC;IACxF,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,GAAG;QACD,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,EAAE;YAChD,OAAO,CAAC,CAAC;SACV;QACD,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KACrB,QAAQ,CAAC,CAAC,WAAW,EAAE,IAAI,IAAI,EAAE;IAElC,0CAA0C;IAC1C,OAAO,IAAI,CAAC;AACd,CAAC"}

package/build/src/util/getLastGitCommitDate.js

@@ -1,46 +1,44 @@
-!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]="710ddc85-73e3-5f47-adc8-32358798bb51")}catch(e){}}();
-import { execFileSync } from 'child_process';
-// RFC3339 pattern, UTC
-export const expectedGitDateFormat = /^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ$/;
-/**
- * Returns the date and time of the last commit from git for the passed in path
- * @param path   Path for which to retrieve the last commit message
- * @returns string, in RFC3339, 'YYYY-MM-DDThh:nn:ssZ'
- */
-export function getLastGitCommitDate(path) {
-    // TZ=UTC0 git log -1 --no-merges --date=format:%Y-%m-%dT%H:%M:%SZ --format=%ad
-    let result = null;
-    try {
-        result = execFileSync('git', [
-            'log',
-            '-1',
-            '--no-merges',
-            '--date=format:%Y-%m-%dT%H:%M:%SZ',
-            '--format=%ad' // emit only the commit date
-        ], {
-            env: { ...process.env, TZ: 'TZ0' },
-            encoding: 'utf-8',
-            windowsHide: true,
-            cwd: path,
-            stdio: ['pipe', 'pipe', 'pipe'] // all output via pipe, so we don't get git errors on console
-        });
-    }
-    catch (e) {
-        // If git is not available, or the file is not in-repo, then it is probably
-        // fine to just silently return null, as the only machines where this is
-        // critical are the CI machines where we build and deploy .keyboard_info
-        // files, and where git will always be available. It would be possible to
-        // have this raise an error in CI environments, but the chance of error
-        // seems low.
-        return null;
-    }
-    result = result.trim();
-    // We'll only return the result if it walks like a date, swims like a date,
-    // and quacks like a date.
-    if (!result.match(expectedGitDateFormat)) {
-        return null;
-    }
-    return result;
-}
-//# debugId=710ddc85-73e3-5f47-adc8-32358798bb51
-//# sourceMappingURL=getLastGitCommitDate.js.map
+import { execFileSync } from 'child_process';
+// RFC3339 pattern, UTC
+export const expectedGitDateFormat = /^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ$/;
+/**
+ * Returns the date and time of the last commit from git for the passed in path
+ * @param path   Path for which to retrieve the last commit message
+ * @returns string, in RFC3339, 'YYYY-MM-DDThh:nn:ssZ'
+ */
+export function getLastGitCommitDate(path) {
+    // TZ=UTC0 git log -1 --no-merges --date=format:%Y-%m-%dT%H:%M:%SZ --format=%ad
+    let result = null;
+    try {
+        result = execFileSync('git', [
+            'log',
+            '-1',
+            '--no-merges',
+            '--date=format:%Y-%m-%dT%H:%M:%SZ',
+            '--format=%ad' // emit only the commit date
+        ], {
+            env: { ...process.env, TZ: 'TZ0' },
+            encoding: 'utf-8',
+            windowsHide: true,
+            cwd: path,
+            stdio: ['pipe', 'pipe', 'pipe'] // all output via pipe, so we don't get git errors on console
+        });
+    }
+    catch (e) {
+        // If git is not available, or the file is not in-repo, then it is probably
+        // fine to just silently return null, as the only machines where this is
+        // critical are the CI machines where we build and deploy .keyboard_info
+        // files, and where git will always be available. It would be possible to
+        // have this raise an error in CI environments, but the chance of error
+        // seems low.
+        return null;
+    }
+    result = result.trim();
+    // We'll only return the result if it walks like a date, swims like a date,
+    // and quacks like a date.
+    if (!result.match(expectedGitDateFormat)) {
+        return null;
+    }
+    return result;
+}
+//# sourceMappingURL=getLastGitCommitDate.js.map

package/build/src/util/getLastGitCommitDate.js.map

@@ -1 +1 @@
-{"debug_id":"710ddc85-73e3-5f47-adc8-32358798bb51","file":"getLastGitCommitDate.js","mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,uBAAuB;AACvB,MAAM,CAAC,MAAM,qBAAqB,GAAG,sCAAsC,CAAC;AAE5E;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,+EAA+E;IAC/E,IAAI,MAAM,GAAG,IAAI,CAAC;IAElB,IAAI;QACF,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE;YAC3B,KAAK;YACL,IAAI;YACJ,aAAa;YACb,kCAAkC;YAClC,cAAc,CAAwB,4BAA4B;SACnE,EAAE;YACD,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE;YAClC,QAAQ,EAAE,OAAO;YACjB,WAAW,EAAE,IAAI;YACjB,GAAG,EAAE,IAAI;YACT,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAO,6DAA6D;SACpG,CAAC,CAAC;KACJ;IAAC,OAAO,CAAC,EAAE;QACV,2EAA2E;QAC3E,wEAAwE;QACxE,wEAAwE;QACxE,yEAAyE;QACzE,uEAAuE;QACvE,aAAa;QACb,OAAO,IAAI,CAAC;KACb;IAED,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IAEvB,2EAA2E;IAC3E,0BAA0B;IAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE;QACxC,OAAO,IAAI,CAAC;KACb;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","names":[],"sourceRoot":"","sources":["../../../src/util/getLastGitCommitDate.ts"],"version":3}
+{"version":3,"file":"getLastGitCommitDate.js","sourceRoot":"","sources":["../../../src/util/getLastGitCommitDate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,uBAAuB;AACvB,MAAM,CAAC,MAAM,qBAAqB,GAAG,sCAAsC,CAAC;AAE5E;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,+EAA+E;IAC/E,IAAI,MAAM,GAAG,IAAI,CAAC;IAElB,IAAI;QACF,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE;YAC3B,KAAK;YACL,IAAI;YACJ,aAAa;YACb,kCAAkC;YAClC,cAAc,CAAwB,4BAA4B;SACnE,EAAE;YACD,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE;YAClC,QAAQ,EAAE,OAAO;YACjB,WAAW,EAAE,IAAI;YACjB,GAAG,EAAE,IAAI;YACT,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAO,6DAA6D;SACpG,CAAC,CAAC;KACJ;IAAC,OAAO,CAAC,EAAE;QACV,2EAA2E;QAC3E,wEAAwE;QACxE,wEAAwE;QACxE,yEAAyE;QACzE,uEAAuE;QACvE,aAAa;QACb,OAAO,IAAI,CAAC;KACb;IAED,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IAEvB,2EAA2E;IAC3E,0BAA0B;IAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE;QACxC,OAAO,IAAI,CAAC;KACb;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/build/src/util/kmcSentryOptions.d.ts

@@ -0,0 +1,8 @@
+import { SentryNodeOptions } from "@keymanapp/developer-utils";
+/**
+ * Rewrites sourcemap paths for the esbuild distribution of kmc (as used in
+ * Keyman Developer itself) /<arbitrary-path>/kmc.mjs to /dist/kmc.mjs, so that
+ * Sentry can pick up the mapping
+ */
+export declare const kmcSentryOptions: SentryNodeOptions;
+//# sourceMappingURL=kmcSentryOptions.d.ts.map

package/build/src/util/kmcSentryOptions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"kmcSentryOptions.d.ts","sourceRoot":"","sources":["../../../src/util/kmcSentryOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,iBAa9B,CAAC"}

package/build/src/util/kmcSentryOptions.js

@@ -0,0 +1,20 @@
+/**
+ * Rewrites sourcemap paths for the esbuild distribution of kmc (as used in
+ * Keyman Developer itself) /<arbitrary-path>/kmc.mjs to /dist/kmc.mjs, so that
+ * Sentry can pick up the mapping
+ */
+export const kmcSentryOptions = {
+    beforeSend: function (event) {
+        const frames = event?.exception?.values?.[0]?.stacktrace?.frames;
+        if (frames) {
+            frames.forEach(frame => {
+                const filename = frame.filename.match(/[^/]+$/)[0];
+                if (filename.endsWith('.mjs')) {
+                    frame.filename = `/dist/${filename}`;
+                }
+            });
+        }
+        return event;
+    }
+};
+//# sourceMappingURL=kmcSentryOptions.js.map

package/build/src/util/kmcSentryOptions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"kmcSentryOptions.js","sourceRoot":"","sources":["../../../src/util/kmcSentryOptions.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAsB;IACjD,UAAU,EAAE,UAAU,KAAK;QACzB,MAAM,MAAM,GAAG,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC;QACjE,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACrB,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnD,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;oBAC7B,KAAK,CAAC,QAAQ,GAAG,SAAS,QAAQ,EAAE,CAAC;iBACtC;YACH,CAAC,CAAC,CAAC;SACJ;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAC"}

package/build/src/util/projectLoader.js

@@ -1,53 +1,51 @@
-!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]="5becf045-25c3-50d3-b97a-6c7e280f24de")}catch(e){}}();
-import * as path from 'path';
-import * as fs from 'fs';
-import { KeymanDeveloperProject, KeymanFileTypes, KPJFileReader } from "@keymanapp/common-types";
-import { InfrastructureMessages } from "../messages/infrastructureMessages.js";
-export const isProject = (filename) => fs.existsSync(filename) && (fs.statSync(filename).isDirectory() ||
-    KeymanFileTypes.sourceTypeFromFilename(filename) == ".kpj" /* KeymanFileTypes.Source.Project */);
-export function loadProject(infile, callbacks) {
-    infile = path.resolve(infile.replace(/\\/g, '/'));
-    if (fs.existsSync(infile) && fs.statSync(infile).isDirectory()) {
-        // This is a project folder, look for folder-name.kpj
-        infile = path.join(infile, path.basename(infile) + ".kpj" /* KeymanFileTypes.Source.Project */);
-    }
-    // infile should be the .kpj
-    if (!infile.endsWith(".kpj" /* KeymanFileTypes.Source.Project */)) {
-        callbacks.reportMessage(InfrastructureMessages.Error_NotAProjectFile({ filename: infile }));
-        return null;
-    }
-    const project = callbacks.fs.existsSync(infile) ?
-        loadProjectFromFile(infile, callbacks) :
-        loadDefaultProjectFromFolder(infile, callbacks);
-    return project;
-}
-function loadDefaultProjectFromFolder(infile, callbacks) {
-    // The folder does not contain a .kpj, so construct a default 2.0 .kpj
-    const project = new KeymanDeveloperProject(infile, '2.0', callbacks);
-    if (!project.populateFiles()) {
-        callbacks.reportMessage(InfrastructureMessages.Error_InvalidProjectFolder({ folderName: path.dirname(infile) }));
-        return null;
-    }
-    return project;
-}
-function loadProjectFromFile(infile, callbacks) {
-    const kpjData = callbacks.loadFile(infile);
-    const reader = new KPJFileReader(callbacks);
-    let kpj = null;
-    try {
-        kpj = reader.read(kpjData);
-        if (kpj.KeymanDeveloperProject?.Options?.Version && kpj.KeymanDeveloperProject.Options.Version != "1.0" && kpj.KeymanDeveloperProject.Options.Version != "2.0") {
-            callbacks.reportMessage(InfrastructureMessages.Error_UnsupportedProjectVersion({ version: kpj.KeymanDeveloperProject.Options.Version }));
-            return null;
-        }
-        reader.validate(kpj);
-    }
-    catch (e) {
-        callbacks.reportMessage(InfrastructureMessages.Error_InvalidProjectFile({ message: (e ?? '').toString() }));
-        return null;
-    }
-    const project = reader.transform(infile, kpj);
-    return project;
-}
-//# debugId=5becf045-25c3-50d3-b97a-6c7e280f24de
-//# sourceMappingURL=projectLoader.js.map
+import * as path from 'path';
+import * as fs from 'fs';
+import { KeymanDeveloperProject, KeymanFileTypes, KPJFileReader } from "@keymanapp/common-types";
+import { InfrastructureMessages } from "../messages/infrastructureMessages.js";
+export const isProject = (filename) => fs.existsSync(filename) && (fs.statSync(filename).isDirectory() ||
+    KeymanFileTypes.sourceTypeFromFilename(filename) == ".kpj" /* KeymanFileTypes.Source.Project */);
+export function loadProject(infile, callbacks) {
+    infile = path.resolve(infile.replace(/\\/g, '/'));
+    if (fs.existsSync(infile) && fs.statSync(infile).isDirectory()) {
+        // This is a project folder, look for folder-name.kpj
+        infile = path.join(infile, path.basename(infile) + ".kpj" /* KeymanFileTypes.Source.Project */);
+    }
+    // infile should be the .kpj
+    if (!infile.endsWith(".kpj" /* KeymanFileTypes.Source.Project */)) {
+        callbacks.reportMessage(InfrastructureMessages.Error_NotAProjectFile({ filename: infile }));
+        return null;
+    }
+    const project = callbacks.fs.existsSync(infile) ?
+        loadProjectFromFile(infile, callbacks) :
+        loadDefaultProjectFromFolder(infile, callbacks);
+    return project;
+}
+function loadDefaultProjectFromFolder(infile, callbacks) {
+    // The folder does not contain a .kpj, so construct a default 2.0 .kpj
+    const project = new KeymanDeveloperProject(infile, '2.0', callbacks);
+    if (!project.populateFiles()) {
+        callbacks.reportMessage(InfrastructureMessages.Error_InvalidProjectFolder({ folderName: path.dirname(infile) }));
+        return null;
+    }
+    return project;
+}
+function loadProjectFromFile(infile, callbacks) {
+    const kpjData = callbacks.loadFile(infile);
+    const reader = new KPJFileReader(callbacks);
+    let kpj = null;
+    try {
+        kpj = reader.read(kpjData);
+        if (kpj.KeymanDeveloperProject?.Options?.Version && kpj.KeymanDeveloperProject.Options.Version != "1.0" && kpj.KeymanDeveloperProject.Options.Version != "2.0") {
+            callbacks.reportMessage(InfrastructureMessages.Error_UnsupportedProjectVersion({ version: kpj.KeymanDeveloperProject.Options.Version }));
+            return null;
+        }
+        reader.validate(kpj);
+    }
+    catch (e) {
+        callbacks.reportMessage(InfrastructureMessages.Error_InvalidProjectFile({ message: (e ?? '').toString() }));
+        return null;
+    }
+    const project = reader.transform(infile, kpj);
+    return project;
+}
+//# sourceMappingURL=projectLoader.js.map

package/build/src/util/projectLoader.js.map

@@ -1 +1 @@
-{"debug_id":"5becf045-25c3-50d3-b97a-6c7e280f24de","file":"projectLoader.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/util/projectLoader.ts"],"version":3}
+{"version":3,"file":"projectLoader.js","sourceRoot":"","sources":["../../../src/util/projectLoader.ts"],"names":[],"mappings":"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"}

package/build/src/util/projectRunner.js

@@ -1,29 +1,27 @@
-!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]="efdfba5f-2611-534b-8fc4-3d8ec12533e2")}catch(e){}}();
-import { KeymanFileTypes } from "@keymanapp/common-types";
-import { isProject, loadProject } from './projectLoader.js';
-async function runProject(callbacks, filename, callback) {
-    const project = loadProject(filename, callbacks);
-    for (const file of project.files) {
-        if (KeymanFileTypes.filenameIs(file.filename, ".kpj" /* KeymanFileTypes.Source.Project */)) {
-            // Don't accidentally recurse into projects
-            continue;
-        }
-        if (!await callback(project.resolveInputFilePath(file))) {
-            return false;
-        }
-    }
-    return true;
-}
-export async function runOnFiles(callbacks, filenames, callback) {
-    for (let filename of filenames) {
-        const result = isProject(filename) ?
-            await runProject(callbacks, filename, callback) :
-            await callback(filename);
-        if (!result) {
-            return false;
-        }
-    }
-    return true;
-}
-//# debugId=efdfba5f-2611-534b-8fc4-3d8ec12533e2
-//# sourceMappingURL=projectRunner.js.map
+import { KeymanFileTypes } from "@keymanapp/common-types";
+import { isProject, loadProject } from './projectLoader.js';
+async function runProject(callbacks, filename, callback) {
+    const project = loadProject(filename, callbacks);
+    for (const file of project.files) {
+        if (KeymanFileTypes.filenameIs(file.filename, ".kpj" /* KeymanFileTypes.Source.Project */)) {
+            // Don't accidentally recurse into projects
+            continue;
+        }
+        if (!await callback(project.resolveInputFilePath(file))) {
+            return false;
+        }
+    }
+    return true;
+}
+export async function runOnFiles(callbacks, filenames, callback) {
+    for (let filename of filenames) {
+        const result = isProject(filename) ?
+            await runProject(callbacks, filename, callback) :
+            await callback(filename);
+        if (!result) {
+            return false;
+        }
+    }
+    return true;
+}
+//# sourceMappingURL=projectRunner.js.map

package/build/src/util/projectRunner.js.map

@@ -1 +1 @@
-{"debug_id":"efdfba5f-2611-534b-8fc4-3d8ec12533e2","file":"projectRunner.js","mappings":";AAAA,OAAO,EAAqB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE5D,KAAK,UAAU,UAAU,CAAC,SAA4B,EAAE,QAAgB,EAAE,QAA6C;IACrH,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAEjD,KAAI,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE;QAC/B,IAAG,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,8CAAiC,EAAE;YAC5E,2CAA2C;YAC3C,SAAS;SACV;QACD,IAAG,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,EAAE;YACtD,OAAO,KAAK,CAAC;SACd;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,SAA4B,EAAE,SAAmB,EAAE,QAA6C;IAC/H,KAAI,IAAI,QAAQ,IAAI,SAAS,EAAE;QAC7B,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClC,MAAM,UAAU,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;YACjD,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC3B,IAAG,CAAC,MAAM,EAAE;YACV,OAAO,KAAK,CAAC;SACd;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC","names":[],"sourceRoot":"","sources":["../../../src/util/projectRunner.ts"],"version":3}
+{"version":3,"file":"projectRunner.js","sourceRoot":"","sources":["../../../src/util/projectRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE5D,KAAK,UAAU,UAAU,CAAC,SAA4B,EAAE,QAAgB,EAAE,QAA6C;IACrH,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAEjD,KAAI,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE;QAC/B,IAAG,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,8CAAiC,EAAE;YAC5E,2CAA2C;YAC3C,SAAS;SACV;QACD,IAAG,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,EAAE;YACtD,OAAO,KAAK,CAAC;SACd;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,SAA4B,EAAE,SAAmB,EAAE,QAA6C;IAC/H,KAAI,IAAI,QAAQ,IAAI,SAAS,EAAE;QAC7B,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClC,MAAM,UAAU,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;YACjD,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC3B,IAAG,CAAC,MAAM,EAAE;YACV,OAAO,KAAK,CAAC;SACd;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/build/src/util/sysexits.js

@@ -1,9 +1,7 @@
-!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]="ce0aa3c3-2acf-56d9-8264-5eb5ae854b8a")}catch(e){}}();
-import { KeymanSentry } from "@keymanapp/developer-utils";
-;
-export async function exitProcess(exitCode) {
-    await KeymanSentry.close();
-    process.exit(exitCode);
-}
-//# debugId=ce0aa3c3-2acf-56d9-8264-5eb5ae854b8a
-//# sourceMappingURL=sysexits.js.map
+import { KeymanSentry } from "@keymanapp/developer-utils";
+;
+export async function exitProcess(exitCode) {
+    await KeymanSentry.close();
+    process.exit(exitCode);
+}
+//# sourceMappingURL=sysexits.js.map

package/build/src/util/sysexits.js.map

@@ -1 +1 @@
-{"debug_id":"ce0aa3c3-2acf-56d9-8264-5eb5ae854b8a","file":"sysexits.js","mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AASzD,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,QAAiB;IACjD,MAAM,YAAY,CAAC,KAAK,EAAE,CAAC;IAC3B,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACzB,CAAC","names":[],"sourceRoot":"","sources":["../../../src/util/sysexits.ts"],"version":3}
+{"version":3,"file":"sysexits.js","sourceRoot":"","sources":["../../../src/util/sysexits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AASzD,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,QAAiB;IACjD,MAAM,YAAY,CAAC,KAAK,EAAE,CAAC;IAC3B,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACzB,CAAC"}

package/package.json

@@ -34,17 +34,17 @@
     "kmlmp": "build/src/kmlmp.js"
   },
   "dependencies": {
-    "@keymanapp/common-types": "17.0.293-beta",
-    "@keymanapp/developer-utils": "17.0.293-beta",
-    "@keymanapp/keyman-version": "17.0.293-beta",
-    "@keymanapp/kmc-analyze": "17.0.293-beta",
-    "@keymanapp/kmc-keyboard-info": "17.0.293-beta",
-    "@keymanapp/kmc-kmn": "17.0.293-beta",
-    "@keymanapp/kmc-ldml": "17.0.293-beta",
-    "@keymanapp/kmc-model": "17.0.293-beta",
-    "@keymanapp/kmc-model-info": "17.0.293-beta",
-    "@keymanapp/kmc-package": "17.0.293-beta",
-    "@keymanapp/models-types": "17.0.293-beta",
+    "@keymanapp/common-types": "17.0.294-beta",
+    "@keymanapp/developer-utils": "17.0.294-beta",
+    "@keymanapp/keyman-version": "17.0.294-beta",
+    "@keymanapp/kmc-analyze": "17.0.294-beta",
+    "@keymanapp/kmc-keyboard-info": "17.0.294-beta",
+    "@keymanapp/kmc-kmn": "17.0.294-beta",
+    "@keymanapp/kmc-ldml": "17.0.294-beta",
+    "@keymanapp/kmc-model": "17.0.294-beta",
+    "@keymanapp/kmc-model-info": "17.0.294-beta",
+    "@keymanapp/kmc-package": "17.0.294-beta",
+    "@keymanapp/models-types": "17.0.294-beta",
     "@sentry/node": "^7.57.0",
     "chalk": "^2.4.2",
     "commander": "^10.0.0",
@@ -86,5 +86,5 @@
     "type": "git",
     "url": "git+https://github.com/keymanapp/keyman.git"
   },
-  "version": "17.0.293-beta"
+  "version": "17.0.294-beta"
 }