7 Commits

Author SHA1 Message Date
876384344c feat: add support for markdownlint v0.38.0 2025-05-11 16:45:14 +02:00
70bdb7013e style: fix prettier 2024-12-28 23:15:32 +01:00
db57d67b0b fix: use .markdownlint-cli2.mjs for the configuration file 2024-12-28 23:13:48 +01:00
aa24db4fac feat: usage of ESM modules imports (instead of CommonJS)
Fixes #10

BREAKING CHANGE: This package is now pure ESM

BREAKING CHANGE: minimum supported Node.js >= 22.0.0
2024-12-28 22:52:51 +01:00
b4a04d2e8e chore: remove not needed npm engine requirement 2024-11-11 20:34:22 +01:00
54e45d3e5d build(deps): update latest 2024-11-11 13:24:45 +01:00
dd70d6da3a chore: remove usage of git hooks (husky, lint-staged, commitlint) + usage of node --run 2024-09-07 00:03:10 +02:00
26 changed files with 4044 additions and 4853 deletions

View File

@ -1 +0,0 @@
{ "extends": ["@commitlint/config-conventional"] }

View File

@ -1,11 +0,0 @@
{
"extends": ["conventions", "prettier"],
"plugins": ["prettier", "import", "unicorn"],
"parserOptions": {
"project": "./tsconfig.json"
},
"rules": {
"prettier/prettier": "error",
"import/extensions": ["error", "always"]
}
}

View File

@ -4,16 +4,16 @@ on:
push: push:
branches: [develop] branches: [develop]
pull_request: pull_request:
branches: [master, develop] branches: [main, develop]
jobs: jobs:
lint: lint:
runs-on: "ubuntu-latest" runs-on: "ubuntu-latest"
steps: steps:
- uses: "actions/checkout@v4.1.1" - uses: "actions/checkout@v4.2.2"
- name: "Setup Node.js" - name: "Setup Node.js"
uses: "actions/setup-node@v4.0.2" uses: "actions/setup-node@v4.1.0"
with: with:
node-version: "lts/*" node-version: "lts/*"
cache: "npm" cache: "npm"
@ -21,9 +21,15 @@ jobs:
- name: "Install dependencies" - name: "Install dependencies"
run: "npm clean-install" run: "npm clean-install"
- run: 'npm run lint:commit -- --to "${{ github.sha }}"' - run: "node --run lint:editorconfig"
- run: "npm run lint:editorconfig" - run: "node --run lint:markdown"
- run: "npm run lint:markdown" - run: "node --run lint:eslint"
- run: "npm run lint:eslint" - run: "node --run lint:prettier"
- run: "npm run lint:prettier" - run: "node --run lint:typescript"
- run: "npm run lint:javascript"
commitlint:
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v4.2.2"
- uses: "wagoid/commitlint-github-action@v6.2.0"

View File

@ -2,7 +2,7 @@ name: "Release"
on: on:
push: push:
branches: [master] branches: [main]
jobs: jobs:
release: release:
@ -13,13 +13,13 @@ jobs:
pull-requests: "write" pull-requests: "write"
id-token: "write" id-token: "write"
steps: steps:
- uses: "actions/checkout@v4.1.1" - uses: "actions/checkout@v4.2.2"
with: with:
fetch-depth: 0 fetch-depth: 0
persist-credentials: false persist-credentials: false
- name: "Setup Node.js" - name: "Setup Node.js"
uses: "actions/setup-node@v4.0.2" uses: "actions/setup-node@v4.1.0"
with: with:
node-version: "lts/*" node-version: "lts/*"
cache: "npm" cache: "npm"
@ -31,7 +31,7 @@ jobs:
run: "npm audit signatures" run: "npm audit signatures"
- name: "Release" - name: "Release"
run: "npm run release" run: "node --run release"
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

View File

@ -4,16 +4,16 @@ on:
push: push:
branches: [develop] branches: [develop]
pull_request: pull_request:
branches: [master, develop] branches: [main, develop]
jobs: jobs:
test: test:
runs-on: "ubuntu-latest" runs-on: "ubuntu-latest"
steps: steps:
- uses: "actions/checkout@v4.1.1" - uses: "actions/checkout@v4.2.2"
- name: "Setup Node.js" - name: "Setup Node.js"
uses: "actions/setup-node@v4.0.2" uses: "actions/setup-node@v4.1.0"
with: with:
node-version: "lts/*" node-version: "lts/*"
cache: "npm" cache: "npm"
@ -22,4 +22,4 @@ jobs:
run: "npm clean-install" run: "npm clean-install"
- name: "Test" - name: "Test"
run: "npm run test" run: "node --run test"

