@ben_12/eslint-plugin-dprint 1.0.3 → 1.1.0
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.
|
@@ -5,4 +5,4 @@
|
|
|
5
5
|
* @param fileText The content of the file.
|
|
6
6
|
* @returns The formatted text or undefined. It's undefined if the formatter doesn't change the text.
|
|
7
7
|
*/
|
|
8
|
-
export declare function format(configFile: string,
|
|
8
|
+
export declare function format(configFile: string, overrideConfig: Record<string, unknown>, filePath: string, fileText: string, configName: string): string | undefined;
|
|
@@ -95,12 +95,19 @@ const formatters = Object.entries(plugins).reduce((formatters, [name, getBuffer]
|
|
|
95
95
|
}
|
|
96
96
|
return formatters;
|
|
97
97
|
}, {});
|
|
98
|
-
|
|
98
|
+
/** Cache to reduce copies of config values. */
|
|
99
|
+
const lastConfigFile = {};
|
|
100
|
+
function getFormatter(filePath, configName, configFile) {
|
|
99
101
|
const formatter = formatters[configName];
|
|
100
102
|
if (formatter) {
|
|
101
|
-
const
|
|
102
|
-
|
|
103
|
-
|
|
103
|
+
const configKey = formatter.getPluginInfo().configKey;
|
|
104
|
+
if (configFile !== lastConfigFile[configKey]) {
|
|
105
|
+
lastConfigFile[configKey] = configFile;
|
|
106
|
+
setConfig(formatter, configKey, configFile);
|
|
107
|
+
}
|
|
108
|
+
const fileMatchingInfo = formatter.getFileMatchingInfo();
|
|
109
|
+
const fileExtensions = fileMatchingInfo.fileExtensions || [];
|
|
110
|
+
const fileNames = fileMatchingInfo.fileNames || [];
|
|
104
111
|
const basename = path_1.default.basename(filePath);
|
|
105
112
|
if (fileExtensions.some(ext => basename.endsWith("." + ext)) || fileNames.some(file => file === basename)) {
|
|
106
113
|
return formatter;
|
|
@@ -117,9 +124,6 @@ function getFormatter(filePath, configName) {
|
|
|
117
124
|
}
|
|
118
125
|
return undefined;
|
|
119
126
|
}
|
|
120
|
-
/** Cache to reduce copies of config values. */
|
|
121
|
-
const lastConfig = {};
|
|
122
|
-
const lastConfigFile = {};
|
|
123
127
|
/**
|
|
124
128
|
* Format the given text with the given config.
|
|
125
129
|
* @param config The config object.
|
|
@@ -127,22 +131,20 @@ const lastConfigFile = {};
|
|
|
127
131
|
* @param fileText The content of the file.
|
|
128
132
|
* @returns The formatted text or undefined. It's undefined if the formatter doesn't change the text.
|
|
129
133
|
*/
|
|
130
|
-
function format(configFile,
|
|
131
|
-
const formatter = getFormatter(filePath, configName);
|
|
134
|
+
function format(configFile, overrideConfig, filePath, fileText, configName) {
|
|
135
|
+
const formatter = getFormatter(filePath, configName, configFile);
|
|
132
136
|
if (formatter) {
|
|
133
|
-
const
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
}
|
|
140
|
-
return formatter.formatText(filePath, fileText);
|
|
137
|
+
const request = {
|
|
138
|
+
filePath,
|
|
139
|
+
fileText,
|
|
140
|
+
overrideConfig,
|
|
141
|
+
};
|
|
142
|
+
return formatter.formatText(request);
|
|
141
143
|
}
|
|
142
144
|
return undefined;
|
|
143
145
|
}
|
|
144
146
|
exports.format = format;
|
|
145
|
-
function setConfig(formatter, configKey, configFile
|
|
147
|
+
function setConfig(formatter, configKey, configFile) {
|
|
146
148
|
// The setting values must be strings.
|
|
147
149
|
const globalConfig = {};
|
|
148
150
|
const pluginConfig = {};
|
|
@@ -155,7 +157,6 @@ function setConfig(formatter, configKey, configFile, config) {
|
|
|
155
157
|
extractConfig(pluginConfigFileJson, pluginConfig);
|
|
156
158
|
}
|
|
157
159
|
}
|
|
158
|
-
extractConfig(config, pluginConfig);
|
|
159
160
|
formatter.setConfig(globalConfig, pluginConfig);
|
|
160
161
|
}
|
|
161
162
|
function isConfigAllowedType(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dprint.js","sourceRoot":"","sources":["../../../lib/dprint/dprint.ts"],"names":[],"mappings":";AAAA,0DAA0D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE1D,
|
|
1
|
+
{"version":3,"file":"dprint.js","sourceRoot":"","sources":["../../../lib/dprint/dprint.ts"],"names":[],"mappings":";AAAA,0DAA0D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE1D,iDAA8E;AAC9E,uCAAwB;AACxB,oDAAqC;AACrC,gDAAuB;AASvB,SAAS,UAAU,CAAC,MAAc;IAC9B,IAAI,MAAM,GAAuB,SAAS,CAAA;IAC1C,IAAI;QACA,MAAM,GAAG,OAAO,CAAC,MAAM,CAAW,CAAA;KACrC;IAAC,OAAO,CAAC,EAAE;QACR,qBAAqB;KACxB;IACD,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE;QACjB,OAAO,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;KAC3C;SAAM,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,EAAE;QAC1B,OAAO,MAAM,CAAC,SAAS,EAAE,CAAA;KAC5B;IACD,OAAO,SAAS,CAAA;AACpB,CAAC;AAED,SAAS,QAAQ,CAAC,MAAc,EAAE,QAAgB;IAC9C,IAAI,QAAQ,GAAuB,SAAS,CAAA;IAC5C,IAAI;QACA,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;KAClF;IAAC,OAAO,CAAC,EAAE;QACR,qBAAqB;KACxB;IACD,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,EAAE;QAClB,OAAO,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;KACnC;IACD,OAAO,SAAS,CAAA;AACpB,CAAC;AAED,MAAM,WAAW,GAAG;IAChB,YAAY,EAAE,oBAAoB;IAClC,MAAM,EAAE,cAAc;IACtB,UAAU,EAAE,kBAAkB;IAC9B,MAAM,EAAE,cAAc;IACtB,YAAY,EAAE,oBAAoB;IAClC,OAAO,EAAE,qBAAqB;IAC9B,QAAQ,EAAE,sBAAsB;CAC1B,CAAA;AAEV,MAAM,OAAO,GAAuD;IAChE,YAAY,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IACzD,MAAM,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7C,UAAU,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACrD,MAAM,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7C,YAAY,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IACzD,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAC5D,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC;CACjE,CAAA;AAED,SAAS,YAAY,CAAC,IAAY;IAC9B,OAAO,IAAI,IAAI,WAAW,CAAA;AAC9B,CAAC;AAED,MAAM,UAAU,GAAwC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAClF,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE;IAC9B,IAAI;QACA,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;QAC1B,IAAI,MAAM,EAAE;YACR,MAAM,SAAS,GAAG,IAAA,4BAAgB,EAAC,MAAM,CAAC,CAAA;YAC1C,UAAU,CAAC,IAAI,CAAC,GAAG,SAAS,CAAA;SAC/B;KACJ;IAAC,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;KACvD;IACD,OAAO,UAAU,CAAA;AACrB,CAAC,EACD,EAA+B,CAClC,CAAA;AAED,+CAA+C;AAC/C,MAAM,cAAc,GAA0C,EAAE,CAAA;AAEhE,SAAS,YAAY,CAAC,QAAgB,EAAE,UAAkB,EAAE,UAAkB;IAC1E,MAAM,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,CAAA;IACxC,IAAI,SAAS,EAAE;QACX,MAAM,SAAS,GAAG,SAAS,CAAC,aAAa,EAAE,CAAC,SAAS,CAAA;QACrD,IAAI,UAAU,KAAK,cAAc,CAAC,SAAS,CAAC,EAAE;YAC1C,cAAc,CAAC,SAAS,CAAC,GAAG,UAAU,CAAA;YACtC,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;SAC9C;QACD,MAAM,gBAAgB,GAAG,SAAS,CAAC,mBAAmB,EAAE,CAAA;QACxD,MAAM,cAAc,GAAG,gBAAgB,CAAC,cAAc,IAAI,EAAE,CAAA;QAC5D,MAAM,SAAS,GAAG,gBAAgB,CAAC,SAAS,IAAI,EAAE,CAAA;QAClD,MAAM,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QACxC,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,EAAE;YACvG,OAAO,SAAS,CAAA;SACnB;aAAM,IAAI,YAAY,CAAC,UAAU,CAAC,EAAE;YACjC,OAAO,CAAC,IAAI,CAAC,6BAA6B,EAAE,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC,CAAA;SACjF;KACJ;SAAM,IAAI,YAAY,CAAC,UAAU,CAAC,EAAE;QACjC,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC,CAAA;KACjE;SAAM;QACH,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE,UAAU,CAAC,CAAA;KACrD;IACD,OAAO,SAAS,CAAA;AACpB,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,MAAM,CAClB,UAAkB,EAClB,cAAuC,EACvC,QAAgB,EAChB,QAAgB,EAChB,UAAkB;IAElB,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,CAAA;IAChE,IAAI,SAAS,EAAE;QACX,MAAM,OAAO,GAAkB;YAC3B,QAAQ;YACR,QAAQ;YACR,cAAc;SACjB,CAAA;QACD,OAAO,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;KACvC;IACD,OAAO,SAAS,CAAA;AACpB,CAAC;AAjBD,wBAiBC;AAED,SAAS,SAAS,CAAC,SAAoB,EAAE,SAAiB,EAAE,UAAkB;IAC1E,sCAAsC;IACtC,MAAM,YAAY,GAA+B,EAAE,CAAA;IACnD,MAAM,YAAY,GAA+B,EAAE,CAAA;IAEnD,IAAI,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAChD,MAAM,iBAAiB,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAA;QAC5E,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;QACrD,aAAa,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;QAE3C,MAAM,oBAAoB,GAAG,cAAc,CAAC,SAAS,CAAC,CAAA;QACtD,IAAI,OAAO,oBAAoB,KAAK,QAAQ,EAAE;YAC1C,aAAa,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAA;SACpD;KACJ;IAED,SAAS,CAAC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;AACnD,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAc;IACvC,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,OAAO,KAAK,CAAC,CAAA;AACjE,CAAC;AAED,SAAS,aAAa,CAAC,MAAc,EAAE,QAAiC;IACpE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAC/C,IAAI,mBAAmB,CAAC,KAAK,CAAC,EAAE;YAC5B,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;SACxB;KACJ;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ben_12/eslint-plugin-dprint",
|
|
3
|
-
"version": "1.0
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"description": "An ESLint plugin that fixes code with dprint",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=18.0.0"
|
|
@@ -12,12 +12,12 @@
|
|
|
12
12
|
],
|
|
13
13
|
"peerDependencies": {
|
|
14
14
|
"@dprint/dockerfile": "^0.3.2",
|
|
15
|
-
"@dprint/json": "^0.
|
|
16
|
-
"@dprint/markdown": "^0.
|
|
17
|
-
"@dprint/toml": "^0.
|
|
18
|
-
"@dprint/typescript": "^0.
|
|
19
|
-
"dprint-plugin-malva": "^0.11.
|
|
20
|
-
"dprint-plugin-markup": "^0.
|
|
15
|
+
"@dprint/json": "^0.20.0",
|
|
16
|
+
"@dprint/markdown": "^0.18.0",
|
|
17
|
+
"@dprint/toml": "^0.7.0",
|
|
18
|
+
"@dprint/typescript": "^0.94.0",
|
|
19
|
+
"dprint-plugin-malva": "^0.11.2",
|
|
20
|
+
"dprint-plugin-markup": "^0.19.0",
|
|
21
21
|
"eslint": ">=7.0.0"
|
|
22
22
|
},
|
|
23
23
|
"peerDependenciesMeta": {
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
}
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@dprint/formatter": "^0.
|
|
47
|
+
"@dprint/formatter": "^0.4.1",
|
|
48
48
|
"debug": "^4.1.1",
|
|
49
49
|
"diff": "^5.0.0",
|
|
50
50
|
"jsonc-parser": "^3.2.0"
|