Improve tests for types

Author: jdesrosiers

.eslintrc.js

@@ -30,7 +30,7 @@ module.exports = {
   rules,
   overrides: [
     {
-      files: ['*.ts', '*.cts', '*.mts'],
+      files: ['*.ts', '*.cts', '*.mts', '*.cjs', '*.mjs'],
       extends: ['plugin:@typescript-eslint/recommended'],
       parser: '@typescript-eslint/parser',
       plugins: ['@typescript-eslint'],

.gitignore

@@ -2,7 +2,6 @@
 /index.mjs
 
 # test
-test/ts/*.js
 /.tap
 
 # coverage

package.json

@@ -16,17 +16,18 @@
     "prepublishOnly": "npm run build",
     "build": "babel -o legacy.js index.js && node ./scripts/build.js",
     "test:lint": "eslint .",
-    "test:tsc": "tsc ./test/ts/simple.ts --lib ES6",
-    "test:tsc:16": "tsc ./test/ts/simple.ts --lib ES6 --moduleResolution Node16 --module Node16",
-    "test:ts": "node ./test/ts/simple.js",
+    "test:ts": "ts-node ./test/ts/simple.ts",
+    "test:ts:16": "ts-node --compilerOptions '{\"moduleResolution\": \"Node16\", \"module\": \"Node16\"}' ./test/ts/simple.ts",
+    "test:cjs:16": "ts-node --compilerOptions '{\"moduleResolution\": \"Node16\", \"module\": \"Node16\"}' ./test/ts/simple.cjs",
+    "test:mjs:16": "ts-node --compilerOptions '{\"moduleResolution\": \"Node16\", \"module\": \"Node16\"}' ./test/ts/simple.mjs",
     "tap": "tap --reporter classic",
     "test:git": "npm run tap test/git-check-ignore.test.js",
     "test:ignore": "npm run tap test/ignore.test.js",
     "test:ignore:only": "IGNORE_ONLY_IGNORES=1 npm run tap test/ignore.test.js",
     "test:others": "npm run tap test/others.test.js",
     "test:cases": "npm run tap test/*.test.js -- --coverage",
     "test:no-coverage": "npm run tap test/*.test.js -- --no-check-coverage",
-    "test:only": "npm run test:lint && npm run build && npm run test:tsc && npm run test:tsc:16 && npm run test:ts && npm run test:cases",
+    "test:only": "npm run test:lint && npm run build && npm run test:ts && npm run test:ts:16 && npm run test:cjs:16 && npm run test:mjs:16 && npm run test:cases",
     "test": "npm run test:only",
     "test:win32": "IGNORE_TEST_WIN32=1 npm run test",
     "report": "tap --coverage-report=html",
@@ -72,6 +73,7 @@
     "spawn-sync": "^2.0.0",
     "tap": "^16.3.9",
     "tmp": "0.2.3",
+    "ts-node": "^10.9.2",
     "typescript": "^5.6.2"
   },
   "engines": {

test/ts/simple.cjs

@@ -0,0 +1,78 @@
+const ignore = require('../..') // eslint-disable-line @typescript-eslint/no-require-imports
+const {isPathValid} = require('../..') // eslint-disable-line @typescript-eslint/no-require-imports
+
+const equal = (actual, expect, message) => {
+  if (actual !== expect) {
+    throw new Error(`${message}, expect: ${expect}, actual: ${actual}`)
+  }
+}
+
+const paths = ['a', 'a/b', 'foo/bar']
+
+let ig = ignore()
+
+ig = ig.add('*')
+ig = ig.add(['!*/', '!foo/bar'])
+
+const filter = ig.createFilter()
+paths.filter(filter)
+const passed = filter('a')
+equal(passed, false, 'filters a out')
+
+const filtered_paths = ig.filter(paths)
+const ignores = ig.ignores('a')
+equal(ignores, true, 'ignores a')
+
+let ig2 = ignore()
+
+ig2 = ig2.add('# test ig.add(Ignore)')
+ig2 = ig2.add(ig)
+
+let ig3 = ignore()
+ig3 = ig3.add('*.js')
+
+let ig4 = ignore()
+ig4 = ig4.add('*.png')
+
+ig2 = ig2.add([ig3, ig4])
+
+const ig5 = ignore({
+  ignorecase: false
+})
+
+const isValid = isPathValid('./foo')
+equal(isValid, false, './foo is not valid')
+
+const {
+  ignored,
+  unignored
+} = ig4.test('foo')
+
+equal(ignored, false, 'not ignored')
+equal(unignored, false, 'not unignored')
+
+// Filter an Readyonly array
+const readonlyPaths = ['a', 'a/b', 'foo/bar']
+ig.filter(readonlyPaths)
+
+// Add an Readonly array of rules
+const ig6 = ignore()
+ig6.add([ig3, ig4])
+
+// options.ignoreCase and options.allowRelativePaths
+ignore({
+  ignoreCase: false,
+  allowRelativePaths: true
+})
+
+const ig7 = ignore()
+
+ig7.add({pattern: 'foo/*', mark: '10'})
+const {
+  ignored: ignored7,
+  rule: ignoreRule7
+} = ig7.checkIgnore('foo/')
+
+equal(ignored7, true, 'should ignore')
+equal(ignoreRule7.mark, '10', 'mark is 10')
+equal(ignoreRule7.pattern, 'foo/*', 'ignored by foo/*')

test/ts/simple.mjs

@@ -0,0 +1,77 @@
+import ignore, {isPathValid} from '../../index.mjs' // eslint-disable-line import/extensions
+
+const equal = (actual, expect, message) => {
+  if (actual !== expect) {
+    throw new Error(`${message}, expect: ${expect}, actual: ${actual}`)
+  }
+}
+
+const paths = ['a', 'a/b', 'foo/bar']
+
+let ig = ignore()
+
+ig = ig.add('*')
+ig = ig.add(['!*/', '!foo/bar'])
+
+const filter = ig.createFilter()
+paths.filter(filter)
+const passed = filter('a')
+equal(passed, false, 'filters a out')
+
+const filtered_paths = ig.filter(paths)
+const ignores = ig.ignores('a')
+equal(ignores, true, 'ignores a')
+
+let ig2 = ignore()
+
+ig2 = ig2.add('# test ig.add(Ignore)')
+ig2 = ig2.add(ig)
+
+let ig3 = ignore()
+ig3 = ig3.add('*.js')
+
+let ig4 = ignore()
+ig4 = ig4.add('*.png')
+
+ig2 = ig2.add([ig3, ig4])
+
+const ig5 = ignore({
+  ignorecase: false
+})
+
+const isValid = isPathValid('./foo')
+equal(isValid, false, './foo is not valid')
+
+const {
+  ignored,
+  unignored
+} = ig4.test('foo')
+
+equal(ignored, false, 'not ignored')
+equal(unignored, false, 'not unignored')
+
+// Filter an Readyonly array
+const readonlyPaths = ['a', 'a/b', 'foo/bar']
+ig.filter(readonlyPaths)
+
+// Add an Readonly array of rules
+const ig6 = ignore()
+ig6.add([ig3, ig4])
+
+// options.ignoreCase and options.allowRelativePaths
+ignore({
+  ignoreCase: false,
+  allowRelativePaths: true
+})
+
+const ig7 = ignore()
+
+ig7.add({pattern: 'foo/*', mark: '10'})
+const {
+  ignored: ignored7,
+  rule: ignoreRule7
+} = ig7.checkIgnore('foo/')
+
+equal(ignored7, true, 'should ignore')
+equal(ignoreRule7.mark, '10', 'mark is 10')
+equal(ignoreRule7.pattern, 'foo/*', 'ignored by foo/*')

test/ts/simple.ts

@@ -1,7 +1,7 @@
 import ignore, {isPathValid} from '../..'
 import type {Ignore} from '../..'
 
-const equal = (actual, expect, message) => {
+const equal = (actual: unknown, expect: unknown, message: string) => {
   if (actual !== expect) {
     throw new Error(`${message}, expect: ${expect}, actual: ${actual}`)
   }
@@ -77,5 +77,5 @@ const {
 } = ig7.checkIgnore('foo/')
 
 equal(ignored7, true, 'should ignore')
-equal(ignoreRule7.mark, '10', 'mark is 10')
-equal(ignoreRule7.pattern, 'foo/*', 'ignored by foo/*')
+equal(ignoreRule7?.mark, '10', 'mark is 10')
+equal(ignoreRule7?.pattern, 'foo/*', 'ignored by foo/*')

test/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "compilerOptions": {
+  }
+}