@cenk1cenk2/oclif-common 3.9.7 → 3.9.9

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.
@@ -1,6 +1,8 @@
1
1
  import { Command as Command$1 } from '@oclif/core';
2
- import { ListrContext, Manager, PromptOptions } from 'listr2';
2
+ import { ExecaChildProcess } from 'execa';
3
+ import { ListrContext, Manager, PromptOptions, ListrTaskWrapper } from 'listr2';
3
4
  import { Logger } from './utils/logger/logger.js';
5
+ import { PipeProcessToLoggerOptions } from './utils/logger/pipe/pipe-process-to-logger.interface.js';
4
6
  import { GlobalConfig } from './lib/config/config.interface.js';
5
7
  import { FileSystemService } from './lib/fs/filesystem.service.js';
6
8
  import { SetCtxDefaultsOptions, SetCtxAssignOptions } from './utils/defaults.js';
@@ -63,6 +65,8 @@ declare class Command<Ctx extends ListrContext = ListrContext, Flags extends Rec
63
65
  prompt<T = any>(options: PromptOptions): Promise<T>;
64
66
  protected setCtxDefaults<T extends Ctx = Ctx>(...defaults: SetCtxDefaultsOptions<T>[]): void;
65
67
  protected setCtxAssign<K = Record<PropertyKey, any>>(...assigns: SetCtxAssignOptions<K>[]): void;
68
+ protected pipeProcessToLogger(instance: ExecaChildProcess, options?: PipeProcessToLoggerOptions): ExecaChildProcess;
69
+ protected pipeProcessThroughListr(task: ListrTaskWrapper<any, any>, instance: ExecaChildProcess): ExecaChildProcess;
66
70
  /** Initial functions / constructor */
67
71
  protected init(): Promise<void>;
68
72
  /** Tasks to run before end of the command. */
@@ -1,7 +1,9 @@
1
1
  import '@oclif/core';
2
+ import 'execa';
2
3
  import 'listr2';
3
4
  import '../utils/logger/logger.js';
4
- export { C as Command } from '../base.command-d3038122.js';
5
+ import '../utils/logger/pipe/pipe-process-to-logger.interface.js';
6
+ export { C as Command } from '../base.command-778f51b5.js';
5
7
  import '../lib/fs/filesystem.service.js';
6
8
  import '../utils/defaults.js';
7
9
  import '../lib/parser/parser.service.js';
@@ -79,6 +79,12 @@ class Command extends import_core.Command {
79
79
  (0, import_utils.setCtxAssign)(this.tasks.options.ctx, ...assigns);
80
80
  this.logger.trace("Updated context with assign: %o", this.tasks.options.ctx, { status: "ctx" });
81
81
  }
