sapegin
diff --git a/‎.eslintignore
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion b/‎.eslintignore
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion
diff --git a/‎.eslintrc.json
Copy file name to clipboard
-3Lines changed: 0 additions & 3 deletions b/‎.eslintrc.json
Copy file name to clipboard
-3Lines changed: 0 additions & 3 deletions
diff --git a/‎.github/workflows/node.js.yml
Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions b/‎.github/workflows/node.js.yml
Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
diff --git a/‎.nvmrc
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎.nvmrc
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎eslint.config.mjs
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎eslint.config.mjs
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎package-lock.json
Copy file name to clipboard
+7,027-7,469Lines changed: 7027 additions & 7469 deletions b/‎package-lock.json
Copy file name to clipboard
+7,027-7,469Lines changed: 7027 additions & 7469 deletions
diff --git a/‎package.json
Copy file name to clipboard
+54-58Lines changed: 54 additions & 58 deletions b/‎package.json
Copy file name to clipboard
+54-58Lines changed: 54 additions & 58 deletions
diff --git a/‎src/index.test.ts
Copy file name to clipboard
+74Lines changed: 74 additions & 0 deletions b/‎src/index.test.ts
Copy file name to clipboard
+74Lines changed: 74 additions & 0 deletions
diff --git a/‎index.js renamed to ‎src/index.ts
Copy file name to clipboard
+21-8Lines changed: 21 additions & 8 deletions b/‎index.js renamed to ‎src/index.ts
Copy file name to clipboard
+21-8Lines changed: 21 additions & 8 deletions
diff --git a/‎test.js
Copy file name to clipboard
-69Lines changed: 0 additions & 69 deletions b/‎test.js
Copy file name to clipboard
-69Lines changed: 0 additions & 69 deletions
@@ -0,0 +1,19 @@
+name: Node.js CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+          cache: 'npm'
+      - run: npm ci
+      - run: npm test
@@ -0,0 +1 @@
+v20
@@ -0,0 +1,5 @@
+import tamiaTypeScript from 'eslint-config-tamia/typescript';
+
+const config = [...tamiaTypeScript];
+
+export default config;
@@ -1,60 +1,56 @@
 {
-  "name": "textlint-rule-apostrophe",
-  "version": "0.0.0-development",
-  "description": "Textlint rule to check correct apostrophe usage",
-  "author": {
-    "name": "Artem Sapegin",
-    "url": "https://sapegin.me"
-  },
-  "homepage": "https://github.com/sapegin/textlint-rule-apostrophe",
-  "repository": "sapegin/textlint-rule-apostrophe",
-  "license": "MIT",
-  "engines": {
-    "node": ">=8.9"
-  },
-  "main": "index.js",
-  "files": [
-    "index.js"
-  ],
-  "scripts": {
-    "pretest": "npm run lint",
-    "test": "jest",
-    "posttest": "npm run format",
-    "lint": "eslint . --cache --fix",
-    "format": "prettier --write \"**/*.{js,md}\""
-  },
-  "keywords": [
-    "textlintrule",
-    "textlint",
-    "rule",
-    "misspelling",
-    "proofreading",
-    "apostrophe",
-    "typography"
-  ],
-  "dependencies": {},
-  "devDependencies": {
-    "eslint": "^6.8.0",
-    "eslint-config-tamia": "^7.1.1",
-    "husky": "^4.0.7",
-    "jest": "^29.3.1",
-    "lint-staged": "^9.5.0",
-    "prettier": "^1.19.1",
-    "textlint-tester": "^12.2.4"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.{js,md}": [
-      "prettier --write",
-      "git add"
-    ],
-    "*.js": [
-      "eslint --fix",
-      "git add"
-    ]
-  }
+	"name": "textlint-rule-apostrophe",
+	"version": "0.0.0-development",
+	"description": "Textlint rule to check correct apostrophe usage",
+	"author": {
+		"name": "Artem Sapegin",
+		"url": "https://sapegin.me"
+	},
+	"homepage": "https://github.com/sapegin/textlint-rule-apostrophe",
+	"repository": "sapegin/textlint-rule-apostrophe",
+	"license": "MIT",
+	"engines": {
+		"node": ">=20"
+	},
+	"type": "module",
+	"exports": "./out/index.js",
+	"files": [
+		"out/*.js"
+	],
+	"scripts": {
+		"pretest": "npm run lint",
+		"test": "npm run test:vitest",
+		"posttest": "npm run format",
+		"lint": "eslint . --cache --fix",
+		"test:vitest": "vitest run",
+		"test:watch": "vitest",
+		"build": "tsc",
+		"format": "prettier --write \"**/*.{ts,js,mjs,cjs,json,jsonc,md}\"",
+		"prepublish": "npm run build",
+		"prepare": "husky"
+	},
+	"keywords": [
+		"textlintrule",
+		"textlint",
+		"rule",
+		"misspelling",
+		"proofreading",
+		"apostrophe",
+		"typography"
+	],
+	"devDependencies": {
+		"@textlint/types": "^14.4.2",
+		"eslint": "^9.17.0",
+		"eslint-config-tamia": "^9.2.2",
+		"husky": "^9.1.7",
+		"lint-staged": "^15.3.0",
+		"prettier": "^3.4.2",
+		"textlint-tester": "^14.4.2",
+		"typescript": "^5.7.2",
+		"vitest": "^2.1.8"
+	},
+	"lint-staged": {
+		"*.{js,mjs,cjs,ts,tsx,md}": "prettier --write",
+		"*.{js,mjs,cjs,ts,tsx}": "eslint --cache --fix"
+	}
 }