4
.gitignore vendored
View File

@ -20,10 +20,6 @@ npm-debug.log*
# IDE - VSCode # IDE - VSCode
.vscode/* .vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
# misc # misc
.DS_Store .DS_Store

View File

@ -1,3 +0,0 @@
#!/usr/bin/env sh
npm run lint:commit -- --edit

View File

@ -1,5 +0,0 @@
#!/usr/bin/env sh
npm run lint:staged
npm run lint:javascript
npm run test

View File

@ -1,7 +0,0 @@
{
"**/*": ["editorconfig-checker", "prettier --write --ignore-unknown"],
"**/*.md": ["markdownlint-cli2 --fix --no-globs"],
"**/*.{js,jsx,ts,tsx}": [
"eslint --fix --max-warnings 0 --report-unused-disable-directives"
]
}

View File

@ -1,11 +0,0 @@
{
"config": {
"extends": "markdownlint/style/prettier",
"default": true,
"relative-links": true,
"no-inline-html": false,
},
"globs": ["**/*.md"],
"ignores": ["**/node_modules", "**/test/fixtures/**"],
"customRules": ["./src/index.js"],
}

18
.markdownlint-cli2.mjs Normal file
View File

@ -0,0 +1,18 @@
import relativeLinksRule, { markdownIt } from "./src/index.js"
const config = {
config: {
extends: "markdownlint/style/prettier",
default: true,
"relative-links": true,
"no-inline-html": false,
},
globs: ["**/*.md"],
ignores: ["**/node_modules", "**/test/fixtures/**"],
customRules: [relativeLinksRule],
markdownItFactory: () => {
return markdownIt
},
}
export default config

4
.npmrc
View File

@ -1,2 +1,2 @@
save-exact=true save-exact = true
provenance=true provenance = true

View File