82
+ pipeProcessToLogger(instance, options) {
83
+ return (0, import_logger.pipeProcessToLogger)(this.logger, instance, options);
84
+ }
85
+ pipeProcessThroughListr(task, instance) {
86
+ return (0, import_logger.pipeProcessThroughListr)(task, instance);
87
+ }
82
88
  async init() {
83
89
  this.constructor.flags = Object.assign({}, import_constants.CLI_FLAGS, this.constructor.flags);
84
90
  await super.init();
@@ -6,15 +6,17 @@ import * as _oclif_core_lib_cli_ux_styled_header from '@oclif/core/lib/cli-ux/st
6
6
  import * as _oclif_core_lib_cli_ux_prompt from '@oclif/core/lib/cli-ux/prompt';
7
7
  import * as _oclif_core_lib_errors from '@oclif/core/lib/errors';
8
8
  import { ListrContext } from 'listr2';
9
- import { C as Command } from '../base.command-d3038122.js';
9
+ import { C as Command } from '../base.command-778f51b5.js';
10
10
  import { ConfigCommandChoices, ConfigCommandSetup } from '../interfaces/config-command.interface.js';
11
11
  import { InferFlags, InferArgs } from '../interfaces/oclif.interface.js';
12
12
  import { CliUx } from '@oclif/core';
13
13
  import { LockerService } from '../lib/locker/locker.service.js';
14
+ import 'execa';
14
15
  import '../utils/logger/logger.js';
15
16
  import '../utils/logger/logger.constants.js';
16
17
  import '../utils/logger/logger.interface.js';
17
18
  import 'winston';
19
+ import '../utils/logger/pipe/pipe-process-to-logger.interface.js';
18
20
  import '../lib/config/config.interface.js';
19
21
  import '../lib/fs/filesystem.service.js';
20
22
  import 'fs-extra';
@@ -1,11 +1,13 @@
1
- export { C as Command } from '../base.command-d3038122.js';
1
+ export { C as Command } from '../base.command-778f51b5.js';
2
2
  export { ConfigCommand } from './config.command.js';
3
3
  import '@oclif/core';
4
+ import 'execa';
4
5
  import 'listr2';
5
6
  import '../utils/logger/logger.js';
6
7
  import '../utils/logger/logger.constants.js';
7
8
  import '../utils/logger/logger.interface.js';
8
9
  import 'winston';
10
+ import '../utils/logger/pipe/pipe-process-to-logger.interface.js';
9
11
  import '../lib/config/config.interface.js';
10
12
  import '../lib/fs/filesystem.service.js';
11
13
  import 'fs-extra';
package/dist/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export { C as Command, a as ConfigService } from './base.command-d3038122.js';
1
+ export { C as Command, a as ConfigService } from './base.command-778f51b5.js';
2
2
  export { ConfigCommand } from './commands/config.command.js';
3
3
  export { FileConstants } from './constants/file.constants.js';
4
4
  export { CLI_FLAGS } from './constants/global-flags.constants.js';
@@ -39,6 +39,7 @@ export { SetCtxAssignOptions, SetCtxDefaultsOptions, setCtxAssign, setCtxDefault
39
39
  export { CliUx, Flags } from '@oclif/core';
40
40
  export { Arg, ArgInput, Flag, FlagInput, InferredFlags } from '@oclif/core/lib/interfaces';
41
41
  export { default as fs } from 'fs-extra';
42
+ import 'execa';
42
43
  import 'listr2';
43
44
  import '@oclif/core/lib/cli-ux/styled/progress';
44
45
  import '@oclif/core/lib/cli-ux/open';
@@ -49,6 +50,5 @@ import '@oclif/core/lib/cli-ux/prompt';
49
50
  import '@oclif/core/lib/errors';
50
51
  import 'class-transformer';
51
52
  import 'class-validator';
52
- import 'execa';
53
53
  import 'winston';
54
54
  import 'colorette';
@@ -1,14 +1,16 @@
1
1
  import './config.interface.js';
2
- export { a as ConfigService } from '../../base.command-d3038122.js';
2
+ export { a as ConfigService } from '../../base.command-778f51b5.js';
3
3
  import '../locker/locker.interface.js';
4
4
  import '../parser/parser.service.js';
5
5
  import '../../utils/logger/logger.constants.js';
6
6
  import '../../utils/merge.constants.js';
7
7
  import '@oclif/core';
8
+ import 'execa';
8
9
  import 'listr2';
9
10
  import '../../utils/logger/logger.js';
10
11
  import '../../utils/logger/logger.interface.js';
11
12
  import 'winston';
13
+ import '../../utils/logger/pipe/pipe-process-to-logger.interface.js';
12
14
  import '../fs/filesystem.service.js';
13
15
  import 'fs-extra';
14
16
  import '../../utils/defaults.js';
@@ -1,11 +1,13 @@
1
1
  export { ConfigIterator, GlobalConfig } from './config.interface.js';
2
- export { a as ConfigService } from '../../base.command-d3038122.js';
2
+ export { a as ConfigService } from '../../base.command-778f51b5.js';
3
3
  import '../../utils/logger/logger.constants.js';
4
4
  import '@oclif/core';
5
+ import 'execa';
5
6
  import 'listr2';
6
7
  import '../../utils/logger/logger.js';
7
8
  import '../../utils/logger/logger.interface.js';
8
9
  import 'winston';
10
+ import '../../utils/logger/pipe/pipe-process-to-logger.interface.js';
9
11
  import '../fs/filesystem.service.js';
10
12
  import 'fs-extra';
11
13
  import '../../utils/defaults.js';
@@ -1,5 +1,5 @@
1
1
  export { ConfigIterator, GlobalConfig } from './config/config.interface.js';
2
- export { a as ConfigService } from '../base.command-d3038122.js';
2
+ export { a as ConfigService } from '../base.command-778f51b5.js';
3
3
  export { FileSystemService } from './fs/filesystem.service.js';
4
4
  export { CommonLockerData, LockData, LockableData, UnlockData } from './locker/locker.interface.js';
5
5
  export { LockerService } from './locker/locker.service.js';
@@ -16,10 +16,12 @@ export { setup } from './setup.js';
16
16
  export { default as fs } from 'fs-extra';
17
17
  import '../utils/logger/logger.constants.js';
18
18
  import '@oclif/core';
19
+ import 'execa';
19
20
  import 'listr2';
20
21
  import '../utils/logger/logger.js';
21
22
  import '../utils/logger/logger.interface.js';
22
23
  import 'winston';
24
+ import '../utils/logger/pipe/pipe-process-to-logger.interface.js';
23
25
  import '../utils/defaults.js';
24
26
  import '../interfaces/oclif.interface.js';
25
27
  import '@oclif/core/lib/interfaces';
@@ -67,7 +67,7 @@ class ValidatorService {
67
67
  return classObject;
68
68
  }
69
69
  logValidationError(err) {
70
- this.logger.error('Field "%s" failed validation with value "%s": %s', err.property, err.value, Object.values(err.constraints).join(", "));
70
+ this.logger.error('Field "%s" failed validation with value "%s": %o', err.property, err.value, err.constraints);
71
71
  }
72
72
  }
73
73
  __name(ValidatorService, "ValidatorService");
@@ -11,6 +11,8 @@ interface PipeProcessToLoggerOptions {
11
11
  stderr?: LogLevels;
12
12
  /** will callback on error in the instance */
13
13
  callback?: (error?: Error) => void;
14
+ /** context for logger */
15
+ context?: string;
14
16
  }
15
17
 
16
18
  export { PipeProcessToLoggerOptions };
@@ -38,35 +38,35 @@ function pipeProcessToLogger(logger, instance, options) {
38
38
  ...options
39
39
  };
40
40
  if (options.start) {
41
- logger.run(instance.spawnargs.join(" "), { level: options.start });
41
+ logger.run(instance.spawnargs.join(" "), { level: options.start, context: options.context });
42
42
  }
43
43
  if (instance.stdout) {
44
44
  instance.stdout.pipe(
45
45
  (0, import_through.default)((chunk) => {
46
- logger.log(options.stdout, chunk);
46
+ logger.log(options.stdout, chunk, { context: options.context });
47
47
  })
48
48
  );
49
49
  }
50
50
  if (instance.stderr) {
51
51
  instance.stderr.pipe(
52
52
  (0, import_through.default)((chunk) => {
53
- logger.log(options.stderr, chunk);
53
+ logger.log(options.stderr, chunk, { context: options.context });
54
54
  })
55
55
  );
56
56
  }
57
57
  void instance.on("exit", (code, signal) => {
58
58
  const message = `Process ended with code ${code}${signal ? ` and signal ${signal}` : ""}.`;
59
- logger.debug(message);
59
+ logger.debug(message, { context: options.context });
60
60
  if (options.end) {
61
- logger.end(instance.spawnargs.join(" "), { level: options.end });
61
+ logger.end(instance.spawnargs.join(" "), { level: options.end, context: options.context });
62
62
  }
63
63
  if (options?.callback) {
64
64
  options.callback();
65
65
  }
66
66
  });
67
67
  void instance.on("error", (error) => {
68
- logger.fatal(error.message);
69
- logger.debug(error.stack);
68
+ logger.fatal(error.message, { context: options.context });
69
+ logger.debug(error.stack, { context: options.context });
70
70
  if (options?.callback) {
71
71
  options.callback(error);
72
72
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cenk1cenk2/oclif-common",
3
- "version": "3.9.7",
3
+ "version": "3.9.9",
4
4
  "description": "Oclif common package for oclif2 projects.",
5
5
  "repository": "https://gitlab.kilic.dev/libraries/oclif-tools",
6
6
  "author": {