@keymanapp/kmc 18.0.41-alpha → 18.0.45-alpha

package/build/src/commands/analyze.d.ts

@@ -1,23 +1,23 @@
-import { Command } from 'commander';
-import { CompilerCallbacks, CompilerLogLevel } from '@keymanapp/common-types';
-interface AnalysisActivityOptions {
-    /**
-     * Reporting level to console, used by NodeCompilerCallbacks (not used in compiler modules;
-     * all messages are still reported to the internal log)
-     */
-    logLevel?: CompilerLogLevel;
-    base?: string;
-    stripDottedCircle?: boolean;
-    includeCounts?: boolean;
-    mappingFile?: string;
-}
-export declare function declareAnalyze(program: Command): void;
-declare function analyzeOskCharUse(callbacks: CompilerCallbacks, filenames: string[], options: AnalysisActivityOptions): Promise<boolean>;
-/**
- * these are exported only for unit tests, do not use
- */
-export declare const analyzeUnitTestEndpoints: {
-    analyzeOskCharUse: typeof analyzeOskCharUse;
-};
-export {};
+import { Command } from 'commander';
+import { CompilerCallbacks, CompilerLogLevel } from '@keymanapp/common-types';
+interface AnalysisActivityOptions {
+    /**
+     * Reporting level to console, used by NodeCompilerCallbacks (not used in compiler modules;
+     * all messages are still reported to the internal log)
+     */
+    logLevel?: CompilerLogLevel;
+    base?: string;
+    stripDottedCircle?: boolean;
+    includeCounts?: boolean;
+    mappingFile?: string;
+}
+export declare function declareAnalyze(program: Command): void;
+declare function analyzeOskCharUse(callbacks: CompilerCallbacks, filenames: string[], options: AnalysisActivityOptions): Promise<boolean>;
+/**
+ * these are exported only for unit tests, do not use
+ */
+export declare const analyzeUnitTestEndpoints: {
+    analyzeOskCharUse: typeof analyzeOskCharUse;
+};
+export {};
 //# sourceMappingURL=analyze.d.ts.map

package/build/src/commands/analyze.js

