@teambit/formatter 0.0.570 → 0.0.572

package/dist/formatter.d.ts

@@ -29,6 +29,7 @@ export declare type FormatResults = {
     errors: Error[];
 };
 export interface Formatter {
+    id: string;
     format(context: FormatterContext): Promise<FormatResults>;
     formatSnippet(snippet: string): Promise<string>;
     check(context: FormatterContext): Promise<FormatResults>;

package/dist/formatter.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["formatter.ts"],"sourcesContent":["import { Component } from '@teambit/component';\nimport { FormatterContext } from './formatter-context';\n\nexport type ComponentFormatResult = {\n  /**\n   * the formatted component.\n   */\n  component: Component;\n\n  /**\n   * format results for each file of the component.\n   */\n  results: FileFormatResult[];\n};\n\nexport type FileFormatResult = {\n  /**\n   * path of the formatted file.\n   */\n  filePath: string;\n\n  /**\n   * Does the file has formatting issues (needs format)\n   */\n  hasIssues: boolean;\n\n  /**\n   * The new file content after the formatting\n   */\n  newContent?: string;\n};\n\nexport type FormatResults = {\n  results: ComponentFormatResult[];\n  errors: Error[];\n};\n\nexport interface Formatter {\n  format(context: FormatterContext): Promise<FormatResults>;\n  formatSnippet(snippet: string): Promise<string>;\n  check(context: FormatterContext): Promise<FormatResults>;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["formatter.ts"],"sourcesContent":["import { Component } from '@teambit/component';\nimport { FormatterContext } from './formatter-context';\n\nexport type ComponentFormatResult = {\n  /**\n   * the formatted component.\n   */\n  component: Component;\n\n  /**\n   * format results for each file of the component.\n   */\n  results: FileFormatResult[];\n};\n\nexport type FileFormatResult = {\n  /**\n   * path of the formatted file.\n   */\n  filePath: string;\n\n  /**\n   * Does the file has formatting issues (needs format)\n   */\n  hasIssues: boolean;\n\n  /**\n   * The new file content after the formatting\n   */\n  newContent?: string;\n};\n\nexport type FormatResults = {\n  results: ComponentFormatResult[];\n  errors: Error[];\n};\n\nexport interface Formatter {\n  id: string;\n  format(context: FormatterContext): Promise<FormatResults>;\n  formatSnippet(snippet: string): Promise<string>;\n  check(context: FormatterContext): Promise<FormatResults>;\n}\n"],"mappings":""}

package/dist/formatter.main.runtime.d.ts

@@ -1,11 +1,12 @@
 import { CLIMain } from '@teambit/cli';
 import { Component, ComponentMain } from '@teambit/component';
-import { EnvsMain } from '@teambit/envs';
+import { EnvsMain, ExecutionContext } from '@teambit/envs';
 import { LoggerMain } from '@teambit/logger';
 import { Workspace } from '@teambit/workspace';
 import { FormatterService } from './formatter.service';
 import { FormatTask } from './format.task';
 import { FormatterOptions } from './formatter-context';
+import { Formatter } from './formatter';
 export declare type FormatterConfig = {};
 export declare class FormatterMain {
     private envs;
@@ -20,6 +21,7 @@ export declare class FormatterMain {
      * check format an array of components.
      */
     check(components: Component[], opts: FormatterOptions): Promise<import("@teambit/envs").EnvsExecutionResult<import("./formatter").FormatResults>>;
+    getFormatter(context: ExecutionContext, options: FormatterOptions): Formatter;
     private toFormatServiceOptions;
     /**
      * create a format task for build pipelines.

package/dist/formatter.main.runtime.js

@@ -102,6 +102,9 @@ class FormatterMain {
     const formatResults = envsRuntime.run(this.formatterService, this.toFormatServiceOptions(opts, true));
     return formatResults;
   }
+  getFormatter(context, options) {
+    return this.formatterService.getFormatter(context, options);
+  }
   toFormatServiceOptions(opts, check = false) {
     return _objectSpread(_objectSpread({}, opts), {}, {
       check

package/dist/formatter.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["FormatterMain","constructor","envs","formatterService","format","components","opts","envsRuntime","createEnvironment","formatResults","run","toFormatServiceOptions","check","createTask","name","FormatTask","FormatterAspect","id","provider","cli","component","loggerAspect","workspace","config","logger","createLogger","FormatterService","formatterAspect","registerService","register","FormatCmd","getHost","MainRuntime","EnvsAspect","CLIAspect","ComponentAspect","LoggerAspect","WorkspaceAspect","addRuntime"],"sources":["formatter.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { Component, ComponentAspect, ComponentMain } from '@teambit/component';\nimport { EnvsAspect, EnvsMain } from '@teambit/envs';\nimport { LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { Workspace, WorkspaceAspect } from '@teambit/workspace';\nimport { FormatterAspect } from './formatter.aspect';\nimport { FormatterService } from './formatter.service';\nimport { FormatTask } from './format.task';\nimport { FormatCmd } from './format.cmd';\nimport { FormatterOptions } from './formatter-context';\n\nexport type FormatterConfig = {};\nexport class FormatterMain {\n  static runtime = MainRuntime;\n\n  constructor(private envs: EnvsMain, private formatterService: FormatterService) {}\n\n  /**\n   * format an array of components.\n   */\n  async format(components: Component[], opts: FormatterOptions) {\n    const envsRuntime = await this.envs.createEnvironment(components);\n    const formatResults = envsRuntime.run(this.formatterService, this.toFormatServiceOptions(opts, false));\n    return formatResults;\n  }\n\n  /**\n   * check format an array of components.\n   */\n  async check(components: Component[], opts: FormatterOptions) {\n    const envsRuntime = await this.envs.createEnvironment(components);\n    const formatResults = envsRuntime.run(this.formatterService, this.toFormatServiceOptions(opts, true));\n    return formatResults;\n  }\n\n  private toFormatServiceOptions(opts: FormatterOptions, check = false): FormatterOptions {\n    return {\n      ...opts,\n      check,\n    };\n  }\n\n  /**\n   * create a format task for build pipelines.\n   * @param name name of the task.\n   */\n  createTask(name?: string): FormatTask {\n    return new FormatTask(FormatterAspect.id, name);\n  }\n\n  static dependencies = [EnvsAspect, CLIAspect, ComponentAspect, LoggerAspect, WorkspaceAspect];\n\n  static defaultConfig: FormatterConfig = {};\n\n  static async provider(\n    [envs, cli, component, loggerAspect, workspace]: [EnvsMain, CLIMain, ComponentMain, LoggerMain, Workspace],\n    config: FormatterConfig\n  ) {\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    const logger = loggerAspect.createLogger(FormatterAspect.id);\n    const formatterService = new FormatterService(config);\n    const formatterAspect = new FormatterMain(envs, formatterService);\n    envs.registerService(formatterService);\n    cli.register(new FormatCmd(formatterAspect, component.getHost(), workspace));\n\n    return formatterAspect;\n  }\n}\n\nFormatterAspect.addRuntime(FormatterMain);\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAAyC;AAAA;AAIlC,MAAMA,aAAa,CAAC;EAGzBC,WAAW,CAASC,IAAc,EAAUC,gBAAkC,EAAE;IAAA,KAA5DD,IAAc,GAAdA,IAAc;IAAA,KAAUC,gBAAkC,GAAlCA,gBAAkC;EAAG;;EAEjF;AACF;AACA;EACE,MAAMC,MAAM,CAACC,UAAuB,EAAEC,IAAsB,EAAE;IAC5D,MAAMC,WAAW,GAAG,MAAM,IAAI,CAACL,IAAI,CAACM,iBAAiB,CAACH,UAAU,CAAC;IACjE,MAAMI,aAAa,GAAGF,WAAW,CAACG,GAAG,CAAC,IAAI,CAACP,gBAAgB,EAAE,IAAI,CAACQ,sBAAsB,CAACL,IAAI,EAAE,KAAK,CAAC,CAAC;IACtG,OAAOG,aAAa;EACtB;;EAEA;AACF;AACA;EACE,MAAMG,KAAK,CAACP,UAAuB,EAAEC,IAAsB,EAAE;IAC3D,MAAMC,WAAW,GAAG,MAAM,IAAI,CAACL,IAAI,CAACM,iBAAiB,CAACH,UAAU,CAAC;IACjE,MAAMI,aAAa,GAAGF,WAAW,CAACG,GAAG,CAAC,IAAI,CAACP,gBAAgB,EAAE,IAAI,CAACQ,sBAAsB,CAACL,IAAI,EAAE,IAAI,CAAC,CAAC;IACrG,OAAOG,aAAa;EACtB;EAEQE,sBAAsB,CAACL,IAAsB,EAAEM,KAAK,GAAG,KAAK,EAAoB;IACtF,uCACKN,IAAI;MACPM;IAAK;EAET;;EAEA;AACF;AACA;AACA;EACEC,UAAU,CAACC,IAAa,EAAc;IACpC,OAAO,KAAIC,oBAAU,EAACC,4BAAe,CAACC,EAAE,EAAEH,IAAI,CAAC;EACjD;EAMA,aAAaI,QAAQ,CACnB,CAAChB,IAAI,EAAEiB,GAAG,EAAEC,SAAS,EAAEC,YAAY,EAAEC,SAAS,CAA4D,EAC1GC,MAAuB,EACvB;IACA;IACA,MAAMC,MAAM,GAAGH,YAAY,CAACI,YAAY,CAACT,4BAAe,CAACC,EAAE,CAAC;IAC5D,MAAMd,gBAAgB,GAAG,KAAIuB,8BAAgB,EAACH,MAAM,CAAC;IACrD,MAAMI,eAAe,GAAG,IAAI3B,aAAa,CAACE,IAAI,EAAEC,gBAAgB,CAAC;IACjED,IAAI,CAAC0B,eAAe,CAACzB,gBAAgB,CAAC;IACtCgB,GAAG,CAACU,QAAQ,CAAC,KAAIC,oBAAS,EAACH,eAAe,EAAEP,SAAS,CAACW,OAAO,EAAE,EAAET,SAAS,CAAC,CAAC;IAE5E,OAAOK,eAAe;EACxB;AACF;AAAC;AAAA,gCAvDY3B,aAAa,aACPgC,kBAAW;AAAA,gCADjBhC,aAAa,kBAsCF,CAACiC,kBAAU,EAAEC,gBAAS,EAAEC,4BAAe,EAAEC,sBAAY,EAAEC,4BAAe,CAAC;AAAA,gCAtClFrC,aAAa,mBAwCgB,CAAC,CAAC;AAiB5CgB,4BAAe,CAACsB,UAAU,CAACtC,aAAa,CAAC"}
+{"version":3,"names":["FormatterMain","constructor","envs","formatterService","format","components","opts","envsRuntime","createEnvironment","formatResults","run","toFormatServiceOptions","check","getFormatter","context","options","createTask","name","FormatTask","FormatterAspect","id","provider","cli","component","loggerAspect","workspace","config","logger","createLogger","FormatterService","formatterAspect","registerService","register","FormatCmd","getHost","MainRuntime","EnvsAspect","CLIAspect","ComponentAspect","LoggerAspect","WorkspaceAspect","addRuntime"],"sources":["formatter.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { Component, ComponentAspect, ComponentMain } from '@teambit/component';\nimport { EnvsAspect, EnvsMain, ExecutionContext } from '@teambit/envs';\nimport { LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { Workspace, WorkspaceAspect } from '@teambit/workspace';\nimport { FormatterAspect } from './formatter.aspect';\nimport { FormatterService } from './formatter.service';\nimport { FormatTask } from './format.task';\nimport { FormatCmd } from './format.cmd';\nimport { FormatterOptions } from './formatter-context';\nimport { Formatter } from './formatter';\n\nexport type FormatterConfig = {};\nexport class FormatterMain {\n  static runtime = MainRuntime;\n\n  constructor(private envs: EnvsMain, private formatterService: FormatterService) {}\n\n  /**\n   * format an array of components.\n   */\n  async format(components: Component[], opts: FormatterOptions) {\n    const envsRuntime = await this.envs.createEnvironment(components);\n    const formatResults = envsRuntime.run(this.formatterService, this.toFormatServiceOptions(opts, false));\n    return formatResults;\n  }\n\n  /**\n   * check format an array of components.\n   */\n  async check(components: Component[], opts: FormatterOptions) {\n    const envsRuntime = await this.envs.createEnvironment(components);\n    const formatResults = envsRuntime.run(this.formatterService, this.toFormatServiceOptions(opts, true));\n    return formatResults;\n  }\n\n  getFormatter(context: ExecutionContext, options: FormatterOptions): Formatter {\n    return this.formatterService.getFormatter(context, options);\n  }\n\n  private toFormatServiceOptions(opts: FormatterOptions, check = false): FormatterOptions {\n    return {\n      ...opts,\n      check,\n    };\n  }\n\n  /**\n   * create a format task for build pipelines.\n   * @param name name of the task.\n   */\n  createTask(name?: string): FormatTask {\n    return new FormatTask(FormatterAspect.id, name);\n  }\n\n  static dependencies = [EnvsAspect, CLIAspect, ComponentAspect, LoggerAspect, WorkspaceAspect];\n\n  static defaultConfig: FormatterConfig = {};\n\n  static async provider(\n    [envs, cli, component, loggerAspect, workspace]: [EnvsMain, CLIMain, ComponentMain, LoggerMain, Workspace],\n    config: FormatterConfig\n  ) {\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    const logger = loggerAspect.createLogger(FormatterAspect.id);\n    const formatterService = new FormatterService(config);\n    const formatterAspect = new FormatterMain(envs, formatterService);\n    envs.registerService(formatterService);\n    cli.register(new FormatCmd(formatterAspect, component.getHost(), workspace));\n\n    return formatterAspect;\n  }\n}\n\nFormatterAspect.addRuntime(FormatterMain);\n"],"mappings":"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"}

package/dist/formatter.service.d.ts

@@ -11,6 +11,7 @@ export declare class FormatterService implements EnvService<FormatResults> {
     name: string;
     constructor(formatterConfig: FormatterConfig);
     run(context: ExecutionContext, options: FormatterOptions): Promise<FormatResults>;
+    getFormatter(context: ExecutionContext, options: FormatterOptions): Formatter;
     private optionsWithDefaults;
     private mergeContext;
     render(env: EnvDefinition): JSX.Element;

package/dist/formatter.service.js

@@ -49,10 +49,16 @@ class FormatterService {
   async run(context, options) {
     const mergedOpts = this.optionsWithDefaults(options);
     const formatterContext = this.mergeContext(mergedOpts, context);
-    const formatter = context.env.getFormatter(formatterContext);
+    const formatter = this.getFormatter(context, options);
     const results = options.check ? await formatter.check(formatterContext) : await formatter.format(formatterContext);
     return results;
   }
+  getFormatter(context, options) {
+    const mergedOpts = this.optionsWithDefaults(options);
+    const formatterContext = this.mergeContext(mergedOpts, context);
+    const formatter = context.env.getFormatter(formatterContext);
+    return formatter;
+  }
   optionsWithDefaults(options) {
     return (0, _lodash().defaults)(options, this.formatterConfig);
   }

package/dist/formatter.service.js.map

@@ -1 +1 @@
-{"version":3,"names":["FormatterService","constructor","formatterConfig","run","context","options","mergedOpts","optionsWithDefaults","formatterContext","mergeContext","formatter","env","getFormatter","results","check","format","defaults","Object","assign","render","descriptor","getDescriptor","id","displayName","version","config","highlight","language","ignoreIllegals","transform","undefined","icon","displayConfig"],"sources":["formatter.service.tsx"],"sourcesContent":["import { defaults } from 'lodash';\nimport React from 'react';\nimport { EnvService, ExecutionContext, EnvDefinition, Env, EnvContext, ServiceTransformationMap } from '@teambit/envs';\nimport { Text, Newline } from 'ink';\nimport highlight from 'cli-highlight';\nimport { Formatter, FormatResults } from './formatter';\nimport { FormatterContext, FormatterOptions } from './formatter-context';\nimport { FormatterConfig } from './formatter.main.runtime';\n\ntype FormatterTransformationMap = ServiceTransformationMap & {\n  getFormatter: () => Formatter;\n};\nexport class FormatterService implements EnvService<FormatResults> {\n  name = 'formatter';\n\n  constructor(private formatterConfig: FormatterConfig) {}\n\n  async run(context: ExecutionContext, options: FormatterOptions): Promise<FormatResults> {\n    const mergedOpts = this.optionsWithDefaults(options);\n    const formatterContext: FormatterContext = this.mergeContext(mergedOpts, context);\n    const formatter: Formatter = context.env.getFormatter(formatterContext);\n\n    const results = options.check ? await formatter.check(formatterContext) : await formatter.format(formatterContext);\n    return results;\n  }\n\n  private optionsWithDefaults(options: FormatterOptions): FormatterOptions {\n    return defaults(options, this.formatterConfig);\n  }\n\n  private mergeContext(options: FormatterOptions, context?: ExecutionContext): FormatterContext {\n    const formatterContext: FormatterContext = Object.assign({}, options, context);\n    return formatterContext;\n  }\n\n  render(env: EnvDefinition) {\n    const descriptor = this.getDescriptor(env);\n\n    return (\n      <Text key={descriptor?.id}>\n        <Text color=\"cyan\">configured formatter: </Text>\n        <Text>\n          {descriptor?.id} ({descriptor?.displayName} @ {descriptor?.version})\n        </Text>\n        <Newline />\n        <Text color=\"cyan\">formatter config:</Text>\n        <Newline />\n        <Text>\n          {descriptor?.config && highlight(descriptor?.config, { language: 'javascript', ignoreIllegals: true })}\n        </Text>\n        <Newline />\n      </Text>\n    );\n  }\n\n  transform(env: Env, context: EnvContext): FormatterTransformationMap | undefined {\n    // Old env\n    if (!env?.formatter) return undefined;\n    return {\n      getFormatter: () => env.formatter()(context),\n    };\n  }\n\n  getDescriptor(env: EnvDefinition) {\n    if (!env.env.getFormatter) return undefined;\n    const mergedOpts = this.optionsWithDefaults({});\n    const formatterContext = this.mergeContext(mergedOpts);\n    const formatter = env.env.getFormatter(formatterContext);\n\n    return {\n      id: formatter.id,\n      icon: formatter.icon,\n      config: formatter.displayConfig ? formatter.displayConfig() : undefined,\n      version: formatter.version ? formatter.version() : '?',\n      displayName: formatter.displayName ? formatter.displayName : '?',\n    };\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["FormatterService","constructor","formatterConfig","run","context","options","mergedOpts","optionsWithDefaults","formatterContext","mergeContext","formatter","getFormatter","results","check","format","env","defaults","Object","assign","render","descriptor","getDescriptor","id","displayName","version","config","highlight","language","ignoreIllegals","transform","undefined","icon","displayConfig"],"sources":["formatter.service.tsx"],"sourcesContent":["import { defaults } from 'lodash';\nimport React from 'react';\nimport { EnvService, ExecutionContext, EnvDefinition, Env, EnvContext, ServiceTransformationMap } from '@teambit/envs';\nimport { Text, Newline } from 'ink';\nimport highlight from 'cli-highlight';\nimport { Formatter, FormatResults } from './formatter';\nimport { FormatterContext, FormatterOptions } from './formatter-context';\nimport { FormatterConfig } from './formatter.main.runtime';\n\ntype FormatterTransformationMap = ServiceTransformationMap & {\n  getFormatter: () => Formatter;\n};\nexport class FormatterService implements EnvService<FormatResults> {\n  name = 'formatter';\n\n  constructor(private formatterConfig: FormatterConfig) {}\n\n  async run(context: ExecutionContext, options: FormatterOptions): Promise<FormatResults> {\n    const mergedOpts = this.optionsWithDefaults(options);\n    const formatterContext: FormatterContext = this.mergeContext(mergedOpts, context);\n    const formatter = this.getFormatter(context, options);\n\n    const results = options.check ? await formatter.check(formatterContext) : await formatter.format(formatterContext);\n    return results;\n  }\n\n  getFormatter(context: ExecutionContext, options: FormatterOptions): Formatter {\n    const mergedOpts = this.optionsWithDefaults(options);\n    const formatterContext: FormatterContext = this.mergeContext(mergedOpts, context);\n    const formatter: Formatter = context.env.getFormatter(formatterContext);\n\n    return formatter;\n  }\n\n  private optionsWithDefaults(options: FormatterOptions): FormatterOptions {\n    return defaults(options, this.formatterConfig);\n  }\n\n  private mergeContext(options: FormatterOptions, context?: ExecutionContext): FormatterContext {\n    const formatterContext: FormatterContext = Object.assign({}, options, context);\n    return formatterContext;\n  }\n\n  render(env: EnvDefinition) {\n    const descriptor = this.getDescriptor(env);\n\n    return (\n      <Text key={descriptor?.id}>\n        <Text color=\"cyan\">configured formatter: </Text>\n        <Text>\n          {descriptor?.id} ({descriptor?.displayName} @ {descriptor?.version})\n        </Text>\n        <Newline />\n        <Text color=\"cyan\">formatter config:</Text>\n        <Newline />\n        <Text>\n          {descriptor?.config && highlight(descriptor?.config, { language: 'javascript', ignoreIllegals: true })}\n        </Text>\n        <Newline />\n      </Text>\n    );\n  }\n\n  transform(env: Env, context: EnvContext): FormatterTransformationMap | undefined {\n    // Old env\n    if (!env?.formatter) return undefined;\n    return {\n      getFormatter: () => env.formatter()(context),\n    };\n  }\n\n  getDescriptor(env: EnvDefinition) {\n    if (!env.env.getFormatter) return undefined;\n    const mergedOpts = this.optionsWithDefaults({});\n    const formatterContext = this.mergeContext(mergedOpts);\n    const formatter = env.env.getFormatter(formatterContext);\n\n    return {\n      id: formatter.id,\n      icon: formatter.icon,\n      config: formatter.displayConfig ? formatter.displayConfig() : undefined,\n      version: formatter.version ? formatter.version() : '?',\n      displayName: formatter.displayName ? formatter.displayName : '?',\n    };\n  }\n}\n"],"mappings":"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"}

package/dist/{preview-1679062502420.js → preview-1679542267429.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.defender_formatter@0.0.570/dist/formatter.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.defender_formatter@0.0.570/dist/formatter.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.defender_formatter@0.0.572/dist/formatter.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.defender_formatter@0.0.572/dist/formatter.docs.mdx';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/formatter.service.tsx

@@ -18,12 +18,20 @@ export class FormatterService implements EnvService<FormatResults> {
   async run(context: ExecutionContext, options: FormatterOptions): Promise<FormatResults> {
     const mergedOpts = this.optionsWithDefaults(options);
     const formatterContext: FormatterContext = this.mergeContext(mergedOpts, context);
-    const formatter: Formatter = context.env.getFormatter(formatterContext);
+    const formatter = this.getFormatter(context, options);
 
     const results = options.check ? await formatter.check(formatterContext) : await formatter.format(formatterContext);
     return results;
   }
 
+  getFormatter(context: ExecutionContext, options: FormatterOptions): Formatter {
+    const mergedOpts = this.optionsWithDefaults(options);
+    const formatterContext: FormatterContext = this.mergeContext(mergedOpts, context);
+    const formatter: Formatter = context.env.getFormatter(formatterContext);
+
+    return formatter;
+  }
+
   private optionsWithDefaults(options: FormatterOptions): FormatterOptions {
     return defaults(options, this.formatterConfig);
   }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/formatter",
-  "version": "0.0.570",
+  "version": "0.0.572",
   "homepage": "https://bit.dev/teambit/defender/formatter",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.defender",
     "name": "formatter",
-    "version": "0.0.570"
+    "version": "0.0.572"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -17,12 +17,12 @@
     "core-js": "^3.0.0",
     "@babel/runtime": "7.20.0",
     "@teambit/harmony": "0.4.6",
-    "@teambit/cli": "0.0.683",
-    "@teambit/component": "0.0.1019",
-    "@teambit/envs": "0.0.1019",
-    "@teambit/workspace": "0.0.1019",
-    "@teambit/builder": "0.0.1019",
-    "@teambit/logger": "0.0.776"
+    "@teambit/cli": "0.0.684",
+    "@teambit/component": "0.0.1021",
+    "@teambit/envs": "0.0.1021",
+    "@teambit/workspace": "0.0.1021",
+    "@teambit/builder": "0.0.1021",
+    "@teambit/logger": "0.0.777"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -35,7 +35,7 @@
     "@teambit/defender.content.formatter-overview": "1.96.1"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.462",
+    "@teambit/legacy": "1.0.464",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },