@tai-kun/vp-lint-plugins 0.0.3 → 0.0.5

package/dist/src/index.d.ts

@@ -1,15 +1,11 @@
-export { default as blankLineAfterControlBlock } from "./rules/blank-line-after-control-block.js";
-export { default as blankLineAfterDeclaration } from "./rules/blank-line-after-declaration.js";
-export { default as blankLineAfterVariableDeclaration } from "./rules/blank-line-after-variable-declaration.js";
-export { default as blankLineBeforeReturn } from "./rules/blank-line-before-return.js";
-export { default as blankLineBetweenClassMembers } from "./rules/blank-line-between-class-members.js";
-export { default as blankLineBetweenSwitchCases } from "./rules/blank-line-between-switch-cases.js";
+export { default as blankLine } from "./rules/blank-line.js";
 export { default as commentJapaneseSpacing } from "./rules/comment-japanese-spacing.js";
 export { default as commentOneSentencePerLine } from "./rules/comment-one-sentence-per-line.js";
 export { default as jsdocParamOrder } from "./rules/jsdoc-param-order.js";
 export { default as jsdocTagLines } from "./rules/jsdoc-tag-lines.js";
 export { default as jsdocTagOrder } from "./rules/jsdoc-tag-order.js";
 export { default as memberOrdering } from "./rules/member-ordering.js";
+export { default as mergeImports } from "./rules/merge-imports.js";
 export { default as objectPropertiesNewline } from "./rules/object-properties-newline.js";
 export { default as overloadSignaturesAdjacent } from "./rules/overload-signatures-adjacent.js";
 export { default as sortImportExportSpecifiers } from "./rules/sort-import-export-specifiers.js";

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAClG,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AAC/F,OAAO,EAAE,OAAO,IAAI,iCAAiC,EAAE,MAAM,kDAAkD,CAAC;AAChH,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AACvF,OAAO,EAAE,OAAO,IAAI,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AACtG,OAAO,EAAE,OAAO,IAAI,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AACpG,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AAChG,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,OAAO,IAAI,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC1F,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AAChG,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AACjG,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACpF,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,4BAA4B,EAAE,MAAM,4CAA4C,CAAC;AAErG,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AAChG,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC1F,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AAChG,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AACjG,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACpF,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,4BAA4B,EAAE,MAAM,4CAA4C,CAAC;AAErG,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC"}

package/dist/src/index.js

@@ -1,15 +1,11 @@
-export { default as blankLineAfterControlBlock } from "./rules/blank-line-after-control-block.js";
-export { default as blankLineAfterDeclaration } from "./rules/blank-line-after-declaration.js";
-export { default as blankLineAfterVariableDeclaration } from "./rules/blank-line-after-variable-declaration.js";
-export { default as blankLineBeforeReturn } from "./rules/blank-line-before-return.js";
-export { default as blankLineBetweenClassMembers } from "./rules/blank-line-between-class-members.js";
-export { default as blankLineBetweenSwitchCases } from "./rules/blank-line-between-switch-cases.js";
+export { default as blankLine } from "./rules/blank-line.js";
 export { default as commentJapaneseSpacing } from "./rules/comment-japanese-spacing.js";
 export { default as commentOneSentencePerLine } from "./rules/comment-one-sentence-per-line.js";
 export { default as jsdocParamOrder } from "./rules/jsdoc-param-order.js";
 export { default as jsdocTagLines } from "./rules/jsdoc-tag-lines.js";
 export { default as jsdocTagOrder } from "./rules/jsdoc-tag-order.js";
 export { default as memberOrdering } from "./rules/member-ordering.js";
+export { default as mergeImports } from "./rules/merge-imports.js";
 export { default as objectPropertiesNewline } from "./rules/object-properties-newline.js";
 export { default as overloadSignaturesAdjacent } from "./rules/overload-signatures-adjacent.js";
 export { default as sortImportExportSpecifiers } from "./rules/sort-import-export-specifiers.js";

package/dist/src/plugin.js

@@ -1,16 +1,12 @@
 import { definePlugin } from "vite-plus/lint/plugins";