@@ -1,106 +1,106 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import { Option } from 'commander';
-import { NodeCompilerCallbacks } from '../util/NodeCompilerCallbacks.js';
-import { InfrastructureMessages } from '../messages/infrastructureMessages.js';
-import { AnalyzeOskCharacterUse, AnalyzeOskRewritePua } from '@keymanapp/kmc-analyze';
-import { BaseOptions } from '../util/baseOptions.js';
-import { runOnFiles } from '../util/projectRunner.js';
-import { exitProcess } from '../util/sysexits.js';
-;
-export function declareAnalyze(program) {
-    let command = program.command('analyze');
-    declareOskCharUse(command);
-    declareOskRewrite(command);
-}
-function declareOskCharUse(command) {
-    let subCommand = command.command('osk-char-use [infile...]');
-    BaseOptions.addLogLevel(subCommand);
-    subCommand
-        .description('Analyze On Screen Keyboards for character usage')
-        .option('-b, --base', 'First PUA codepoint to use, in hexadecimal (default F100)', 'F100')
-        .option('--include-counts', 'Include number of times each character is referenced', false)
-        .option('--strip-dotted-circle', 'Strip U+25CC (dotted circle base) from results', false)
-        .addOption(new Option('-m, --mapping-file <filename>', 'Result file to write to (.json, .md, or .txt)').makeOptionMandatory())
-        .action(async (filenames, _options, commander) => {
-        const options = commander.optsWithGlobals();
-        if (!filenames.length) {
-            // If there are no filenames provided, then we are building the current
-            // folder ('.') as a project-style build
-            filenames.push('.');
-        }
-        if (!await analyze(analyzeOskCharUse, filenames, options)) {
-            // Once a file fails to build, we bail on subsequent builds
-            return await exitProcess(1);
-        }
-    });
-}
-function declareOskRewrite(command) {
-    let subCommand = command.command('osk-rewrite-from-char-use [infile...]');
-    subCommand
-        .description('Rewrite On Screen Keyboard files from source mapping; given file.ext, output is written to file-pua.ext')
-        .addOption(new Option('-m, --mapping-file <filename>', 'JSON mapping file to read from').makeOptionMandatory())
-        .action(async (filenames, options) => {
-        if (!filenames.length) {
-            // If there are no filenames provided, then we are building the current
-            // folder ('.') as a project-style build
-            filenames.push('.');
-        }
-        if (!await analyze(analyzeOskRewritePua, filenames, options)) {
-            // Once a file fails to build, we bail on subsequent builds
-            return await exitProcess(1);
-        }
-        return null;
-    });
-}
-async function analyze(action, filenames, options) {
-    let callbacks = new NodeCompilerCallbacks({ logLevel: options.logLevel });
-    try {
-        return await action(callbacks, filenames, options);
-    }
-    catch (e) {
-        callbacks.reportMessage(InfrastructureMessages.Fatal_UnexpectedException({ e }));
-        return false;
-    }
-}
-async function analyzeOskCharUse(callbacks, filenames, options) {
-    const format = path.extname(options.mappingFile);
-    if (format != '.txt' && format != '.json' && format != '.md') {
-        callbacks.reportMessage(InfrastructureMessages.Error_UnknownFileFormat({ format }));
-        return false;
-    }
-    const analyzer = new AnalyzeOskCharacterUse(callbacks, {
-        puaBase: parseInt(options.base, 16),
-        stripDottedCircle: options.stripDottedCircle,
-        includeCounts: options.includeCounts,
-    });
-    if (!await runOnFiles(callbacks, filenames, analyzer.analyze.bind(analyzer))) {
-        return false;
-    }
-    const output = analyzer.getStrings(format).join('\n');
-    fs.writeFileSync(options.mappingFile, output, 'utf8');
-    return true;
-}
-async function analyzeOskRewritePua(callbacks, filenames, options) {
-    const analyzer = new AnalyzeOskRewritePua(callbacks);
-    const mapping = JSON.parse(fs.readFileSync(options.mappingFile, 'utf-8'));
-    return await runOnFiles(callbacks, filenames, async (filename) => {
-        if (!await analyzer.analyze(filename, mapping)) {
-            return false;
-        }
-        const mappedFilenames = Object.keys(analyzer.data);
-        for (let filename of mappedFilenames) {
-            const ext = path.extname(filename);
-            const outputFilename = filename.substring(0, filename.length - ext.length) + '-pua' + ext;
-            fs.writeFileSync(outputFilename, analyzer.data[filename]);
-        }
-        return true;
-    });
-}
-/**
- * these are exported only for unit tests, do not use
- */
-export const analyzeUnitTestEndpoints = {
-    analyzeOskCharUse
-};
+import * as fs from 'fs';
+import * as path from 'path';
+import { Option } from 'commander';
+import { NodeCompilerCallbacks } from '../util/NodeCompilerCallbacks.js';
+import { InfrastructureMessages } from '../messages/infrastructureMessages.js';
+import { AnalyzeOskCharacterUse, AnalyzeOskRewritePua } from '@keymanapp/kmc-analyze';
+import { BaseOptions } from '../util/baseOptions.js';
+import { runOnFiles } from '../util/projectRunner.js';
+import { exitProcess } from '../util/sysexits.js';
+;
+export function declareAnalyze(program) {
+    let command = program.command('analyze');
+    declareOskCharUse(command);
+    declareOskRewrite(command);
+}
+function declareOskCharUse(command) {
+    let subCommand = command.command('osk-char-use [infile...]');
+    BaseOptions.addLogLevel(subCommand);
+    subCommand
+        .description('Analyze On Screen Keyboards for character usage')
+        .option('-b, --base', 'First PUA codepoint to use, in hexadecimal (default F100)', 'F100')
+        .option('--include-counts', 'Include number of times each character is referenced', false)
+        .option('--strip-dotted-circle', 'Strip U+25CC (dotted circle base) from results', false)
+        .addOption(new Option('-m, --mapping-file <filename>', 'Result file to write to (.json, .md, or .txt)').makeOptionMandatory())
+        .action(async (filenames, _options, commander) => {
+        const options = commander.optsWithGlobals();
+        if (!filenames.length) {
+            // If there are no filenames provided, then we are building the current
+            // folder ('.') as a project-style build
+            filenames.push('.');
+        }
+        if (!await analyze(analyzeOskCharUse, filenames, options)) {
+            // Once a file fails to build, we bail on subsequent builds
+            return await exitProcess(1);
+        }
+    });
+}
+function declareOskRewrite(command) {
+    let subCommand = command.command('osk-rewrite-from-char-use [infile...]');
+    subCommand
+        .description('Rewrite On Screen Keyboard files from source mapping; given file.ext, output is written to file-pua.ext')
+        .addOption(new Option('-m, --mapping-file <filename>', 'JSON mapping file to read from').makeOptionMandatory())
+        .action(async (filenames, options) => {
+        if (!filenames.length) {
+            // If there are no filenames provided, then we are building the current
+            // folder ('.') as a project-style build
+            filenames.push('.');
+        }
+        if (!await analyze(analyzeOskRewritePua, filenames, options)) {
+            // Once a file fails to build, we bail on subsequent builds
+            return await exitProcess(1);
+        }
+        return null;
+    });
+}
+async function analyze(action, filenames, options) {
+    let callbacks = new NodeCompilerCallbacks({ logLevel: options.logLevel });
+    try {
+        return await action(callbacks, filenames, options);
+    }
+    catch (e) {
+        callbacks.reportMessage(InfrastructureMessages.Fatal_UnexpectedException({ e }));
+        return false;
+    }
+}
+async function analyzeOskCharUse(callbacks, filenames, options) {
+    const format = path.extname(options.mappingFile);
+    if (format != '.txt' && format != '.json' && format != '.md') {
+        callbacks.reportMessage(InfrastructureMessages.Error_UnknownFileFormat({ format }));
+        return false;
+    }
+    const analyzer = new AnalyzeOskCharacterUse(callbacks, {
+        puaBase: parseInt(options.base, 16),
+        stripDottedCircle: options.stripDottedCircle,
+        includeCounts: options.includeCounts,
+    });
+    if (!await runOnFiles(callbacks, filenames, analyzer.analyze.bind(analyzer))) {
+        return false;
+    }
+    const output = analyzer.getStrings(format).join('\n');
+    fs.writeFileSync(options.mappingFile, output, 'utf8');
+    return true;
+}
+async function analyzeOskRewritePua(callbacks, filenames, options) {
+    const analyzer = new AnalyzeOskRewritePua(callbacks);
+    const mapping = JSON.parse(fs.readFileSync(options.mappingFile, 'utf-8'));
+    return await runOnFiles(callbacks, filenames, async (filename) => {
+        if (!await analyzer.analyze(filename, mapping)) {
+            return false;
+        }
+        const mappedFilenames = Object.keys(analyzer.data);
+        for (let filename of mappedFilenames) {
+            const ext = path.extname(filename);
+            const outputFilename = filename.substring(0, filename.length - ext.length) + '-pua' + ext;
+            fs.writeFileSync(outputFilename, analyzer.data[filename]);
+        }
+        return true;
+    });
+}
+/**
+ * these are exported only for unit tests, do not use
+ */
+export const analyzeUnitTestEndpoints = {
+    analyzeOskCharUse
+};
 //# sourceMappingURL=analyze.js.map

