knip 3.6.0 → 3.6.1

package/dist/ProjectPrincipal.js

@@ -3,7 +3,7 @@ import { DEFAULT_EXTENSIONS } from './constants.js';
 import { IGNORED_FILE_EXTENSIONS } from './constants.js';
 import { getJSDocTags, getLineAndCharacterOfPosition, isInModuleBlock } from './typescript/ast-helpers.js';
 import { createHosts } from './typescript/createHosts.js';
-import { getImportsAndExports } from './typescript/getImportsAndExports.js';
+import { _getImportsAndExports } from './typescript/getImportsAndExports.js';
 import { createCustomModuleResolver } from './typescript/resolveModuleNames.js';
 import { SourceFileManager } from './typescript/SourceFileManager.js';
 import { compact } from './util/array.js';
@@ -121,7 +121,7 @@ export class ProjectPrincipal {
         const getResolvedModule = specifier => this.backend.program?.getResolvedModule
             ? this.backend.program.getResolvedModule(sourceFile, specifier, undefined)
             : sourceFile.resolvedModules?.get(specifier, undefined);
-        const { imports, exports, scripts } = getImportsAndExports(sourceFile, getResolvedModule, {
+        const { imports, exports, scripts } = _getImportsAndExports(sourceFile, getResolvedModule, {
             skipTypeOnly,
             skipExports,
         });

package/dist/index.js

@@ -308,8 +308,11 @@ export const main = async (unresolvedConfiguration) => {
                     if (isProduction && exportedItem.jsDocTags.has('@internal'))
                         continue;
                     if (importsForExport && isSymbolImported(symbol, importsForExport)) {
-                        if (importsForExport.isReExport && isExportedInEntryFile(principal, importsForExport))
+                        if (!isIncludeEntryExports &&
+                            importsForExport.isReExport &&
+                            isExportedInEntryFile(principal, importsForExport)) {
                             continue;
+                        }
                         if (report.enumMembers && exportedItem.type === 'enum' && exportedItem.members) {
                             principal.findUnusedMembers(filePath, exportedItem.members).forEach(member => {
                                 collector.addIssue({

package/dist/typescript/getImportsAndExports.d.ts

@@ -17,7 +17,7 @@ export type AddImportOptions = {
 export type AddExportOptions = ExportItem & {
     identifier: string;
 };
-export declare const getImportsAndExports: (sourceFile: BoundSourceFile, getResolvedModule: GetResolvedModule, options: GetImportsAndExportsOptions) => {
+export declare const _getImportsAndExports: (sourceFile: BoundSourceFile, getResolvedModule: GetResolvedModule, options: GetImportsAndExportsOptions) => {
     imports: {
         internal: Imports;
         external: Set<string>;

package/dist/typescript/getImportsAndExports.js

@@ -3,6 +3,7 @@ import ts from 'typescript';
 import { getOrSet } from '../util/map.js';
 import { isStartsLikePackageName, sanitizeSpecifier } from '../util/modules.js';
 import { isInNodeModules } from '../util/path.js';
+import { timerify } from '../util/Performance.js';
 import { isDeclarationFileExtension, isAccessExpression, getAccessExpressionName, getJSDocTags, getLineAndCharacterOfPosition, } from './ast-helpers.js';
 import getExportVisitors from './visitors/exports/index.js';
 import { getJSXImplicitImportBase } from './visitors/helpers.js';
@@ -13,7 +14,7 @@ const getVisitors = (sourceFile) => ({
     import: getImportVisitors(sourceFile),
     script: getScriptVisitors(sourceFile),
 });
-export const getImportsAndExports = (sourceFile, getResolvedModule, options) => {
+const getImportsAndExports = (sourceFile, getResolvedModule, options) => {
     const internalImports = new Map();
     const externalImports = new Set();
     const unresolvedImports = new Set();
@@ -176,3 +177,4 @@ export const getImportsAndExports = (sourceFile, getResolvedModule, options) =>
         scripts,
     };
 };
+export const _getImportsAndExports = timerify(getImportsAndExports);

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.6.0";
+export declare const version = "3.6.1";

package/dist/version.js

@@ -1 +1 @@
-export const version = '3.6.0';
+export const version = '3.6.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knip",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Find unused files, dependencies and exports in your TypeScript and JavaScript projects",
   "homepage": "https://knip.dev",
   "repository": {
@@ -14,6 +14,16 @@
     "name": "Lars Kappert",
     "email": "lars@webpro.nl"
   },
+  "funding": [
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/webpro"
+    },
+    {
+      "type": "opencollective",
+      "url": "https://opencollective.com/webpro"
+    }
+  ],
   "main": "./dist/index.js",
   "bin": {
     "knip": "./bin/knip.js"

package/schema.json

@@ -96,17 +96,17 @@
     "rules": {
       "type": "object",
       "properties": {
-        "files": { "$ref": "#/definitions/ruleValue" },
+        "classMembers": { "$ref": "#/definitions/ruleValue" },
         "dependencies": { "$ref": "#/definitions/ruleValue" },
-        "unlisted": { "$ref": "#/definitions/ruleValue" },
-        "unresolved": { "$ref": "#/definitions/ruleValue" },
+        "duplicates": { "$ref": "#/definitions/ruleValue" },
+        "enumMembers": { "$ref": "#/definitions/ruleValue" },
         "exports": { "$ref": "#/definitions/ruleValue" },
+        "files": { "$ref": "#/definitions/ruleValue" },
         "nsExports": { "$ref": "#/definitions/ruleValue" },
-        "classMembers": { "$ref": "#/definitions/ruleValue" },
-        "types": { "$ref": "#/definitions/ruleValue" },
         "nsTypes": { "$ref": "#/definitions/ruleValue" },
-        "enumMembers": { "$ref": "#/definitions/ruleValue" },
-        "duplicates": { "$ref": "#/definitions/ruleValue" }
+        "types": { "$ref": "#/definitions/ruleValue" },
+        "unlisted": { "$ref": "#/definitions/ruleValue" },
+        "unresolved": { "$ref": "#/definitions/ruleValue" }
       }
     }
   },
@@ -123,16 +123,18 @@
       "items": {
         "type": "string",
         "enum": [
-          "files",
+          "binaries",
+          "classMembers",
           "dependencies",
-          "unlisted",
+          "duplicates",
+          "enumMembers",
           "exports",
+          "files",
           "nsExports",
-          "classMembers",
-          "types",
           "nsTypes",
-          "enumMembers",
-          "duplicates"
+          "types",
+          "unlisted",
+          "unresolved"
         ]
       }
     },