@diia-inhouse/oxc-config 6.0.0 → 6.1.0

package/dist/oxlint/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../oxlint/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAsC,MAAM,QAAQ,CAAA;AAE9E,KAAK,MAAM,GAAG,YAAY,GAAG;IAAE,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAAA;AAujBzD,eAAO,MAAM,IAAI,EAAE,MAAuC,CAAA;AAE1D,eAAO,MAAM,UAAU,EAAE,MAKvB,CAAA;AAIF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,YAAY,GAAI,QAAQ,YAAY,KAAG,YAOnD,CAAA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../oxlint/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAsC,MAAM,QAAQ,CAAA;AAE9E,KAAK,MAAM,GAAG,YAAY,GAAG;IAAE,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAAA;AAsjBzD,eAAO,MAAM,IAAI,EAAE,MAAuC,CAAA;AAE1D,eAAO,MAAM,UAAU,EAAE,MAKvB,CAAA;AAIF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,YAAY,GAAI,QAAQ,YAAY,KAAG,YAOnD,CAAA"}

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') },
@@ -188,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',
@@ -215,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

@@ -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',

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

@@ -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',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@diia-inhouse/oxc-config",
-    "version": "6.0.0",
+    "version": "6.1.0",
     "description": "OXC toolchain configs for Diia services: oxlint, oxfmt, oxc transformer",
     "license": "SEE LICENSE IN LICENSE.md",
     "author": "diia-team",
@@ -30,7 +30,6 @@
     },
     "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",