@ -1,18 +1,8 @@
{ {
"branches": ["master"], "branches": ["main", { "name": "beta", "prerelease": true }],
"plugins": [ "plugins": [
[
"@semantic-release/commit-analyzer", "@semantic-release/commit-analyzer",
{
"preset": "conventionalcommits"
}
],
[
"@semantic-release/release-notes-generator", "@semantic-release/release-notes-generator",
{
"preset": "conventionalcommits"
}
],
"@semantic-release/npm", "@semantic-release/npm",
"@semantic-release/github" "@semantic-release/github"
] ]

View File

@ -1,8 +0,0 @@
{
"recommendations": [
"editorconfig.editorconfig",
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint",
"davidanson.vscode-markdownlint"
]
}

View File

@ -1,8 +0,0 @@
{
"editor.defaultFormatter": "esbenp.prettier-vscode",
"prettier.configPath": ".prettierrc.json",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll": "explicit"
}
}

View File

@ -66,7 +66,7 @@ Contributions are welcome to improve the rule, and to alleviate these limitation
## Prerequisites ## Prerequisites
[Node.js](https://nodejs.org/) >= 16.0.0 [Node.js](https://nodejs.org/) >= 22.0.0
## Installation ## Installation
@ -80,18 +80,25 @@ There are various ways [markdownlint](https://github.com/DavidAnson/markdownlint
We recommend configuring [markdownlint-cli2](https://github.com/DavidAnson/markdownlint-cli2) over [markdownlint-cli](https://github.com/igorshubovych/markdownlint-cli) for compatibility with the [vscode-markdownlint](https://github.com/DavidAnson/vscode-markdownlint) extension. We recommend configuring [markdownlint-cli2](https://github.com/DavidAnson/markdownlint-cli2) over [markdownlint-cli](https://github.com/igorshubovych/markdownlint-cli) for compatibility with the [vscode-markdownlint](https://github.com/DavidAnson/vscode-markdownlint) extension.
`.markdownlint-cli2.jsonc` `.markdownlint-cli2.mjs`
```json ```js
{ import relativeLinksRule, { markdownIt } from "markdownlint-rule-relative-links"
"config": {
"default": true, const config = {
"relative-links": true config: {
default: true,
"relative-links": true,
},
globs: ["**/*.md"],
ignores: ["**/node_modules"],
customRules: [relativeLinksRule],
markdownItFactory: () => {
return markdownIt
}, },
"globs": ["**/*.md"],
"ignores": ["**/node_modules"],
"customRules": ["markdownlint-rule-relative-links"]
} }
export default config
``` ```
`package.json` `package.json`
@ -107,7 +114,7 @@ We recommend configuring [markdownlint-cli2](https://github.com/DavidAnson/markd
## Usage ## Usage
```sh ```sh
npm run lint:markdown node --run lint:markdown
``` ```
## 💡 Contributing ## 💡 Contributing

13
eslint.config.js Normal file
View File

@ -0,0 +1,13 @@
import typescriptESLint from "typescript-eslint"
import configConventions from "eslint-config-conventions"
export default typescriptESLint.config(...configConventions, {
files: ["**/*.ts", "**/*.tsx"],
languageOptions: {
parser: typescriptESLint.parser,
parserOptions: {
projectService: true,
tsconfigRootDir: import.meta.dirname,
},
},
})

8572
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -18,6 +18,8 @@
"markdownlint-rule" "markdownlint-rule"
], ],
"main": "src/index.js", "main": "src/index.js",
"types": "src/index.d.ts",
"type": "module",
"files": [ "files": [
"src" "src"
], ],
@ -26,46 +28,35 @@
"provenance": true "provenance": true
}, },
"engines": { "engines": {
"node": ">=16.0.0", "node": ">=22.0.0"
"npm": ">=9.0.0"
}, },
"scripts": { "scripts": {
"lint:commit": "commitlint",
"lint:editorconfig": "editorconfig-checker", "lint:editorconfig": "editorconfig-checker",
"lint:markdown": "markdownlint-cli2", "lint:markdown": "markdownlint-cli2",
"lint:eslint": "eslint . --max-warnings 0 --report-unused-disable-directives --ignore-path .gitignore", "lint:eslint": "eslint . --max-warnings 0",
"lint:prettier": "prettier . --check --ignore-path .gitignore", "lint:prettier": "prettier . --check",
"lint:javascript": "tsc --project jsconfig.json --noEmit", "lint:typescript": "tsc --noEmit",
"lint:staged": "lint-staged",
"test": "node --test", "test": "node --test",
"release": "semantic-release", "release": "semantic-release"
"postinstall": "husky",
"prepublishOnly": "pinst --disable",
"postpublish": "pinst --enable"
}, },
"dependencies": { "dependencies": {
"markdown-it": "14.1.0" "markdown-it": "14.1.0"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "19.2.2", "@types/markdown-it": "14.1.2",
"@commitlint/config-conventional": "19.2.2", "@types/node": "22.15.17",
"@types/markdown-it": "14.1.1", "editorconfig-checker": "6.0.1",
"@types/node": "20.12.12", "eslint": "9.26.0",
"editorconfig-checker": "5.1.5", "eslint-config-conventions": "19.2.0",
"eslint": "8.57.0", "eslint-plugin-promise": "7.2.1",
"eslint-config-conventions": "14.2.0", "eslint-plugin-unicorn": "59.0.1",
"eslint-config-prettier": "9.1.0", "eslint-plugin-import-x": "4.11.1",
"eslint-plugin-import": "2.29.1", "globals": "16.1.0",
"eslint-plugin-prettier": "5.1.3", "markdownlint": "0.38.0",
"eslint-plugin-promise": "6.2.0", "markdownlint-cli2": "0.18.0",
"eslint-plugin-unicorn": "53.0.0", "prettier": "3.5.3",
"husky": "9.0.11", "semantic-release": "24.2.3",
"lint-staged": "15.2.5", "typescript-eslint": "8.32.0",
"markdownlint": "0.34.0", "typescript": "5.8.3"
"markdownlint-cli2": "0.13.0",
"pinst": "3.0.0",
"prettier": "3.2.5",
"semantic-release": "23.1.1",
"typescript": "5.4.5"
} }
} }

8
src/index.d.ts vendored Normal file
View File

@ -0,0 +1,8 @@
import type MarkdownIt from "markdown-it"
import type { Rule } from "markdownlint"
declare const relativeLinksRule: Rule
export default relativeLinksRule
declare const markdownIt: MarkdownIt
export { markdownIt }

View File

