@teambit/formatter 0.0.63 → 0.0.67

package/dist/formatter.service.d.ts

@@ -1,4 +1,4 @@
-import { EnvService, ExecutionContext } from '@teambit/envs';
+import { EnvService, ExecutionContext, EnvDefinition } from '@teambit/envs';
 import { FormatResults } from './formatter';
 import { FormatterOptions } from './formatter-context';
 import { FormatterConfig } from './formatter.main.runtime';
@@ -10,4 +10,14 @@ export declare class FormatterService implements EnvService<FormatResults> {
     name: string;
     constructor(formatterConfig: FormatterConfig);
     run(context: ExecutionContext, options: FormatterServiceOptions): Promise<FormatResults>;
+    private optionsWithDefaults;
+    private mergeContext;
+    render(env: EnvDefinition): JSX.Element;
+    getDescriptor(env: EnvDefinition): {
+        id: any;
+        icon: any;
+        config: any;
+        version: any;
+        displayName: any;
+    } | undefined;
 }

package/dist/formatter.service.js

@@ -29,6 +29,36 @@ function _lodash() {
   return data;
 }
 
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+
+  _react = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _ink() {
+  const data = require("ink");
+
+  _ink = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _cliHighlight() {
+  const data = _interopRequireDefault(require("cli-highlight"));
+
+  _cliHighlight = function () {
+    return data;
+  };
+
+  return data;
+}
+
 class FormatterService {
   constructor(formatterConfig) {
     this.formatterConfig = formatterConfig;
@@ -36,13 +66,50 @@ class FormatterService {
   }
 
   async run(context, options) {
-    const mergedOpts = (0, _lodash().defaults)(options, this.formatterConfig);
-    const formatterContext = Object.assign({}, mergedOpts, context);
+    const mergedOpts = this.optionsWithDefaults(options);
+    const formatterContext = this.mergeContext(mergedOpts, context);
     const formatter = context.env.getFormatter(formatterContext);
     const results = options.check ? await formatter.check(formatterContext) : await formatter.format(formatterContext);
     return results;
   }
 
+  optionsWithDefaults(options) {
+    return (0, _lodash().defaults)(options, this.formatterConfig);
+  }
+
+  mergeContext(options, context) {
+    const formatterContext = Object.assign({}, options, context);
+    return formatterContext;
+  }
+
+  render(env) {
+    const descriptor = this.getDescriptor(env);
+    return /*#__PURE__*/_react().default.createElement(_ink().Text, {
+      key: descriptor === null || descriptor === void 0 ? void 0 : descriptor.id
+    }, /*#__PURE__*/_react().default.createElement(_ink().Text, {
+      color: "cyan"
+    }, "configured formatter: "), /*#__PURE__*/_react().default.createElement(_ink().Text, null, descriptor === null || descriptor === void 0 ? void 0 : descriptor.id, " (", descriptor === null || descriptor === void 0 ? void 0 : descriptor.displayName, " @ ", descriptor === null || descriptor === void 0 ? void 0 : descriptor.version, ")"), /*#__PURE__*/_react().default.createElement(_ink().Newline, null), /*#__PURE__*/_react().default.createElement(_ink().Text, {
+      color: "cyan"
+    }, "formatter config:"), /*#__PURE__*/_react().default.createElement(_ink().Newline, null), /*#__PURE__*/_react().default.createElement(_ink().Text, null, (descriptor === null || descriptor === void 0 ? void 0 : descriptor.config) && (0, _cliHighlight().default)(descriptor === null || descriptor === void 0 ? void 0 : descriptor.config, {
+      language: 'javascript',
+      ignoreIllegals: true
+    })), /*#__PURE__*/_react().default.createElement(_ink().Newline, null));
+  }
+
+  getDescriptor(env) {
+    if (!env.env.getFormatter) return undefined;
+    const mergedOpts = this.optionsWithDefaults({});
+    const formatterContext = this.mergeContext(mergedOpts);
+    const formatter = env.env.getFormatter(formatterContext);
+    return {
+      id: formatter.id,
+      icon: formatter.icon,
+      config: formatter.displayConfig ? formatter.displayConfig() : undefined,
+      version: formatter.version ? formatter.version() : '?',
+      displayName: formatter.displayName ? formatter.displayName : '?'
+    };
+  }
+
 }
 
 exports.FormatterService = FormatterService;

package/dist/formatter.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["formatter.service.ts"],"names":["FormatterService","constructor","formatterConfig","run","context","options","mergedOpts","formatterContext","Object","assign","formatter","env","getFormatter","results","check","format"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAUO,MAAMA,gBAAN,CAA4D;AAGjEC,EAAAA,WAAW,CAASC,eAAT,EAA2C;AAAA,SAAlCA,eAAkC,GAAlCA,eAAkC;AAAA,kDAF/C,WAE+C;AAAE;;AAE/C,QAAHC,GAAG,CAACC,OAAD,EAA4BC,OAA5B,EAAsF;AAC7F,UAAMC,UAAU,GAAG,wBAASD,OAAT,EAAkB,KAAKH,eAAvB,CAAnB;AACA,UAAMK,gBAAkC,GAAGC,MAAM,CAACC,MAAP,CAAc,EAAd,EAAkBH,UAAlB,EAA8BF,OAA9B,CAA3C;AACA,UAAMM,SAAoB,GAAGN,OAAO,CAACO,GAAR,CAAYC,YAAZ,CAAyBL,gBAAzB,CAA7B;AAEA,UAAMM,OAAO,GAAGR,OAAO,CAACS,KAAR,GAAgB,MAAMJ,SAAS,CAACI,KAAV,CAAgBP,gBAAhB,CAAtB,GAA0D,MAAMG,SAAS,CAACK,MAAV,CAAiBR,gBAAjB,CAAhF;AACA,WAAOM,OAAP;AACD;;AAZgE","sourcesContent":["import { defaults } from 'lodash';\nimport { EnvService, ExecutionContext } from '@teambit/envs';\nimport { Formatter, FormatResults } from './formatter';\nimport { FormatterContext, FormatterOptions } from './formatter-context';\nimport { FormatterConfig } from './formatter.main.runtime';\n\nexport type FormatterServiceOptions = FormatterOptions & {\n  check?: boolean;\n};\n\nexport class FormatterService implements EnvService<FormatResults> {\n  name = 'formatter';\n\n  constructor(private formatterConfig: FormatterConfig) {}\n\n  async run(context: ExecutionContext, options: FormatterServiceOptions): Promise<FormatResults> {\n    const mergedOpts = defaults(options, this.formatterConfig);\n    const formatterContext: FormatterContext = Object.assign({}, 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"]}
+{"version":3,"sources":["formatter.service.tsx"],"names":["FormatterService","constructor","formatterConfig","run","context","options","mergedOpts","optionsWithDefaults","formatterContext","mergeContext","formatter","env","getFormatter","results","check","format","Object","assign","render","descriptor","getDescriptor","id","displayName","version","config","language","ignoreIllegals","undefined","icon","displayConfig"],"mappings":"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","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 type FormatterServiceOptions = FormatterOptions & {\n  check?: boolean;\n};\n\nexport class FormatterService implements EnvService<FormatResults> {\n  name = 'formatter';\n\n  constructor(private formatterConfig: FormatterConfig) {}\n\n  async run(context: ExecutionContext, options: FormatterServiceOptions): 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: FormatterServiceOptions): FormatterServiceOptions {\n    return defaults(options, this.formatterConfig);\n  }\n\n  private mergeContext(options: FormatterServiceOptions, 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"]}

package/formatter.service.tsx

@@ -0,0 +1,71 @@
+import { defaults } from 'lodash';
+import React from 'react';
+import { EnvService, ExecutionContext, EnvDefinition } 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';
+
+export type FormatterServiceOptions = FormatterOptions & {
+  check?: boolean;
+};
+
+export class FormatterService implements EnvService<FormatResults> {
+  name = 'formatter';
+
+  constructor(private formatterConfig: FormatterConfig) {}
+
+  async run(context: ExecutionContext, options: FormatterServiceOptions): Promise<FormatResults> {
+    const mergedOpts = this.optionsWithDefaults(options);
+    const formatterContext: FormatterContext = this.mergeContext(mergedOpts, context);
+    const formatter: Formatter = context.env.getFormatter(formatterContext);
+
+    const results = options.check ? await formatter.check(formatterContext) : await formatter.format(formatterContext);
+    return results;
+  }
+
+  private optionsWithDefaults(options: FormatterServiceOptions): FormatterServiceOptions {
+    return defaults(options, this.formatterConfig);
+  }
+
+  private mergeContext(options: FormatterServiceOptions, context?: ExecutionContext): FormatterContext {
+    const formatterContext: FormatterContext = Object.assign({}, options, context);
+    return formatterContext;
+  }
+
+  render(env: EnvDefinition) {
+    const descriptor = this.getDescriptor(env);
+
+    return (
+      <Text key={descriptor?.id}>
+        <Text color="cyan">configured formatter: </Text>
+        <Text>
+          {descriptor?.id} ({descriptor?.displayName} @ {descriptor?.version})
+        </Text>
+        <Newline />
+        <Text color="cyan">formatter config:</Text>
+        <Newline />
+        <Text>
+          {descriptor?.config && highlight(descriptor?.config, { language: 'javascript', ignoreIllegals: true })}
+        </Text>
+        <Newline />
+      </Text>
+    );
+  }
+
+  getDescriptor(env: EnvDefinition) {
+    if (!env.env.getFormatter) return undefined;
+    const mergedOpts = this.optionsWithDefaults({});
+    const formatterContext = this.mergeContext(mergedOpts);
+    const formatter = env.env.getFormatter(formatterContext);
+
+    return {
+      id: formatter.id,
+      icon: formatter.icon,
+      config: formatter.displayConfig ? formatter.displayConfig() : undefined,
+      version: formatter.version ? formatter.version() : '?',
+      displayName: formatter.displayName ? formatter.displayName : '?',
+    };
+  }
+}

package/package.json

@@ -1,34 +1,36 @@
 {
   "name": "@teambit/formatter",
-  "version": "0.0.63",
+  "version": "0.0.67",
   "homepage": "https://bit.dev/teambit/defender/formatter",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.defender",
     "name": "formatter",
-    "version": "0.0.63"
+    "version": "0.0.67"
   },
   "dependencies": {
     "chalk": "2.4.2",
     "lodash": "4.17.21",
     "@teambit/harmony": "0.2.11",
     "graphql-tag": "2.12.1",
+    "cli-highlight": "2.1.9",
+    "ink": "3.0.8",
     "@babel/runtime": "7.12.18",
     "core-js": "^3.0.0",
-    "@teambit/cli": "0.0.378",
-    "@teambit/component": "0.0.512",
-    "@teambit/envs": "0.0.512",
-    "@teambit/workspace": "0.0.512",
-    "@teambit/builder": "0.0.512",
-    "@teambit/logger": "0.0.444"
+    "@teambit/cli": "0.0.379",
+    "@teambit/component": "0.0.516",
+    "@teambit/envs": "0.0.516",
+    "@teambit/workspace": "0.0.516",
+    "@teambit/builder": "0.0.516",
+    "@teambit/logger": "0.0.447"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
+    "@types/react": "^17.0.8",
     "@types/mocha": "5.2.7",
     "@types/testing-library__jest-dom": "5.9.5",
     "@types/jest": "^26.0.0",
     "@types/react-dom": "^17.0.5",
-    "@types/react": "^17.0.8",
     "@types/node": "12.20.4"
   },
   "peerDependencies": {

package/formatter.service.ts

@@ -1,24 +0,0 @@
-import { defaults } from 'lodash';
-import { EnvService, ExecutionContext } from '@teambit/envs';
-import { Formatter, FormatResults } from './formatter';
-import { FormatterContext, FormatterOptions } from './formatter-context';
-import { FormatterConfig } from './formatter.main.runtime';
-
-export type FormatterServiceOptions = FormatterOptions & {
-  check?: boolean;
-};
-
-export class FormatterService implements EnvService<FormatResults> {
-  name = 'formatter';
-
-  constructor(private formatterConfig: FormatterConfig) {}
-
-  async run(context: ExecutionContext, options: FormatterServiceOptions): Promise<FormatResults> {
-    const mergedOpts = defaults(options, this.formatterConfig);
-    const formatterContext: FormatterContext = Object.assign({}, mergedOpts, context);
-    const formatter: Formatter = context.env.getFormatter(formatterContext);
-
-    const results = options.check ? await formatter.check(formatterContext) : await formatter.format(formatterContext);
-    return results;
-  }
-}