@taiga-ui/eslint-plugin-experience-next 0.383.0 → 0.385.0

package/configs/html-eslint.d.ts

@@ -1,58 +1,2 @@
-import html from '@html-eslint/eslint-plugin';
-import htmlParser from '@html-eslint/parser';
-declare const _default: ({
-    ignores: string[];
-    files?: undefined;
-    rules?: undefined;
-} | {
-    files: string[];
-    plugins: {
-        html: typeof html;
-    };
-    language: string;
-    languageOptions: {
-        parser: typeof htmlParser;
-    };
-    rules: {
-        '@taiga-ui/experience-next/no-href-with-router-link': string;
-        'html/indent': string;
-        'html/no-extra-spacing-attrs': string;
-        'html/no-multiple-h1': string;
-        'html/no-restricted-attr-values': (string | {
-            attrPatterns: string[];
-            attrValuePatterns: string[];
-            message: string;
-        })[];
-        'html/no-restricted-attrs': (string | {
-            attrPatterns: string[];
-            message: string;
-            tagPatterns: string[];
-        })[];
-        'html/require-closing-tags': string;
-        'html/require-img-alt': (string | {
-            substitute: string[];
-        })[];
-        'html/use-baseline': string;
-        "html/require-lang": "error";
-        "html/require-doctype": "error";
-        "html/require-title": "error";
-        "html/attrs-newline": "error";
-        "html/element-newline": ["error", {
-            inline: string[];
-        }];
-        "html/no-duplicate-id": "error";
-        "html/require-li-container": "error";
-        "html/quotes": "error";
-        "html/no-obsolete-tags": "error";
-        "html/no-duplicate-attrs": "error";
-        "html/no-duplicate-in-head": "error";
-    };
-    ignores?: undefined;
-} | {
-    files: string[];
-    rules: {
-        'html/no-restricted-attr-values': string;
-    };
-    ignores?: undefined;
-})[];
+declare const _default: import("@eslint/config-helpers").Config[];
 export default _default;

package/index.esm.js

@@ -1,13 +1,13 @@
 import fs, { readFileSync } from 'node:fs';
 import html from '@html-eslint/eslint-plugin';
 import htmlParser from '@html-eslint/parser';
+import { defineConfig } from 'eslint/config';
 import { createRequire } from 'node:module';
 import eslint from '@eslint/js';
 import markdown from '@eslint/markdown';
 import rxjs from '@smarttools/eslint-plugin-rxjs';
 import stylistic from '@stylistic/eslint-plugin';
 import angular from 'angular-eslint';
-import { defineConfig } from 'eslint/config';
 import compat from 'eslint-plugin-compat';
 import progress from 'eslint-plugin-file-progress';
 import jest from 'eslint-plugin-jest';
@@ -26,7 +26,7 @@ import ts from 'typescript';
 import { AST_NODE_TYPES as AST_NODE_TYPES$1 } from '@typescript-eslint/types';
 import path from 'node:path';
 