@@ -0,0 +1,74 @@
+import { test } from 'vitest';
+import TextLintTester from 'textlint-tester';
+import rule from './index';
+
+const tester = new TextLintTester();
+
+test('textlint-rule-apostrophe', () => {
+	tester.run('apostrophe', rule, {
+		valid: [
+			'I’m looking forward',
+			'rock’n’roll',
+			'my sisters’ friends’ investments',
+			'Summer of ’69',
+			'Personal best: 00\'03"48',
+			'Latitude: 49° 53\' 08"',
+		],
+		invalid: [
+			{
+				text: "as in the eagle's feathers",
+				output: 'as in the eagle’s feathers',
+				errors: [
+					{
+						message:
+							"Incorrect usage of an apostrophe: “eagle's”, use “eagle’s” instead",
+					},
+				],
+			},
+			{
+				text: "rock'n'roll",
+				output: 'rock’n’roll',
+				errors: [
+					{
+						message:
+							"Incorrect usage of an apostrophe: “rock'n'roll”, use “rock’n’roll” instead",
+					},
+				],
+			},
+			{
+				text: "my sisters' friends' investments",
+				output: 'my sisters’ friends’ investments',
+				errors: [
+					{
+						message:
+							"Incorrect usage of an apostrophe: “sisters'”, use “sisters’” instead",
+					},
+					{
+						message:
+							"Incorrect usage of an apostrophe: “friends'”, use “friends’” instead",
+					},
+				],
+			},
+			{
+				text: "Summer of '69",
+				output: 'Summer of ’69',
+				errors: [
+					{
+						message:
+							"Incorrect usage of an apostrophe: “'69”, use “’69” instead",
+					},
+				],
+			},
+			{
+				text: 'Summer of ‘69',
+				output: 'Summer of ’69',
+				errors: [
+					{
+						message:
+							'Incorrect usage of an apostrophe: “‘69”, use “’69” instead',
+					},
+				],
+			},
+		],
+	});
+});
@@ -1,22 +1,33 @@
+import type { TxtNode } from '@textlint/ast-node-types';
+import type {
+	TextlintFixableRuleModule,
+	TextlintRuleContext,
+} from '@textlint/types';
+
 const evilApostropheRegExp = /(?:(?<=\s)|[^\d\W])+['‘](?:\w['‘])?\w*/g;
 const evilApostrophe = /['‘]/g;
 const goodApostrophe = '’';
 
-function reporter(context) {
+function reporter(context: TextlintRuleContext) {
 	const { Syntax, RuleError, report, fixer, getSource } = context;
 	return {
-		[Syntax.Str](node) {
-			return new Promise(resolve => {
+		[Syntax.Str](node: TxtNode) {
+			return new Promise<void>((resolve) => {
 				const text = getSource(node);
 
 				let match;
-				// eslint-disable-next-line no-cond-assign
+
 				while ((match = evilApostropheRegExp.exec(text))) {
 					const index = match.index;
 					const matched = match[0];
-					const replacement = matched.replace(evilApostrophe, goodApostrophe);
-					const range = [index, index + matched.length];
-					const fix = fixer.replaceTextRange(range, replacement);
+					const replacement = matched.replaceAll(
+						evilApostrophe,
+						goodApostrophe
+					);
+					const fix = fixer.replaceTextRange(
+						[index, index + matched.length],
+						replacement
+					);
 					const message = `Incorrect usage of an apostrophe: “${matched}”, use “${replacement}” instead`;
 					report(
 						node,
@@ -33,7 +44,9 @@ function reporter(context) {
 	};
 }
 
-module.exports = {
+const rule: TextlintFixableRuleModule = {
 	linter: reporter,
 	fixer: reporter,
 };
+
+export default rule;