-import blankLineAfterControlBlock from "./rules/blank-line-after-control-block.js";
-import blankLineAfterDeclaration from "./rules/blank-line-after-declaration.js";
-import blankLineAfterVariableDeclaration from "./rules/blank-line-after-variable-declaration.js";
-import blankLineBeforeReturn from "./rules/blank-line-before-return.js";
-import blankLineBetweenClassMembers from "./rules/blank-line-between-class-members.js";
-import blankLineBetweenSwitchCases from "./rules/blank-line-between-switch-cases.js";
+import blankLine from "./rules/blank-line.js";
 import commentJapaneseSpacing from "./rules/comment-japanese-spacing.js";
 import commentOneSentencePerLine from "./rules/comment-one-sentence-per-line.js";
 import jsdocParamOrder from "./rules/jsdoc-param-order.js";
 import jsdocTagLines from "./rules/jsdoc-tag-lines.js";
 import jsdocTagOrder from "./rules/jsdoc-tag-order.js";
 import memberOrdering from "./rules/member-ordering.js";
+import mergeImports from "./rules/merge-imports.js";
 import objectPropertiesNewline from "./rules/object-properties-newline.js";
 import overloadSignaturesAdjacent from "./rules/overload-signatures-adjacent.js";
 import sortImportExportSpecifiers from "./rules/sort-import-export-specifiers.js";