package/build/src/commands/analyze.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../../src/commands/analyze.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../../src/commands/analyze.ts"],"names":[],"mappings":"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"}

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

@@ -1,13 +1,13 @@
-import { Command } from 'commander';
-import { NodeCompilerCallbacks } from '../util/NodeCompilerCallbacks.js';
-import { CompilerOptions } from '@keymanapp/common-types';
-export declare function declareBuild(program: Command): void;
-declare function build(filename: string, outfile: string, parentCallbacks: NodeCompilerCallbacks, options: CompilerOptions): Promise<boolean>;
-/**
- * these are exported only for unit tests, do not use
- */
-export declare const unitTestEndpoints: {
-    build: typeof build;
-};
-export {};
+import { Command } from 'commander';
+import { NodeCompilerCallbacks } from '../util/NodeCompilerCallbacks.js';
+import { CompilerOptions } from '@keymanapp/common-types';
+export declare function declareBuild(program: Command): void;
+declare function build(filename: string, outfile: string, parentCallbacks: NodeCompilerCallbacks, options: CompilerOptions): Promise<boolean>;
+/**
+ * these are exported only for unit tests, do not use
+ */
+export declare const unitTestEndpoints: {
+    build: typeof build;
+};
+export {};
 //# sourceMappingURL=build.d.ts.map