@ -1,10 +1,8 @@
"use strict" import { pathToFileURL } from "node:url"
import fs from "node:fs"
const { pathToFileURL } = require("node:url") import { filterTokens } from "./markdownlint-rule-helpers/helpers.js"
const fs = require("node:fs") import {
const { filterTokens } = require("./markdownlint-rule-helpers/helpers.js")
const {
convertHeadingToHTMLFragment, convertHeadingToHTMLFragment,
getMarkdownHeadings, getMarkdownHeadings,
getMarkdownIdOrAnchorNameFragments, getMarkdownIdOrAnchorNameFragments,
@ -12,14 +10,16 @@ const {
getNumberOfLines, getNumberOfLines,
getLineNumberStringFromFragment, getLineNumberStringFromFragment,
lineFragmentRe, lineFragmentRe,
} = require("./utils.js") } from "./utils.js"
export { markdownIt } from "./utils.js"
/** @typedef {import('markdownlint').Rule} MarkdownLintRule */ /** @typedef {import('markdownlint').Rule} MarkdownLintRule */
/** /**
* @type {MarkdownLintRule} * @type {MarkdownLintRule}
*/ */
const customRule = { const relativeLinksRule = {
names: ["relative-links"], names: ["relative-links"],
description: "Relative links should be valid", description: "Relative links should be valid",
tags: ["links"], tags: ["links"],
@ -172,4 +172,4 @@ const customRule = {
}, },
} }
module.exports = customRule export default relativeLinksRule

View File

