@keymanapp/kmc 18.0.184-alpha → 18.0.186-alpha
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/src/commands/analyze.d.ts +2 -7
- package/build/src/commands/analyze.d.ts.map +1 -1
- package/build/src/commands/analyze.js +18 -3
- package/build/src/commands/analyze.js.map +1 -1
- package/build/src/commands/build.d.ts.map +1 -1
- package/build/src/commands/build.js +4 -6
- package/build/src/commands/build.js.map +1 -1
- package/build/src/commands/buildTestData/index.js.map +1 -1
- package/build/src/commands/copy.d.ts +2 -1
- package/build/src/commands/copy.d.ts.map +1 -1
- package/build/src/commands/copy.js +8 -5
- package/build/src/commands/copy.js.map +1 -1
- package/build/src/commands/generate.d.ts +2 -1
- package/build/src/commands/generate.d.ts.map +1 -1
- package/build/src/commands/generate.js +18 -15
- package/build/src/commands/generate.js.map +1 -1
- package/build/src/util/baseOptions.d.ts +6 -0
- package/build/src/util/baseOptions.d.ts.map +1 -1
- package/build/src/util/baseOptions.js +16 -0
- package/build/src/util/baseOptions.js.map +1 -1
- package/build/src/util/extendedCompilerOptions.d.ts +5 -4
- package/build/src/util/extendedCompilerOptions.d.ts.map +1 -1
- package/build/src/util/extendedCompilerOptions.js +15 -10
- package/build/src/util/extendedCompilerOptions.js.map +1 -1
- package/package.json +13 -13
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
|
-
import {
|
|
3
|
-
interface AnalysisActivityOptions {
|
|
4
|
-
/**
|
|
5
|
-
* Reporting level to console, used by NodeCompilerCallbacks (not used in compiler modules;
|
|
6
|
-
* all messages are still reported to the internal log)
|
|
7
|
-
*/
|
|
8
|
-
logLevel?: CompilerLogLevel;
|
|
2
|
+
import { CompilerBaseOptions, CompilerCallbacks } from '@keymanapp/developer-utils';
|
|
3
|
+
interface AnalysisActivityOptions extends CompilerBaseOptions {
|
|
9
4
|
base?: string;
|
|
10
5
|
stripDottedCircle?: boolean;
|
|
11
6
|
includeCounts?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../../src/commands/analyze.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAG5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../../src/commands/analyze.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAG5C,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAOpF,UAAU,uBAAwB,SAAQ,mBAAmB;IAC3D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,QAI9C;AA2ED,iBAAe,iBAAiB,CAAC,SAAS,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,uBAAuB,oBAqBnH;AAoBD;;GAEG;AACH,eAAO,MAAM,wBAAwB;;CAEpC,CAAC"}
|
|
@@ -7,6 +7,7 @@ import { AnalyzeOskCharacterUse, AnalyzeOskRewritePua } from '@keymanapp/kmc-ana
|
|
|
7
7
|
import { BaseOptions } from '../util/baseOptions.js';
|
|
8
8
|
import { runOnFiles } from '../util/projectRunner.js';
|
|
9
9
|
import { exitProcess } from '../util/sysexits.js';
|
|
10
|
+
import { commanderOptionsToBaseOptions } from '../util/extendedCompilerOptions.js';
|
|
10
11
|
;
|
|
11
12
|
export function declareAnalyze(program) {
|
|
12
13
|
let command = program.command('analyze');
|
|
@@ -15,7 +16,7 @@ export function declareAnalyze(program) {
|
|
|
15
16
|
}
|
|
16
17
|
function declareOskCharUse(command) {
|
|
17
18
|
let subCommand = command.command('osk-char-use [infile...]');
|
|
18
|
-
BaseOptions.
|
|
19
|
+
BaseOptions.addAll(subCommand);
|
|
19
20
|
subCommand
|
|
20
21
|
.description('Analyze On Screen Keyboards for character usage')
|
|
21
22
|
.option('-b, --base', 'First PUA codepoint to use, in hexadecimal (default F100)', 'F100')
|
|
@@ -54,8 +55,22 @@ function declareOskRewrite(command) {
|
|
|
54
55
|
return null;
|
|
55
56
|
});
|
|
56
57
|
}
|
|
57
|
-
|
|
58
|
-
|
|
58
|
+
function commanderOptionsToAnalyzeOptions(options) {
|
|
59
|
+
// TODO: split options per sub-command
|
|
60
|
+
const result = {
|
|
61
|
+
...commanderOptionsToBaseOptions(options),
|
|
62
|
+
// AnalysisActivityOptions
|
|
63
|
+
base: options.base,
|
|
64
|
+
includeCounts: options.includeCounts ?? false,
|
|
65
|
+
inputMappingFile: options.inputMappingFile,
|
|
66
|
+
mappingFile: options.mappingFile,
|
|
67
|
+
stripDottedCircle: options.stripDottedCircle ?? false,
|
|
68
|
+
};
|
|
69
|
+
return result;
|
|
70
|
+
}
|
|
71
|
+
async function analyze(action, filenames, commanderOptions) {
|
|
72
|
+
const options = commanderOptionsToAnalyzeOptions(commanderOptions);
|
|
73
|
+
let callbacks = new NodeCompilerCallbacks(options);
|
|
59
74
|
try {
|
|
60
75
|
return await action(callbacks, filenames, options);
|
|
61
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../../src/commands/analyze.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAW,MAAM,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../../src/commands/analyze.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/build.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAGzE,OAAO,EAAE,eAAe,EAAyB,MAAM,4BAA4B,CAAC;AASpF,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/build.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAGzE,OAAO,EAAE,eAAe,EAAyB,MAAM,4BAA4B,CAAC;AASpF,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,QAmD5C;AA6CD,iBAAe,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,qBAAqB,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAoE1I;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB;;CAE7B,CAAC"}
|
|
@@ -5,19 +5,17 @@ import { BuildProject } from './buildClasses/BuildProject.js';
|
|
|
5
5
|
import { NodeCompilerCallbacks } from '../util/NodeCompilerCallbacks.js';
|
|
6
6
|
import { InfrastructureMessages } from '../messages/infrastructureMessages.js';
|
|
7
7
|
import { CompilerFileCallbacks } from '@keymanapp/developer-utils';
|
|
8
|
-
import {
|
|
8
|
+
import { BuildBaseOptions } from '../util/baseOptions.js';
|
|
9
9
|
import { expandFileLists } from '../util/fileLists.js';
|
|
10
10
|
import { isProject } from '../util/projectLoader.js';
|
|
11
11
|
import { buildTestData } from './buildTestData/index.js';
|
|
12
12
|
import { buildWindowsPackageInstaller } from './buildWindowsPackageInstaller/index.js';
|
|
13
|
-
import {
|
|
13
|
+
import { commanderOptionsToCompilerOptions } from '../util/extendedCompilerOptions.js';
|
|
14
14
|
import { exitProcess } from '../util/sysexits.js';
|
|
15
15
|
export function declareBuild(program) {
|
|
16
16
|
// TODO: localization?
|
|
17
17
|
const buildCommand = program
|
|
18
18
|
.command('build')
|
|
19
|
-
.option('--color', 'Force colorization for log messages')
|
|
20
|
-
.option('--no-color', 'No colorization for log messages; if both omitted, detects from console')
|
|
21
19
|
// These options are only used with build file but are included here so that
|
|
22
20
|
// they are visible in `kmc build --help`
|
|
23
21
|
.option('-d, --debug', 'Include debug information in output')
|
|
@@ -26,7 +24,7 @@ export function declareBuild(program) {
|
|
|
26
24
|
.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]), [])
|
|
27
25
|
.option('--no-compiler-version', 'Exclude compiler version metadata from output')
|
|
28
26
|
.option('--no-warn-deprecated-code', 'Turn off warnings for deprecated code styles');
|
|
29
|
-
|
|
27
|
+
BuildBaseOptions.addAll(buildCommand);
|
|
30
28
|
buildCommand.command('file [infile...]', { isDefault: true })
|
|
31
29
|
.description(`Compile one or more source files or projects ('file' subcommand is default).`)
|
|
32
30
|
.option('--for-publishing', 'Verify that project meets @keymanapp repository requirements')
|
|
@@ -63,7 +61,7 @@ function initialize(commanderOptions) {
|
|
|
63
61
|
// We use a default callback instance when validating command line, but throw
|
|
64
62
|
// it away once we have completed initialization
|
|
65
63
|
const initializationCallbacks = new NodeCompilerCallbacks({});
|
|
66
|
-
const options =
|
|
64
|
+
const options = commanderOptionsToCompilerOptions(commanderOptions, initializationCallbacks);
|
|
67
65
|
return options;
|
|
68
66
|
}
|
|
69
67
|
async function buildFile(filenames, _options, commander) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/commands/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,OAAO,EAAmB,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACpF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/commands/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,OAAO,EAAmB,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,4BAA4B,EAAE,MAAM,yCAAyC,CAAC;AACvF,OAAO,EAAE,iCAAiC,EAAE,MAAM,oCAAoC,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,MAAM,UAAU,YAAY,CAAC,OAAgB;IAC3C,sBAAsB;IACtB,MAAM,YAAY,GAAG,OAAO;SACzB,OAAO,CAAC,OAAO,CAAC;QAEjB,4EAA4E;QAC5E,yCAAyC;SACxC,MAAM,CAAC,aAAa,EAAE,qCAAqC,CAAC;SAC5D,MAAM,CAAC,mCAAmC,EAAE,sFAAsF,CAAC;SACnI,MAAM,CAAC,sCAAsC,EAAE,mFAAmF,CAAC;SACnI,MAAM,CAAC,wBAAwB,EAAE,2HAA2H,EAC3J,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;SACnD,MAAM,CAAC,uBAAuB,EAAE,+CAA+C,CAAC;SAChF,MAAM,CAAC,2BAA2B,EAAE,8CAA8C,CAAC,CAAC;IAEvF,gBAAgB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAEtC,YAAY,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;SACxD,WAAW,CAAC,8EAA8E,CAAC;SAC3F,MAAM,CAAC,kBAAkB,EAAE,8DAA8D,CAAC;SAC1F,WAAW,CAAC,OAAO,EAAE;;;;;;;;;;;iEAWuC,CAAC;SAE7D,MAAM,CAAC,SAAS,CAAC,CAAC;IAErB,YAAY;SACT,OAAO,CAAC,yBAAyB,CAAC;SAClC,WAAW,CAAC,0CAA0C,CAAC;SACvD,MAAM,CAAC,aAAa,CAAC,CAAC;IAEzB,YAAY;SACT,OAAO,CAAC,oCAAoC,CAAC;SAC7C,WAAW,CAAC,gEAAgE,CAAC;SAC7E,cAAc,CAAC,qBAAqB,EAAE,+BAA+B,CAAC;SACtE,cAAc,CAAC,qBAAqB,EAAE,uBAAuB,CAAC;SAC9D,cAAc,CAAC,6BAA6B,EAAE,yBAAyB,CAAC;SACxE,MAAM,CAAC,oCAAoC,EAAE,yBAAyB,CAAC;SACvE,MAAM,CAAC,8BAA8B,EAAE,6DAA6D,EAAE,QAAQ,CAAC;SAC/G,MAAM,CAAC,kBAAkB,EAAE,0EAA0E,CAAC;SACtG,MAAM,CAAC,4BAA4B,EAAE,6EAA6E,CAAC;SACnH,MAAM,CAAC,4BAA4B,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,UAAU,CAAC,gBAAqB;IACvC,6EAA6E;IAC7E,gDAAgD;IAChD,MAAM,uBAAuB,GAAG,IAAI,qBAAqB,CAAC,EAAE,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,iCAAiC,CAAC,gBAAgB,EAAE,uBAAuB,CAAC,CAAC;IAC7F,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,SAAmB,EAAE,QAAa,EAAE,SAAc;IACzE,MAAM,gBAAgB,CAAA,uCAAuC,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC;IAC5F,MAAM,OAAO,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC7C,IAAG,CAAC,OAAO,EAAE,CAAC;QACZ,OAAO,MAAM,WAAW,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAErD,IAAG,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QACrB,uEAAuE;QACvE,wCAAwC;QACxC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;IAED,sBAAsB;IACtB,4FAA4F;IAC5F,IAAG,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;QACpD,oDAAoD;QACpD,SAAS,CAAC,aAAa,CAAC,sBAAsB,CAAC,+CAA+C,EAAE,CAAC,CAAC;QAClG,OAAO,MAAM,WAAW,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,IAAG,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;QAC1C,OAAO,MAAM,WAAW,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,KAAI,IAAI,QAAQ,IAAI,SAAS,EAAE,CAAC;QAC9B,IAAG,CAAC,MAAM,KAAK,CAAC,QAAQ,EAAE,gBAAgB,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC;YACxE,2DAA2D;YAC3D,OAAO,MAAM,WAAW,CAAC,CAAC,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,KAAK,CAAC,QAAgB,EAAE,OAAe,EAAE,eAAsC,EAAE,OAAwB;IACtH,IAAI,CAAC;QACH,0EAA0E;QAC1E,sBAAsB;QACtB,IAAG,OAAO,CAAC,GAAG,CAAC,kCAAkC,IAAI,GAAG,EAAE,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC5E,CAAC;QAED,IAAG,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,eAAe,CAAC,aAAa,CAAC,sBAAsB,CAAC,sBAAsB,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;YACzF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,yEAAyE;QACzE,gEAAgE;QAChE,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAE5C,IAAI,OAAO,GAAG,IAAI,CAAC;QAEnB,yEAAyE;QACzE,IAAG,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvB,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,mEAAmE;YACnE,IAAI,UAAU,GAAa,EAAE,CAAC;YAC9B,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACrC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBACvC,OAAO,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;YACH,IAAG,CAAC,OAAO,EAAE,CAAC;gBACZ,eAAe,CAAC,aAAa,CAAC,sBAAsB,CAAC,2BAA2B,CAAC,EAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAC,CAAC,CAAC,CAAC;gBACjI,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,yEAAyE;QACzE,6DAA6D;QAC7D,IAAI,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;YACvC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,8CAAiC,CAAC,CAAC;QAC1G,CAAC;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAEzF,MAAM,SAAS,GAAG,IAAI,qBAAqB,CAAC,aAAa,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;QACrF,SAAS,CAAC,aAAa,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,EAAC,QAAQ,EAAC,aAAa,EAAE,gBAAgB,EAAC,CAAC,CAAC,CAAC;QAE9G,IAAI,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QACxE,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,CAAC;QAClD,IAAG,MAAM,EAAE,CAAC;YACV,SAAS,CAAC,aAAa,CAAC,OAAO,YAAY,YAAY;gBACrD,CAAC,CAAC,sBAAsB,CAAC,6BAA6B,CAAC,EAAC,QAAQ,EAAC,aAAa,EAAE,gBAAgB,EAAC,CAAC;gBAClG,CAAC,CAAC,sBAAsB,CAAC,0BAA0B,CAAC,EAAC,QAAQ,EAAC,aAAa,EAAE,gBAAgB,EAAC,CAAC,CAChG,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,+CAA+C;gBACvF,SAAS,CAAC,aAAa,CAAC,sBAAsB,CAAC,4BAA4B,EAAE,CAAC,CAAC;YACjF,CAAC;YACD,SAAS,CAAC,aAAa,CAAC,OAAO,YAAY,YAAY;gBACrD,CAAC,CAAC,sBAAsB,CAAC,gCAAgC,CAAC,EAAC,QAAQ,EAAC,aAAa,EAAE,gBAAgB,EAAC,CAAC;gBACrG,CAAC,CAAC,sBAAsB,CAAC,6BAA6B,CAAC,EAAC,QAAQ,EAAC,aAAa,EAAE,gBAAgB,EAAC,CAAC,CACnG,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAM,CAAC,EAAE,CAAC;QACV,eAAe,CAAC,aAAa,CAAC,sBAAsB,CAAC,yBAAyB,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC,CAAC;QACrF,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,KAAK;CACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/buildTestData/index.ts"],"names":[],"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,4BAA4B,CAAC;AAC3J,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAc,EAAE,QAAa,EAAE,SAAc;IAC/E,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/buildTestData/index.ts"],"names":[],"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,4BAA4B,CAAC;AAC3J,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAc,EAAE,QAAa,EAAE,SAAc;IAC/E,MAAM,OAAO,GAAgC,SAAS,CAAC,eAAe,EAAE,CAAC;IAEzE,IAAI,eAAe,GAAgC;QACjD,GAAG,sBAAsB;QACzB,GAAG,OAAO;QACV,SAAS,EAAE,KAAK;QAChB,wBAAwB,EAAE,KAAK;QAC/B,aAAa,EAAE;YACb,eAAe,EAAE,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,+BAA+B,CAAC,iBAAiB,CAAC,CAAC;YAC7F,iBAAiB,EAAE,CAAE,OAAO,CAAC,MAAM,CAAC,CAAE,EAAE,YAAY;SACrD;KACF,CAAC;IAEF,MAAM,SAAS,GAAG,IAAI,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAErD,IAAI,QAAQ,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;IACtE,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,iBAAiB,EAAE,EAAE,CAAC;QAC/C,MAAM,WAAW,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;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,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IACpE,SAAS,CAAC,aAAa,CAAC,sBAAsB,CAAC,0BAA0B,CAAC,EAAC,QAAQ,EAAE,WAAW,EAAE,gBAAgB,EAAG,MAAM,EAAC,CAAC,CAAC,CAAC;AACjI,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,aAAqB,EAAE,SAA4B,EAAE,OAAoC;IACnH,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAC7C,IAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,MAAM,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;AAC7C,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
2
|
import { NodeCompilerCallbacks } from '../util/NodeCompilerCallbacks.js';
|
|
3
|
+
import { CopierOptions } from '@keymanapp/kmc-copy';
|
|
3
4
|
export declare function declareCopy(program: Command): void;
|
|
4
|
-
declare function doCopy(callbacks: NodeCompilerCallbacks, sources: string | string[],
|
|
5
|
+
declare function doCopy(callbacks: NodeCompilerCallbacks, sources: string | string[], options: CopierOptions): Promise<boolean>;
|
|
5
6
|
/** @internal */
|
|
6
7
|
export declare const unitTestEndpoints: {
|
|
7
8
|
doCopy: typeof doCopy;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copy.d.ts","sourceRoot":"","sources":["../../../src/commands/copy.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"copy.d.ts","sourceRoot":"","sources":["../../../src/commands/copy.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAIzE,OAAO,EAAE,aAAa,EAAuB,MAAM,qBAAqB,CAAC;AAKzE,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,QAkBzC;AA0BH,iBAAe,MAAM,CAAC,SAAS,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CA2C5H;AAED,gBAAgB;AAChB,eAAO,MAAM,iBAAiB;;CAE7B,CAAA"}
|
|
@@ -8,10 +8,11 @@ import { InfrastructureMessages } from '../messages/infrastructureMessages.js';
|
|
|
8
8
|
import { BaseOptions } from '../util/baseOptions.js';
|
|
9
9
|
import { exitProcess } from '../util/sysexits.js';
|
|
10
10
|
import { KeymanProjectCopier } from '@keymanapp/kmc-copy';
|
|
11
|
+
import { commanderOptionsToBaseOptions } from '../util/extendedCompilerOptions.js';
|
|
11
12
|
/* c8 ignore start */
|
|
12
13
|
export function declareCopy(program) {
|
|
13
14
|
const command = program.command('copy <project>');
|
|
14
|
-
BaseOptions.
|
|
15
|
+
BaseOptions.addAll(command);
|
|
15
16
|
command
|
|
16
17
|
.description('Copy a Keyman keyboard or lexical model project')
|
|
17
18
|
.option('-o, --out-path <path>', 'New name and path for project')
|
|
@@ -30,6 +31,8 @@ export function declareCopy(program) {
|
|
|
30
31
|
}
|
|
31
32
|
function commanderOptionsToCopierOptions(options) {
|
|
32
33
|
const result = {
|
|
34
|
+
...commanderOptionsToBaseOptions(options),
|
|
35
|
+
// CopierOptions
|
|
33
36
|
outPath: options.outPath,
|
|
34
37
|
dryRun: options.dryRun ?? false,
|
|
35
38
|
relocateExternalFiles: options.relocateExternal ?? false,
|
|
@@ -39,13 +42,14 @@ function commanderOptionsToCopierOptions(options) {
|
|
|
39
42
|
const MaxDryRunCopyLogMessages = 10000;
|
|
40
43
|
async function copyProject(ids, _options, commander) {
|
|
41
44
|
const commanderOptions = commander.optsWithGlobals();
|
|
42
|
-
const
|
|
43
|
-
|
|
45
|
+
const options = commanderOptionsToCopierOptions(commanderOptions);
|
|
46
|
+
const callbacks = new NodeCompilerCallbacks(options);
|
|
47
|
+
if (!await doCopy(callbacks, ids, options)) {
|
|
44
48
|
return await exitProcess(1);
|
|
45
49
|
}
|
|
46
50
|
}
|
|
47
51
|
/* c8 ignore stop */
|
|
48
|
-
async function doCopy(callbacks, sources,
|
|
52
|
+
async function doCopy(callbacks, sources, options) {
|
|
49
53
|
const source = sources;
|
|
50
54
|
if (!source || typeof source != 'string') {
|
|
51
55
|
// Note that commander can pass an array for the ids parameter, so we
|
|
@@ -53,7 +57,6 @@ async function doCopy(callbacks, sources, commanderOptions) {
|
|
|
53
57
|
callbacks.reportMessage(InfrastructureMessages.Error_CopyRequiresSource());
|
|
54
58
|
return false;
|
|
55
59
|
}
|
|
56
|
-
const options = commanderOptionsToCopierOptions(commanderOptions);
|
|
57
60
|
if (options.dryRun) {
|
|
58
61
|
// For dry run, we may need a lot of log messages, to show
|
|
59
62
|
// where all the files are copied to
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copy.js","sourceRoot":"","sources":["../../../src/commands/copy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAiB,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"copy.js","sourceRoot":"","sources":["../../../src/commands/copy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
|
+
import { GeneratorOptions } from '@keymanapp/kmc-generate';
|
|
2
3
|
import { CompilerCallbacks, KeymanCompiler } from '@keymanapp/developer-utils';
|
|
3
4
|
export declare function declareGenerate(program: Command): void;
|
|
4
|
-
declare function doGenerate(callbacks: CompilerCallbacks, generator: KeymanCompiler,
|
|
5
|
+
declare function doGenerate(callbacks: CompilerCallbacks, generator: KeymanCompiler, options: GeneratorOptions): Promise<boolean>;
|
|
5
6
|
/** @internal */
|
|
6
7
|
export declare const unitTestEndpoints: {
|
|
7
8
|
doGenerate: typeof doGenerate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/commands/generate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/commands/generate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,OAAO,EAAE,gBAAgB,EAAyE,MAAM,yBAAyB,CAAC;AAClI,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAK/E,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,QAK/C;AA2GD,iBAAe,UAAU,CAAC,SAAS,EAAE,iBAAiB,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAsB9H;AAED,gBAAgB;AAChB,eAAO,MAAM,iBAAiB;;CAE7B,CAAA"}
|
|
@@ -3,6 +3,7 @@ import { InfrastructureMessages } from '../messages/infrastructureMessages.js';
|
|
|
3
3
|
import { BaseOptions } from '../util/baseOptions.js';
|
|
4
4
|
import { exitProcess } from '../util/sysexits.js';
|
|
5
5
|
import { KeymanKeyboardGenerator, LdmlKeyboardGenerator, LexicalModelGenerator } from '@keymanapp/kmc-generate';
|
|
6
|
+
import { commanderOptionsToBaseOptions } from '../util/extendedCompilerOptions.js';
|
|
6
7
|
/* c8 ignore start */
|
|
7
8
|
export function declareGenerate(program) {
|
|
8
9
|
const command = program.command('generate');
|
|
@@ -12,7 +13,7 @@ export function declareGenerate(program) {
|
|
|
12
13
|
}
|
|
13
14
|
function declareGenerateKmnKeyboard(command) {
|
|
14
15
|
const subCommand = command.command('keyman-keyboard <id>');
|
|
15
|
-
BaseOptions.
|
|
16
|
+
BaseOptions.addAll(subCommand);
|
|
16
17
|
subCommand
|
|
17
18
|
.description('Generate a .kmn keyboard project')
|
|
18
19
|
.option('-t, --target <target>', 'Target platforms', (value, previous) => previous.concat([value]), [])
|
|
@@ -29,7 +30,7 @@ function declareGenerateKmnKeyboard(command) {
|
|
|
29
30
|
}
|
|
30
31
|
function declareGenerateLdmlKeyboard(command) {
|
|
31
32
|
const ldmlSubCommand = command.command('ldml-keyboard <id>');
|
|
32
|
-
BaseOptions.
|
|
33
|
+
BaseOptions.addAll(ldmlSubCommand);
|
|
33
34
|
ldmlSubCommand
|
|
34
35
|
.description('Generate an LDML .xml keyboard project')
|
|
35
36
|
.option('-t, --target <target>', 'Target platforms', (value, previous) => previous.concat([value]), [])
|
|
@@ -44,7 +45,7 @@ function declareGenerateLdmlKeyboard(command) {
|
|
|
44
45
|
}
|
|
45
46
|
function declareGenerateLexicalModel(command) {
|
|
46
47
|
const modelSubCommand = command.command('lexical-model <id>');
|
|
47
|
-
BaseOptions.
|
|
48
|
+
BaseOptions.addAll(modelSubCommand);
|
|
48
49
|
modelSubCommand
|
|
49
50
|
.description('Generate a wordlist lexical model project')
|
|
50
51
|
.option('-o, --out-path <path>', 'Output path (may exist)')
|
|
@@ -59,6 +60,7 @@ function declareGenerateLexicalModel(command) {
|
|
|
59
60
|
}
|
|
60
61
|
function commanderOptionsToGeneratorOptions(id, options) {
|
|
61
62
|
const result = {
|
|
63
|
+
...commanderOptionsToBaseOptions(options),
|
|
62
64
|
// TODO-GENERATE: icon support
|
|
63
65
|
// icon: options.icon ?? true,
|
|
64
66
|
id,
|
|
@@ -69,7 +71,6 @@ function commanderOptionsToGeneratorOptions(id, options) {
|
|
|
69
71
|
version: options.version ?? '1.0',
|
|
70
72
|
author: options.author ?? id,
|
|
71
73
|
copyright: options.copyright ?? options.author ?? id,
|
|
72
|
-
logLevel: options.logLevel ?? 'info',
|
|
73
74
|
description: options.description ?? '',
|
|
74
75
|
};
|
|
75
76
|
return result;
|
|
@@ -79,27 +80,29 @@ const generateLdmlKeyboard = async (ids, _options, commander) => generate(new Ld
|
|
|
79
80
|
const generateLexicalModel = async (ids, _options, commander) => generate(new LexicalModelGenerator(), ids, commander);
|
|
80
81
|
async function generate(generator, ids, commander) {
|
|
81
82
|
const commanderOptions = commander.optsWithGlobals();
|
|
82
|
-
const callbacks = new NodeCompilerCallbacks({ logLevel: commanderOptions.logLevel ?? 'info' });
|
|
83
|
-
if (!await doGenerate(callbacks, generator, ids, commanderOptions)) {
|
|
84
|
-
return await exitProcess(1);
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
/* c8 ignore stop */
|
|
88
|
-
async function doGenerate(callbacks, generator, ids, commanderOptions) {
|
|
89
83
|
const id = ids;
|
|
90
84
|
if (!id || typeof id != 'string') {
|
|
91
85
|
// Note that commander can pass an array for the ids parameter, so we
|
|
92
|
-
// constrain here
|
|
93
|
-
|
|
94
|
-
|
|
86
|
+
// constrain here; as this is a parameter error before we have parsed
|
|
87
|
+
// other options, we use a 'default' compiler callback to generate
|
|
88
|
+
// the error message
|
|
89
|
+
(new NodeCompilerCallbacks({})).reportMessage(InfrastructureMessages.Error_GenerateRequiresId());
|
|
90
|
+
return await exitProcess(1);
|
|
95
91
|
}
|
|
96
92
|
const options = commanderOptionsToGeneratorOptions(id, commanderOptions);
|
|
93
|
+
const callbacks = new NodeCompilerCallbacks(options);
|
|
94
|
+
if (!await doGenerate(callbacks, generator, options)) {
|
|
95
|
+
return await exitProcess(1);
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
/* c8 ignore stop */
|
|
99
|
+
async function doGenerate(callbacks, generator, options) {
|
|
97
100
|
try {
|
|
98
101
|
if (!await generator.init(callbacks, options)) {
|
|
99
102
|
// errors will have been reported by the generator
|
|
100
103
|
return false;
|
|
101
104
|
}
|
|
102
|
-
const result = await generator.run(id); // note: id is currently ignored here
|
|
105
|
+
const result = await generator.run(options.id); // note: id is currently ignored here
|
|
103
106
|
if (!result) {
|
|
104
107
|
// errors will have been reported by the generator
|
|
105
108
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/commands/generate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAoB,uBAAuB,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/commands/generate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAoB,uBAAuB,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAElI,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAEnF,qBAAqB;AAErB,MAAM,UAAU,eAAe,CAAC,OAAgB;IAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5C,0BAA0B,CAAC,OAAO,CAAC,CAAC;IACpC,2BAA2B,CAAC,OAAO,CAAC,CAAC;IACrC,2BAA2B,CAAC,OAAO,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,0BAA0B,CAAC,OAAgB;IAClD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAC3D,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC/B,UAAU;SACP,WAAW,CAAC,kCAAkC,CAAC;SAC/C,MAAM,CAAC,uBAAuB,EAAE,kBAAkB,EACjD,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;SACnD,MAAM,CAAC,uBAAuB,EAAE,yBAAyB,CAAC;SAC1D,MAAM,CAAC,mBAAmB,EAAE,2BAA2B,CAAC;SACxD,MAAM,CAAC,kCAAkC,EAAE,kBAAkB,CAAC;SAC9D,MAAM,CAAC,gCAAgC,EAAE,kBAAkB,EAAE,KAAK,CAAC;SACnE,MAAM,CAAC,iCAAiC,EAAE,qBAAqB,EAC9D,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;SACnD,MAAM,CAAC,4BAA4B,EAAE,yBAAyB,CAAC;QAChE,8BAA8B;QAC9B,0DAA0D;SACzD,MAAM,CAAC,iCAAiC,EAAE,4CAA4C,CAAC;SACvF,MAAM,CAAC,mBAAmB,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,2BAA2B,CAAC,OAAgB;IACnD,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC7D,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IACnC,cAAc;SACX,WAAW,CAAC,wCAAwC,CAAC;SACrD,MAAM,CAAC,uBAAuB,EAAE,kBAAkB,EACjD,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;SACnD,MAAM,CAAC,uBAAuB,EAAE,yBAAyB,CAAC;SAC1D,MAAM,CAAC,mBAAmB,EAAE,2BAA2B,CAAC;SACxD,MAAM,CAAC,kCAAkC,EAAE,kBAAkB,CAAC,CAAC,6BAA6B;SAC5F,MAAM,CAAC,gCAAgC,EAAE,kBAAkB,EAAE,OAAO,CAAC;SACrE,MAAM,CAAC,iCAAiC,EAAE,qBAAqB,EAC9D,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;SACnD,MAAM,CAAC,4BAA4B,EAAE,yBAAyB,CAAC;SAC/D,MAAM,CAAC,iCAAiC,EAAE,4CAA4C,CAAC;SACvF,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,2BAA2B,CAAC,OAAgB;IACnD,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC9D,WAAW,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IACpC,eAAe;SACZ,WAAW,CAAC,2CAA2C,CAAC;SACxD,MAAM,CAAC,uBAAuB,EAAE,yBAAyB,CAAC;SAC1D,MAAM,CAAC,mBAAmB,EAAE,gCAAgC,CAAC;SAC7D,MAAM,CAAC,kCAAkC,EAAE,kBAAkB,CAAC,CAAC,6BAA6B;SAC5F,MAAM,CAAC,gCAAgC,EAAE,uBAAuB,EAAE,KAAK,CAAC;SACxE,MAAM,CAAC,iCAAiC,EAAE,qBAAqB,EAC9D,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;SACnD,MAAM,CAAC,4BAA4B,EAAE,8BAA8B,CAAC;SACpE,MAAM,CAAC,iCAAiC,EAAE,4CAA4C,CAAC;SACvF,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAE9B,oBAAoB;AACxB,CAAC;AAED,SAAS,kCAAkC,CAAC,EAAU,EAAE,OAAY;IAClE,MAAM,MAAM,GAAqB;QAC/B,GAAG,6BAA6B,CAAC,OAAO,CAAC;QACzC,8BAA8B;QAC9B,8BAA8B;QAC9B,EAAE;QACF,YAAY,EAAE,OAAO,CAAC,WAAW,IAAI,EAAE;QACvC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,EAAE;QACxB,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,GAAG;QAC/B,OAAO,EAAE,OAAO,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC;QAClC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,KAAK;QACjC,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;QAC5B,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,MAAM,IAAI,EAAE;QACpD,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,EAAE;KACvC,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,mBAAmB,GAAG,KAAK,EAAE,GAAsB,EAAE,QAAa,EAAE,SAAc,EAAE,EAAE,CAC1F,QAAQ,CAAC,IAAI,uBAAuB,EAAE,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;AAC1D,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAsB,EAAE,QAAa,EAAE,SAAc,EAAE,EAAE,CAC3F,QAAQ,CAAC,IAAI,qBAAqB,EAAE,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;AACxD,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAsB,EAAE,QAAa,EAAE,SAAc,EAAE,EAAE,CAC3F,QAAQ,CAAC,IAAI,qBAAqB,EAAE,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;AAExD,KAAK,UAAU,QAAQ,CAAC,SAAyB,EAAE,GAAsB,EAAE,SAAc;IACvF,MAAM,gBAAgB,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC;IAErD,MAAM,EAAE,GAAG,GAAG,CAAC;IAEf,IAAG,CAAC,EAAE,IAAI,OAAO,EAAE,IAAI,QAAQ,EAAE,CAAC;QAChC,qEAAqE;QACrE,qEAAqE;QACrE,kEAAkE;QAClE,oBAAoB;QACpB,CAAC,IAAI,qBAAqB,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,sBAAsB,CAAC,wBAAwB,EAAE,CAAC,CAAC;QACjG,OAAO,MAAM,WAAW,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,OAAO,GAAG,kCAAkC,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAEzE,MAAM,SAAS,GAAG,IAAI,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACrD,IAAG,CAAC,MAAM,UAAU,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC;QACpD,OAAO,MAAM,WAAW,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,oBAAoB;AAEpB,KAAK,UAAU,UAAU,CAAC,SAA4B,EAAE,SAAyB,EAAE,OAAyB;IAC1G,IAAI,CAAC;QACH,IAAG,CAAC,MAAM,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC;YAC7C,kDAAkD;YAClD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,qCAAqC;QACrF,IAAG,CAAC,MAAM,EAAE,CAAC;YACX,kDAAkD;YAClD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAG,CAAC,MAAM,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5C,kDAAkD;YAClD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAAC,OAAM,CAAC,EAAE,CAAC;QACV,sBAAsB;QACtB,SAAS,CAAC,aAAa,CAAC,sBAAsB,CAAC,yBAAyB,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC,CAAC;QAC/E,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,gBAAgB;AAChB,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,UAAU;CACX,CAAA"}
|
|
@@ -7,6 +7,8 @@ export interface CommandLineBaseOptions {
|
|
|
7
7
|
logLevel?: CompilerLogLevel;
|
|
8
8
|
logFormat?: CompilerLogFormat;
|
|
9
9
|
color?: boolean;
|
|
10
|
+
}
|
|
11
|
+
export interface CommandLineBuildBaseOptions extends CommandLineBaseOptions {
|
|
10
12
|
outFile?: string;
|
|
11
13
|
}
|
|
12
14
|
/**
|
|
@@ -15,6 +17,10 @@ export interface CommandLineBaseOptions {
|
|
|
15
17
|
export declare class BaseOptions {
|
|
16
18
|
static addLogLevel(program: Command): Command;
|
|
17
19
|
static addLogFormat(program: Command): Command;
|
|
20
|
+
static addColor(program: Command): Command;
|
|
21
|
+
static addAll(program: Command): Command;
|
|
22
|
+
}
|
|
23
|
+
export declare class BuildBaseOptions extends BaseOptions {
|
|
18
24
|
static addOutFile(program: Command): Command;
|
|
19
25
|
static addAll(program: Command): Command;
|
|
20
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseOptions.d.ts","sourceRoot":"","sources":["../../../src/util/baseOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqD,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACpI,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAE5C;;GAEG;AAEH,MAAM,WAAW,sBAAsB;IAErC,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"baseOptions.d.ts","sourceRoot":"","sources":["../../../src/util/baseOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqD,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACpI,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAE5C;;GAEG;AAEH,MAAM,WAAW,sBAAsB;IAErC,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,2BAA4B,SAAQ,sBAAsB;IACzE,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,qBAAa,WAAW;WACR,WAAW,CAAC,OAAO,EAAE,OAAO;WAI5B,YAAY,CAAC,OAAO,EAAE,OAAO;WAI7B,QAAQ,CAAC,OAAO,EAAE,OAAO;WAMzB,MAAM,CAAC,OAAO,EAAE,OAAO;CAOtC;AAED,qBAAa,gBAAiB,SAAQ,WAAW;WACjC,UAAU,CAAC,OAAO,EAAE,OAAO;WAI3B,MAAM,CAAC,OAAO,EAAE,OAAO;CAQtC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ALL_COMPILER_LOG_FORMATS, ALL_COMPILER_LOG_LEVELS } from "@keymanapp/developer-utils";
|
|
2
2
|
import { Option } from "commander";
|
|
3
|
+
;
|
|
3
4
|
/**
|
|
4
5
|
* These options map to CompilerBaseOptions
|
|
5
6
|
*/
|
|
@@ -10,6 +11,20 @@ export class BaseOptions {
|
|
|
10
11
|
static addLogFormat(program) {
|
|
11
12
|
return program.addOption(new Option('--log-format <logFormat>', 'Log format').choices(ALL_COMPILER_LOG_FORMATS).default('formatted'));
|
|
12
13
|
}
|
|
14
|
+
static addColor(program) {
|
|
15
|
+
return program
|
|
16
|
+
.option('--color', 'Force colorization for log messages')
|
|
17
|
+
.option('--no-color', 'No colorization for log messages; if both omitted, detects from console');
|
|
18
|
+
}
|
|
19
|
+
static addAll(program) {
|
|
20
|
+
return [
|
|
21
|
+
this.addLogLevel,
|
|
22
|
+
this.addLogFormat,
|
|
23
|
+
this.addColor,
|
|
24
|
+
].reduce((p, f) => f(p), program);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
export class BuildBaseOptions extends BaseOptions {
|
|
13
28
|
static addOutFile(program) {
|
|
14
29
|
return program.option('-o, --out-file <filename>', 'Override the default path and filename for the output file');
|
|
15
30
|
}
|
|
@@ -17,6 +32,7 @@ export class BaseOptions {
|
|
|
17
32
|
return [
|
|
18
33
|
this.addLogLevel,
|
|
19
34
|
this.addLogFormat,
|
|
35
|
+
this.addColor,
|
|
20
36
|
this.addOutFile,
|
|
21
37
|
].reduce((p, f) => f(p), program);
|
|
22
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseOptions.js","sourceRoot":"","sources":["../../../src/util/baseOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,uBAAuB,EAAuC,MAAM,4BAA4B,CAAC;AACpI,OAAO,EAAW,MAAM,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"baseOptions.js","sourceRoot":"","sources":["../../../src/util/baseOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,uBAAuB,EAAuC,MAAM,4BAA4B,CAAC;AACpI,OAAO,EAAW,MAAM,EAAE,MAAM,WAAW,CAAC;AAW3C,CAAC;AAMF;;GAEG;AACH,MAAM,OAAO,WAAW;IACf,MAAM,CAAC,WAAW,CAAC,OAAgB;QACxC,OAAO,OAAO,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,4BAA4B,EAAE,WAAW,CAAC,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACnI,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,OAAgB;QACzC,OAAO,OAAO,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,0BAA0B,EAAE,YAAY,CAAC,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;IACxI,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,OAAgB;QACrC,OAAO,OAAO;aACX,MAAM,CAAC,SAAS,EAAE,qCAAqC,CAAC;aACxD,MAAM,CAAC,YAAY,EAAE,yEAAyE,CAAC,CAAC;IACrG,CAAC;IAEM,MAAM,CAAC,MAAM,CAAC,OAAgB;QACnC,OAAO;YACL,IAAI,CAAC,WAAW;YAChB,IAAI,CAAC,YAAY;YACjB,IAAI,CAAC,QAAQ;SACd,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC;CACF;AAED,MAAM,OAAO,gBAAiB,SAAQ,WAAW;IACxC,MAAM,CAAC,UAAU,CAAC,OAAgB;QACvC,OAAO,OAAO,CAAC,MAAM,CAAC,2BAA2B,EAAE,4DAA4D,CAAC,CAAA;IAClH,CAAC;IAEM,MAAM,CAAC,MAAM,CAAC,OAAgB;QACnC,OAAO;YACL,IAAI,CAAC,WAAW;YAChB,IAAI,CAAC,YAAY;YACjB,IAAI,CAAC,QAAQ;YACb,IAAI,CAAC,UAAU;SAChB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC;CACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CompilerCallbacks, CompilerErrorNamespace, CompilerMessageOverride, CompilerMessageOverrideMap, CompilerOptions } from '@keymanapp/developer-utils';
|
|
1
|
+
import { CompilerBaseOptions, CompilerCallbacks, CompilerErrorNamespace, CompilerMessageOverride, CompilerMessageOverrideMap, CompilerOptions } from '@keymanapp/developer-utils';
|
|
2
2
|
export interface ExtendedCompilerOptions extends CompilerOptions {
|
|
3
3
|
/**
|
|
4
4
|
* Verify that the project meets the requirements of the keymanapp/keyboards
|
|
@@ -23,7 +23,7 @@ export interface ExtendedCompilerOptions extends CompilerOptions {
|
|
|
23
23
|
* @returns CompilerMessageOverride map with the new severity level for the
|
|
24
24
|
* message; or `null` if parameter is invalid.
|
|
25
25
|
*/
|
|
26
|
-
declare function
|
|
26
|
+
declare function commanderOptionsMessageToCompilerOptionsMessage(message: string, callbacks: CompilerCallbacks): CompilerMessageOverride;
|
|
27
27
|
export interface CompilerMessageDetail {
|
|
28
28
|
code: number;
|
|
29
29
|
id: any;
|
|
@@ -49,19 +49,20 @@ export declare function findMessagesById(searchNamespace: CompilerErrorNamespace
|
|
|
49
49
|
* @returns true if the message can be overridden
|
|
50
50
|
*/
|
|
51
51
|
declare function checkMessageOverride(override: CompilerMessageOverride, callbacks: CompilerCallbacks): boolean;
|
|
52
|
+
export declare function commanderOptionsToBaseOptions(options: any): CompilerBaseOptions;
|
|
52
53
|
/**
|
|
53
54
|
* Maps command line compiler options to the compiler API options.
|
|
54
55
|
* @param options
|
|
55
56
|
* @param callbacks
|
|
56
57
|
* @returns
|
|
57
58
|
*/
|
|
58
|
-
export declare function
|
|
59
|
+
export declare function commanderOptionsToCompilerOptions(options: any, callbacks: CompilerCallbacks): ExtendedCompilerOptions;
|
|
59
60
|
/**
|
|
60
61
|
* these are exported only for unit tests, do not use
|
|
61
62
|
*/
|
|
62
63
|
export declare const unitTestEndpoints: {
|
|
63
64
|
checkMessageOverride: typeof checkMessageOverride;
|
|
64
|
-
|
|
65
|
+
commanderOptionsMessageToCompilerOptionsMessage: typeof commanderOptionsMessageToCompilerOptionsMessage;
|
|
65
66
|
};
|
|
66
67
|
export {};
|
|
67
68
|
//# sourceMappingURL=extendedCompilerOptions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extendedCompilerOptions.d.ts","sourceRoot":"","sources":["../../../src/util/extendedCompilerOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAiB,sBAAsB,EAAyB,uBAAuB,EAAE,0BAA0B,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"extendedCompilerOptions.d.ts","sourceRoot":"","sources":["../../../src/util/extendedCompilerOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAiB,sBAAsB,EAAyB,uBAAuB,EAAE,0BAA0B,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAIxN,MAAM,WAAW,uBAAwB,SAAQ,eAAe;IAC9D;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;OAEG;IACH,gBAAgB,CAAC,EAAE,0BAA0B,CAAC;CAC/C;AAED;;;;;;;;;;;GAWG;AACH,iBAAS,+CAA+C,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,GAAG,uBAAuB,CAqB/H;AAkBD,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,GAAG,CAAC;IACR,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,GAAG,CAAC;CACZ;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,GAAG,qBAAqB,CAsBpG;AAED,eAAO,MAAM,2BAA2B,QAAS,GAAG,aAGqB,CAAC;AAE1E;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,eAAe,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,GAAG,qBAAqB,EAAE,CA+BnH;AAED;;;;;;GAMG;AACH,iBAAS,oBAAoB,CAAC,QAAQ,EAAE,uBAAuB,EAAE,SAAS,EAAE,iBAAiB,WAa5F;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,GAAG,GAAG,mBAAmB,CAO/E;AAED;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,iBAAiB,GAAG,uBAAuB,CAoBrH;AAGD;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;CAG7B,CAAC"}
|
|
@@ -14,7 +14,7 @@ import { messageNamespaceKeys, messageSources } from '../messages/messageNamespa
|
|
|
14
14
|
* @returns CompilerMessageOverride map with the new severity level for the
|
|
15
15
|
* message; or `null` if parameter is invalid.
|
|
16
16
|
*/
|
|
17
|
-
function
|
|
17
|
+
function commanderOptionsMessageToCompilerOptionsMessage(message, callbacks) {
|
|
18
18
|
const pattern = /^(KM)?([0-9a-f]+)(:(D|Disable|I|Info|H|Hint|W|Warn|E|Error))?$/i;
|
|
19
19
|
const result = message.match(pattern);
|
|
20
20
|
if (!result) {
|
|
@@ -31,13 +31,13 @@ function commandOptionsMessageToCompilerOptionsMessage(message, callbacks) {
|
|
|
31
31
|
}
|
|
32
32
|
return override;
|
|
33
33
|
}
|
|
34
|
-
function
|
|
34
|
+
function commanderOptionsMessagesToCompilerOptionsMessages(messages, callbacks) {
|
|
35
35
|
if (!messages || !Array.isArray(messages)) {
|
|
36
36
|
return {};
|
|
37
37
|
}
|
|
38
38
|
const result = {};
|
|
39
39
|
for (let message of messages) {
|
|
40
|
-
const override =
|
|
40
|
+
const override = commanderOptionsMessageToCompilerOptionsMessage(message, callbacks);
|
|
41
41
|
if (!override) {
|
|
42
42
|
return null;
|
|
43
43
|
}
|
|
@@ -122,14 +122,22 @@ function checkMessageOverride(override, callbacks) {
|
|
|
122
122
|
}
|
|
123
123
|
return true;
|
|
124
124
|
}
|
|
125
|
+
export function commanderOptionsToBaseOptions(options) {
|
|
126
|
+
return {
|
|
127
|
+
// CompilerBaseOptions
|
|
128
|
+
logLevel: options.logLevel,
|
|
129
|
+
logFormat: options.logFormat,
|
|
130
|
+
color: options.color,
|
|
131
|
+
};
|
|
132
|
+
}
|
|
125
133
|
/**
|
|
126
134
|
* Maps command line compiler options to the compiler API options.
|
|
127
135
|
* @param options
|
|
128
136
|
* @param callbacks
|
|
129
137
|
* @returns
|
|
130
138
|
*/
|
|
131
|
-
export function
|
|
132
|
-
const overrides =
|
|
139
|
+
export function commanderOptionsToCompilerOptions(options, callbacks) {
|
|
140
|
+
const overrides = commanderOptionsMessagesToCompilerOptionsMessages(options.message, callbacks);
|
|
133
141
|
if (!overrides) {
|
|
134
142
|
return null;
|
|
135
143
|
}
|
|
@@ -137,10 +145,7 @@ export function commandOptionsToCompilerOptions(options, callbacks) {
|
|
|
137
145
|
// properties that we have in CompilerOptions, but nor do we want to rename
|
|
138
146
|
// CompilerOptions properties...
|
|
139
147
|
return {
|
|
140
|
-
|
|
141
|
-
logLevel: options.logLevel,
|
|
142
|
-
logFormat: options.logFormat,
|
|
143
|
-
color: options.color,
|
|
148
|
+
...commanderOptionsToBaseOptions(options),
|
|
144
149
|
// CompilerOptions
|
|
145
150
|
shouldAddCompilerVersion: options.compilerVersion,
|
|
146
151
|
saveDebug: options.debug,
|
|
@@ -156,6 +161,6 @@ export function commandOptionsToCompilerOptions(options, callbacks) {
|
|
|
156
161
|
*/
|
|
157
162
|
export const unitTestEndpoints = {
|
|
158
163
|
checkMessageOverride,
|
|
159
|
-
|
|
164
|
+
commanderOptionsMessageToCompilerOptionsMessage
|
|
160
165
|
};
|
|
161
166
|
//# sourceMappingURL=extendedCompilerOptions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extendedCompilerOptions.js","sourceRoot":"","sources":["../../../src/util/extendedCompilerOptions.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"extendedCompilerOptions.js","sourceRoot":"","sources":["../../../src/util/extendedCompilerOptions.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -34,18 +34,18 @@
|
|
|
34
34
|
"kmlmp": "build/src/kmlmp.js"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@keymanapp/common-types": "18.0.
|
|
38
|
-
"@keymanapp/developer-utils": "18.0.
|
|
39
|
-
"@keymanapp/keyman-version": "18.0.
|
|
40
|
-
"@keymanapp/kmc-analyze": "18.0.
|
|
41
|
-
"@keymanapp/kmc-copy": "18.0.
|
|
42
|
-
"@keymanapp/kmc-generate": "18.0.
|
|
43
|
-
"@keymanapp/kmc-keyboard-info": "18.0.
|
|
44
|
-
"@keymanapp/kmc-kmn": "18.0.
|
|
45
|
-
"@keymanapp/kmc-ldml": "18.0.
|
|
46
|
-
"@keymanapp/kmc-model": "18.0.
|
|
47
|
-
"@keymanapp/kmc-model-info": "18.0.
|
|
48
|
-
"@keymanapp/kmc-package": "18.0.
|
|
37
|
+
"@keymanapp/common-types": "18.0.186-alpha",
|
|
38
|
+
"@keymanapp/developer-utils": "18.0.186-alpha",
|
|
39
|
+
"@keymanapp/keyman-version": "18.0.186-alpha",
|
|
40
|
+
"@keymanapp/kmc-analyze": "18.0.186-alpha",
|
|
41
|
+
"@keymanapp/kmc-copy": "18.0.186-alpha",
|
|
42
|
+
"@keymanapp/kmc-generate": "18.0.186-alpha",
|
|
43
|
+
"@keymanapp/kmc-keyboard-info": "18.0.186-alpha",
|
|
44
|
+
"@keymanapp/kmc-kmn": "18.0.186-alpha",
|
|
45
|
+
"@keymanapp/kmc-ldml": "18.0.186-alpha",
|
|
46
|
+
"@keymanapp/kmc-model": "18.0.186-alpha",
|
|
47
|
+
"@keymanapp/kmc-model-info": "18.0.186-alpha",
|
|
48
|
+
"@keymanapp/kmc-package": "18.0.186-alpha",
|
|
49
49
|
"@sentry/node": "^7.57.0",
|
|
50
50
|
"chalk": "^2.4.2",
|
|
51
51
|
"commander": "^10.0.0",
|
|
@@ -84,5 +84,5 @@
|
|
|
84
84
|
"type": "git",
|
|
85
85
|
"url": "git+https://github.com/keymanapp/keyman.git"
|
|
86
86
|
},
|
|
87
|
-
"version": "18.0.
|
|
87
|
+
"version": "18.0.186-alpha"
|
|
88
88
|
}
|