@forge/cli
14.1.0-next.1-experimental-13c2f8d14.1.0-next.21-experimental-554d417
out/command-line/register-log-commands.js~
out/command-line/register-log-commands.jsModified+43−43
Index: package/out/command-line/register-log-commands.js
===================================================================
--- package/out/command-line/register-log-commands.js
+++ package/out/command-line/register-log-commands.js
@@ -3,12 +3,12 @@
exports.registerCommands = exports.LogsCommandError = void 0;
exports.parseSinceDateTime = parseSinceDateTime;
exports.logInvocation = logInvocation;
const tslib_1 = require("tslib");
-const cli_table3_1 = tslib_1.__importDefault(require("cli-table3"));
const cli_shared_1 = require("@forge/cli-shared");
const cli_shared_2 = require("@forge/cli-shared");
const cli_shared_3 = require("@forge/cli-shared");
+const cli_shared_4 = require("@forge/cli-shared");
const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
const utc_1 = tslib_1.__importDefault(require("dayjs/plugin/utc"));
dayjs_1.default.extend(utc_1.default);
const DEFAULT_LIMIT = 20;
@@ -40,97 +40,97 @@
return [message];
}
}
const FRONTEND_LOG_METADATA = [
- ['logSource', cli_shared_3.Text.logs.metadata.logSource],
- ['browserName', cli_shared_3.Text.logs.metadata.browserName],
- ['browserVersion', cli_shared_3.Text.logs.metadata.browserVersion],
- ['osName', cli_shared_3.Text.logs.metadata.operatingSystem],
- ['errorType', cli_shared_3.Text.logs.metadata.errorType],
- ['extensionType', cli_shared_3.Text.logs.metadata.extensionType],
- ['installationId', cli_shared_3.Text.logs.metadata.installationId],
- ['renderType', cli_shared_3.Text.logs.metadata.renderType],
- ['userAgent', cli_shared_3.Text.logs.metadata.userAgent]
+ ['logSource', cli_shared_4.Text.logs.metadata.logSource],
+ ['browserName', cli_shared_4.Text.logs.metadata.browserName],
+ ['browserVersion', cli_shared_4.Text.logs.metadata.browserVersion],
+ ['osName', cli_shared_4.Text.logs.metadata.operatingSystem],
+ ['errorType', cli_shared_4.Text.logs.metadata.errorType],
+ ['extensionType', cli_shared_4.Text.logs.metadata.extensionType],
+ ['installationId', cli_shared_4.Text.logs.metadata.installationId],
+ ['renderType', cli_shared_4.Text.logs.metadata.renderType],
+ ['userAgent', cli_shared_4.Text.logs.metadata.userAgent]
];
function logFrontendMetadata(logger, log) {
FRONTEND_LOG_METADATA.forEach(([key, label]) => {
const value = log[key];
if (typeof value === 'string' && value) {
- const displayValue = key === 'logSource' ? cli_shared_3.Text.logs.displayLogSource(value) : value;
- logger.debug(cli_shared_3.Text.logs.metadataLine(label, displayValue));
+ const displayValue = key === 'logSource' ? cli_shared_4.Text.logs.displayLogSource(value) : value;
+ logger.debug(cli_shared_4.Text.logs.metadataLine(label, displayValue));
}
});
}
function logFlat(logger, { id, appVersion, function: fn, trigger, logs }, containers) {
logs.forEach((log) => {
const { timestamp, level, message, other, logSource } = log;
const invocationId = logSource ? '' : ` ${id}`;
if (containers) {
- logger.info(timestamp + invocationId + ' ' + (0, cli_shared_2.formatRuntimeLogArgs)(combineLogParts(message, other)));
+ logger.info(timestamp + invocationId + ' ' + (0, cli_shared_3.formatRuntimeLogArgs)(combineLogParts(message, other)));
}
else {
- logger.info((0, cli_shared_2.formatRuntimeLogLevel)(level) +
+ logger.info((0, cli_shared_3.formatRuntimeLogLevel)(level) +
' ' +
timestamp +
invocationId +
' ' +
- (0, cli_shared_2.formatRuntimeLogArgs)(combineLogParts(message, other)));
+ (0, cli_shared_3.formatRuntimeLogArgs)(combineLogParts(message, other)));
}
if (!containers) {
- logger.debug(cli_shared_3.Text.logs.metadataLine(cli_shared_3.Text.logs.metadata.appVersion, appVersion));
+ logger.debug(cli_shared_4.Text.logs.metadataLine(cli_shared_4.Text.logs.metadata.appVersion, appVersion));
}
if (fn) {
- logger.debug(cli_shared_3.Text.logs.metadataLine(cli_shared_3.Text.logs.metadata.functionName, fn));
+ logger.debug(cli_shared_4.Text.logs.metadataLine(cli_shared_4.Text.logs.metadata.functionName, fn));
}
if (trigger) {
- logger.debug(cli_shared_3.Text.logs.metadataLine(cli_shared_3.Text.logs.metadata.functionTrigger, trigger));
+ logger.debug(cli_shared_4.Text.logs.metadataLine(cli_shared_4.Text.logs.metadata.functionTrigger, trigger));
}
logFrontendMetadata(logger, log);
});
}
function logGrouped(logger, { id, appVersion, function: fn, trigger, logs }) {
const isFrontendInvocation = logs.length > 0 && logs.every(({ logSource }) => Boolean(logSource));
if (logger.debugEnabled && !isFrontendInvocation) {
- const table = new cli_table3_1.default(cli_shared_1.TableStyle.runtimeLog);
- table.push({ [cli_shared_3.Text.logs.metadata.appVersion]: appVersion });
- table.push({ [cli_shared_3.Text.logs.metadata.invocationId]: id });
+ const table = new cli_shared_1.ForgeTable(cli_shared_2.TableStyle.runtimeLog);
+ table.push({ [cli_shared_4.Text.logs.metadata.appVersion]: appVersion });
+ table.push({ [cli_shared_4.Text.logs.metadata.invocationId]: id });
if (fn) {
- table.push({ [cli_shared_3.Text.logs.metadata.functionName]: fn });
+ table.push({ [cli_shared_4.Text.logs.metadata.functionName]: fn });
}
if (trigger) {
- table.push({ [cli_shared_3.Text.logs.metadata.functionTrigger]: trigger });
+ table.push({ [cli_shared_4.Text.logs.metadata.functionTrigger]: trigger });
}
logger.debug(table.toString());
logger.debug('');
}
else if (!isFrontendInvocation) {
- logger.info(cli_shared_1.LogColor.debug(cli_shared_3.Text.logs.invocationHeading(id)));
+ logger.info(cli_shared_2.LogColor.debug(cli_shared_4.Text.logs.invocationHeading(id)));
}
logs.forEach((log) => {
const { timestamp, level, message, other, logSource } = log;
const invocationId = logSource ? '' : ` ${id}`;
if (logger.debugEnabled) {
- logger.info((0, cli_shared_2.formatRuntimeLogLevel)(level) +
+ logger.info((0, cli_shared_3.formatRuntimeLogLevel)(level) +
' ' +
timestamp +
invocationId +
' ' +
- (0, cli_shared_2.formatRuntimeLogArgs)(combineLogParts(message, other)));
- logger.debug(cli_shared_3.Text.logs.metadataLine(cli_shared_3.Text.logs.metadata.appVersion, appVersion));
+ (0, cli_shared_3.formatRuntimeLogArgs)(combineLogParts(message, other)));
+ logger.debug(cli_shared_4.Text.logs.metadataLine(cli_shared_4.Text.logs.metadata.appVersion, appVersion));
if (fn) {
- logger.debug(cli_shared_3.Text.logs.metadataLine(cli_shared_3.Text.logs.metadata.functionName, fn));
+ logger.debug(cli_shared_4.Text.logs.metadataLine(cli_shared_4.Text.logs.metadata.functionName, fn));
}
if (trigger) {
- logger.debug(cli_shared_3.Text.logs.metadataLine(cli_shared_3.Text.logs.metadata.functionTrigger, trigger));
+ logger.debug(cli_shared_4.Text.logs.metadataLine(cli_shared_4.Text.logs.metadata.functionTrigger, trigger));
}
logFrontendMetadata(logger, log);
}
else {
- logger.info((0, cli_shared_2.formatRuntimeLogLevel)(level) +
+ logger.info((0, cli_shared_3.formatRuntimeLogLevel)(level) +
' ' +
timestamp.split('T')[1] +
' ' +
- (0, cli_shared_2.formatRuntimeLogArgs)(combineLogParts(message, other)));
+ (0, cli_shared_3.formatRuntimeLogArgs)(combineLogParts(message, other)));
}
});
logger.info('');
}
@@ -140,24 +140,24 @@
const registerCommands = ({ cmd, ui, commands: { viewAppLogsCommand } }) => {
cmd
.command('logs')
.requireAppId()
- .description(cli_shared_3.Text.logs.cmd)
+ .description(cli_shared_4.Text.logs.cmd)
.environmentOption()
- .option('-i, --invocation <invocation>', cli_shared_3.Text.logs.optionInvocation)
- .option('-n, --limit <limit>', cli_shared_3.Text.logs.optionLimit)
- .option('-s, --since <since>', cli_shared_3.Text.logs.optionSince)
- .option('-g, --grouped', cli_shared_3.Text.logs.optionGroup, false)
- .option('-c, --containerKey <containerKey>', cli_shared_3.Text.logs.optionContainer)
- .option('--instance <instance>', cli_shared_3.Text.logs.optionContainerInstance)
- .option('--serviceKey <serviceKey>', cli_shared_3.Text.logs.optionService)
- .option('-f, --functionKey <functionKey>', cli_shared_3.Text.logs.optionFunction)
+ .option('-i, --invocation <invocation>', cli_shared_4.Text.logs.optionInvocation)
+ .option('-n, --limit <limit>', cli_shared_4.Text.logs.optionLimit)
+ .option('-s, --since <since>', cli_shared_4.Text.logs.optionSince)
+ .option('-g, --grouped', cli_shared_4.Text.logs.optionGroup, false)
+ .option('-c, --containerKey <containerKey>', cli_shared_4.Text.logs.optionContainer)
+ .option('--instance <instance>', cli_shared_4.Text.logs.optionContainerInstance)
+ .option('--serviceKey <serviceKey>', cli_shared_4.Text.logs.optionService)
+ .option('-f, --functionKey <functionKey>', cli_shared_4.Text.logs.optionFunction)
.action(async ({ environment, invocation, limit: limitStr, grouped, since, containerKey, instance, serviceKey, functionKey }) => {
const limit = limitStr ? parseLimit(limitStr) : DEFAULT_LIMIT;
const containers = Boolean(containerKey || instance || serviceKey);
if (invocation) {
if (containers) {
- ui.error(new LogsCommandError(cli_shared_3.Text.logs.invalidOptionWithContainersCmd('-i')));
+ ui.error(new LogsCommandError(cli_shared_4.Text.logs.invalidOptionWithContainersCmd('-i')));
ui.emptyLine();
return;
}
const log = await viewAppLogsCommand.getOne({
@@ -167,15 +167,15 @@
logInvocation(ui, log, grouped, false);
}
else {
if (containers && grouped) {
- ui.error(new LogsCommandError(cli_shared_3.Text.logs.invalidOptionWithContainersCmd('-g')));
+ ui.error(new LogsCommandError(cli_shared_4.Text.logs.invalidOptionWithContainersCmd('-g')));
ui.emptyLine();
return;
}
const startTime = parseSinceDateTime(since);
if (since && !startTime) {
- ui.warn(cli_shared_3.Text.logs.invalidSinceOption(since));
+ ui.warn(cli_shared_4.Text.logs.invalidSinceOption(since));
}
const logs = await viewAppLogsCommand.getAll({
environmentKey: environment,
containerKey,