knip 2.41.0 → 2.41.1

package/dist/plugins/eslint/helpers.d.ts

@@ -4,6 +4,4 @@ type GetDependenciesDeep = (configFilePath: string, options: {
     manifest: PackageJsonWithPlugins;
 }, dependencies?: Set<string>) => Promise<Set<string>>;
 export declare const getDependenciesDeep: GetDependenciesDeep;
-export declare const resolvePluginSpecifier: (specifier: string) => string;
-export declare const resolveExtendSpecifier: (specifier: string) => string | undefined;
 export {};

package/dist/plugins/eslint/helpers.js

@@ -1,4 +1,5 @@
 import { compact } from '../../util/array.js';
+import { getPackageNameFromModuleSpecifier } from '../../util/modules.js';
 import { isInternal, dirname, toAbsolute } from '../../util/path.js';
 import { load } from '../../util/plugin.js';
 import { _resolve } from '../../util/require.js';
@@ -54,15 +55,17 @@ const resolveSpecifier = (namespace, rawSpecifier) => {
     const specifier = rawSpecifier.replace(/(^plugin:|:.+$)/, '');
     if (isQualifiedSpecifier(specifier))
         return specifier;
-    if (!specifier.startsWith('@'))
-        return `${namespace}-${specifier}`;
+    if (!specifier.startsWith('@')) {
+        const id = rawSpecifier.startsWith('plugin:') ? getPackageNameFromModuleSpecifier(specifier) : specifier;
+        return `${namespace}-${id}`;
+    }
     const [scope, name, ...rest] = specifier.split('/');
     if (rawSpecifier.startsWith('plugin:') && rest.length === 0)
-        return [scope, namespace, name].join('/');
+        return [scope, namespace].join('/');
     return [scope, name ? `${namespace}-${name}` : namespace, ...rest].join('/');
 };
-export const resolvePluginSpecifier = (specifier) => resolveSpecifier('eslint-plugin', specifier);
-export const resolveExtendSpecifier = (specifier) => {
+const resolvePluginSpecifier = (specifier) => resolveSpecifier('eslint-plugin', specifier);
+const resolveExtendSpecifier = (specifier) => {
     if (isInternal(specifier))
         return;
     if (/^next(\/.+)?$/.test(specifier))

package/dist/plugins/vitest/index.js

@@ -1,5 +1,5 @@
 import { compact } from '../../util/array.js';
-import { dirname, join } from '../../util/path.js';
+import { dirname, join, relative } from '../../util/path.js';
 import { timerify } from '../../util/Performance.js';
 import { hasDependency, load, tryResolve } from '../../util/plugin.js';
 import { toEntryPattern } from '../../util/protocols.js';
@@ -9,6 +9,13 @@ export const ENABLERS = ['vitest'];
 export const isEnabled = ({ dependencies }) => hasDependency(dependencies, ENABLERS);
 export const CONFIG_FILE_PATTERNS = ['vitest.config.ts', 'vitest.{workspace,projects}.{ts,js,json}'];
 export const ENTRY_FILE_PATTERNS = ['**/*.{test,spec}.?(c|m)[jt]s?(x)'];
+const resolveEntry = (containingFilePath, specifier) => {
+    const dir = dirname(containingFilePath);
+    const resolvedPath = tryResolve(join(dir, specifier), containingFilePath);
+    if (resolvedPath)
+        return toEntryPattern(relative(dir, resolvedPath));
+    return specifier;
+};
 const findConfigDependencies = (configFilePath, localConfig, options) => {
     const { isProduction, config } = options;
     const testConfig = localConfig.test;
@@ -18,9 +25,8 @@ const findConfigDependencies = (configFilePath, localConfig, options) => {
     const environments = testConfig.environment ? [getEnvPackageName(testConfig.environment)] : [];
     const reporters = getExternalReporters(testConfig.reporters);
     const coverage = testConfig.coverage ? [`@vitest/coverage-${testConfig.coverage.provider ?? 'v8'}`] : [];
-    const toPath = (v) => tryResolve(join(dirname(configFilePath), v), configFilePath) ?? v;
-    const setupFiles = (testConfig.setupFiles ? [testConfig.setupFiles].flat() : []).map(toPath);
-    const globalSetup = (testConfig.globalSetup ? [testConfig.globalSetup].flat() : []).map(toPath);
+    const setupFiles = [testConfig.setupFiles ?? []].flat().map(v => resolveEntry(configFilePath, v));
+    const globalSetup = [testConfig.globalSetup ?? []].flat().map(v => resolveEntry(configFilePath, v));
     return [...entryPatterns, ...environments, ...reporters, ...coverage, ...setupFiles, ...globalSetup];
 };
 export const findVitestDependencies = async (configFilePath, localConfig, options) => {

package/dist/util/fs.d.ts

@@ -5,3 +5,4 @@ export declare const loadJSON: (filePath: string) => Promise<any>;
 export declare const loadYAML: (filePath: string) => Promise<unknown>;
 export declare const parseJSON: (filePath: string, contents: string) => Promise<any>;
 export declare const parseYAML: (contents: string) => Promise<unknown>;
+export declare function isTypeModule(filePath: string): boolean;

package/dist/util/fs.js

@@ -1,9 +1,9 @@
-import { statSync } from 'node:fs';
+import { readFileSync, statSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import yaml from 'js-yaml';
 import stripJsonComments from 'strip-json-comments';
 import { LoaderError } from './errors.js';
-import { join } from './path.js';
+import { dirname, join } from './path.js';
 export const isFile = (filePath) => {
     const stat = statSync(filePath, { throwIfNoEntry: false });
     return stat !== undefined && stat.isFile();
@@ -40,3 +40,25 @@ export const parseJSON = async (filePath, contents) => {
 export const parseYAML = async (contents) => {
     return yaml.load(contents);
 };
+export function isTypeModule(filePath) {
+    if (!filePath.endsWith('.js'))
+        return false;
+    try {
+        let currentDir = dirname(filePath);
+        while (true) {
+            const packagePath = join(currentDir, 'package.json');
+            try {
+                const data = JSON.parse(readFileSync(packagePath, 'utf-8'));
+                return data.type === 'module';
+            }
+            catch { }
+            const parentDir = dirname(currentDir);
+            if (parentDir === currentDir)
+                return false;
+            currentDir = parentDir;
+        }
+    }
+    catch (error) {
+        return false;
+    }
+}

package/dist/util/loader.js

@@ -1,6 +1,7 @@
 import { pathToFileURL } from 'node:url';
 import { LoaderError } from './errors.js';
 import { loadJSON, loadYAML, loadFile, parseJSON, parseYAML } from './fs.js';
+import { isTypeModule } from './fs.js';
 import { extname } from './path.js';
 import { timerify } from './Performance.js';
 import { jiti } from './register.js';
@@ -20,7 +21,7 @@ const load = async (filePath) => {
         if (ext === '.yaml' || ext === '.yml') {
             return loadYAML(filePath);
         }
-        if (ext === '.mjs') {
+        if (ext === '.mjs' || (ext === '.js' && isTypeModule(filePath))) {
             const fileUrl = pathToFileURL(filePath);
             const imported = await import(fileUrl.href);
             return imported.default ?? imported;

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "2.41.0";
+export declare const version = "2.41.1";

package/dist/version.js

@@ -1 +1 @@
-export const version = '2.41.0';
+export const version = '2.41.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knip",
-  "version": "2.41.0",
+  "version": "2.41.1",
   "description": "Find unused files, dependencies and exports in your TypeScript and JavaScript projects",
   "homepage": "https://github.com/webpro/knip",
   "repository": "github:webpro/knip",