@teambit/formatter 0.0.496 → 0.0.497

package/dist/formatter.service.d.ts

@@ -1,8 +1,11 @@
 /// <reference types="react" />
-import { EnvService, ExecutionContext, EnvDefinition } from '@teambit/envs';
-import { FormatResults } from './formatter';
+import { EnvService, ExecutionContext, EnvDefinition, Env, EnvContext, ServiceTransformationMap } from '@teambit/envs';
+import { Formatter, FormatResults } from './formatter';
 import { FormatterOptions } from './formatter-context';
 import { FormatterConfig } from './formatter.main.runtime';
+declare type FormatterTransformationMap = ServiceTransformationMap & {
+    getFormatter: () => Formatter;
+};
 export declare class FormatterService implements EnvService<FormatResults> {
     private formatterConfig;
     name: string;
@@ -11,6 +14,7 @@ export declare class FormatterService implements EnvService<FormatResults> {
     private optionsWithDefaults;
     private mergeContext;
     render(env: EnvDefinition): JSX.Element;
+    transform(env: Env, context: EnvContext): FormatterTransformationMap | undefined;
     getDescriptor(env: EnvDefinition): {
         id: any;
         icon: any;
@@ -19,3 +23,4 @@ export declare class FormatterService implements EnvService<FormatResults> {
         displayName: any;
     } | undefined;
 }
+export {};

package/dist/formatter.service.js

@@ -73,6 +73,13 @@ class FormatterService {
       ignoreIllegals: true
     })), /*#__PURE__*/_react().default.createElement(_ink().Newline, null));
   }
+  transform(env, context) {
+    // Old env
+    if (!(env !== null && env !== void 0 && env.formatter)) return undefined;
+    return {
+      getFormatter: () => env.formatter()(context)
+    };
+  }
   getDescriptor(env) {
     if (!env.env.getFormatter) return undefined;
     const mergedOpts = this.optionsWithDefaults({});

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","undefined","icon","displayConfig"],"sources":["formatter.service.tsx"],"sourcesContent":["import { defaults } from 'lodash';\nimport React from 'react';\nimport { EnvService, ExecutionContext, EnvDefinition } 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\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  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","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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"}

package/dist/{preview-1672284308356.js → preview-1672331186584.js}

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

package/formatter.service.tsx

@@ -1,12 +1,15 @@
 import { defaults } from 'lodash';
 import React from 'react';
-import { EnvService, ExecutionContext, EnvDefinition } from '@teambit/envs';
+import { EnvService, ExecutionContext, EnvDefinition, Env, EnvContext, ServiceTransformationMap } from '@teambit/envs';
 import { Text, Newline } from 'ink';
 import highlight from 'cli-highlight';
 import { Formatter, FormatResults } from './formatter';
 import { FormatterContext, FormatterOptions } from './formatter-context';
 import { FormatterConfig } from './formatter.main.runtime';
 
+type FormatterTransformationMap = ServiceTransformationMap  & {
+  getFormatter: () => Formatter;
+}
 export class FormatterService implements EnvService<FormatResults> {
   name = 'formatter';
 
@@ -50,6 +53,14 @@ export class FormatterService implements EnvService<FormatResults> {
     );
   }
 
+  transform(env: Env, context: EnvContext): FormatterTransformationMap | undefined {
+    // Old env
+    if (!env?.formatter) return undefined;
+    return {
+      getFormatter: () => env.formatter()(context),
+    }
+  }
+
   getDescriptor(env: EnvDefinition) {
     if (!env.env.getFormatter) return undefined;
     const mergedOpts = this.optionsWithDefaults({});

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/formatter",
-  "version": "0.0.496",
+  "version": "0.0.497",
   "homepage": "https://bit.dev/teambit/defender/formatter",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.defender",
     "name": "formatter",
-    "version": "0.0.496"
+    "version": "0.0.497"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -18,10 +18,10 @@
     "@babel/runtime": "7.20.0",
     "@teambit/harmony": "0.4.6",
     "@teambit/cli": "0.0.633",
-    "@teambit/component": "0.0.945",
-    "@teambit/envs": "0.0.945",
-    "@teambit/workspace": "0.0.945",
-    "@teambit/builder": "0.0.945",
+    "@teambit/component": "0.0.946",
+    "@teambit/envs": "0.0.946",
+    "@teambit/workspace": "0.0.946",
+    "@teambit/builder": "0.0.946",
     "@teambit/logger": "0.0.726"
   },
   "devDependencies": {