package/build/src/commands/build.js

@@ -1,35 +1,35 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import { buildActivities } from './buildClasses/buildActivities.js';
-import { BuildProject } from './buildClasses/BuildProject.js';
-import { NodeCompilerCallbacks } from '../util/NodeCompilerCallbacks.js';
-import { InfrastructureMessages } from '../messages/infrastructureMessages.js';
-import { CompilerFileCallbacks } from '@keymanapp/common-types';
-import { BaseOptions } from '../util/baseOptions.js';
-import { expandFileLists } from '../util/fileLists.js';
-import { isProject } from '../util/projectLoader.js';
-import { buildTestData } from './buildTestData/index.js';
-import { buildWindowsPackageInstaller } from './buildWindowsPackageInstaller/index.js';
-import { commandOptionsToCompilerOptions } from '../util/extendedCompilerOptions.js';
-import { exitProcess } from '../util/sysexits.js';
-export function declareBuild(program) {
-    // TODO: localization?
-    const buildCommand = program
-        .command('build')
-        .option('--color', 'Force colorization for log messages')
-        .option('--no-color', 'No colorization for log messages; if both omitted, detects from console')
-        // These options are only used with build file but are included here so that
-        // they are visible in `kmc build --help`
-        .option('-d, --debug', 'Include debug information in output')
-        .option('-w, --compiler-warnings-as-errors', 'Causes warnings to fail the build; overrides project-level warnings-as-errors option')
-        .option('-W, --no-compiler-warnings-as-errors', 'Warnings do not fail the build; overrides project-level warnings-as-errors option')
-        .option('-m, --message <number>', 'Adjust severity of info, hint or warning message to Disable (default), Info, Hint, Warn or Error (option can be repeated)', (value, previous) => previous.concat([value]), [])
-        .option('--no-compiler-version', 'Exclude compiler version metadata from output')
-        .option('--no-warn-deprecated-code', 'Turn off warnings for deprecated code styles');
-    BaseOptions.addAll(buildCommand);
-    buildCommand.command('file [infile...]', { isDefault: true })
-        .description(`Compile one or more source files or projects ('file' subcommand is default).`)
-        .option('--for-publishing', 'Verify that project meets @keymanapp repository requirements')
+import * as fs from 'fs';
+import * as path from 'path';
+import { buildActivities } from './buildClasses/buildActivities.js';
+import { BuildProject } from './buildClasses/BuildProject.js';
+import { NodeCompilerCallbacks } from '../util/NodeCompilerCallbacks.js';
+import { InfrastructureMessages } from '../messages/infrastructureMessages.js';
+import { CompilerFileCallbacks } from '@keymanapp/common-types';
+import { BaseOptions } from '../util/baseOptions.js';
+import { expandFileLists } from '../util/fileLists.js';
+import { isProject } from '../util/projectLoader.js';
+import { buildTestData } from './buildTestData/index.js';
+import { buildWindowsPackageInstaller } from './buildWindowsPackageInstaller/index.js';
+import { commandOptionsToCompilerOptions } from '../util/extendedCompilerOptions.js';
+import { exitProcess } from '../util/sysexits.js';
+export function declareBuild(program) {
+    // TODO: localization?
+    const buildCommand = program
+        .command('build')
+        .option('--color', 'Force colorization for log messages')
+        .option('--no-color', 'No colorization for log messages; if both omitted, detects from console')
+        // These options are only used with build file but are included here so that
+        // they are visible in `kmc build --help`
+        .option('-d, --debug', 'Include debug information in output')
+        .option('-w, --compiler-warnings-as-errors', 'Causes warnings to fail the build; overrides project-level warnings-as-errors option')
+        .option('-W, --no-compiler-warnings-as-errors', 'Warnings do not fail the build; overrides project-level warnings-as-errors option')
+        .option('-m, --message <number>', 'Adjust severity of info, hint or warning message to Disable (default), Info, Hint, Warn or Error (option can be repeated)', (value, previous) => previous.concat([value]), [])
+        .option('--no-compiler-version', 'Exclude compiler version metadata from output')
+        .option('--no-warn-deprecated-code', 'Turn off warnings for deprecated code styles');
+    BaseOptions.addAll(buildCommand);
+    buildCommand.command('file [infile...]', { isDefault: true })
+        .description(`Compile one or more source files or projects ('file' subcommand is default).`)
+        .option('--for-publishing', 'Verify that project meets @keymanapp repository requirements')
         .addHelpText('after', `
 Supported file types:
 * folder: Keyman project in folder
@@ -41,126 +41,126 @@ Supported file types:
 
 File lists can be referenced with @filelist.txt.
 
-If no input file is supplied, kmc will build the current folder.`)
-        .action(buildFile);
-    buildCommand
-        .command('ldml-test-data <infile>')
-        .description('Convert LDML keyboard test .xml to .json')
-        .action(buildTestData);
-    buildCommand
-        .command('windows-package-installer <infile>')
-        .description('Build an executable installer for Windows for a Keyman package')
-        .option('--msi <msiFilename>', 'Location of keymandesktop.msi')
-        .option('--exe <exeFilename>', 'Location of setup.exe')
-        .option('--license <licenseFilename>', 'Location of license.txt')
-        .option('--title-image [titleImageFilename]', 'Location of title image')
-        .option('--app-name [applicationName]', 'Installer property: name of the application to be installed', 'Keyman')
-        .option('--start-disabled', 'Installer property: do not enable keyboards after installation completes')
-        .option('--start-with-configuration', 'Installer property: start Keyman Configuration after installation completes')
-        .action(buildWindowsPackageInstaller);
-}
-function initialize(commanderOptions) {
-    // We use a default callback instance when validating command line, but throw
-    // it away once we have completed initialization
-    const initializationCallbacks = new NodeCompilerCallbacks({});
-    const options = commandOptionsToCompilerOptions(commanderOptions, initializationCallbacks);
-    return options;
-}
-async function buildFile(filenames, _options, commander) {
-    const commanderOptions /*:{TODO?} CommandLineCompilerOptions*/ = commander.optsWithGlobals();
-    const options = initialize(commanderOptions);
-    if (!options) {
-        return await exitProcess(1);
-    }
-    const callbacks = new NodeCompilerCallbacks(options);
-    if (!filenames.length) {
-        // If there are no filenames provided, then we are building the current
-        // folder ('.') as a project-style build
-        filenames.push('.');
-    }
-    /* c8 ignore next 6 */
-    // full test on console log of error message not justified; check with user test recommended
-    if (filenames.length > 1 && commanderOptions.outFile) {
-        // -o can only be specified with a single input file
-        callbacks.reportMessage(InfrastructureMessages.Error_OutFileCanOnlyBeSpecifiedWithSingleInfile());
-        return await exitProcess(1);
-    }
-    if (!expandFileLists(filenames, callbacks)) {
-        return await exitProcess(1);
-    }
-    for (let filename of filenames) {
-        if (!await build(filename, commanderOptions.outFile, callbacks, options)) {
-            // Once a file fails to build, we bail on subsequent builds
-            return await exitProcess(1);
-        }
-    }
-}
-async function build(filename, outfile, parentCallbacks, options) {
-    try {
-        // TEST: allow command-line simulation of infrastructure fatal errors, and
-        // also for unit tests
-        if (process.env.SENTRY_CLIENT_TEST_BUILD_EXCEPTION == '1') {
-            throw new Error('Test exception from SENTRY_CLIENT_TEST_BUILD_EXCEPTION');
-        }
-        if (!fs.existsSync(filename)) {
-            parentCallbacks.reportMessage(InfrastructureMessages.Error_FileDoesNotExist({ filename }));
-            return false;
-        }
-        // Normalize case for the filename and expand the path; this avoids false
-        // positive case mismatches on input filenames and glommed paths
-        filename = fs.realpathSync.native(filename);
-        let builder = null;
-        // If infile is a directory, then we treat that as a project and build it
-        if (isProject(filename)) {
-            builder = new BuildProject();
-        }
-        else {
-            // Otherwise, if it's one of our known file extensions, we build it
-            let extensions = [];
-            builder = buildActivities.find(build => {
-                extensions.push(build.sourceExtension);
-                return filename.toLowerCase().endsWith(build.sourceExtension);
-            });
-            if (!builder) {
-                parentCallbacks.reportMessage(InfrastructureMessages.Error_FileTypeNotRecognized({ filename, extensions: extensions.join(', ') }));
-                return false;
-            }
-        }
-        // For builds which refer to a project folder, we'll imply a build of the
-        // .kpj, even if it doesn't actually exist, just for clarity.
-        let buildFilename = path.resolve(filename);
-        if (fs.statSync(filename).isDirectory()) {
-            buildFilename = path.join(buildFilename, path.basename(buildFilename) + ".kpj" /* KeymanFileTypes.Source.Project */);
-        }
-        const relativeFilename = path.relative(process.cwd(), buildFilename).replace(/\\/g, '/');
-        const callbacks = new CompilerFileCallbacks(buildFilename, options, parentCallbacks);
-        callbacks.reportMessage(InfrastructureMessages.Info_BuildingFile({ filename: buildFilename, relativeFilename }));
-        let result = await builder.build(filename, outfile, callbacks, options);
-        result = result && !callbacks.hasFailureMessage();
-        if (result) {
-            callbacks.reportMessage(builder instanceof BuildProject
-                ? InfrastructureMessages.Info_ProjectBuiltSuccessfully({ filename: buildFilename, relativeFilename })
-                : InfrastructureMessages.Info_FileBuiltSuccessfully({ filename: buildFilename, relativeFilename }));
-        }
-        else {
-            if (!callbacks.hasFailureMessage(false)) { // false == check only for error+fatal messages
-                callbacks.reportMessage(InfrastructureMessages.Info_WarningsHaveFailedBuild());
-            }
-            callbacks.reportMessage(builder instanceof BuildProject
-                ? InfrastructureMessages.Info_ProjectNotBuiltSuccessfully({ filename: buildFilename, relativeFilename })
-                : InfrastructureMessages.Info_FileNotBuiltSuccessfully({ filename: buildFilename, relativeFilename }));
-        }
-        return result;
-    }
-    catch (e) {
-        parentCallbacks.reportMessage(InfrastructureMessages.Fatal_UnexpectedException({ e }));
-        return false;
-    }
-}
-/**
- * these are exported only for unit tests, do not use
- */
-export const unitTestEndpoints = {
-    build,
-};
+If no input file is supplied, kmc will build the current folder.`)
+        .action(buildFile);
+    buildCommand
+        .command('ldml-test-data <infile>')
+        .description('Convert LDML keyboard test .xml to .json')
+        .action(buildTestData);
+    buildCommand
+        .command('windows-package-installer <infile>')
+        .description('Build an executable installer for Windows for a Keyman package')
+        .option('--msi <msiFilename>', 'Location of keymandesktop.msi')
+        .option('--exe <exeFilename>', 'Location of setup.exe')
+        .option('--license <licenseFilename>', 'Location of license.txt')
+        .option('--title-image [titleImageFilename]', 'Location of title image')
+        .option('--app-name [applicationName]', 'Installer property: name of the application to be installed', 'Keyman')
+        .option('--start-disabled', 'Installer property: do not enable keyboards after installation completes')
+        .option('--start-with-configuration', 'Installer property: start Keyman Configuration after installation completes')
+        .action(buildWindowsPackageInstaller);
+}
+function initialize(commanderOptions) {
+    // We use a default callback instance when validating command line, but throw
+    // it away once we have completed initialization
+    const initializationCallbacks = new NodeCompilerCallbacks({});
+    const options = commandOptionsToCompilerOptions(commanderOptions, initializationCallbacks);
+    return options;
+}
+async function buildFile(filenames, _options, commander) {
+    const commanderOptions /*:{TODO?} CommandLineCompilerOptions*/ = commander.optsWithGlobals();
+    const options = initialize(commanderOptions);
+    if (!options) {
+        return await exitProcess(1);
+    }
+    const callbacks = new NodeCompilerCallbacks(options);
+    if (!filenames.length) {
+        // If there are no filenames provided, then we are building the current
+        // folder ('.') as a project-style build
+        filenames.push('.');
+    }
+    /* c8 ignore next 6 */
+    // full test on console log of error message not justified; check with user test recommended
+    if (filenames.length > 1 && commanderOptions.outFile) {
+        // -o can only be specified with a single input file
+        callbacks.reportMessage(InfrastructureMessages.Error_OutFileCanOnlyBeSpecifiedWithSingleInfile());
+        return await exitProcess(1);
+    }
+    if (!expandFileLists(filenames, callbacks)) {
+        return await exitProcess(1);
+    }
+    for (let filename of filenames) {
+        if (!await build(filename, commanderOptions.outFile, callbacks, options)) {
+            // Once a file fails to build, we bail on subsequent builds
+            return await exitProcess(1);
+        }
+    }
+}
+async function build(filename, outfile, parentCallbacks, options) {
+    try {
+        // TEST: allow command-line simulation of infrastructure fatal errors, and
+        // also for unit tests
+        if (process.env.SENTRY_CLIENT_TEST_BUILD_EXCEPTION == '1') {
+            throw new Error('Test exception from SENTRY_CLIENT_TEST_BUILD_EXCEPTION');
+        }
+        if (!fs.existsSync(filename)) {
+            parentCallbacks.reportMessage(InfrastructureMessages.Error_FileDoesNotExist({ filename }));
+            return false;
+        }
+        // Normalize case for the filename and expand the path; this avoids false
+        // positive case mismatches on input filenames and glommed paths
+        filename = fs.realpathSync.native(filename);
+        let builder = null;
+        // If infile is a directory, then we treat that as a project and build it
+        if (isProject(filename)) {
+            builder = new BuildProject();
+        }
+        else {
+            // Otherwise, if it's one of our known file extensions, we build it
+            let extensions = [];
+            builder = buildActivities.find(build => {
+                extensions.push(build.sourceExtension);
+                return filename.toLowerCase().endsWith(build.sourceExtension);
+            });
+            if (!builder) {
+                parentCallbacks.reportMessage(InfrastructureMessages.Error_FileTypeNotRecognized({ filename, extensions: extensions.join(', ') }));
+                return false;
+            }
+        }
+        // For builds which refer to a project folder, we'll imply a build of the
+        // .kpj, even if it doesn't actually exist, just for clarity.
+        let buildFilename = path.resolve(filename);
+        if (fs.statSync(filename).isDirectory()) {
+            buildFilename = path.join(buildFilename, path.basename(buildFilename) + ".kpj" /* KeymanFileTypes.Source.Project */);
+        }
+        const relativeFilename = path.relative(process.cwd(), buildFilename).replace(/\\/g, '/');
+        const callbacks = new CompilerFileCallbacks(buildFilename, options, parentCallbacks);
+        callbacks.reportMessage(InfrastructureMessages.Info_BuildingFile({ filename: buildFilename, relativeFilename }));
+        let result = await builder.build(filename, outfile, callbacks, options);
+        result = result && !callbacks.hasFailureMessage();
+        if (result) {
+            callbacks.reportMessage(builder instanceof BuildProject
+                ? InfrastructureMessages.Info_ProjectBuiltSuccessfully({ filename: buildFilename, relativeFilename })
+                : InfrastructureMessages.Info_FileBuiltSuccessfully({ filename: buildFilename, relativeFilename }));
+        }
+        else {
+            if (!callbacks.hasFailureMessage(false)) { // false == check only for error+fatal messages
+                callbacks.reportMessage(InfrastructureMessages.Info_WarningsHaveFailedBuild());
+            }
+            callbacks.reportMessage(builder instanceof BuildProject
+                ? InfrastructureMessages.Info_ProjectNotBuiltSuccessfully({ filename: buildFilename, relativeFilename })
+                : InfrastructureMessages.Info_FileNotBuiltSuccessfully({ filename: buildFilename, relativeFilename }));
+        }
+        return result;
+    }
+    catch (e) {
+        parentCallbacks.reportMessage(InfrastructureMessages.Fatal_UnexpectedException({ e }));
+        return false;
+    }
+}
+/**
+ * these are exported only for unit tests, do not use
+ */
+export const unitTestEndpoints = {
+    build,
+};
 //# sourceMappingURL=build.js.map