@@ -22,6 +18,8 @@ import typeLiteralPropertiesNewline from "./rules/type-literal-properties-newlin
 export default definePlugin({
     meta: { name: "tai-kun" },
     rules: {
+        "blank-line": blankLine,
+        "merge-imports": mergeImports,
         "sort-jsx-props": sortJsxProps,
         "spaced-comment": spacedComment,
         "jsdoc-tag-lines": jsdocTagLines,
@@ -30,17 +28,11 @@ export default definePlugin({
         "jsdoc-param-order": jsdocParamOrder,
         "sort-type-members": sortTypeMembers,
         "sort-object-properties": sortObjectProperties,
-        "blank-line-before-return": blankLineBeforeReturn,
         "comment-japanese-spacing": commentJapaneseSpacing,
         "object-properties-newline": objectPropertiesNewline,
-        "blank-line-after-declaration": blankLineAfterDeclaration,
         "overload-signatures-adjacent": overloadSignaturesAdjacent,
         "comment-one-sentence-per-line": commentOneSentencePerLine,
         "sort-import-export-specifiers": sortImportExportSpecifiers,
-        "blank-line-after-control-block": blankLineAfterControlBlock,
-        "blank-line-between-switch-cases": blankLineBetweenSwitchCases,
         "type-literal-properties-newline": typeLiteralPropertiesNewline,
-        "blank-line-between-class-members": blankLineBetweenClassMembers,
-        "blank-line-after-variable-declaration": blankLineAfterVariableDeclaration,
     },
 });

package/dist/src/rules/blank-line-utils.d.ts

@@ -0,0 +1,30 @@
+import type { Fix, Fixer, ESTree, Comment, SourceCode } from "vite-plus/lint/plugins";
+declare function getNextStatement(node: ESTree.Node): ESTree.Node | null;
+declare function getPreviousStatement(node: ESTree.Node): ESTree.Node | null;
+/**
+ * 空行の挿入位置を返します。
+ *
+ * 次の文に付くコメントがある場合は、そのコメントの前を挿入位置にします。
+ * 同じ行の末尾コメントは対象外です。
+ */
+declare function getInsertionTarget(node: ESTree.Node, nextStatement: ESTree.Node, sourceCode: SourceCode): ESTree.Node | Comment;
+declare function hasBlankLine(node: ESTree.Node, target: ESTree.Node | Comment): boolean;
+/**
+ * 挿入対象がコメントかどうかを返します。
+ *
+ * コメントを挟む場合、前後の空行は任意とします。
+ */
+declare function isComment(target: ESTree.Node | Comment): target is Comment;
+/**
+ * JSDoc 形式のブロックコメント（`/**` で始まる）かどうかを返します。
+ *
+ * JSDoc 形式のブロックコメントの 1 行上は空行にします。
+ */
+declare function isDocComment(target: ESTree.Node | Comment): target is Comment;
+declare function getBlankLineFix(fixer: Fixer, sourceCode: SourceCode, node: ESTree.Node, target: ESTree.Node | Comment): Fix | null;
+/**
+ * 指定したノードと対象の間の空行を削除します。
+ */
+declare function getRemoveBlankLineFix(fixer: Fixer, sourceCode: SourceCode, node: ESTree.Node, target: ESTree.Node | Comment): Fix | null;
+export { isComment, hasBlankLine, isDocComment, getBlankLineFix, getNextStatement, getInsertionTarget, getPreviousStatement, getRemoveBlankLineFix, };
+//# sourceMappingURL=blank-line-utils.d.ts.map

package/dist/src/rules/blank-line-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"blank-line-utils.d.ts","sourceRoot":"","sources":["../../../src/rules/blank-line-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4BtF,iBAAS,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,CAc/D;AAED,iBAAS,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,CAcnE;AAED;;;;;GAKG;AACH,iBAAS,kBAAkB,CACzB,IAAI,EAAE,MAAM,CAAC,IAAI,EACjB,aAAa,EAAE,MAAM,CAAC,IAAI,EAC1B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,IAAI,GAAG,OAAO,CAWvB;AAED,iBAAS,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,GAAG,OAAO,CAE/E;AAED;;;;GAIG;AACH,iBAAS,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,GAAG,MAAM,IAAI,OAAO,CAInE;AAED;;;;GAIG;AACH,iBAAS,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,GAAG,MAAM,IAAI,OAAO,CAEtE;AAED,iBAAS,eAAe,CACtB,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,CAAC,IAAI,EACjB,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,GAC5B,GAAG,GAAG,IAAI,CAYZ;AAED;;GAEG;AACH,iBAAS,qBAAqB,CAC5B,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,CAAC,IAAI,EACjB,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,GAC5B,GAAG,GAAG,IAAI,CAmBZ;AAED,OAAO,EACL,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,GACtB,CAAC"}

package/dist/src/rules/blank-line-utils.js

@@ -0,0 +1,103 @@
+/**
+ * 文の配列を持つ親から、その文が属する配列を取得します。
+ */
+function getStatementBody(node) {
+    const { parent } = node;
+    if (parent === null) {
+        return null;
+    }
+    if (parent.type === "Program" ||
+        parent.type === "BlockStatement" ||
+        parent.type === "StaticBlock" ||
+        parent.type === "TSModuleBlock") {
+        return parent.body;
+    }
+    if (parent.type === "SwitchCase") {
+        return parent.consequent;
+    }
+    return null;
+}
+function getNextStatement(node) {
+    const body = getStatementBody(node);
+    if (body === null) {
+        return null;
+    }
+    const index = body.indexOf(node);
+    if (index === -1 || index === body.length - 1) {
+        return null;
+    }
+    return body[index + 1] ?? null;
+}
+function getPreviousStatement(node) {
+    const body = getStatementBody(node);
+    if (body === null) {
+        return null;
+    }
+    const index = body.indexOf(node);
+    if (index <= 0) {
+        return null;
+    }
+    return body[index - 1] ?? null;
+}
+/**
+ * 空行の挿入位置を返します。
+ *
+ * 次の文に付くコメントがある場合は、そのコメントの前を挿入位置にします。
+ * 同じ行の末尾コメントは対象外です。
+ */
+function getInsertionTarget(node, nextStatement, sourceCode) {
+    return (sourceCode
+        .getAllComments()
+        .find((comment) => comment.range[0] >= node.range[1] &&
+        comment.range[1] <= nextStatement.range[0] &&
+        comment.loc.start.line > node.loc.end.line) ?? nextStatement);
+}
+function hasBlankLine(node, target) {
+    return target.loc.start.line > node.loc.end.line + 1;
+}
+/**
+ * 挿入対象がコメントかどうかを返します。
+ *
+ * コメントを挟む場合、前後の空行は任意とします。
+ */
+function isComment(target) {
+    const { type } = target;
+    return type === "Line" || type === "Block" || type === "Shebang";
+}
+/**
+ * JSDoc 形式のブロックコメント（`/**` で始まる）かどうかを返します。
+ *
+ * JSDoc 形式のブロックコメントの 1 行上は空行にします。
+ */
+function isDocComment(target) {
+    return isComment(target) && target.type === "Block" && target.value.startsWith("*");
+}
+function getBlankLineFix(fixer, sourceCode, node, target) {
+    if (target.loc.start.line === node.loc.end.line) {
+        return fixer.insertTextAfterRange([node.range[1], node.range[1]], "\n\n");
+    }
+    const lineEnd = sourceCode.text.indexOf("\n", node.range[1]);
+    if (lineEnd === -1) {
+        return null;
+    }
+    return fixer.insertTextBeforeRange([lineEnd, lineEnd + 1], "\n");
+}
+/**
+ * 指定したノードと対象の間の空行を削除します。
+ */
+function getRemoveBlankLineFix(fixer, sourceCode, node, target) {
+    if (target.loc.start.line <= node.loc.end.line + 1) {
+        return null;
+    }
+    const fromLineEnd = sourceCode.text.indexOf("\n", node.range[1]);
+    if (fromLineEnd === -1) {
+        return null;
+    }
+    const targetLineStart = sourceCode.text.lastIndexOf("\n", target.range[0]) + 1;
+    const indent = sourceCode.text.slice(targetLineStart, target.range[0]);
+    if (indent.trim() !== "") {
+        return null;
+    }
+    return fixer.replaceTextRange([fromLineEnd, target.range[0]], `\n${indent}`);
+}
+export { isComment, hasBlankLine, isDocComment, getBlankLineFix, getNextStatement, getInsertionTarget, getPreviousStatement, getRemoveBlankLineFix, };

package/dist/src/rules/blank-line.d.ts

@@ -1,18 +1,9 @@
-import type { Fix, Fixer, ESTree, Comment, SourceCode } from "vite-plus/lint/plugins";
-declare function getNextStatement(node: ESTree.Node): ESTree.Node | null;
-declare function getPreviousStatement(node: ESTree.Node): ESTree.Node | null;
 /**
- * 空行の挿入位置を返します。
+ * 宣言・制御ブロック・変数宣言グループ・return・クラスや型のメンバー・switch の case における空行を、1 つのルールでまとめて扱います。
  *
- * 次の文に付くコメントがある場合は、そのコメントの前を挿入位置にします。
- * 同じ行の末尾コメントは対象外です。
+ * 文の境界ごとに該当する項目を 1 つだけ判定するため、複数の診断が同じ箇所で矛盾しません。
+ * 行コメントや通常のブロックコメントを挟む場合、前後の空行は任意とします。
  */
-declare function getInsertionTarget(node: ESTree.Node, nextStatement: ESTree.Node, sourceCode: SourceCode): ESTree.Node | Comment;
-declare function hasBlankLine(node: ESTree.Node, target: ESTree.Node | Comment): boolean;
-declare function getBlankLineFix(fixer: Fixer, sourceCode: SourceCode, node: ESTree.Node, target: ESTree.Node | Comment): Fix | null;
-/**
- * 指定したノードと対象の間の空行を削除します。
- */
-declare function getRemoveBlankLineFix(fixer: Fixer, sourceCode: SourceCode, node: ESTree.Node, target: ESTree.Node | Comment): Fix | null;
-export { hasBlankLine, getBlankLineFix, getNextStatement, getInsertionTarget, getPreviousStatement, getRemoveBlankLineFix, };
+declare const blankLine: import("vite-plus/lint/plugins").Rule;
+export default blankLine;
 //# sourceMappingURL=blank-line.d.ts.map

package/dist/src/rules/blank-line.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blank-line.d.ts","sourceRoot":"","sources":["../../../src/rules/blank-line.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4BtF,iBAAS,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,CAc/D;AAED,iBAAS,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,CAcnE;AAED;;;;;GAKG;AACH,iBAAS,kBAAkB,CACzB,IAAI,EAAE,MAAM,CAAC,IAAI,EACjB,aAAa,EAAE,MAAM,CAAC,IAAI,EAC1B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,IAAI,GAAG,OAAO,CAWvB;AAED,iBAAS,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,GAAG,OAAO,CAE/E;AAED,iBAAS,eAAe,CACtB,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,CAAC,IAAI,EACjB,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,GAC5B,GAAG,GAAG,IAAI,CAYZ;AAED;;GAEG;AACH,iBAAS,qBAAqB,CAC5B,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,CAAC,IAAI,EACjB,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,GAC5B,GAAG,GAAG,IAAI,CAmBZ;AAED,OAAO,EACL,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,GACtB,CAAC"}
+{"version":3,"file":"blank-line.d.ts","sourceRoot":"","sources":["../../../src/rules/blank-line.ts"],"names":[],"mappings":"AAoPA;;;;;GAKG;AACH,QAAA,MAAM,SAAS,uCA4Vb,CAAC;eAEY,SAAS"}