@teambit/prettier 0.0.653 → 0.0.655
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.
- package/dist/index.d.ts +0 -1
- package/dist/index.js.map +1 -1
- package/dist/prettier.formatter.d.ts +1 -5
- package/dist/prettier.formatter.js +0 -5
- package/dist/prettier.formatter.js.map +1 -1
- package/dist/prettier.main.runtime.d.ts +1 -5
- package/dist/prettier.main.runtime.js +2 -24
- package/dist/prettier.main.runtime.js.map +1 -1
- package/dist/{preview-1689061040556.js → preview-1689218262868.js} +1 -1
- package/package-tar/teambit-prettier-0.0.655.tgz +0 -0
- package/package.json +9 -11
- package/tsconfig.json +1 -1
- package/dist/prettier-config-writer.d.ts +0 -14
- package/dist/prettier-config-writer.js +0 -72
- package/dist/prettier-config-writer.js.map +0 -1
- package/dist/prettier-formatter-interface.d.ts +0 -7
- package/dist/prettier-formatter-interface.js +0 -3
- package/dist/prettier-formatter-interface.js.map +0 -1
- package/package-tar/teambit-prettier-0.0.653.tgz +0 -0
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { PrettierAspect } from './prettier.aspect';
|
|
2
|
-
export type { PrettierFormatterInterface } from './prettier-formatter-interface';
|
|
3
2
|
export { PrettierAspect };
|
|
4
3
|
export type { PrettierMain, PrettierOptions, PrettierConfigTransformer, PrettierConfigTransformContext, } from './prettier.main.runtime';
|
|
5
4
|
export default PrettierAspect;
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["PrettierAspect"],"sources":["index.ts"],"sourcesContent":["import { PrettierAspect } from './prettier.aspect';\n\nexport
|
|
1
|
+
{"version":3,"names":["PrettierAspect"],"sources":["index.ts"],"sourcesContent":["import { PrettierAspect } from './prettier.aspect';\n\nexport { PrettierAspect };\nexport type {\n PrettierMain,\n PrettierOptions,\n PrettierConfigTransformer,\n PrettierConfigTransformContext,\n} from './prettier.main.runtime';\nexport default PrettierAspect;\n"],"mappings":";;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAAmD,eASpCA,0BAAc;AAAA"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { Formatter, FormatterContext, FormatResults } from '@teambit/formatter';
|
|
2
2
|
import PrettierLib, { Options as PrettierModuleOptions } from 'prettier';
|
|
3
3
|
import { Logger } from '@teambit/logger';
|
|
4
|
-
|
|
5
|
-
export declare class PrettierFormatter implements Formatter, PrettierFormatterInterface {
|
|
4
|
+
export declare class PrettierFormatter implements Formatter {
|
|
6
5
|
private logger;
|
|
7
6
|
private options;
|
|
8
7
|
/**
|
|
@@ -17,9 +16,6 @@ export declare class PrettierFormatter implements Formatter, PrettierFormatterIn
|
|
|
17
16
|
id: string;
|
|
18
17
|
displayName: string;
|
|
19
18
|
displayConfig(): string;
|
|
20
|
-
generateIdeConfig(): {
|
|
21
|
-
prettierConfig: PrettierLib.Options;
|
|
22
|
-
};
|
|
23
19
|
format(context: FormatterContext): Promise<FormatResults>;
|
|
24
20
|
formatSnippet(snippet: string): Promise<string>;
|
|
25
21
|
check(context: FormatterContext): Promise<FormatResults>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["PrettierFormatter","constructor","logger","options","prettierModule","PrettierLib","displayConfig","JSON","stringify","
|
|
1
|
+
{"version":3,"names":["PrettierFormatter","constructor","logger","options","prettierModule","PrettierLib","displayConfig","JSON","stringify","format","context","run","formatSnippet","snippet","check","longProcessLogger","createLongProcessLogger","components","length","resultsP","mapSeries","component","logProgress","id","toString","mergedOpts","getOptions","filesP","filesystem","files","map","file","sourceCode","contents","optsWithFilePath","addFilePathToOpts","checkFormatResults","formatResults","hasIssues","newContent","undefined","Buffer","from","write","filePath","relative","Promise","all","results","errors","Object","assign","filepath","path","version"],"sources":["prettier.formatter.ts"],"sourcesContent":["import { AbstractVinyl } from '@teambit/legacy/dist/consumer/component/sources';\nimport {\n Formatter,\n FormatterContext,\n FormatResults,\n FileFormatResult,\n ComponentFormatResult,\n} from '@teambit/formatter';\nimport PrettierLib, { Options as PrettierModuleOptions } from 'prettier';\nimport mapSeries from 'p-map-series';\nimport { Logger } from '@teambit/logger';\nimport { ExecutionContext } from '@teambit/envs';\n// import { PrettierOptions } from './prettier.main.runtime';\n\nexport class PrettierFormatter implements Formatter {\n constructor(\n private logger: Logger,\n\n private options: PrettierModuleOptions,\n\n /**\n * reference to the prettier module.\n */\n private prettierModule = PrettierLib\n ) {}\n\n id = 'prettier-formatter';\n displayName = 'Prettier';\n\n displayConfig() {\n return JSON.stringify(this.options, null, 2);\n }\n\n async format(context: FormatterContext): Promise<FormatResults> {\n return this.run(context);\n }\n\n async formatSnippet(snippet: string): Promise<string> {\n return this.prettierModule.format(snippet, this.options);\n }\n\n async check(context: FormatterContext): Promise<FormatResults> {\n return this.run(context);\n }\n\n private async run(context: FormatterContext & ExecutionContext): Promise<FormatResults> {\n const check = !!context.check;\n const longProcessLogger = this.logger.createLongProcessLogger('formatting components', context.components.length);\n const resultsP = mapSeries(context.components, async (component): Promise<ComponentFormatResult> => {\n longProcessLogger.logProgress(component.id.toString());\n const mergedOpts = this.getOptions(this.options, context);\n const filesP = component.filesystem.files.map(async (file): Promise<FileFormatResult> => {\n const sourceCode = file.contents.toString('utf8');\n const optsWithFilePath = this.addFilePathToOpts(mergedOpts, file);\n const checkFormatResults = await this.prettierModule.check(sourceCode, optsWithFilePath);\n const formatResults = await this.prettierModule.format(sourceCode, optsWithFilePath);\n\n const hasIssues = !checkFormatResults;\n const newContent = typeof formatResults === 'string' && hasIssues ? formatResults : undefined;\n\n if (!check && newContent) {\n file.contents = Buffer.from(newContent);\n await file.write(undefined, true);\n }\n\n return {\n filePath: file.relative,\n hasIssues,\n newContent,\n };\n });\n\n const files = await Promise.all(filesP);\n\n return {\n component,\n results: files,\n };\n });\n\n const results = await resultsP;\n\n return {\n results,\n errors: [],\n };\n }\n\n /**\n * get options for eslint.\n */\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n private getOptions(options: PrettierModuleOptions, context: FormatterContext): PrettierModuleOptions {\n return options;\n }\n\n private addFilePathToOpts(options: PrettierModuleOptions, file: AbstractVinyl): PrettierModuleOptions {\n return Object.assign({}, options, { filepath: file.path });\n }\n\n version() {\n return this.prettierModule.version;\n }\n}\n"],"mappings":"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"}
|
|
@@ -24,10 +24,6 @@ export declare class PrettierMain {
|
|
|
24
24
|
createFormatter(formatterOptions: FormatterOptions | undefined, options: PrettierOptions, transformers?: PrettierConfigTransformer[], PrettierModule?: any): Formatter;
|
|
25
25
|
static runtime: import("@teambit/harmony").RuntimeDefinition;
|
|
26
26
|
static dependencies: import("@teambit/harmony").Aspect[];
|
|
27
|
-
static provider([loggerExt,
|
|
28
|
-
LoggerMain,
|
|
29
|
-
FormatterMain,
|
|
30
|
-
WorkspaceConfigFilesMain
|
|
31
|
-
]): Promise<PrettierMain>;
|
|
27
|
+
static provider([loggerExt]: [LoggerMain, FormatterMain, WorkspaceConfigFilesMain]): Promise<PrettierMain>;
|
|
32
28
|
}
|
|
33
29
|
export declare function runTransformersWithContext(config: PrettierConfigMutator, transformers: PrettierConfigTransformer[] | undefined, context: PrettierConfigTransformContext): PrettierConfigMutator;
|
|
@@ -22,13 +22,6 @@ function _cli() {
|
|
|
22
22
|
};
|
|
23
23
|
return data;
|
|
24
24
|
}
|
|
25
|
-
function _formatter() {
|
|
26
|
-
const data = _interopRequireDefault(require("@teambit/formatter"));
|
|
27
|
-
_formatter = function () {
|
|
28
|
-
return data;
|
|
29
|
-
};
|
|
30
|
-
return data;
|
|
31
|
-
}
|
|
32
25
|
function _logger() {
|
|
33
26
|
const data = require("@teambit/logger");
|
|
34
27
|
_logger = function () {
|
|
@@ -43,13 +36,6 @@ function _defenderPrettier() {
|
|
|
43
36
|
};
|
|
44
37
|
return data;
|
|
45
38
|
}
|
|
46
|
-
function _workspaceConfigFiles() {
|
|
47
|
-
const data = _interopRequireDefault(require("@teambit/workspace-config-files"));
|
|
48
|
-
_workspaceConfigFiles = function () {
|
|
49
|
-
return data;
|
|
50
|
-
};
|
|
51
|
-
return data;
|
|
52
|
-
}
|
|
53
39
|
function _prettier() {
|
|
54
40
|
const data = require("./prettier.aspect");
|
|
55
41
|
_prettier = function () {
|
|
@@ -64,13 +50,6 @@ function _prettier2() {
|
|
|
64
50
|
};
|
|
65
51
|
return data;
|
|
66
52
|
}
|
|
67
|
-
function _prettierConfigWriter() {
|
|
68
|
-
const data = require("./prettier-config-writer");
|
|
69
|
-
_prettierConfigWriter = function () {
|
|
70
|
-
return data;
|
|
71
|
-
};
|
|
72
|
-
return data;
|
|
73
|
-
}
|
|
74
53
|
class PrettierMain {
|
|
75
54
|
constructor(logger) {
|
|
76
55
|
this.logger = logger;
|
|
@@ -88,15 +67,14 @@ class PrettierMain {
|
|
|
88
67
|
const afterMutation = runTransformersWithContext(configMutator.clone(), transformers, transformerContext);
|
|
89
68
|
return new (_prettier2().PrettierFormatter)(this.logger, afterMutation.raw, PrettierModule);
|
|
90
69
|
}
|
|
91
|
-
static async provider([loggerExt
|
|
70
|
+
static async provider([loggerExt]) {
|
|
92
71
|
const logger = loggerExt.createLogger(_prettier().PrettierAspect.id);
|
|
93
|
-
workspaceConfigFiles.registerConfigWriter(new (_prettierConfigWriter().PrettierConfigWriter)(formatter));
|
|
94
72
|
return new PrettierMain(logger);
|
|
95
73
|
}
|
|
96
74
|
}
|
|
97
75
|
exports.PrettierMain = PrettierMain;
|
|
98
76
|
(0, _defineProperty2().default)(PrettierMain, "runtime", _cli().MainRuntime);
|
|
99
|
-
(0, _defineProperty2().default)(PrettierMain, "dependencies", [_logger().LoggerAspect
|
|
77
|
+
(0, _defineProperty2().default)(PrettierMain, "dependencies", [_logger().LoggerAspect]);
|
|
100
78
|
_prettier().PrettierAspect.addRuntime(PrettierMain);
|
|
101
79
|
function runTransformersWithContext(config, transformers = [], context) {
|
|
102
80
|
if (!Array.isArray(transformers)) return config;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["PrettierMain","constructor","logger","createFormatter","formatterOptions","options","transformers","PrettierModule","configMutator","PrettierConfigMutator","config","transformerContext","check","afterMutation","runTransformersWithContext","clone","PrettierFormatter","raw","provider","loggerExt","
|
|
1
|
+
{"version":3,"names":["PrettierMain","constructor","logger","createFormatter","formatterOptions","options","transformers","PrettierModule","configMutator","PrettierConfigMutator","config","transformerContext","check","afterMutation","runTransformersWithContext","clone","PrettierFormatter","raw","provider","loggerExt","createLogger","PrettierAspect","id","MainRuntime","LoggerAspect","addRuntime","context","Array","isArray","newConfig","reduce","acc","transformer"],"sources":["prettier.main.runtime.ts"],"sourcesContent":["import { MainRuntime } from '@teambit/cli';\nimport { Options as PrettierModuleOptions } from 'prettier';\nimport { Formatter, FormatterMain, FormatterOptions } from '@teambit/formatter';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { PrettierConfigMutator } from '@teambit/defender.prettier.config-mutator';\nimport { WorkspaceConfigFilesMain } from '@teambit/workspace-config-files';\nimport { PrettierAspect } from './prettier.aspect';\nimport { PrettierFormatter } from './prettier.formatter';\n\nexport type PrettierOptions = {\n /**\n * formatter config for prettier.\n */\n config: PrettierModuleOptions;\n};\n\nexport type PrettierConfigTransformContext = {\n check: boolean;\n};\n\nexport type PrettierConfigTransformer = (\n config: PrettierConfigMutator,\n context: PrettierConfigTransformContext\n) => PrettierConfigMutator;\n\nexport class PrettierMain {\n constructor(private logger: Logger) {}\n /**\n * create a prettier formatter instance.\n * @param options prettier options.\n * @param PrettierModule reference to an `prettier` module.\n */\n createFormatter(\n formatterOptions: FormatterOptions = {},\n options: PrettierOptions,\n transformers: PrettierConfigTransformer[] = [],\n PrettierModule?: any\n ): Formatter {\n const configMutator = new PrettierConfigMutator(options.config);\n const transformerContext: PrettierConfigTransformContext = { check: !!formatterOptions.check };\n const afterMutation = runTransformersWithContext(configMutator.clone(), transformers, transformerContext);\n return new PrettierFormatter(this.logger, afterMutation.raw, PrettierModule);\n }\n\n static runtime = MainRuntime;\n\n static dependencies = [LoggerAspect];\n\n static async provider([loggerExt]: [LoggerMain, FormatterMain, WorkspaceConfigFilesMain]): Promise<PrettierMain> {\n const logger = loggerExt.createLogger(PrettierAspect.id);\n return new PrettierMain(logger);\n }\n}\n\nPrettierAspect.addRuntime(PrettierMain);\n\nexport function runTransformersWithContext(\n config: PrettierConfigMutator,\n transformers: PrettierConfigTransformer[] = [],\n context: PrettierConfigTransformContext\n): PrettierConfigMutator {\n if (!Array.isArray(transformers)) return config;\n const newConfig = transformers.reduce((acc, transformer) => {\n return transformer(acc, context);\n }, config);\n return newConfig;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAGA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAkBO,MAAMA,YAAY,CAAC;EACxBC,WAAW,CAASC,MAAc,EAAE;IAAA,KAAhBA,MAAc,GAAdA,MAAc;EAAG;EACrC;AACF;AACA;AACA;AACA;EACEC,eAAe,CACbC,gBAAkC,GAAG,CAAC,CAAC,EACvCC,OAAwB,EACxBC,YAAyC,GAAG,EAAE,EAC9CC,cAAoB,EACT;IACX,MAAMC,aAAa,GAAG,KAAIC,yCAAqB,EAACJ,OAAO,CAACK,MAAM,CAAC;IAC/D,MAAMC,kBAAkD,GAAG;MAAEC,KAAK,EAAE,CAAC,CAACR,gBAAgB,CAACQ;IAAM,CAAC;IAC9F,MAAMC,aAAa,GAAGC,0BAA0B,CAACN,aAAa,CAACO,KAAK,EAAE,EAAET,YAAY,EAAEK,kBAAkB,CAAC;IACzG,OAAO,KAAIK,8BAAiB,EAAC,IAAI,CAACd,MAAM,EAAEW,aAAa,CAACI,GAAG,EAAEV,cAAc,CAAC;EAC9E;EAMA,aAAaW,QAAQ,CAAC,CAACC,SAAS,CAAwD,EAAyB;IAC/G,MAAMjB,MAAM,GAAGiB,SAAS,CAACC,YAAY,CAACC,0BAAc,CAACC,EAAE,CAAC;IACxD,OAAO,IAAItB,YAAY,CAACE,MAAM,CAAC;EACjC;AACF;AAAC;AAAA,gCA3BYF,YAAY,aAmBNuB,kBAAW;AAAA,gCAnBjBvB,YAAY,kBAqBD,CAACwB,sBAAY,CAAC;AAQtCH,0BAAc,CAACI,UAAU,CAACzB,YAAY,CAAC;AAEhC,SAASc,0BAA0B,CACxCJ,MAA6B,EAC7BJ,YAAyC,GAAG,EAAE,EAC9CoB,OAAuC,EAChB;EACvB,IAAI,CAACC,KAAK,CAACC,OAAO,CAACtB,YAAY,CAAC,EAAE,OAAOI,MAAM;EAC/C,MAAMmB,SAAS,GAAGvB,YAAY,CAACwB,MAAM,CAAC,CAACC,GAAG,EAAEC,WAAW,KAAK;IAC1D,OAAOA,WAAW,CAACD,GAAG,EAAEL,OAAO,CAAC;EAClC,CAAC,EAAEhB,MAAM,CAAC;EACV,OAAOmB,SAAS;AAClB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.defender_prettier@0.0.
|
|
1
|
+
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.defender_prettier@0.0.655/dist/prettier.composition.js';
|
|
2
2
|
;
|
|
3
3
|
|
|
4
4
|
export const compositions = [compositions_0];
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,29 +1,27 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/prettier",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.655",
|
|
4
4
|
"homepage": "https://bit.cloud/teambit/defender/prettier",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.defender",
|
|
8
8
|
"name": "prettier",
|
|
9
|
-
"version": "0.0.
|
|
9
|
+
"version": "0.0.655"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"fs-extra": "10.0.0",
|
|
13
12
|
"p-map-series": "2.1.0",
|
|
14
13
|
"prettier": "2.3.2",
|
|
15
14
|
"core-js": "^3.0.0",
|
|
16
15
|
"@babel/runtime": "7.20.0",
|
|
17
16
|
"@teambit/harmony": "0.4.6",
|
|
18
|
-
"@teambit/envs": "0.0.
|
|
19
|
-
"@teambit/formatter": "0.0.
|
|
20
|
-
"@teambit/
|
|
21
|
-
"@teambit/
|
|
22
|
-
"@teambit/
|
|
23
|
-
"@teambit/
|
|
17
|
+
"@teambit/envs": "0.0.1104",
|
|
18
|
+
"@teambit/formatter": "0.0.655",
|
|
19
|
+
"@teambit/logger": "0.0.833",
|
|
20
|
+
"@teambit/cli": "0.0.740",
|
|
21
|
+
"@teambit/defender.prettier.config-mutator": "0.0.90",
|
|
22
|
+
"@teambit/workspace-config-files": "0.0.84"
|
|
24
23
|
},
|
|
25
24
|
"devDependencies": {
|
|
26
|
-
"@types/fs-extra": "9.0.7",
|
|
27
25
|
"@types/react": "^17.0.8",
|
|
28
26
|
"@types/prettier": "2.3.2",
|
|
29
27
|
"@types/mocha": "9.1.0",
|
|
@@ -33,7 +31,7 @@
|
|
|
33
31
|
"@types/testing-library__jest-dom": "5.9.5"
|
|
34
32
|
},
|
|
35
33
|
"peerDependencies": {
|
|
36
|
-
"@teambit/legacy": "1.0.
|
|
34
|
+
"@teambit/legacy": "1.0.521",
|
|
37
35
|
"react": "^16.8.0 || ^17.0.0",
|
|
38
36
|
"react-dom": "^16.8.0 || ^17.0.0"
|
|
39
37
|
},
|
package/tsconfig.json
CHANGED
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import { ExecutionContext } from '@teambit/envs';
|
|
2
|
-
import type { ConfigWriterEntry, ExtendingConfigFile, ConfigFile, GenerateExtendingConfigFilesArgs } from '@teambit/workspace-config-files';
|
|
3
|
-
import { FormatterMain } from '@teambit/formatter';
|
|
4
|
-
export declare class PrettierConfigWriter implements ConfigWriterEntry {
|
|
5
|
-
private formatter;
|
|
6
|
-
name: string;
|
|
7
|
-
cliName: string;
|
|
8
|
-
constructor(formatter: FormatterMain);
|
|
9
|
-
patterns: string[];
|
|
10
|
-
calcConfigFiles(executionContext: ExecutionContext): ConfigFile[] | undefined;
|
|
11
|
-
generateExtendingFile(args: GenerateExtendingConfigFilesArgs): ExtendingConfigFile | undefined;
|
|
12
|
-
calcName(hash: string): string;
|
|
13
|
-
isBitGenerated(filePath: string): boolean;
|
|
14
|
-
}
|
|
@@ -1,72 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
Object.defineProperty(exports, "__esModule", {
|
|
5
|
-
value: true
|
|
6
|
-
});
|
|
7
|
-
exports.PrettierConfigWriter = void 0;
|
|
8
|
-
function _defineProperty2() {
|
|
9
|
-
const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
|
-
_defineProperty2 = function () {
|
|
11
|
-
return data;
|
|
12
|
-
};
|
|
13
|
-
return data;
|
|
14
|
-
}
|
|
15
|
-
function _fsExtra() {
|
|
16
|
-
const data = _interopRequireDefault(require("fs-extra"));
|
|
17
|
-
_fsExtra = function () {
|
|
18
|
-
return data;
|
|
19
|
-
};
|
|
20
|
-
return data;
|
|
21
|
-
}
|
|
22
|
-
const CONFIG_NAME = '.prettierrc.cjs';
|
|
23
|
-
const BIT_GENERATED_PRETTIER_CONFIG_COMMENT = '// bit-generated-prettier-config';
|
|
24
|
-
class PrettierConfigWriter {
|
|
25
|
-
constructor(formatter) {
|
|
26
|
-
this.formatter = formatter;
|
|
27
|
-
(0, _defineProperty2().default)(this, "name", 'PrettierConfigWriter');
|
|
28
|
-
(0, _defineProperty2().default)(this, "cliName", 'prettier');
|
|
29
|
-
(0, _defineProperty2().default)(this, "patterns", [`**/${CONFIG_NAME}`]);
|
|
30
|
-
}
|
|
31
|
-
calcConfigFiles(executionContext) {
|
|
32
|
-
var _formatter$generateId;
|
|
33
|
-
const formatter = this.formatter.getFormatter(executionContext, {});
|
|
34
|
-
if (!formatter) return undefined;
|
|
35
|
-
if (!formatter.id.toLowerCase().includes('prettier')) return undefined;
|
|
36
|
-
const config = (_formatter$generateId = formatter.generateIdeConfig) === null || _formatter$generateId === void 0 ? void 0 : _formatter$generateId.call(formatter);
|
|
37
|
-
if (!config || !config.prettierConfig) return undefined;
|
|
38
|
-
const content = `module.exports = ${JSON.stringify(config.prettierConfig, null, 2)}`;
|
|
39
|
-
const prettierConfigFile = {
|
|
40
|
-
content,
|
|
41
|
-
name: '.prettierrc.bit.{hash}.cjs'
|
|
42
|
-
};
|
|
43
|
-
return [prettierConfigFile];
|
|
44
|
-
}
|
|
45
|
-
generateExtendingFile(args) {
|
|
46
|
-
const {
|
|
47
|
-
writtenConfigFiles
|
|
48
|
-
} = args;
|
|
49
|
-
const prettierConfigFile = writtenConfigFiles[0];
|
|
50
|
-
// Using DSL to make sure it will be replaced with relative path
|
|
51
|
-
const configContent = `module.exports = {
|
|
52
|
-
...require('{${prettierConfigFile.name}}')
|
|
53
|
-
}`;
|
|
54
|
-
const content = `${BIT_GENERATED_PRETTIER_CONFIG_COMMENT}\n${configContent}`;
|
|
55
|
-
return {
|
|
56
|
-
content,
|
|
57
|
-
name: CONFIG_NAME,
|
|
58
|
-
extendingTarget: prettierConfigFile,
|
|
59
|
-
useAbsPaths: false
|
|
60
|
-
};
|
|
61
|
-
}
|
|
62
|
-
calcName(hash) {
|
|
63
|
-
return `.prettierrc.bit.${hash}.cjs`;
|
|
64
|
-
}
|
|
65
|
-
isBitGenerated(filePath) {
|
|
66
|
-
const content = _fsExtra().default.readFileSync(filePath).toString();
|
|
67
|
-
return content.includes(BIT_GENERATED_PRETTIER_CONFIG_COMMENT);
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
exports.PrettierConfigWriter = PrettierConfigWriter;
|
|
71
|
-
|
|
72
|
-
//# sourceMappingURL=prettier-config-writer.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"names":["CONFIG_NAME","BIT_GENERATED_PRETTIER_CONFIG_COMMENT","PrettierConfigWriter","constructor","formatter","calcConfigFiles","executionContext","getFormatter","undefined","id","toLowerCase","includes","config","generateIdeConfig","prettierConfig","content","JSON","stringify","prettierConfigFile","name","generateExtendingFile","args","writtenConfigFiles","configContent","extendingTarget","useAbsPaths","calcName","hash","isBitGenerated","filePath","fs","readFileSync","toString"],"sources":["prettier-config-writer.ts"],"sourcesContent":["import fs from 'fs-extra';\nimport { ExecutionContext } from '@teambit/envs';\nimport type {\n ConfigWriterEntry,\n ExtendingConfigFile,\n ConfigFile,\n GenerateExtendingConfigFilesArgs,\n} from '@teambit/workspace-config-files';\nimport { FormatterMain } from '@teambit/formatter';\nimport { PrettierFormatterInterface } from './prettier-formatter-interface';\n\nconst CONFIG_NAME = '.prettierrc.cjs';\nconst BIT_GENERATED_PRETTIER_CONFIG_COMMENT = '// bit-generated-prettier-config';\n\nexport class PrettierConfigWriter implements ConfigWriterEntry {\n name = 'PrettierConfigWriter';\n cliName = 'prettier';\n\n constructor(private formatter: FormatterMain) {}\n patterns: string[] = [`**/${CONFIG_NAME}`];\n\n calcConfigFiles(executionContext: ExecutionContext): ConfigFile[] | undefined {\n const formatter = this.formatter.getFormatter(executionContext, {}) as PrettierFormatterInterface;\n if (!formatter) return undefined;\n if (!formatter.id.toLowerCase().includes('prettier')) return undefined;\n const config = formatter.generateIdeConfig?.();\n if (!config || !config.prettierConfig) return undefined;\n const content = `module.exports = ${JSON.stringify(config.prettierConfig, null, 2)}`;\n const prettierConfigFile = {\n content,\n name: '.prettierrc.bit.{hash}.cjs',\n };\n return [prettierConfigFile];\n }\n\n generateExtendingFile(args: GenerateExtendingConfigFilesArgs): ExtendingConfigFile | undefined {\n const { writtenConfigFiles } = args;\n const prettierConfigFile = writtenConfigFiles[0];\n // Using DSL to make sure it will be replaced with relative path\n const configContent = `module.exports = {\n ...require('{${prettierConfigFile.name}}')\n}`;\n const content = `${BIT_GENERATED_PRETTIER_CONFIG_COMMENT}\\n${configContent}`;\n return { content, name: CONFIG_NAME, extendingTarget: prettierConfigFile, useAbsPaths: false };\n }\n calcName(hash: string): string {\n return `.prettierrc.bit.${hash}.cjs`;\n }\n\n isBitGenerated(filePath: string): boolean {\n const content = fs.readFileSync(filePath).toString();\n return content.includes(BIT_GENERATED_PRETTIER_CONFIG_COMMENT);\n }\n}\n"],"mappings":";;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAWA,MAAMA,WAAW,GAAG,iBAAiB;AACrC,MAAMC,qCAAqC,GAAG,kCAAkC;AAEzE,MAAMC,oBAAoB,CAA8B;EAI7DC,WAAW,CAASC,SAAwB,EAAE;IAAA,KAA1BA,SAAwB,GAAxBA,SAAwB;IAAA,8CAHrC,sBAAsB;IAAA,iDACnB,UAAU;IAAA,kDAGC,CAAE,MAAKJ,WAAY,EAAC,CAAC;EADK;EAG/CK,eAAe,CAACC,gBAAkC,EAA4B;IAAA;IAC5E,MAAMF,SAAS,GAAG,IAAI,CAACA,SAAS,CAACG,YAAY,CAACD,gBAAgB,EAAE,CAAC,CAAC,CAA+B;IACjG,IAAI,CAACF,SAAS,EAAE,OAAOI,SAAS;IAChC,IAAI,CAACJ,SAAS,CAACK,EAAE,CAACC,WAAW,EAAE,CAACC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAOH,SAAS;IACtE,MAAMI,MAAM,4BAAGR,SAAS,CAACS,iBAAiB,0DAA3B,2BAAAT,SAAS,CAAsB;IAC9C,IAAI,CAACQ,MAAM,IAAI,CAACA,MAAM,CAACE,cAAc,EAAE,OAAON,SAAS;IACvD,MAAMO,OAAO,GAAI,oBAAmBC,IAAI,CAACC,SAAS,CAACL,MAAM,CAACE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAE,EAAC;IACpF,MAAMI,kBAAkB,GAAG;MACzBH,OAAO;MACPI,IAAI,EAAE;IACR,CAAC;IACD,OAAO,CAACD,kBAAkB,CAAC;EAC7B;EAEAE,qBAAqB,CAACC,IAAsC,EAAmC;IAC7F,MAAM;MAAEC;IAAmB,CAAC,GAAGD,IAAI;IACnC,MAAMH,kBAAkB,GAAGI,kBAAkB,CAAC,CAAC,CAAC;IAChD;IACA,MAAMC,aAAa,GAAI;AAC3B,iBAAiBL,kBAAkB,CAACC,IAAK;AACzC,EAAE;IACE,MAAMJ,OAAO,GAAI,GAAEd,qCAAsC,KAAIsB,aAAc,EAAC;IAC5E,OAAO;MAAER,OAAO;MAAEI,IAAI,EAAEnB,WAAW;MAAEwB,eAAe,EAAEN,kBAAkB;MAAEO,WAAW,EAAE;IAAM,CAAC;EAChG;EACAC,QAAQ,CAACC,IAAY,EAAU;IAC7B,OAAQ,mBAAkBA,IAAK,MAAK;EACtC;EAEAC,cAAc,CAACC,QAAgB,EAAW;IACxC,MAAMd,OAAO,GAAGe,kBAAE,CAACC,YAAY,CAACF,QAAQ,CAAC,CAACG,QAAQ,EAAE;IACpD,OAAOjB,OAAO,CAACJ,QAAQ,CAACV,qCAAqC,CAAC;EAChE;AACF;AAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"names":[],"sources":["prettier-formatter-interface.ts"],"sourcesContent":["import { Formatter } from '@teambit/formatter';\n\nexport type IdeConfig = {\n prettierConfig: Object;\n};\n\nexport interface PrettierFormatterInterface extends Formatter {\n generateIdeConfig?: () => IdeConfig;\n}\n"],"mappings":""}
|
|
Binary file
|