@jiakun-zhao/eslint-config 4.0.2 → 4.0.4

package/dist/index.d.mts

@@ -4,7 +4,7 @@ import { FlatGitignoreOptions } from 'eslint-config-flat-gitignore';
 
 /* This file is generated by eslint-typegen, for augmenting rules types in ESLint */
 /* You might want to include this file in tsconfig.json but excluded from git */
-/* eslint-typegen-hash: eIswpN2Lb5CNp7vDuJhKvR7RwFYmqCMwNh9mkHCwgeU */
+/* eslint-typegen-hash: -AUfUQM0_NDYtGZWthHGIFC1_sS_ud0xf_XNyTI_F-8 */
 
 
 
@@ -1182,9 +1182,9 @@ interface RuleOptions {
   'mine/no-blank-before-astro-element'?: Linter.RuleEntry<[]>
   /**
    * Enforce no blank in astro frontmatter start
-   * @see https://example.com/no-blank-in-astro-frontmatter-start
+   * @see https://example.com/no-blank-in-astro-frontmatter-edge
    */
-  'mine/no-blank-in-astro-frontmatter-start'?: Linter.RuleEntry<[]>
+  'mine/no-blank-in-astro-frontmatter-edge'?: Linter.RuleEntry<[]>
   /**
    * Enforce no space in empty object
    * @see https://example.com/no-space-in-empty-block

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { FlatGitignoreOptions } from 'eslint-config-flat-gitignore';
 
 /* This file is generated by eslint-typegen, for augmenting rules types in ESLint */
 /* You might want to include this file in tsconfig.json but excluded from git */
-/* eslint-typegen-hash: eIswpN2Lb5CNp7vDuJhKvR7RwFYmqCMwNh9mkHCwgeU */
+/* eslint-typegen-hash: -AUfUQM0_NDYtGZWthHGIFC1_sS_ud0xf_XNyTI_F-8 */
 
 
 
@@ -1182,9 +1182,9 @@ interface RuleOptions {
   'mine/no-blank-before-astro-element'?: Linter.RuleEntry<[]>
   /**
    * Enforce no blank in astro frontmatter start
-   * @see https://example.com/no-blank-in-astro-frontmatter-start
+   * @see https://example.com/no-blank-in-astro-frontmatter-edge
    */
-  'mine/no-blank-in-astro-frontmatter-start'?: Linter.RuleEntry<[]>
+  'mine/no-blank-in-astro-frontmatter-edge'?: Linter.RuleEntry<[]>
   /**
    * Enforce no space in empty object
    * @see https://example.com/no-space-in-empty-block

package/dist/index.mjs

@@ -135,7 +135,7 @@ async function astro() {
   const pluginAstro = await findDynamicPlugin("eslint-plugin-astro");
   return pluginAstro && createSharedAstroConfig(pluginAstro, {
     "mine/no-blank-before-astro-element": "warn",
-    "mine/no-blank-in-astro-frontmatter-start": "warn"
+    "mine/no-blank-in-astro-frontmatter-edge": "warn"
   });
 }
 function createSharedAstroConfig(plugin, rules = {}) {
@@ -372,23 +372,17 @@ function jsonc() {
   ];
 }
 
-const version = "4.0.2";
+const version = "4.0.4";
 
-const toString = (v) => Object.prototype.toString.call(v);
-const isNull = (val) => toString(val) === "[object Null]";
-
-function isFileStart(node) {
+function isDocumentStart(node) {
   return node.range[0] === 0;
 }
 function isLineStart(node) {
   return node.loc.start.column === 0;
 }
-function numOfBlankLines(left, right) {
+function numOfLines(left, right) {
   return right.loc.start.line - left.loc.end.line;
 }
-function isFrontmatterToken(token) {
-  return token?.value === "---";
-}
 
 const name$2 = "no-blank-before-astro-element";
 const _noBlankBeforeAstroElement = createRule({
@@ -408,13 +402,13 @@ const _noBlankBeforeAstroElement = createRule({
     return {
       AstroFragment(node) {
         const token = context.sourceCode.getTokenBefore(node);
-        if (isNull(token) && !isFileStart(node)) {
+        if (!token && !isDocumentStart(node)) {
           context.report({
             fix: (fixer) => fixer.removeRange([0, node.range[0]]),
             loc: { start: { line: 1, column: 0 }, end: node.loc.start },
             messageId: "unexpectedBlank"
           });
-        } else if (isFrontmatterToken(token) && (!isLineStart(node) || numOfBlankLines(token, node) !== 2)) {
+        } else if (token && token.value === "---" && (!isLineStart(node) || numOfLines(token, node) !== 2)) {
           context.report({
             fix: (fixer) => fixer.replaceTextRange([token.range[1], node.range[0]], "\n\n"),
             loc: { start: token.loc.end, end: node.loc.start },
@@ -426,8 +420,8 @@ const _noBlankBeforeAstroElement = createRule({
   }
 });
 
-const name$1 = "no-blank-in-astro-frontmatter-start";
-const _noBlankInAstroFrontmatterStart = createRule({
+const name$1 = "no-blank-in-astro-frontmatter-edge";
+const _noBlankInAstroFrontmatterEdge = createRule({
   name: name$1,
   meta: {
     docs: {
@@ -444,13 +438,23 @@ const _noBlankInAstroFrontmatterStart = createRule({
     return {
       Program(node) {
         const [first, next] = context.sourceCode.getFirstTokens(node, { count: 2 });
-        if (isFrontmatterToken(first) && next && next.loc.start.line !== 2) {
+        if (first && first.value === "---" && next && next.loc.start.line !== 2) {
           context.report({
             fix: (fixer) => fixer.replaceTextRange([3, next.range[0]], "\n"),
             loc: { start: { line: 1, column: 0 }, end: next.loc.start },
             messageId: "unexpectedBlank"
           });
         }
+      },
+      AstroFragment(node) {
+        const [left, right] = context.sourceCode.getTokensBefore(node, { count: 2 });
+        if (right && right.value === "---" && left && left.value !== "---" && numOfLines(left, right) !== 1) {
+          context.report({
+            fix: (fixer) => fixer.replaceTextRange([left.range[1], right.range[0]], "\n"),
+            loc: { start: left.loc.end, end: right.loc.start },
+            messageId: "unexpectedBlank"
+          });
+        }
       }
     };
   }
@@ -506,7 +510,7 @@ const _noSpaceInEmptyObject = createRule({
 const rules = {
   [name]: _noSpaceInEmptyObject,
   [name$2]: _noBlankBeforeAstroElement,
-  [name$1]: _noBlankInAstroFrontmatterStart
+  [name$1]: _noBlankInAstroFrontmatterEdge
 };
 const pluginMine = {
   meta: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jiakun-zhao/eslint-config",
   "type": "module",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "description": "Jiakun Zhao's ESLint config.",
   "author": "Jiakun Zhao <hi@zhaojiakun.com>",
   "license": "MIT",
@@ -69,7 +69,7 @@
   "scripts": {
     "build": "unbuild",
     "dev": "config-inspector --open=false",
-    "release": "bumpp && pnpm publish && npx cnpm sync @jiakun-zhao/eslint-config",
+    "release": "pnpm typegen && bumpp && pnpm publish && npx cnpm sync @jiakun-zhao/eslint-config",
     "stub": "unbuild --stub",
     "test": "vitest",
     "typegen": "tsx ./scripts/typegen.ts"