@teambit/formatter 1.0.185 → 1.0.186

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.
@@ -1241,7 +1241,7 @@
1241
1241
  "_legacy": {
1242
1242
  "scope": "teambit.defender",
1243
1243
  "name": "formatter",
1244
- "version": "1.0.185"
1244
+ "version": "1.0.186"
1245
1245
  },
1246
1246
  "_scope": "teambit.defender"
1247
1247
  }
@@ -1336,7 +1336,7 @@
1336
1336
  "_legacy": {
1337
1337
  "scope": "teambit.defender",
1338
1338
  "name": "formatter",
1339
- "version": "1.0.185"
1339
+ "version": "1.0.186"
1340
1340
  },
1341
1341
  "_scope": "teambit.defender"
1342
1342
  }
@@ -2728,7 +2728,7 @@
2728
2728
  "_legacy": {
2729
2729
  "scope": "teambit.defender",
2730
2730
  "name": "formatter",
2731
- "version": "1.0.185"
2731
+ "version": "1.0.186"
2732
2732
  },
2733
2733
  "_scope": "teambit.defender"
2734
2734
  }
@@ -2809,7 +2809,7 @@
2809
2809
  "componentId": {
2810
2810
  "scope": "teambit.defender",
2811
2811
  "name": "formatter",
2812
- "version": "1.0.185"
2812
+ "version": "1.0.186"
2813
2813
  },
2814
2814
  "taggedModuleExports": []
2815
2815
  }