@ -14,7 +14,7 @@
* @param {(token: MarkdownItToken) => void} handler Callback function. * @param {(token: MarkdownItToken) => void} handler Callback function.
* @returns {void} * @returns {void}
*/ */
const filterTokens = (params, type, handler) => { export const filterTokens = (params, type, handler) => {
for (const token of params.parsers.markdownit.tokens) { for (const token of params.parsers.markdownit.tokens) {
if (token.type === type) { if (token.type === type) {
handler(token) handler(token)
@ -28,11 +28,6 @@ const filterTokens = (params, type, handler) => {
* @param {string} name HTML attribute name. * @param {string} name HTML attribute name.
* @returns {RegExp} Regular Expression for matching. * @returns {RegExp} Regular Expression for matching.
*/ */
const getHtmlAttributeRe = (name) => { export const getHtmlAttributeRe = (name) => {
return new RegExp(`\\s${name}\\s*=\\s*['"]?([^'"\\s>]*)`, "iu") return new RegExp(`\\s${name}\\s*=\\s*['"]?([^'"\\s>]*)`, "iu")
} }
module.exports = {
filterTokens,
getHtmlAttributeRe,
}

View File

@ -1,10 +1,10 @@
const MarkdownIt = require("markdown-it") import MarkdownIt from "markdown-it"
const { getHtmlAttributeRe } = require("./markdownlint-rule-helpers/helpers.js") import { getHtmlAttributeRe } from "./markdownlint-rule-helpers/helpers.js"
const markdownIt = new MarkdownIt({ html: true }) export const markdownIt = new MarkdownIt({ html: true })
const lineFragmentRe = /^#(?:L\d+(?:C\d+)?-L\d+(?:C\d+)?|L\d+)$/ export const lineFragmentRe = /^#(?:L\d+(?:C\d+)?-L\d+(?:C\d+)?|L\d+)$/
/** /**
* Converts a Markdown heading into an HTML fragment according to the rules * Converts a Markdown heading into an HTML fragment according to the rules
@ -14,7 +14,7 @@ const lineFragmentRe = /^#(?:L\d+(?:C\d+)?-L\d+(?:C\d+)?|L\d+)$/
* @param {string} inlineText Inline token for heading. * @param {string} inlineText Inline token for heading.
* @returns {string} Fragment string for heading. * @returns {string} Fragment string for heading.
*/ */
const convertHeadingToHTMLFragment = (inlineText) => { export const convertHeadingToHTMLFragment = (inlineText) => {
return ( return (
"#" + "#" +
encodeURIComponent( encodeURIComponent(
@ -40,7 +40,7 @@ const ignoredTokens = new Set(["heading_open", "heading_close"])
* @param {string} content * @param {string} content
* @returns {string[]} * @returns {string[]}
*/ */
const getMarkdownHeadings = (content) => { export const getMarkdownHeadings = (content) => {
const tokens = markdownIt.parse(content, {}) const tokens = markdownIt.parse(content, {})
/** @type {string[]} */ /** @type {string[]} */
@ -88,7 +88,7 @@ const idHTMLAttributeRegex = getHtmlAttributeRe("id")
* @param {string} content * @param {string} content
* @returns {string[]} * @returns {string[]}
*/ */
const getMarkdownIdOrAnchorNameFragments = (content) => { export const getMarkdownIdOrAnchorNameFragments = (content) => {
const tokens = markdownIt.parse(content, {}) const tokens = markdownIt.parse(content, {})
/** @type {string[]} */ /** @type {string[]} */
@ -128,7 +128,7 @@ const getMarkdownIdOrAnchorNameFragments = (content) => {
* @example isValidIntegerString("1abc") // false * @example isValidIntegerString("1abc") // false
* @example isValidIntegerString("1.0") // false * @example isValidIntegerString("1.0") // false
*/ */
const isValidIntegerString = (value) => { export const isValidIntegerString = (value) => {
const regex = /^\d+$/ const regex = /^\d+$/
return regex.test(value) return regex.test(value)
} }
@ -138,7 +138,7 @@ const isValidIntegerString = (value) => {
* @param {string} content * @param {string} content
* @returns {number} * @returns {number}
*/ */
const getNumberOfLines = (content) => { export const getNumberOfLines = (content) => {
return content.split("\n").length return content.split("\n").length
} }
@ -148,16 +148,6 @@ const getNumberOfLines = (content) => {
* @returns {string} * @returns {string}
* @example getLineNumberStringFromFragment("#L50") // 50 * @example getLineNumberStringFromFragment("#L50") // 50
*/ */
const getLineNumberStringFromFragment = (fragment) => { export const getLineNumberStringFromFragment = (fragment) => {
return fragment.slice(2) return fragment.slice(2)
} }
module.exports = {
lineFragmentRe,
convertHeadingToHTMLFragment,
getMarkdownHeadings,
getMarkdownIdOrAnchorNameFragments,
isValidIntegerString,
getNumberOfLines,
getLineNumberStringFromFragment,
}

View File

@ -1,9 +1,9 @@
const { test } = require("node:test") import { test } from "node:test"
const assert = require("node:assert/strict") import assert from "node:assert/strict"
const { markdownlint } = require("markdownlint").promises import * as markdownlint from "markdownlint/promise"
const relativeLinksRule = require("../src/index.js") import relativeLinksRule, { markdownIt } from "../src/index.js"
/** /**
* *
@ -11,13 +11,16 @@ const relativeLinksRule = require("../src/index.js")
* @returns * @returns
*/ */
const validateMarkdownLint = async (fixtureFile) => { const validateMarkdownLint = async (fixtureFile) => {
const lintResults = await markdownlint({ const lintResults = await markdownlint.lint({
files: [fixtureFile], files: [fixtureFile],
config: { config: {
default: false, default: false,
"relative-links": true, "relative-links": true,
}, },
customRules: [relativeLinksRule], customRules: [relativeLinksRule],
markdownItFactory: () => {
return markdownIt
},
}) })
return lintResults[fixtureFile] return lintResults[fixtureFile]
} }

View File

@ -1,14 +1,14 @@
const { test } = require("node:test") import { test } from "node:test"
const assert = require("node:assert/strict") import assert from "node:assert/strict"
const { import {
convertHeadingToHTMLFragment, convertHeadingToHTMLFragment,
getMarkdownHeadings, getMarkdownHeadings,
getMarkdownIdOrAnchorNameFragments, getMarkdownIdOrAnchorNameFragments,
isValidIntegerString, isValidIntegerString,
getNumberOfLines, getNumberOfLines,
getLineNumberStringFromFragment, getLineNumberStringFromFragment,
} = require("../src/utils.js") } from "../src/utils.js"
test("utils", async (t) => { test("utils", async (t) => {
await t.test("convertHeadingToHTMLFragment", async () => { await t.test("convertHeadingToHTMLFragment", async () => {

View File

@ -2,8 +2,8 @@
"compilerOptions": { "compilerOptions": {
"lib": ["ESNext"], "lib": ["ESNext"],
"target": "ESNext", "target": "ESNext",
"module": "CommonJS", "module": "NodeNext",
"moduleResolution": "Node", "moduleResolution": "NodeNext",
"checkJs": true, "checkJs": true,
"allowJs": true, "allowJs": true,
"noEmit": true, "noEmit": true,