Modernize

.gitignore

@@ -2,3 +2,4 @@ node_modules
 .DS_Store
 npm-debug.log
 coverage
+.nyc_output

index.cjs

@@ -0,0 +1,2 @@
+const {anymatch} = require('./cjs')
+module.exports = anymatch

index.mjs

@@ -0,0 +1,3 @@
+import {anymatch} from './esm'
+export * from './esm'
+export default anymatch

index.js → index.ts

@@ -1,25 +1,20 @@
 'use strict';
 
-Object.defineProperty(exports, "__esModule", { value: true });
+import picomatch, { PicomatchOptions } from 'picomatch';
+import normalizePath from 'normalize-path';
 
-const picomatch = require('picomatch');
-const normalizePath = require('normalize-path');
 
-/**
- * @typedef {(testString: string) => boolean} AnymatchFn
- * @typedef {string|RegExp|AnymatchFn} AnymatchPattern
- * @typedef {AnymatchPattern|AnymatchPattern[]} AnymatchMatcher
- */
+declare type AnymatchFn = (testString: string) => boolean
+declare type AnymatchPattern = string|RegExp|AnymatchFn
+declare type AnymatchMatcher = AnymatchPattern|AnymatchPattern[]
+
 const BANG = '!';
-const DEFAULT_OPTIONS = {returnIndex: false};
-const arrify = (item) => Array.isArray(item) ? item : [item];
-
-/**
- * @param {AnymatchPattern} matcher
- * @param {object} options
- * @returns {AnymatchFn}
- */
-const createPattern = (matcher, options) => {
+type returnIndexOptions = {returnIndex?: boolean}
+const DEFAULT_OPTIONS: returnIndexOptions = {returnIndex: false};
+const arrify = (item: unknown) => Array.isArray(item) ? item : [item];
+
+
+const createPattern = (matcher: AnymatchPattern, options: object): AnymatchFn => {
   if (typeof matcher === 'function') {
     return matcher;
   }
@@ -30,17 +25,10 @@ const createPattern = (matcher, options) => {
   if (matcher instanceof RegExp) {
     return (string) => matcher.test(string);
   }
-  return (string) => false;
+  return () => false;
 };
 
-/**
- * @param {Array<Function>} patterns
- * @param {Array<Function>} negPatterns
- * @param {String|Array} args
- * @param {Boolean} returnIndex
- * @returns {boolean|number}
- */
-const matchPatterns = (patterns, negPatterns, args, returnIndex) => {
+const matchPatterns = (patterns: Array<Function>, negPatterns: Array<Function>, args: string|Array<unknown>, returnIndex: boolean): boolean|number => {
   const isList = Array.isArray(args);
   const _path = isList ? args[0] : args;
   if (!isList && typeof _path !== 'string') {
@@ -67,18 +55,15 @@ const matchPatterns = (patterns, negPatterns, args, returnIndex) => {
   return returnIndex ? -1 : false;
 };
 
-/**
- * @param {AnymatchMatcher} matchers
- * @param {Array|string} testString
- * @param {object} options
- * @returns {boolean|number|Function}
- */
-const anymatch = (matchers, testString, options = DEFAULT_OPTIONS) => {
+
+type anymatchFn = (testString: string, ri: boolean) => anymatchFn|boolean|number
+
+export const anymatch = (matchers: AnymatchMatcher, testString: Array<unknown>|string, options: PicomatchOptions | returnIndexOptions | boolean  = DEFAULT_OPTIONS): boolean|number|anymatchFn => {
   if (matchers == null) {
     throw new TypeError('anymatch: specify first argument');
   }
-  const opts = typeof options === 'boolean' ? {returnIndex: options} : options;
-  const returnIndex = opts.returnIndex || false;
+  const opts : PicomatchOptions & returnIndexOptions = typeof options === 'boolean' ? {returnIndex: options} : options as PicomatchOptions & returnIndexOptions;
+  const returnIndex: boolean = opts.returnIndex || false;
 
   // Early cache for matchers.
   const mtchers = arrify(matchers);
@@ -100,5 +85,4 @@ const anymatch = (matchers, testString, options = DEFAULT_OPTIONS) => {
   return matchPatterns(patterns, negatedGlobs, testString, returnIndex);
 };
 
-anymatch.default = anymatch;
-module.exports = anymatch;
+export default anymatch

package.json

@@ -1,14 +1,20 @@
 {
   "name": "anymatch",
-  "version": "3.1.3",
+  "version": "4.0.0-dev.1",
   "description": "Matches strings against configurable strings, globs, regular expressions, and/or functions",
   "files": [
-    "index.js",
-    "index.d.ts"
+    "index.cjs",
+    "index.mjs",
+    "index.ts",
+    "cjs/index.js",
+    "cjs/index.js.map",
+    "mjs/index.js",
+    "mjs/index.js.map"
   ],
   "dependencies": {
     "normalize-path": "^3.0.0",
-    "picomatch": "^2.0.4"
+    "picomatch": "^2.3.1",
+    "typescript": "^4.9.5"
   },
   "author": {
     "name": "Elan Shanker",
@@ -36,11 +42,15 @@
   ],
   "scripts": {
     "test": "nyc mocha",
-    "mocha": "mocha"
+    "mocha": "mocha",
+    "build": "tsc -b && tsc -p tsconfig.esm.json"
   },
   "devDependencies": {
-    "mocha": "^6.1.3",
-    "nyc": "^14.0.0"
+    "@types/node": "^18.15.0",
+    "@types/normalize-path": "^3.0.0",
+    "@types/picomatch": "^2.3.0",
+    "mocha": "^10.2.0",
+    "nyc": "^15.1.0"
   },
   "engines": {
     "node": ">= 8"

tsconfig.esm.json

@@ -0,0 +1,7 @@
+{
+	"compilerOptions": {
+		"module": "ES6",
+		"outDir": "./esm",			
+	},
+	"extends": "./tsconfig.json",
+}

tsconfig.json

@@ -0,0 +1,16 @@
+{
+	"compilerOptions": {
+		"alwaysStrict": true,
+		"esModuleInterop": true,		
+		"module": "CommonJS",
+		"moduleResolution": "node16",
+		"noImplicitAny": true,
+		"outDir": "./cjs",
+		"preserveConstEnums": true,
+		"removeComments": true,		
+		"sourceMap": true,				
+	},
+	"files": [
+	  "index.ts",
+	],
+}