@@ -13,7 +13,7 @@ export declare class FormatterService implements EnvService<FormatResults> {
13
13
  getFormatter(context: ExecutionContext, options: FormatterOptions): Formatter;
14
14
  private optionsWithDefaults;
15
15
  private mergeContext;
16
- render(env: EnvDefinition): JSX.Element;
16
+ render(env: EnvDefinition): string;
17
17
  transform(env: Env, context: EnvContext): FormatterTransformationMap | undefined;
18
18
  getDescriptor(env: EnvDefinition): {
19
19
  id: any;
@@ -4,23 +4,16 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.FormatterService = void 0;
7
- function _lodash() {
8
- const data = require("lodash");
9
- _lodash = function () {
10
- return data;
11
- };
12
- return data;
13
- }
14
- function _react() {
15
- const data = _interopRequireDefault(require("react"));
16
- _react = function () {
7
+ function _chalk() {
8
+ const data = _interopRequireDefault(require("chalk"));
9
+ _chalk = function () {
17
10
  return data;
18
11
  };
19
12
  return data;
20
13
  }
21
- function _ink() {
22
- const data = require("ink");
23
- _ink = function () {
14
+ function _lodash() {
15
+ const data = require("lodash");
16
+ _lodash = function () {
24
17
  return data;
25
18
  };
26
19
  return data;
@@ -63,16 +56,13 @@ class FormatterService {
63
56
  }
64
57
  render(env) {
65
58
  const descriptor = this.getDescriptor(env);
66
- return /*#__PURE__*/_react().default.createElement(_ink().Text, {
67
- key: descriptor?.id
68
- }, /*#__PURE__*/_react().default.createElement(_ink().Text, {
69
- color: "cyan"
70
- }, "configured formatter: "), /*#__PURE__*/_react().default.createElement(_ink().Text, null, descriptor?.id, " (", descriptor?.displayName, " @ ", descriptor?.version, ")"), /*#__PURE__*/_react().default.createElement(_ink().Newline, null), /*#__PURE__*/_react().default.createElement(_ink().Text, {
71
- color: "cyan"
72
- }, "formatter config:"), /*#__PURE__*/_react().default.createElement(_ink().Newline, null), /*#__PURE__*/_react().default.createElement(_ink().Text, null, descriptor?.config && (0, _cliHighlight().default)(descriptor?.config, {
73
- language: 'javascript',
59
+ const name = `${_chalk().default.green('configured formatter:')} ${descriptor?.id} (${descriptor?.displayName} @ ${descriptor?.version})`;
60
+ const configLabel = _chalk().default.green('formatter config:');
61
+ const configObj = descriptor?.config ? (0, _cliHighlight().default)(descriptor?.config, {
62
+ language: 'json',
74
63
  ignoreIllegals: true
75
- })), /*#__PURE__*/_react().default.createElement(_ink().Newline, null));
64
+ }) : '';
65
+ return `${name}\n${configLabel}\n${configObj}`;
76
66
  }
77
67
  transform(env, context) {
78
68
  // Old env
@@ -1 +1 @@
1
- {"version":3,"names":["_lodash","data","require","_react","_interopRequireDefault","_ink","_cliHighlight","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","FormatterService","constructor","formatterConfig","run","context","options","mergedOpts","optionsWithDefaults","formatterContext","mergeContext","formatter","getFormatter","results","check","format","env","defaults","assign","render","descriptor","getDescriptor","createElement","Text","id","color","displayName","version","Newline","config","highlight","language","ignoreIllegals","transform","undefined","icon","displayConfig","exports"],"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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"}
1
+ {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_cliHighlight","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","FormatterService","constructor","formatterConfig","run","context","options","mergedOpts","optionsWithDefaults","formatterContext","mergeContext","formatter","getFormatter","results","check","format","env","defaults","assign","render","descriptor","getDescriptor","name","chalk","green","id","displayName","version","configLabel","configObj","config","highlight","language","ignoreIllegals","transform","undefined","icon","displayConfig","exports"],"sources":["formatter.service.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { defaults } from 'lodash';\nimport { EnvService, ExecutionContext, EnvDefinition, Env, EnvContext, ServiceTransformationMap } from '@teambit/envs';\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 const name = `${chalk.green('configured formatter:')} ${descriptor?.id} (${descriptor?.displayName} @ ${\n descriptor?.version\n })`;\n const configLabel = chalk.green('formatter config:');\n const configObj = descriptor?.config\n ? highlight(descriptor?.config, { language: 'json', ignoreIllegals: true })\n : '';\n return `${name}\\n${configLabel}\\n${configObj}`;\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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"}
@@ -1,5 +1,5 @@
1
- import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.defender_formatter@1.0.185/dist/formatter.composition.js';
2
- import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.defender_formatter@1.0.185/dist/formatter.docs.mdx';
1
+ import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.defender_formatter@1.0.186/dist/formatter.composition.js';
2
+ import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.defender_formatter@1.0.186/dist/formatter.docs.mdx';
3
3
 
4
4
  export const compositions = [compositions_0];
5
5
  export const overview = [overview_0];
package/package.json CHANGED
@@ -1,26 +1,25 @@
1
1
  {
2
2
  "name": "@teambit/formatter",
3
- "version": "1.0.185",
3
+ "version": "1.0.186",
4
4
  "homepage": "https://bit.cloud/teambit/defender/formatter",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.defender",
8
8
  "name": "formatter",
9
- "version": "1.0.185"
9
+ "version": "1.0.186"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
13
13
  "lodash": "4.17.21",
14
14
  "graphql-tag": "2.12.1",
15
15
  "cli-highlight": "2.1.9",
16
- "ink": "3.2.0",
17
16
  "@teambit/harmony": "0.4.6",
18
- "@teambit/cli": "0.0.853",
19
- "@teambit/component": "1.0.185",
20
- "@teambit/envs": "1.0.185",
21
- "@teambit/workspace": "1.0.185",
22
- "@teambit/builder": "1.0.185",
23
- "@teambit/logger": "0.0.946"
17
+ "@teambit/cli": "0.0.854",
18
+ "@teambit/component": "1.0.186",
19
+ "@teambit/envs": "1.0.186",
20
+ "@teambit/workspace": "1.0.186",
21
+ "@teambit/builder": "1.0.186",
22
+ "@teambit/logger": "0.0.947"
24
23
  },
25
24
  "devDependencies": {
26
25
  "@types/lodash": "4.14.165",
@@ -1,86 +0,0 @@
1
- import { defaults } from 'lodash';
2
- import React from 'react';
3
- import { EnvService, ExecutionContext, EnvDefinition, Env, EnvContext, ServiceTransformationMap } from '@teambit/envs';
4
- import { Text, Newline } from 'ink';
5
- import highlight from 'cli-highlight';
6
- import { Formatter, FormatResults } from './formatter';
7
- import { FormatterContext, FormatterOptions } from './formatter-context';
8
- import { FormatterConfig } from './formatter.main.runtime';
9
-
10
- type FormatterTransformationMap = ServiceTransformationMap & {
11
- getFormatter: () => Formatter;
12
- };
13
- export class FormatterService implements EnvService<FormatResults> {
14
- name = 'formatter';
15
-
16
- constructor(private formatterConfig: FormatterConfig) {}
17
-
18
- async run(context: ExecutionContext, options: FormatterOptions): Promise<FormatResults> {
19
- const mergedOpts = this.optionsWithDefaults(options);
20
- const formatterContext: FormatterContext = this.mergeContext(mergedOpts, context);
21
- const formatter = this.getFormatter(context, options);
22
-
23
- const results = options.check ? await formatter.check(formatterContext) : await formatter.format(formatterContext);
24
- return results;
25
- }
26
-
27
- getFormatter(context: ExecutionContext, options: FormatterOptions): Formatter {
28
- const mergedOpts = this.optionsWithDefaults(options);
29
- const formatterContext: FormatterContext = this.mergeContext(mergedOpts, context);
30
- const formatter: Formatter = context.env.getFormatter(formatterContext);
31
-
32
- return formatter;
33
- }
34
-
35
- private optionsWithDefaults(options: FormatterOptions): FormatterOptions {
36
- return defaults(options, this.formatterConfig);
37
- }
38
-
39
- private mergeContext(options: FormatterOptions, context?: ExecutionContext): FormatterContext {
40
- const formatterContext: FormatterContext = Object.assign({}, options, context);
41
- return formatterContext;
42
- }
43
-
44
- render(env: EnvDefinition) {
45
- const descriptor = this.getDescriptor(env);
46
-
47
- return (
48
- <Text key={descriptor?.id}>
49
- <Text color="cyan">configured formatter: </Text>
50
- <Text>
51
- {descriptor?.id} ({descriptor?.displayName} @ {descriptor?.version})
52
- </Text>
53
- <Newline />
54
- <Text color="cyan">formatter config:</Text>
55
- <Newline />
56
- <Text>
57
- {descriptor?.config && highlight(descriptor?.config, { language: 'javascript', ignoreIllegals: true })}
58
- </Text>
59
- <Newline />
60
- </Text>
61
- );
62
- }
63
-
64
- transform(env: Env, context: EnvContext): FormatterTransformationMap | undefined {
65
- // Old env
66
- if (!env?.formatter) return undefined;
67
- return {
68
- getFormatter: () => env.formatter()(context),
69
- };
70
- }
71
-
72
- getDescriptor(env: EnvDefinition) {
73
- if (!env.env.getFormatter) return undefined;
74
- const mergedOpts = this.optionsWithDefaults({});
75
- const formatterContext = this.mergeContext(mergedOpts);
76
- const formatter = env.env.getFormatter(formatterContext);
77
-
78
- return {
79
- id: formatter.id,
80
- icon: formatter.icon,
81
- config: formatter.displayConfig ? formatter.displayConfig() : undefined,
82
- version: formatter.version ? formatter.version() : '?',
83
- displayName: formatter.displayName ? formatter.displayName : '?',
84
- };
85
- }
86
- }