-var htmlEslint = [
+var htmlEslint = defineConfig([
     {
         ignores: [
             '**/tests-report/**',
@@ -38,15 +38,14 @@ var htmlEslint = [
         ],
     },
     {
-        ...html.configs.recommended,
         files: ['**/*.html'],
         plugins: { html },
+        extends: ['html/recommended'],
         language: 'html/html',
         languageOptions: {
             parser: htmlParser,
         },
         rules: {
-            ...html.configs.recommended.rules,
             '@taiga-ui/experience-next/no-href-with-router-link': 'error',
             'html/indent': 'off', // prettier conflicts
             'html/no-extra-spacing-attrs': 'off', // prettier conflicts
@@ -116,7 +115,7 @@ var htmlEslint = [
             'html/no-restricted-attr-values': 'off',
         },
     },
-];
+]);
 
 const TUI_RECOMMENDED_NAMING_CONVENTION = [
     {
@@ -272,6 +271,11 @@ var recommended = defineConfig([
             tseslint.configs.all,
         ],
         languageOptions: {
+            globals: {
+                ...globals.builtin,
+                ...globals.browser,
+                ...globals.node,
+            },
             parserOptions: {
                 ecmaVersion: 'latest',
                 errorOnTypeScriptSyntacticAndSemanticIssues: false,
@@ -280,18 +284,8 @@ var recommended = defineConfig([
                 warnOnUnsupportedTypeScriptVersion: false,
                 ...parserOptions,
             },
-            globals: {
-                ...globals.builtin,
-                ...globals.browser,
-                ...globals.node,
-            },
         },
         rules: {
-            '@typescript-eslint/no-confusing-void-expression': 'off',
-            '@typescript-eslint/no-import-type-side-effects': 'off', // verbatimModuleSyntax should be false
-            '@typescript-eslint/no-invalid-void-type': 'off',
-            'no-void': ['error', { allowAsStatement: true }],
-            'sonarjs/no-identical-functions': 'error',
             '@stylistic/function-call-spacing': 'error',
             '@stylistic/lines-between-class-members': [
                 'error',
@@ -376,6 +370,7 @@ var recommended = defineConfig([
             '@typescript-eslint/explicit-member-accessibility': [
                 'error',
                 {
+                    accessibility: 'explicit',
                     overrides: {
                         accessors: 'explicit',
                         constructors: 'no-public',
@@ -383,7 +378,6 @@ var recommended = defineConfig([
                         parameterProperties: 'explicit',
                         properties: 'explicit',
                     },
-                    accessibility: 'explicit',
                 },
             ],
             '@typescript-eslint/explicit-module-boundary-types': 'off',
@@ -400,6 +394,7 @@ var recommended = defineConfig([
             ],
             '@typescript-eslint/no-base-to-string': 'off',
             '@typescript-eslint/no-confusing-non-null-assertion': 'error',
+            '@typescript-eslint/no-confusing-void-expression': 'off',
             '@typescript-eslint/no-deprecated': 'off',
             '@typescript-eslint/no-duplicate-enum-values': 'error',
             '@typescript-eslint/no-duplicate-type-constituents': 'error',
@@ -431,7 +426,9 @@ var recommended = defineConfig([
             '@typescript-eslint/no-floating-promises': 'off',
             '@typescript-eslint/no-for-in-array': 'error',
             '@typescript-eslint/no-implied-eval': 'error',
+            '@typescript-eslint/no-import-type-side-effects': 'off', // verbatimModuleSyntax should be false
             '@typescript-eslint/no-inferrable-types': 'error',
+            '@typescript-eslint/no-invalid-void-type': 'off',
             '@typescript-eslint/no-magic-numbers': 'off',
             '@typescript-eslint/no-misused-promises': 'off',
             '@typescript-eslint/no-misused-spread': 'off',
@@ -547,8 +544,8 @@ var recommended = defineConfig([
             '@typescript-eslint/switch-exhaustiveness-check': [
                 'error',
                 {
-                    considerDefaultExhaustiveForUnions: true,
                     allowDefaultCaseForExhaustiveSwitch: true,
+                    considerDefaultExhaustiveForUnions: true,
                     requireDefaultForNonUnion: false,
                 },
             ],
@@ -566,8 +563,8 @@ var recommended = defineConfig([
             'decorator-position/decorator-position': [
                 'error',
                 {
-                    printWidth: 120,
                     methods: 'above',
+                    printWidth: 120,
                     properties: 'above',
                 },
             ],
@@ -722,10 +719,10 @@ var recommended = defineConfig([
                 },
             ],
             'no-var': 'error',
+            'no-void': ['error', { allowAsStatement: true }],
             'perfectionist/sort-array-includes': [
                 'error',
                 {
-                    groupKind: 'literals-first',
                     ignoreCase: true,
                     order: 'asc',
                     type: 'alphabetical',
@@ -742,7 +739,6 @@ var recommended = defineConfig([
             'perfectionist/sort-sets': [
                 'error',
                 {
-                    groupKind: 'literals-first',
                     ignoreCase: true,
                     order: 'asc',
                     type: 'alphabetical',
@@ -778,6 +774,7 @@ var recommended = defineConfig([
             'promise/param-names': 'error',
             'simple-import-sort/exports': 'error',
             'simple-import-sort/imports': 'error',
+            'sonarjs/no-identical-functions': 'error',
             'sonarjs/no-inverted-boolean-check': 'error',
             'spaced-comment': [
                 'error',
@@ -947,6 +944,7 @@ var recommended = defineConfig([
                 {
                     ignoreWithDirectives: [
                         'tuiButtonClose',
+                        'tuiButtonCopy',
                         'tuiAccordion',
                         'tuiButtonX',
                         'tuiOption',
@@ -992,7 +990,6 @@ var recommended = defineConfig([
         files: ['**/*.pw.spec.ts'],
         extends: [playwright.configs['flat/recommended']],
         rules: {
-            'playwright/no-networkidle': 'off',
             'compat/compat': 'off',
             'jest/prefer-importing-jest-globals': 'off',
             'playwright/expect-expect': [
@@ -1002,6 +999,7 @@ var recommended = defineConfig([
                 },
             ],
             'playwright/no-force-option': 'error',
+            'playwright/no-networkidle': 'off',
             'playwright/no-skipped-test': 'off',
             'playwright/no-wait-for-selector': 'off',
             'playwright/no-wait-for-timeout': 'off',
@@ -1034,7 +1032,6 @@ var recommended = defineConfig([
              * If enabled we have
              * Expected to be running in 'ProxyZone', but it was not found
              */
-            'jest/valid-title': 'error',
             'jest/prefer-ending-with-an-expect': 'off',
             'jest/prefer-importing-jest-globals': 'off',
             'jest/prefer-lowercase-title': [
@@ -1072,6 +1069,7 @@ var recommended = defineConfig([
                 },
             ],
             'jest/unbound-method': 'off',
+            'jest/valid-title': 'error',
         },
     },
     {
@@ -1667,6 +1665,7 @@ const rule$3 = createRule$6({
     create(context) {
         const { currentProject, deepImport, ignoreImports, importDeclaration, projectName, } = { ...DEFAULT_OPTIONS, ...context.options[0] };
         const isDeepImport = (source) => !!source && new RegExp(deepImport, 'g').test(source);
+        const isSideEffectImport = (node) => node.specifiers.length === 0;
         const isInsideTheSameEntryPoint = (source) => {
             const filePath = path
                 .relative(context.cwd, context.filename)
@@ -1680,9 +1679,11 @@ const rule$3 = createRule$6({
         const shouldIgnore = (source) => !!source && ignoreImports.some((p) => new RegExp(p, 'g').test(source));
         return {
             [`ImportDeclaration[source.value=/${importDeclaration}/]`](node) {
-                const importSource = node?.source.value;
-                if (!node ||
-                    !importSource ||
+                if (!node || isSideEffectImport(node)) {
+                    return;
+                }
+                const importSource = node.source.value;
+                if (!importSource ||
                     !isDeepImport(importSource) ||
                     isInsideTheSameEntryPoint(importSource) ||
                     shouldIgnore(importSource)) {
@@ -1749,54 +1750,154 @@ var noDeepImportsToIndexedPackages = createRule$5({
         const parserServices = ESLintUtils.getParserServices(context);
         const program = parserServices.program;
         const compilerHost = ts.createCompilerHost(program.getCompilerOptions(), true);
+        function resolveTypescriptModule(moduleSpecifier) {
+            const resolved = ts.resolveModuleName(moduleSpecifier, context.filename, program.getCompilerOptions(), compilerHost);
+            return resolved.resolvedModule?.resolvedFileName ?? null;
+        }
         return {
             ImportDeclaration(node) {
-                const importPath = node.source.value;
-                if (typeof importPath !== 'string' || importPath.startsWith('.')) {
+                const importSpecifier = node.source.value;
+                if (typeof importSpecifier !== 'string') {
                     return;
                 }
-                const containingFile = context.filename;
-                const { resolvedModule } = ts.resolveModuleName(importPath, containingFile, program.getCompilerOptions(), compilerHost);
-                const resolvedPath = resolvedModule?.resolvedFileName;
-                if (!resolvedPath || resolvedPath.endsWith('index.ts')) {
+                if (!isExternalModuleSpecifier(importSpecifier)) {
                     return;
                 }
-                const dir = path.dirname(resolvedPath);
-                const baseDir = path.resolve(dir, '..');
-                const indexPath = path.join(baseDir, 'index.ts');
-                const ngPackagePath = path.join(baseDir, 'ng-package.json');
-                const packageJsonPath = path.join(baseDir, 'package.json');
-                const hasIndex = fs.existsSync(indexPath);
-                const hasPackage = fs.existsSync(ngPackagePath) || fs.existsSync(packageJsonPath);
-                if (hasIndex && hasPackage) {
-                    const relative = path.relative(baseDir, resolvedPath);
-                    const shouldFix = !!(relative && !relative.startsWith('..'));
-                    if (shouldFix) {
-                        const parts = importPath.split('/');
-                        const suggestedImport = parts.slice(0, -1).join('/');
-                        context.report({
-                            data: { importPath, suggestedImport },
-                            messageId: 'deepImport',
-                            node: node.source,
-                        });
-                    }
+                const packageRootSpecifier = getPackageRootSpecifier(importSpecifier);
+                const importSubpath = getSubpath(importSpecifier, packageRootSpecifier);
+                if (!importSubpath) {
+                    return;
+                }
+                const resolvedRootModuleFilePath = resolveTypescriptModule(packageRootSpecifier);
+                if (!resolvedRootModuleFilePath) {
+                    return;
                 }
+                const packageMarkerFilePath = pickPackageMarkerFile(resolvedRootModuleFilePath);
+                if (!packageMarkerFilePath) {
+                    return;
+                }
+                const packageDirectory = path.dirname(packageMarkerFilePath);
+                const indexFilePath = pickIndexFileInDirectory(packageDirectory);
+                if (!indexFilePath) {
+                    return;
+                }
+                const hasMatchingReExport = indexExportsSubpath(indexFilePath, importSubpath);
+                if (!hasMatchingReExport) {
+                    return;
+                }
+                context.report({
+                    data: {
+                        importPath: importSpecifier,
+                        suggestedImport: packageRootSpecifier,
+                    },
+                    messageId: 'deepImport',
+                    node: node.source,
+                });
             },
         };
     },
     defaultOptions: [],
     meta: {
         docs: {
-            description: 'Disallow deep imports from packages that expose an index.ts next to ng-package.json or package.json',
+            description: 'Disallow deep imports only when package root index.ts (or index.d.ts) re-exports that subpath, and the package is marked by ng-package.json or package.json',
         },
         messages: {
-            deepImport: 'Import "{{importPath}}" should go through the package index.ts (use "{{suggestedImport}}").',
+            deepImport: 'Import "{{importPath}}" should go through the package root export (use "{{suggestedImport}}").',
         },
         schema: [],
         type: 'problem',
     },
     name: 'no-deep-imports-to-indexed-packages',
 });
+function isExternalModuleSpecifier(moduleSpecifier) {
+    if (!moduleSpecifier || moduleSpecifier.startsWith('.')) {
+        return false;
+    }
+    return !path.isAbsolute(moduleSpecifier);
+}
+function pickPackageMarkerFile(resolvedRootFilePath) {
+    const resolvedRootDirectory = path.dirname(resolvedRootFilePath);
+    const nearestNgPackageJson = findNearestFileUpwards(resolvedRootDirectory, 'ng-package.json');
+    const nearestPackageJson = findNearestFileUpwards(resolvedRootDirectory, 'package.json');
+    return nearestNgPackageJson ?? nearestPackageJson ?? null;
+}
+function pickIndexFileInDirectory(packageDirectory) {
+    const indexTypescriptPath = path.join(packageDirectory, 'index.ts');
+    const indexTypesDeclarationPath = path.join(packageDirectory, 'index.d.ts');
+    if (fs.existsSync(indexTypescriptPath)) {
+        return indexTypescriptPath;
+    }
+    if (fs.existsSync(indexTypesDeclarationPath)) {
+        return indexTypesDeclarationPath;
+    }
+    return null;
+}
+function isScopedPackage(importSpecifier) {
+    return importSpecifier.startsWith('@');
+}
+function getPackageRootSpecifier(importSpecifier) {
+    const pathParts = importSpecifier.split('/');
+    if (isScopedPackage(importSpecifier)) {
+        if (pathParts.length >= 2) {
+            return `${pathParts[0]}/${pathParts[1]}`;
+        }
+        return importSpecifier;
+    }
+    return pathParts[0] ?? importSpecifier;
+}
+function getSubpath(importSpecifier, packageRootSpecifier) {
+    if (importSpecifier === packageRootSpecifier) {
+        return null;
+    }
+    if (!importSpecifier.startsWith(`${packageRootSpecifier}/`)) {
+        return null;
+    }
+    return importSpecifier.slice(packageRootSpecifier.length + 1);
+}
+function findNearestFileUpwards(startDirectory, fileName) {
+    let currentDirectory = startDirectory;
+    while (currentDirectory.length > 0) {
+        const candidatePath = path.join(currentDirectory, fileName);
+        if (fs.existsSync(candidatePath)) {
+            return candidatePath;
+        }
+        const parentDirectory = path.dirname(currentDirectory);
+        if (parentDirectory === currentDirectory) {
+            break;
+        }
+        currentDirectory = parentDirectory;
+    }
+    return null;
+}
+function normalizeModuleSpecifier(moduleSpecifier) {
+    return moduleSpecifier.replaceAll('\\', '/');
+}
+function stripKnownExtensions(filePathOrSpecifier) {
+    return filePathOrSpecifier.replace(/\.(d\.ts|ts|tsx|js|jsx|mjs|cjs)$/, '');
+}
+function indexExportsSubpath(indexFilePath, subpath) {
+    const fileText = fs.readFileSync(indexFilePath, 'utf8');
+    const sourceFile = ts.createSourceFile(indexFilePath, fileText, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+    const expectedSpecifier = normalizeModuleSpecifier(stripKnownExtensions(`./${subpath}`));
+    const expectedIndexSpecifier = normalizeModuleSpecifier(stripKnownExtensions(`./${subpath}/index`));
+    let isReExportFound = false;
+    sourceFile.forEachChild((astNode) => {
+        if (isReExportFound) {
+            return;
+        }
+        if (ts.isExportDeclaration(astNode)) {
+            const moduleSpecifierNode = astNode.moduleSpecifier;
+            if (moduleSpecifierNode && ts.isStringLiteral(moduleSpecifierNode)) {
+                const exportedSpecifier = normalizeModuleSpecifier(stripKnownExtensions(moduleSpecifierNode.text));
+                if (exportedSpecifier === expectedSpecifier ||
+                    exportedSpecifier === expectedIndexSpecifier) {
+                    isReExportFound = true;
+                }
+            }
+        }
+    });
+    return isReExportFound;
+}
 
 const MESSAGE_ID$2 = 'no-href-with-router-link';
 const ERROR_MESSAGE$1 = 'Do not use href and routerLink attributes together on the same element';
@@ -2294,6 +2395,7 @@ const DEFAULT_DECORATORS = ['Component', 'Directive', 'NgModule', 'Pipe'];
 const DEFAULT_EXCEPTIONS = [
     { from: 'TuiTextfieldOptionsDirective', to: 'TuiTextfield' },
     { from: 'TuiPreviewDialogDirective', to: 'TuiPreview' },
+    { from: 'TuiAccountComponent', to: 'TuiAccountComponent' },
 ];
 const createRule$2 = ESLintUtils.RuleCreator((name) => name);
 const rule$1 = createRule$2({

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "@taiga-ui/eslint-plugin-experience-next",
-  "version": "0.383.0",
+  "version": "0.385.0",
   "description": "An ESLint plugin to enforce a consistent code styles across taiga-ui projects",
   "license": "Apache-2.0",
   "type": "module",
   "devDependencies": {
-    "@typescript-eslint/rule-tester": "8.50.0",
+    "@typescript-eslint/rule-tester": "8.53.0",
     "glob": "13.0.0"
   },
   "peerDependencies": {
     "@eslint/compat": "^2.0.0",
     "@eslint/markdown": "^7.5.1",
-    "@html-eslint/eslint-plugin": "^0.48.0",
+    "@html-eslint/eslint-plugin": "^0.52.1",
     "@html-eslint/parser": "^0.52.0",
     "@smarttools/eslint-plugin-rxjs": "^1.0.22",
     "@stylistic/eslint-plugin": "^5.6.1",
     "@types/glob": "*",
-    "@typescript-eslint/eslint-plugin": "^8.50.0",
-    "angular-eslint": "^20.7.0",
+    "@typescript-eslint/eslint-plugin": "^8.53.0",
+    "angular-eslint": "^21.1.0",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.7",
     "eslint-plugin-compat": "^6.0.2",
@@ -27,8 +27,8 @@
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jest": "^29.5.0",
     "eslint-plugin-package-json": "^0.85.0",
-    "eslint-plugin-perfectionist": "^4.15.1",
-    "eslint-plugin-playwright": "^2.4.0",
+    "eslint-plugin-perfectionist": "^5.3.1",
+    "eslint-plugin-playwright": "^2.5.0",
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-simple-import-sort": "^12.1.1",
@@ -36,7 +36,7 @@
     "eslint-plugin-unicorn": "^62.0.0",
     "eslint-plugin-unused-imports": "^4.3.0",
     "glob": "*",
-    "globals": "^16.5.0",
+    "globals": "^17.0.0",
     "typescript-eslint": "^8.50.0"
   },
   "publishConfig": {