@diia-inhouse/oxc-config 5.0.2 → 6.1.0

package/dist/oxlint/config.js

@@ -9,7 +9,6 @@ const baseConfig = {
         resolve('eslint-plugin-security'),
         resolve('eslint-plugin-regexp'),
         { name: '@stylistic/js', specifier: resolve('@stylistic/eslint-plugin') },
-        resolve('@diia-inhouse/eslint-plugin'),
         { name: '@diia-inhouse/package', specifier: resolveFile('./plugins/packageCheck.mjs') },
         { name: '@diia-inhouse/locale', specifier: resolveFile('./plugins/noHardcodedCyrillic.mjs') },
         { name: '@diia-inhouse/test', specifier: resolveFile('./plugins/testConventions.mjs') },
@@ -69,6 +68,7 @@ const baseConfig = {
         'import/prefer-default-export': 'off',
         'import/named': 'off',
         'import/namespace': 'off',
+        'import/no-cycle': ['error', { ignoreTypes: true }],
         'import/no-unassigned-import': ['warn', { allow: ['**/*.css', 'reflect-metadata', 'module-alias/register'] }],
         'typescript/consistent-type-assertions': ['error', { assertionStyle: 'as' }],
         'typescript/no-unsafe-type-assertion': 'off',
@@ -187,7 +187,6 @@ const baseConfig = {
         'security/detect-object-injection': 'off',
         'security/detect-non-literal-fs-filename': 'error',
         'security/detect-non-literal-regexp': 'error',
-        '@diia-inhouse/logger-err-field': 'error',
         '@diia-inhouse/package/no-service-in-package-name': 'error',
         '@diia-inhouse/package/pinned-dependencies': 'error',
         '@diia-inhouse/package/unique-dependencies': 'error',
@@ -214,6 +213,7 @@ const baseConfig = {
         '@diia-inhouse/code/prefer-as-const-object': 'error',
         '@diia-inhouse/code/const-enum-naming': 'error',
         '@diia-inhouse/code/const-enum-type-name': 'error',
+        '@diia-inhouse/code/logger-err-field': 'error',
         '@diia-inhouse/mongoose/status-requires-history': 'error',
         // Context-specific rules — off by default, enable per service in oxlint.config.ts
         '@diia-inhouse/mongoose/schema-timestamps': 'off',

package/dist/oxlint/plugins/codeConventions.mjs

@@ -77,6 +77,83 @@ function isValidPlural(rawSingular, rawPlural) {
     return false
 }
 
+const LOGGER_PROPERTY = 'logger'
+const ERROR_FIELD = 'err'
+
+function isNode(value) {
+    return value !== null && typeof value === 'object' && typeof value.type === 'string'
+}
+
+function collect(root, predicate) {
+    const found = []
+
+    const walk = (node) => {
+        if (predicate(node)) {
+            found.push(node)
+        }
+
+        for (const key of Object.keys(node)) {
+            if (key === 'parent') {
+                continue
+            }
+
+            const value = node[key]
+
+            if (Array.isArray(value)) {
+                for (const child of value) {
+                    if (isNode(child)) {
+                        walk(child)
+                    }
+                }
+            } else if (isNode(value)) {
+                walk(value)
+            }
+        }
+    }
+
+    walk(root)
+
+    return found
+}
+
+function isThisLogger(node) {
+    return (
+        node.type === 'MemberExpression' &&
+        node.object.type === 'ThisExpression' &&
+        node.property.type === 'Identifier' &&
+        node.property.name === LOGGER_PROPERTY
+    )
+}
+
+// this.logger.error(...) and chains such as this.logger.child(...).warn(...)
+function isLoggerCall(node) {
+    if (node.type !== 'CallExpression') {
+        return false
+    }
+
+    let callee = node.callee
+
+    while (callee.type === 'MemberExpression' || callee.type === 'CallExpression') {
+        if (isThisLogger(callee)) {
+            return true
+        }
+
+        callee = callee.type === 'MemberExpression' ? callee.object : callee.callee
+    }
+
+    return false
+}
+
+function isErrorUnderWrongField(node, errorName) {
+    return (
+        node.type === 'Property' &&
+        node.value.type === 'Identifier' &&
+        node.value.name === errorName &&
+        node.key.type === 'Identifier' &&
+        node.key.name !== ERROR_FIELD
+    )
+}
+
 export default {
     meta: { name: '@diia-inhouse/oxlint-plugin-code' },
     rules: {
@@ -274,5 +351,47 @@ export default {
                 }
             },
         },
+
+        'logger-err-field': {
+            meta: {
+                type: 'problem',
+                messages: {
+                    errField: 'Error must be logged only in the object with [err] field. For example: <{err: e}>',
+                },
+            },
+            create(context) {
+                return {
+                    CatchClause(node) {
+                        if (!node.param || node.param.type !== 'Identifier') {
+                            return
+                        }
+
+                        const errorName = node.param.name
+                        const report = (target) => context.report({ node: target, messageId: 'errField' })
+                        const wrongFields = (root) => collect(root, (candidate) => isErrorUnderWrongField(candidate, errorName))
+
+                        for (const call of collect(node.body, isLoggerCall)) {
+                            for (const arg of call.arguments) {
+                                if (arg.type === 'Identifier' && arg.name === errorName) {
+                                    report(arg)
+                                } else if (arg.type === 'Identifier') {
+                                    const declarators = collect(
+                                        node.body,
+                                        (candidate) =>
+                                            candidate.type === 'VariableDeclarator' &&
+                                            candidate.id.type === 'Identifier' &&
+                                            candidate.id.name === arg.name,
+                                    )
+
+                                    declarators.flatMap(wrongFields).forEach(report)
+                                } else if (arg.type === 'ObjectExpression') {
+                                    wrongFields(arg).forEach(report)
+                                }
+                            }
+                        }
+                    },
+                }
+            },
+        },
     },
 }

package/dist/oxlint/plugins/packageCheck.mjs

@@ -5,7 +5,7 @@ import { dirname, join, relative, resolve } from 'node:path'
 const FIX_FLAGS = new Set(['--fix', '--fix-suggestions', '--fix-dangerously'])
 const DEPENDENCY_FIELDS = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies']
 const PUBLISH_FIELDS = ['license', 'files', 'publishConfig', 'repository']
-const LEGACY_CONFIG_FIELDS = ['prettier', 'eslintConfig', 'eslintIgnore']
+const LEGACY_CONFIG_FIELDS = ['prettier', 'eslintConfig', 'eslintIgnore', 'madge']
 const LEGACY_PACKAGES = [
     'eslint',
     'typescript-eslint',
@@ -13,6 +13,7 @@ const LEGACY_PACKAGES = [
     'eslint-config-prettier',
     'eslint-plugin-prettier',
     '@diia-inhouse/eslint-config',
+    '@diia-inhouse/eslint-plugin',
     'prettier',
     'prettier-plugin-sort-imports',
     '@ianvs/prettier-plugin-sort-imports',
@@ -20,9 +21,14 @@ const LEGACY_PACKAGES = [
     'ts-node',
     'ts-node-dev',
     'nodemon',
+    'madge',
 ]
-const LEGACY_SCRIPT_NAMES = new Set(['eslint', 'prettier'])
-const LEGACY_TOOL_PATTERN = /\b(eslint|prettier)\b/
+const LEGACY_SCRIPTS = new Map([
+    ['eslint', 'eslint'],
+    ['prettier', 'prettier'],
+    ['find-circulars', 'madge'],
+])
+const LEGACY_TOOL_PATTERN = /\b(eslint|prettier|madge)\b/
 const SERVICE_NAME_PATTERN = /^service-|-service$/
 const VERSION_RANGE_PATTERN = /^[\^~]/
 const EXACT_VERSION_PATTERN = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/
@@ -50,7 +56,6 @@ const DEV_TOOL_PATTERNS = [
     /^@eslint\//,
     /^prettier(-|$)/,
     /^typescript$/,
-    /^madge$/,
     /^lockfile-lint$/,
     /^semantic-release(-|$)/,
     /^@semantic-release\//,
@@ -64,7 +69,6 @@ const DEFAULT_NODE_MAJOR = 24
 const DEFAULT_AUTHOR = 'diia-team'
 const DEV_SCRIPT = 'diia-dev'
 const COMMITLINT_CONFIG = '@diia-inhouse/configs/dist/commitlint'
-const MADGE_TS_CONFIG = './tsconfig.json'
 const RUNTIME_SOURCE_PATTERN = /^src\//
 const TEST_SOURCE_PATTERN = /(^|\/)(tests?|__tests__|__mocks__)\/|\.(spec|test)\.[cm]?[jt]sx?$/
 const RUNTIME_DEPENDENCY_FIELDS = ['dependencies', 'peerDependencies', 'optionalDependencies']
@@ -408,7 +412,7 @@ export const manifestRules = {
             const violations = []
 
             for (const [name, body] of Object.entries(scripts)) {
-                const tool = LEGACY_SCRIPT_NAMES.has(name) ? name : LEGACY_TOOL_PATTERN.exec(String(body))?.[1]
+                const tool = LEGACY_SCRIPTS.get(name) ?? LEGACY_TOOL_PATTERN.exec(String(body))?.[1]
 
                 if (tool) {
                     violations.push({ messageId: 'script', data: { name, tool } })
@@ -419,7 +423,7 @@ export const manifestRules = {
         },
         fix: (data) => {
             for (const [name, body] of Object.entries(data.scripts ?? {})) {
-                if (LEGACY_SCRIPT_NAMES.has(name)) {
+                if (LEGACY_SCRIPTS.has(name)) {
                     delete data.scripts[name]
                 } else {
                     data.scripts[name] = String(body)
@@ -558,7 +562,6 @@ export const manifestRules = {
     'shared-configs': {
         messages: {
             commitlint: 'package.json "commitlint.extends" must be "{{ expected }}" so commit messages are checked by the shared rules.',
-            madge: 'package.json "madge.tsConfig" must be "{{ expected }}" so find-circulars resolves the same paths as the build.',
         },
         check: (data) => {
             const violations = []
@@ -567,10 +570,6 @@ export const manifestRules = {
                 violations.push({ messageId: 'commitlint', data: { expected: COMMITLINT_CONFIG } })
             }
 
-            if (dependsOn(data, 'madge') && data.madge?.tsConfig !== MADGE_TS_CONFIG) {
-                violations.push({ messageId: 'madge', data: { expected: MADGE_TS_CONFIG } })
-            }
-
             return violations
         },
         fix: (data) => {
@@ -578,10 +577,6 @@ export const manifestRules = {
                 data.commitlint = { ...data.commitlint, extends: COMMITLINT_CONFIG }
             }
 
-            if (dependsOn(data, 'madge')) {
-                data.madge = { ...data.madge, tsConfig: MADGE_TS_CONFIG }
-            }
-
             return data
         },
     },

package/oxlint/plugins/codeConventions.mjs

@@ -77,6 +77,83 @@ function isValidPlural(rawSingular, rawPlural) {
     return false
 }
 
+const LOGGER_PROPERTY = 'logger'
+const ERROR_FIELD = 'err'
+
+function isNode(value) {
+    return value !== null && typeof value === 'object' && typeof value.type === 'string'
+}
+
+function collect(root, predicate) {
+    const found = []
+
+    const walk = (node) => {
+        if (predicate(node)) {
+            found.push(node)
+        }
+
+        for (const key of Object.keys(node)) {
+            if (key === 'parent') {
+                continue
+            }
+
+            const value = node[key]
+
+            if (Array.isArray(value)) {
+                for (const child of value) {
+                    if (isNode(child)) {
+                        walk(child)
+                    }
+                }
+            } else if (isNode(value)) {
+                walk(value)
+            }
+        }
+    }
+
+    walk(root)
+
+    return found
+}
+
+function isThisLogger(node) {
+    return (
+        node.type === 'MemberExpression' &&
+        node.object.type === 'ThisExpression' &&
+        node.property.type === 'Identifier' &&
+        node.property.name === LOGGER_PROPERTY
+    )
+}
+
+// this.logger.error(...) and chains such as this.logger.child(...).warn(...)
+function isLoggerCall(node) {
+    if (node.type !== 'CallExpression') {
+        return false
+    }
+
+    let callee = node.callee
+
+    while (callee.type === 'MemberExpression' || callee.type === 'CallExpression') {
+        if (isThisLogger(callee)) {
+            return true
+        }
+
+        callee = callee.type === 'MemberExpression' ? callee.object : callee.callee
+    }
+
+    return false
+}
+
+function isErrorUnderWrongField(node, errorName) {
+    return (
+        node.type === 'Property' &&
+        node.value.type === 'Identifier' &&
+        node.value.name === errorName &&
+        node.key.type === 'Identifier' &&
+        node.key.name !== ERROR_FIELD
+    )
+}
+
 export default {
     meta: { name: '@diia-inhouse/oxlint-plugin-code' },
     rules: {
@@ -274,5 +351,47 @@ export default {
                 }
             },
         },
+
+        'logger-err-field': {
+            meta: {
+                type: 'problem',
+                messages: {
+                    errField: 'Error must be logged only in the object with [err] field. For example: <{err: e}>',
+                },
+            },
+            create(context) {
+                return {
+                    CatchClause(node) {
+                        if (!node.param || node.param.type !== 'Identifier') {
+                            return
+                        }
+
+                        const errorName = node.param.name
+                        const report = (target) => context.report({ node: target, messageId: 'errField' })
+                        const wrongFields = (root) => collect(root, (candidate) => isErrorUnderWrongField(candidate, errorName))
+
+                        for (const call of collect(node.body, isLoggerCall)) {
+                            for (const arg of call.arguments) {
+                                if (arg.type === 'Identifier' && arg.name === errorName) {
+                                    report(arg)
+                                } else if (arg.type === 'Identifier') {
+                                    const declarators = collect(
+                                        node.body,
+                                        (candidate) =>
+                                            candidate.type === 'VariableDeclarator' &&
+                                            candidate.id.type === 'Identifier' &&
+                                            candidate.id.name === arg.name,
+                                    )
+
+                                    declarators.flatMap(wrongFields).forEach(report)
+                                } else if (arg.type === 'ObjectExpression') {
+                                    wrongFields(arg).forEach(report)
+                                }
+                            }
+                        }
+                    },
+                }
+            },
+        },
     },
 }

package/oxlint/plugins/packageCheck.mjs

@@ -5,7 +5,7 @@ import { dirname, join, relative, resolve } from 'node:path'
 const FIX_FLAGS = new Set(['--fix', '--fix-suggestions', '--fix-dangerously'])
 const DEPENDENCY_FIELDS = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies']
 const PUBLISH_FIELDS = ['license', 'files', 'publishConfig', 'repository']
-const LEGACY_CONFIG_FIELDS = ['prettier', 'eslintConfig', 'eslintIgnore']
+const LEGACY_CONFIG_FIELDS = ['prettier', 'eslintConfig', 'eslintIgnore', 'madge']
 const LEGACY_PACKAGES = [
     'eslint',
     'typescript-eslint',
@@ -13,6 +13,7 @@ const LEGACY_PACKAGES = [
     'eslint-config-prettier',
     'eslint-plugin-prettier',
     '@diia-inhouse/eslint-config',
+    '@diia-inhouse/eslint-plugin',
     'prettier',
     'prettier-plugin-sort-imports',
     '@ianvs/prettier-plugin-sort-imports',
@@ -20,9 +21,14 @@ const LEGACY_PACKAGES = [
     'ts-node',
     'ts-node-dev',
     'nodemon',
+    'madge',
 ]
-const LEGACY_SCRIPT_NAMES = new Set(['eslint', 'prettier'])
-const LEGACY_TOOL_PATTERN = /\b(eslint|prettier)\b/
+const LEGACY_SCRIPTS = new Map([
+    ['eslint', 'eslint'],
+    ['prettier', 'prettier'],
+    ['find-circulars', 'madge'],
+])
+const LEGACY_TOOL_PATTERN = /\b(eslint|prettier|madge)\b/
 const SERVICE_NAME_PATTERN = /^service-|-service$/
 const VERSION_RANGE_PATTERN = /^[\^~]/
 const EXACT_VERSION_PATTERN = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/
@@ -50,7 +56,6 @@ const DEV_TOOL_PATTERNS = [
     /^@eslint\//,
     /^prettier(-|$)/,
     /^typescript$/,
-    /^madge$/,
     /^lockfile-lint$/,
     /^semantic-release(-|$)/,
     /^@semantic-release\//,
@@ -64,7 +69,6 @@ const DEFAULT_NODE_MAJOR = 24
 const DEFAULT_AUTHOR = 'diia-team'
 const DEV_SCRIPT = 'diia-dev'
 const COMMITLINT_CONFIG = '@diia-inhouse/configs/dist/commitlint'
-const MADGE_TS_CONFIG = './tsconfig.json'
 const RUNTIME_SOURCE_PATTERN = /^src\//
 const TEST_SOURCE_PATTERN = /(^|\/)(tests?|__tests__|__mocks__)\/|\.(spec|test)\.[cm]?[jt]sx?$/
 const RUNTIME_DEPENDENCY_FIELDS = ['dependencies', 'peerDependencies', 'optionalDependencies']
@@ -408,7 +412,7 @@ export const manifestRules = {
             const violations = []
 
             for (const [name, body] of Object.entries(scripts)) {
-                const tool = LEGACY_SCRIPT_NAMES.has(name) ? name : LEGACY_TOOL_PATTERN.exec(String(body))?.[1]
+                const tool = LEGACY_SCRIPTS.get(name) ?? LEGACY_TOOL_PATTERN.exec(String(body))?.[1]
 
                 if (tool) {
                     violations.push({ messageId: 'script', data: { name, tool } })
@@ -419,7 +423,7 @@ export const manifestRules = {
         },
         fix: (data) => {
             for (const [name, body] of Object.entries(data.scripts ?? {})) {
-                if (LEGACY_SCRIPT_NAMES.has(name)) {
+                if (LEGACY_SCRIPTS.has(name)) {
                     delete data.scripts[name]
                 } else {
                     data.scripts[name] = String(body)
@@ -558,7 +562,6 @@ export const manifestRules = {
     'shared-configs': {
         messages: {
             commitlint: 'package.json "commitlint.extends" must be "{{ expected }}" so commit messages are checked by the shared rules.',
-            madge: 'package.json "madge.tsConfig" must be "{{ expected }}" so find-circulars resolves the same paths as the build.',
         },
         check: (data) => {
             const violations = []
@@ -567,10 +570,6 @@ export const manifestRules = {
                 violations.push({ messageId: 'commitlint', data: { expected: COMMITLINT_CONFIG } })
             }
 
-            if (dependsOn(data, 'madge') && data.madge?.tsConfig !== MADGE_TS_CONFIG) {
-                violations.push({ messageId: 'madge', data: { expected: MADGE_TS_CONFIG } })
-            }
-
             return violations
         },
         fix: (data) => {
@@ -578,10 +577,6 @@ export const manifestRules = {
                 data.commitlint = { ...data.commitlint, extends: COMMITLINT_CONFIG }
             }
 
-            if (dependsOn(data, 'madge')) {
-                data.madge = { ...data.madge, tsConfig: MADGE_TS_CONFIG }
-            }
-
             return data
         },
     },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@diia-inhouse/oxc-config",
-    "version": "5.0.2",
+    "version": "6.1.0",
     "description": "OXC toolchain configs for Diia services: oxlint, oxfmt, oxc transformer",
     "license": "SEE LICENSE IN LICENSE.md",
     "author": "diia-team",
@@ -25,13 +25,11 @@
         "prepare": "npm run build",
         "lint": "oxlint && oxfmt --check",
         "lint-fix": "oxlint --fix && oxfmt",
-        "find-circulars": "madge --circular --extensions ts ./",
         "lint:lockfile": "lockfile-lint --path package-lock.json --allowed-hosts registry.npmjs.org --validate-https",
         "semantic-release": "semantic-release"
     },
     "dependencies": {
         "@boundaries/eslint-plugin": "7.2.1",
-        "@diia-inhouse/eslint-plugin": "1.9.13",
         "@stylistic/eslint-plugin": "5.10.0",
         "eslint-import-resolver-oxc": "0.15.0",
         "eslint-plugin-regexp": "3.3.1",
@@ -45,7 +43,6 @@
         "@vitest/coverage-v8": "5.0.5",
         "@vitest/ui": "5.0.5",
         "lockfile-lint": "5.0.1",
-        "madge": "8.0.0",
         "oxfmt": "0.72.0",
         "oxlint": "1.87.0",
         "oxlint-tsgolint": "7.0.2003",
@@ -68,8 +65,5 @@
     },
     "engines": {
         "node": ">=24"
-    },
-    "madge": {
-        "tsConfig": "./tsconfig.json"
     }
 }