@ben_12/eslint-plugin-dprint 0.6.1 → 0.7.0

package/README.md

@@ -26,6 +26,10 @@ module.exports = {
     "@ben_12/dprint/dprint": [
       "error",
       {
+        // Use dprint JSON configuration file (default: "dprint.json")
+        // It may be created using `dprint init` command
+        // See also https://dprint.dev/config/
+        configFile: "dprint.json",
         config: {
           // The TypeScript configuration of dprint
           // See also https://dprint.dev/plugins/typescript/config/

package/{lib → dist/lib}/dprint/config-schema.json

@@ -4,7 +4,6 @@
         "useTabs": {
             "description": "Whether to use tabs (true) or spaces (false).",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Uses tabs for indentation."
@@ -16,7 +15,6 @@
         "semiColons": {
             "description": "How semi-colons should be used.",
             "type": "string",
-            "default": "prefer",
             "oneOf": [{
                     "enum": ["always"],
                     "description": "Always uses semi-colons where applicable."
@@ -31,7 +29,6 @@
         "quoteStyle": {
             "description": "How to use single or double quotes.",
             "type": "string",
-            "default": "alwaysDouble",
             "oneOf": [{
                     "enum": ["alwaysDouble"],
                     "description": "Always uses double quotes."
@@ -49,7 +46,6 @@
         "jsx.quoteStyle": {
             "description": "How to use single or double quotes in JSX attributes.",
             "type": "string",
-            "default": "preferDouble",
             "oneOf": [{
                     "enum": ["preferDouble"],
                     "description": "Prefers using double quotes except in scenarios where the string contains more double quotes than single quotes."
@@ -61,7 +57,6 @@
         "quoteProps": {
             "description": "Change when properties in objects are quoted.",
             "type": "string",
-            "default": "preserve",
             "oneOf": [{
                     "enum": ["asNeeded"],
                     "description": "Remove unnecessary quotes around property names."
@@ -76,7 +71,6 @@
         "jsx.multiLineParens": {
             "description": "Surrounds the top-most JSX element or fragment in parentheses when it spans multiple lines.",
             "type": "string",
-            "default": "prefer",
             "oneOf": [{
                     "enum": ["never"],
                     "description": "Never wrap JSX with parentheses."
@@ -91,7 +85,6 @@
         "jsx.forceNewLinesSurroundingContent": {
             "description": "Forces newlines surrounding the content of JSX elements.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": ""
@@ -103,7 +96,6 @@
         "jsx.bracketPosition": {
             "description": "If the end angle bracket of a jsx open element or self closing element should be on the same or next line when the attributes span multiple lines.",
             "type": "string",
-            "default": "nextLine",
             "oneOf": [{
                     "enum": ["maintain"],
                     "description": "Maintains the position of the end angle bracket."
@@ -118,7 +110,6 @@
         "newLineKind": {
             "description": "The kind of newline to use.",
             "type": "string",
-            "default": "lf",
             "oneOf": [{
                     "enum": ["auto"],
                     "description": "For each file, uses the last newline kind found in the file."
@@ -136,7 +127,6 @@
         "useBraces": {
             "description": "If braces should be used or not.",
             "type": "string",
-            "default": "whenNotSingleLine",
             "oneOf": [{
                     "enum": ["maintain"],
                     "description": "Uses braces if they're used. Doesn't use braces if they're not used."
@@ -154,7 +144,6 @@
         "bracePosition": {
             "description": "Where to place the opening brace.",
             "type": "string",
-            "default": "sameLineUnlessHanging",
             "oneOf": [{
                     "enum": ["maintain"],
                     "description": "Maintains the brace being on the next line or the same line."
@@ -172,7 +161,6 @@
         "singleBodyPosition": {
             "description": "Where to place the expression of a statement that could possibly be on one line (ex. `if (true) console.log(5);`).",
             "type": "string",
-            "default": "maintain",
             "oneOf": [{
                     "enum": ["maintain"],
                     "description": "Maintains the position of the expression."
@@ -187,7 +175,6 @@
         "nextControlFlowPosition": {
             "description": "Where to place the next control flow within a control flow statement.",
             "type": "string",
-            "default": "sameLine",
             "oneOf": [{
                     "enum": ["maintain"],
                     "description": "Maintains the next control flow being on the next line or the same line."
@@ -202,7 +189,6 @@
         "trailingCommas": {
             "description": "If trailing commas should be used.",
             "type": "string",
-            "default": "onlyMultiLine",
             "oneOf": [{
                     "enum": ["never"],
                     "description": "Trailing commas should not be used."
@@ -217,7 +203,6 @@
         "operatorPosition": {
             "description": "Where to place the operator for expressions that span multiple lines.",
             "type": "string",
-            "default": "nextLine",
             "oneOf": [{
                     "enum": ["maintain"],
                     "description": "Maintains the operator being on the next line or the same line."
@@ -232,7 +217,6 @@
         "preferHanging": {
             "description": "Set to prefer hanging indentation when exceeding the line width instead of making code split up on multiple lines.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": ""
@@ -244,7 +228,6 @@
         "preferHangingGranular": {
             "description": "Set to prefer hanging indentation when exceeding the line width instead of making code split up on multiple lines.",
             "type": "string",
-            "default": "never",
             "oneOf": [{
                     "enum": ["always"],
                     "description": "Always prefers hanging regardless of the number of elements."
@@ -259,7 +242,6 @@
         "preferSingleLine": {
             "description": "If code should revert back from being on multiple lines to being on a single line when able.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": ""
@@ -271,7 +253,6 @@
         "forceSingleLine": {
             "description": "If code should be forced to be on a single line if able.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": ""
@@ -283,7 +264,6 @@
         "forceMultiLineSpecifiers": {
             "description": "If code import/export specifiers should be forced to be on multiple lines.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": ""
@@ -295,7 +275,6 @@
         "sortOrder": {
             "description": "The kind of sort ordering to use.",
             "type": "string",
-            "default": "caseInsensitive",
             "oneOf": [{
                     "enum": ["maintain"],
                     "description": "Maintains the current ordering."
@@ -310,7 +289,6 @@
         "deno": {
             "description": "Top level configuration that sets the configuration to what is used in Deno.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": ""
@@ -322,7 +300,6 @@
         "arrowFunction.useParentheses": {
             "description": "Whether to use parentheses around a single parameter in an arrow function.",
             "type": "string",
-            "default": "maintain",
             "oneOf": [{
                     "enum": ["force"],
                     "description": "Forces parentheses."
@@ -337,7 +314,6 @@
         "binaryExpression.linePerExpression": {
             "description": "Whether to force a line per expression when spanning multiple lines.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Formats with each part on a new line."
@@ -349,7 +325,6 @@
         "conditionalExpression.linePerExpression": {
             "description": "Whether to force a line per expression when spanning multiple lines.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Formats with each part on a new line."
@@ -361,7 +336,6 @@
         "memberExpression.linePerExpression": {
             "description": "Whether to force a line per expression when spanning multiple lines.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Formats with each part on a new line."
@@ -373,7 +347,6 @@
         "enumDeclaration.memberSpacing": {
             "description": "How to space the members of an enum.",
             "type": "string",
-            "default": "maintain",
             "oneOf": [{
                     "enum": ["newLine"],
                     "description": "Forces a new line between members."
@@ -388,7 +361,6 @@
         "typeLiteral.separatorKind": {
             "description": "The kind of separator to use in type literals.",
             "type": "string",
-            "default": "semiColon",
             "oneOf": [{
                     "enum": ["semiColon"],
                     "description": "Use semi-colons."
@@ -400,7 +372,6 @@
         "spaceAround": {
             "description": "Whether to place spaces around enclosed expressions.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `myFunction( true )`"
@@ -412,7 +383,6 @@
         "spaceSurroundingProperties": {
             "description": "Whether to add a space surrounding the properties of single line object-like nodes.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `{ key: value }`"
@@ -424,7 +394,6 @@
         "objectExpression.spaceSurroundingProperties": {
             "description": "Whether to add a space surrounding the properties of a single line object expression.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `{ key: value }`"
@@ -436,7 +405,6 @@
         "objectPattern.spaceSurroundingProperties": {
             "description": "Whether to add a space surrounding the properties of a single line object pattern.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `{ key: value } = obj`"
@@ -448,7 +416,6 @@
         "typeLiteral.spaceSurroundingProperties": {
             "description": "Whether to add a space surrounding the properties of a single line type literal.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `type Test = { key: string }`"
@@ -460,7 +427,6 @@
         "binaryExpression.spaceSurroundingBitwiseAndArithmeticOperator": {
             "description": "Whether to surround the operator in a binary expression with spaces.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `1 + 2`"
@@ -472,7 +438,6 @@
         "commentLine.forceSpaceAfterSlashes": {
             "description": "Forces a space after the double slash in a comment line.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `//test` -> `// test`"
@@ -484,7 +449,6 @@
         "constructor.spaceBeforeParentheses": {
             "description": "Whether to add a space before the parentheses of a constructor.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `constructor ()`"
@@ -496,7 +460,6 @@
         "constructorType.spaceAfterNewKeyword": {
             "description": "Whether to add a space after the `new` keyword in a constructor type.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `type MyClassCtor = new () => MyClass;`"
@@ -508,7 +471,6 @@
         "constructSignature.spaceAfterNewKeyword": {
             "description": "Whether to add a space after the `new` keyword in a construct signature.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `new (): MyClass;`"
@@ -520,7 +482,6 @@
         "doWhileStatement.spaceAfterWhileKeyword": {
             "description": "Whether to add a space after the `while` keyword in a do while statement.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `do {\n} while (condition);`"
@@ -532,7 +493,6 @@
         "exportDeclaration.spaceSurroundingNamedExports": {
             "description": "Whether to add spaces around named exports in an export declaration.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `export { SomeExport, OtherExport };`"
@@ -544,7 +504,6 @@
         "forInStatement.spaceAfterForKeyword": {
             "description": "Whether to add a space after the `for` keyword in a \"for in\" statement.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `for (const prop in obj)`"
@@ -556,7 +515,6 @@
         "forOfStatement.spaceAfterForKeyword": {
             "description": "Whether to add a space after the `for` keyword in a \"for of\" statement.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `for (const value of myArray)`"
@@ -568,7 +526,6 @@
         "forStatement.spaceAfterForKeyword": {
             "description": "Whether to add a space after the `for` keyword in a \"for\" statement.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `for (let i = 0; i < 5; i++)`"
@@ -580,7 +537,6 @@
         "forStatement.spaceAfterSemiColons": {
             "description": "Whether to add a space after the semi-colons in a \"for\" statement.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `for (let i = 0; i < 5; i++)`"
@@ -592,7 +548,6 @@
         "functionDeclaration.spaceBeforeParentheses": {
             "description": "Whether to add a space before the parentheses of a function declaration.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `function myFunction ()`"
@@ -604,7 +559,6 @@
         "functionExpression.spaceBeforeParentheses": {
             "description": "Whether to add a space before the parentheses of a function expression.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `function<T> ()`"
@@ -616,7 +570,6 @@
         "functionExpression.spaceAfterFunctionKeyword": {
             "description": "Whether to add a space after the function keyword of a function expression.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `function <T>()`"
@@ -628,7 +581,6 @@
         "getAccessor.spaceBeforeParentheses": {
             "description": "Whether to add a space before the parentheses of a get accessor.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `get myProp ()`"
@@ -640,7 +592,6 @@
         "ifStatement.spaceAfterIfKeyword": {
             "description": "Whether to add a space after the `if` keyword in an \"if\" statement.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `if (true)`"
@@ -652,7 +603,6 @@
         "importDeclaration.spaceSurroundingNamedImports": {
             "description": "Whether to add spaces around named imports in an import declaration.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `import { SomeExport, OtherExport } from \"my-module\";`"
@@ -664,7 +614,6 @@
         "jsxSelfClosingElement.spaceBeforeSlash": {
             "description": "Whether to add a space before a JSX element's slash when self closing.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `<Test />`"
@@ -676,7 +625,6 @@
         "jsxExpressionContainer.spaceSurroundingExpression": {
             "description": "Whether to add a space surrounding the expression of a JSX container.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `{ myValue }`"
@@ -688,7 +636,6 @@
         "method.spaceBeforeParentheses": {
             "description": "Whether to add a space before the parentheses of a method.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `myMethod ()`"
@@ -700,7 +647,6 @@
         "setAccessor.spaceBeforeParentheses": {
             "description": "Whether to add a space before the parentheses of a set accessor.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `set myProp (value: string)`"
@@ -712,7 +658,6 @@
         "taggedTemplate.spaceBeforeLiteral": {
             "description": "Whether to add a space before the literal in a tagged template.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `html `<element />``"
@@ -724,7 +669,6 @@
         "typeAnnotation.spaceBeforeColon": {
             "description": "Whether to add a space before the colon of a type annotation.",
             "type": "boolean",
-            "default": false,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `function myFunction() : string`"
@@ -736,7 +680,6 @@
         "typeAssertion.spaceBeforeExpression": {
             "description": "Whether to add a space before the expression in a type assertion.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `<string> myValue`"
@@ -748,7 +691,6 @@
         "whileStatement.spaceAfterWhileKeyword": {
             "description": "Whether to add a space after the `while` keyword in a while statement.",
             "type": "boolean",
-            "default": true,
             "oneOf": [{
                     "enum": [true],
                     "description": "Ex. `while (true)`"
@@ -765,12 +707,10 @@
         },
         "lineWidth": {
             "description": "The width of a line the printer will try to stay under. Note that the printer may exceed this width in certain cases.",
-            "default": 120,
             "type": "number"
         },
         "indentWidth": {
             "description": "The number of columns for an indent.",
-            "default": 2,
             "type": "number"
         },
         "useTabs": {
@@ -994,12 +934,10 @@
         },
         "ignoreNodeCommentText": {
             "description": "The text to use for an ignore comment (ex. `// dprint-ignore`).",
-            "default": "dprint-ignore",
             "type": "string"
         },
         "ignoreFileCommentText": {
             "description": "The text to use for a file ignore comment (ex. `// dprint-ignore-file`).",
-            "default": "dprint-ignore-file",
             "type": "string"
         },
         "forInStatement.useBraces": {

package/{lib → dist/lib}/dprint/typescript.d.ts

@@ -5,4 +5,4 @@
  * @param fileText The content of the file.
  * @returns The formatted text or undefined. It's undefined if the formatter doesn't change the text.
  */
-export declare function format(config: Record<string, any>, filePath: string, fileText: string): string | undefined;
+export declare function format(configFile: string, config: Record<string, any>, filePath: string, fileText: string): string | undefined;

package/{lib → dist/lib}/dprint/typescript.js

@@ -1,12 +1,36 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.format = void 0;
+const typescript_1 = __importDefault(require("@dprint/typescript"));
 const debug_1 = __importDefault(require("debug"));
 const fs_1 = __importDefault(require("fs"));
-const typescript_1 = __importDefault(require("@dprint/typescript"));
+const JSONC = __importStar(require("jsonc-parser"));
 const debug = (0, debug_1.default)("eslint:plugin-dprint");
 // Load `dprint-plugin-typescript`.
 const TSPluginPath = typescript_1.default.getPath();
@@ -16,6 +40,7 @@ const TSPlugin = TSPluginInstance.exports;
 const BufferSize = TSPlugin.get_wasm_memory_buffer_size();
 /** Cache to reduce copies of config values. */
 let lastConfig;
+let lastConfigFile;
 /**
  * Format the given text with the given config.
  * @param config The config object.
@@ -23,10 +48,11 @@ let lastConfig;
  * @param fileText The content of the file.
  * @returns The formatted text or undefined. It's undefined if the formatter doesn't change the text.
  */
-function format(config, filePath, fileText) {
-    if (config !== lastConfig) {
-        lastConfig = config;
-        writeConfig(config);
+function format(configFile, config, filePath, fileText) {
+    if (JSON.stringify(config) !== lastConfig || configFile !== lastConfigFile) {
+        lastConfig = JSON.stringify(config);
+        lastConfigFile = configFile;
+        writeConfig(configFile, config);
     }
     writeFilePath(filePath);
     writeString(fileText);
@@ -45,18 +71,36 @@ function format(config, filePath, fileText) {
     }
 }
 exports.format = format;
+function isConfigAllowedType(value) {
+    return ["string", "number", "boolean"].includes(typeof value);
+}
+function extractConfig(config, toConfig) {
+    for (const [key, value] of Object.entries(config)) {
+        if (isConfigAllowedType(value)) {
+            toConfig[key] = value;
+        }
+    }
+}
 /**
  * Write the config to the plugin.
  * @param config The config object.
  */
-function writeConfig(config) {
+function writeConfig(configFile, config) {
     TSPlugin.reset_config();
     // The setting values must be strings.
+    const globalConfig = {};
     const pluginConfig = {};
-    for (const [key, value] of Object.entries(config)) {
-        pluginConfig[key] = String(value);
+    if ((configFile === null || configFile === void 0 ? void 0 : configFile.length) && fs_1.default.existsSync(configFile)) {
+        const configFileContent = fs_1.default.readFileSync(configFile, { encoding: "utf-8" });
+        const configFileJson = JSONC.parse(configFileContent);
+        extractConfig(configFileJson, globalConfig);
+        const typescriptConfig = configFileJson.typescript;
+        if (typeof typescriptConfig === "object") {
+            extractConfig(typescriptConfig, pluginConfig);
+        }
     }
-    writeString("{}");
+    extractConfig(config, pluginConfig);
+    writeString(JSON.stringify(globalConfig));
     TSPlugin.set_global_config();
     writeString(JSON.stringify(pluginConfig));
     TSPlugin.set_plugin_config();

package/dist/lib/dprint/typescript.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../lib/dprint/typescript.ts"],"names":[],"mappings":"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"}

package/dist/lib/rules/dprint.d.ts

@@ -0,0 +1,5 @@
+import { ESLintUtils } from "@typescript-eslint/utils";
+export declare const dprint: ESLintUtils.RuleModule<"requireLinebreak" | "extraLinebreak" | "requireWhitespace" | "extraWhitespace" | "requireCode" | "extraCode" | "replaceWhitespace" | "replaceCode" | "moveCodeToNextLine" | "moveCodeToPrevLine" | "moveCode", {
+    configFile: string;
+    config: {};
+}[], ESLintUtils.RuleListener>;

package/{lib → dist/lib}/rules/dprint.js

@@ -118,26 +118,35 @@ exports.dprint = createRule({
             type: "array",
             items: [{
                     type: "object",
-                    properties: { config: config_schema_json_1.default },
+                    properties: {
+                        configFile: {
+                            type: "string",
+                            default: "dprint.json",
+                            description: "dprint configuration file (default 'dprint.json')",
+                        },
+                        config: config_schema_json_1.default,
+                    },
                     additionalProperties: false,
                 }],
             additionalItems: false,
         },
         type: "layout",
     },
-    defaultOptions: [{ config: {} }],
+    defaultOptions: [{ configFile: "dprint.json", config: {} }],
     create: (context, options) => ({
         Program() {
+            var _a;
             const sourceCode = context.getSourceCode();
             const filePath = context.getFilename();
             const fileText = sourceCode.getText();
+            const configFile = (_a = options[0].configFile) !== null && _a !== void 0 ? _a : "dprint.json";
             const config = options[0].config || {};
             // Needs an absolute path
             if (!filePath || !path_1.default.isAbsolute(filePath)) {
                 return;
             }
             // Does format
-            const formattedText = (0, typescript_1.format)(config, filePath, fileText);
+            const formattedText = (0, typescript_1.format)(configFile, config, filePath, fileText);
             if (typeof formattedText !== "string") {
                 return;
             }

package/{lib → dist/lib}/rules/dprint.js.map

@@ -1 +1 @@
-{"version":3,"file":"dprint.js","sourceRoot":"","sources":["../../../lib/rules/dprint.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dprint.js","sourceRoot":"","sources":["../../../lib/rules/dprint.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,33 +1,32 @@
 {
   "name": "@ben_12/eslint-plugin-dprint",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "An ESLint plugin that fixes code with dprint",
   "engines": {
     "node": ">=18.0.0"
   },
-  "main": "lib/index.js",
+  "main": "dist/lib/index.js",
   "type": "commonjs",
   "files": [
-    "lib"
+    "dist"
   ],
   "peerDependencies": {
     "eslint": ">=5.16.0"
   },
   "dependencies": {
-    "@dprint/typescript": "^0.87.1",
+    "@dprint/typescript": "^0.88.1",
     "debug": "^4.1.1",
-    "diff": "^4.0.2"
+    "diff": "^5.0.0",
+    "jsonc-parser": "^3.2.0"
   },
   "devDependencies": {
-    "@ben_12/eslint-plugin-dprint": "^0.6.0",
+    "@ben_12/eslint-plugin-dprint": "^0.6.1",
     "@types/debug": "^4.1.5",
     "@types/diff": "^5.0.0",
     "@types/node": "^18.0.0",
-    "@types/rimraf": "^4.0.0",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
     "@typescript-eslint/utils": "^6.0.0",
-    "codecov": "^3.7.0",
     "eslint": "^8.50.0",
     "mocha": "^10.0.0",
     "nyc": "^15.0.1",
@@ -37,7 +36,7 @@
     "typescript": "~5.0.0"
   },
   "scripts": {
-    "build": "rimraf dist && tsc -p tsconfig.build.json && shx cp \"{LICENSE,README.md,package.json}\" dist",
+    "build": "rimraf dist && tsc -p tsconfig.build.json",
     "codecov": "nyc report --reporter text-lcov | codecov --pipe --disable=gcov",
     "lint": "eslint --rulesdir scripts/internal-rules \"**/*.ts\"",
     "test": "npm run -s lint && npm run -s test:ci",
@@ -51,6 +50,10 @@
     "type": "git",
     "url": "git+https://github.com/ben12/eslint-plugin-dprint.git"
   },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org",
+    "access": "public"
+  },
   "keywords": [
     "eslint",
     "eslintplugin",
@@ -61,6 +64,5 @@
   "bugs": {
     "url": "https://github.com/ben12/eslint-plugin-dprint/issues"
   },
-  "homepage": "https://github.com/ben12/eslint-plugin-dprint#readme",
-  "funding": "https://github.com/sponsors/ben12"
+  "homepage": "https://eslint-plugin-dprint.ben12.eu"
 }

package/lib/dprint/typescript.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../lib/dprint/typescript.ts"],"names":[],"mappings":"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"}

package/lib/rules/dprint.d.ts

@@ -1,4 +0,0 @@
-import { TSESLint } from "@typescript-eslint/utils";
-export declare const dprint: TSESLint.RuleModule<"requireLinebreak" | "extraLinebreak" | "requireWhitespace" | "extraWhitespace" | "requireCode" | "extraCode" | "replaceWhitespace" | "replaceCode" | "moveCodeToNextLine" | "moveCodeToPrevLine" | "moveCode", {
-    config: {};
-}[], TSESLint.RuleListener>;