@diia-inhouse/genproto 3.3.1 → 4.0.0

package/package.json

@@ -1,25 +1,33 @@
 {
     "name": "@diia-inhouse/genproto",
-    "version": "3.3.1",
+    "version": "4.0.0",
+    "type": "module",
     "description": "JS codegen from proto with imports from @diia-inhouse/types",
     "bin": {
         "genproto": "./dist/genproto.js"
     },
+    "exports": {
+        ".": {
+            "types": "./dist/types/genproto.d.ts",
+            "default": "./dist/genproto.js"
+        },
+        "./package.json": "./package.json"
+    },
     "repository": "https://github.com/diia-open-source/be-genproto",
     "scripts": {
         "prebuild": "rimraf dist",
         "build": "tsc",
         "build:watch": "tsc --watch",
         "semantic-release": "semantic-release",
-        "lint": "eslint . && prettier --check .",
-        "lint-fix": "eslint --fix . && prettier --write .",
+        "lint": "oxlint && oxfmt --check .",
+        "lint-fix": "oxlint --fix && oxfmt .",
         "lint:lockfile": "lockfile-lint --path package-lock.json --allowed-hosts registry.npmjs.org --validate-https",
         "prepare": "npm run build",
         "test": "tsc --project tests/tsconfig.json && vitest run",
         "find-circulars": "madge --circular --extensions ts ./"
     },
     "engines": {
-        "node": ">=20"
+        "node": ">=24"
     },
     "author": "Diia",
     "license": "SEE LICENSE IN LICENSE.md",
@@ -28,28 +36,29 @@
         "src"
     ],
     "dependencies": {
-        "glob": "11.1.0",
+        "glob": "13.0.6",
         "lodash": "4.18.1",
-        "lookpath": "1.2.2",
-        "yargs": "17.7.2"
+        "lookpath": "1.2.3",
+        "yargs": "18.0.0"
     },
     "peerDependencies": {
         "ts-proto": ">=2.7.0"
     },
     "devDependencies": {
-        "@diia-inhouse/configs": "6.1.1",
-        "@diia-inhouse/eslint-config": "8.8.2",
+        "@diia-inhouse/configs": "7.0.0",
+        "@diia-inhouse/oxc-config": "1.9.3",
         "@types/lodash": "4.17.24",
-        "@types/node": "20.17.1",
-        "@types/yargs": "17.0.33",
-        "@vitest/coverage-v8": "4.1.2",
-        "eslint": "9.33.0",
-        "lockfile-lint": "4.14.0",
-        "madge": "7.0.0",
-        "prettier": "3.3.3",
-        "rimraf": "6.0.1",
-        "semantic-release": "24.0.0",
-        "vitest": "4.1.2"
+        "@types/node": "25.6.2",
+        "@types/yargs": "17.0.35",
+        "@vitest/coverage-v8": "4.1.5",
+        "lockfile-lint": "5.0.0",
+        "madge": "8.0.0",
+        "oxfmt": "0.48.0",
+        "oxlint": "1.63.0",
+        "oxlint-tsgolint": "0.22.1",
+        "rimraf": "6.1.3",
+        "semantic-release": "25.0.3",
+        "vitest": "4.1.5"
     },
     "release": {
         "extends": "@diia-inhouse/configs/dist/semantic-release/package"
@@ -57,7 +66,6 @@
     "commitlint": {
         "extends": "@diia-inhouse/configs/dist/commitlint"
     },
-    "prettier": "@diia-inhouse/eslint-config/prettier",
     "madge": {
         "tsConfig": "./tsconfig.json"
     }

package/src/command/index.ts

@@ -3,7 +3,7 @@ import path from 'node:path'
 
 import { glob } from 'glob'
 
-import Logger from '../logger'
+import Logger from '../logger.js'
 
 export enum Platform {
     ts = 'ts',
@@ -25,7 +25,7 @@ export abstract class CommandBuilder {
         const protoFiles = await glob(`${this.rootDir}/**/*.proto`, { ignore: '**/node_modules/**' })
 
         if (protoFiles.length > 0) {
-            iPath += ' ' + protoFiles.join(' ')
+            iPath += ` ${protoFiles.join(' ')}`
         }
 
         return iPath.trim()
@@ -61,7 +61,6 @@ export abstract class CommandBuilder {
                 return acc
             }
 
-            // eslint-disable-next-line security/detect-non-literal-fs-filename
             const contents = fs.readFileSync(value) // nosemgrep: eslint.detect-non-literal-fs-filename
             if (!contents.includes('package ua.gov.diia')) {
                 return acc

package/src/command/javaCommandBuilder.ts

@@ -1,4 +1,4 @@
-import { CommandBuilder } from './index'
+import { CommandBuilder } from './index.js'
 
 export default class JavaCommandBuilder extends CommandBuilder {
     async protocCommand(): Promise<string[]> {

package/src/command/pythonCommandBuilder.ts

@@ -1,4 +1,3 @@
-/* eslint-disable security/detect-non-literal-fs-filename */
 import { once } from 'node:events'
 import { WriteStream, createWriteStream, existsSync } from 'node:fs'
 import fsPromises from 'node:fs/promises'
@@ -6,16 +5,16 @@ import path from 'node:path'
 import { finished } from 'node:stream/promises'
 
 import { glob } from 'glob'
-import { snakeCase } from 'lodash'
+import snakeCase from 'lodash/snakeCase.js'
 
-import Logger from '../logger'
-import { CommandBuilder } from './index'
-
-// import "designSystem/molecules/attentionIconMessageMlc.proto";
-const importRegex = /import "(?<path>[^"]+)";/
-const slashPrefix = /^\/+/
+import Logger from '../logger.js'
+import { CommandBuilder } from './index.js'
 
 export default class PythonCommandBuilder extends CommandBuilder {
+    // import "designSystem/molecules/attentionIconMessageMlc.proto";
+    static readonly importRegex = /import "(?<path>[^"]+)";/
+    static readonly slashPrefix = /^\/+/
+
     private cardinalDependencies: Record<string, string> = {
         'node_modules/@diia-inhouse/types/dist/proto': 'types_proto',
         'node_modules/@diia-inhouse/design-system/dist/proto': 'design_system_proto',
@@ -33,8 +32,8 @@ export default class PythonCommandBuilder extends CommandBuilder {
             '--proto_path=node_modules/protobufjs/google',
             '--proto_path=/usr/local/include',
             ...Object.keys(this.cardinalDependencies)
-                .filter((path) => existsSync(path)) // nosemgrep: eslint.detect-non-literal-fs-filename
-                .map((path) => `--proto_path=${path}`),
+                .filter((depPath) => existsSync(depPath)) // nosemgrep: eslint.detect-non-literal-fs-filename
+                .map((depPath) => `--proto_path=${depPath}`),
         ]
 
         for (const protoPath of this.protoPaths) {
@@ -71,7 +70,7 @@ export default class PythonCommandBuilder extends CommandBuilder {
             const files = await glob(dep + protoPattern)
 
             for (const file of files) {
-                const res = file.replace(dep, '').replace(slashPrefix, '')
+                const res = file.replace(dep, '').replace(PythonCommandBuilder.slashPrefix, '')
 
                 mapping[res] = this.cardinalDependencies[dep]
 
@@ -79,7 +78,7 @@ export default class PythonCommandBuilder extends CommandBuilder {
             }
         }
 
-        const localProtos = await glob('proto' + protoPattern)
+        const localProtos = await glob(`proto${protoPattern}`)
 
         const rulesTasks = []
         for (const localProto of localProtos) {
@@ -90,7 +89,7 @@ export default class PythonCommandBuilder extends CommandBuilder {
 
         replaceRules = [...new Map(rules.flat().map((rule) => [rule.regex.source, rule])).values()]
 
-        const generatedFiles = await glob(this.outputDir + '/**/*.py')
+        const generatedFiles = await glob(`${this.outputDir}/**/*.py`)
 
         const tasks: Promise<void>[] = []
         for (const generatedFile of generatedFiles) {
@@ -119,7 +118,7 @@ async function touchFilesInTree(dirPath: string, fileName: string, logger: Logge
         await handle.utimes(new Date(), new Date()) // nosemgrep: eslint.detect-non-literal-fs-filename
         await handle.close()
     } catch (err) {
-        logger.log(`Could not touch file in ${dirPath}: ${err instanceof Error ? err.message : err}`)
+        logger.log(`Could not touch file in ${dirPath}: ${err instanceof Error ? err.message : String(err)}`)
     }
 
     for (const entry of entries) {
@@ -149,7 +148,6 @@ async function replaceRulesTask(
         const protoFilenameSnakeImportAlies = doubleInnerUnderscores(protoFilenameSnake)
 
         if (protoDirname === 'proto') {
-            // eslint-disable-next-line security/detect-non-literal-regexp
             const rootImportRegex = new RegExp( // nosemgrep: eslint.detect-non-literal-regexp
                 `^${escapeRegex(`import ${protoFilenameSnake}_pb2 as ${protoFilenameSnakeImportAlies}__pb2`)}`,
             )
@@ -161,7 +159,7 @@ async function replaceRulesTask(
         }
 
         for await (const line of handle.readLines()) {
-            const result = importRegex.exec(line)
+            const result = PythonCommandBuilder.importRegex.exec(line)
             const importPath = result?.groups?.path
 
             if (importPath === undefined) {
@@ -175,13 +173,12 @@ async function replaceRulesTask(
                 const depname = mapping[importPath]
 
                 if (depname === undefined) {
-                    logger.log(`Looking for ${importPath} in mapper, received ${depname}. Skipping the mapper.`)
+                    logger.log(`Looking for ${importPath} in mapper, received undefined. Skipping the mapper.`)
                     continue
                 }
 
                 logger.log(`I'm looking for ${fileName} (${fileName}) to map as "import ${fileName}_pb2"`)
 
-                // eslint-disable-next-line security/detect-non-literal-regexp
                 const flatImportRegex = new RegExp(`^${escapeRegex(`import ${fileName}_pb2`)}`) // nosemgrep: eslint.detect-non-literal-regexp
 
                 replaceRules.push({
@@ -192,7 +189,7 @@ async function replaceRulesTask(
                 const depname = mapping[importPath]
 
                 if (depname === undefined) {
-                    logger.log(`Looking for ${importPath} in mapper, received ${depname}. Skipping the mapper.`)
+                    logger.log(`Looking for ${importPath} in mapper, received undefined. Skipping the mapper.`)
                     continue
                 }
 
@@ -200,7 +197,6 @@ async function replaceRulesTask(
 
                 logger.log(`I'm looking for ${fileName} (${fileName}) to map as "from ${importName} import ${fileName}_pb2"`)
 
-                // eslint-disable-next-line security/detect-non-literal-regexp
                 const nestedImportRegex = new RegExp(`^${escapeRegex(`from ${importName} import ${fileName}_pb2`)}`) // nosemgrep: eslint.detect-non-literal-regexp
 
                 replaceRules.push({
@@ -225,7 +221,7 @@ async function fileMapper(generatedFile: string, replaceRules: { regex: RegExp;
     try {
         handle = await fsPromises.open(generatedFile) // nosemgrep: eslint.detect-non-literal-fs-filename
 
-        wstream = createWriteStream(generatedFile + '.new') // nosemgrep: eslint.detect-non-literal-fs-filename
+        wstream = createWriteStream(`${generatedFile}.new`) // nosemgrep: eslint.detect-non-literal-fs-filename
 
         for await (const line of handle.readLines()) {
             let mutableLine = line
@@ -233,7 +229,7 @@ async function fileMapper(generatedFile: string, replaceRules: { regex: RegExp;
                 mutableLine = mutableLine.replace(rule.regex, rule.to)
             }
 
-            const writeOk = wstream.write(mutableLine + '\n')
+            const writeOk = wstream.write(`${mutableLine}\n`)
 
             if (!writeOk) {
                 await once(wstream, 'drain')
@@ -251,22 +247,22 @@ async function fileMapper(generatedFile: string, replaceRules: { regex: RegExp;
             await finished(wstream)
 
             // nosemgrep: eslint.detect-non-literal-fs-filename
-            if (!isOk && existsSync(generatedFile + '.new')) {
-                await fsPromises.unlink(generatedFile + '.new') // nosemgrep: eslint.detect-non-literal-fs-filename
+            if (!isOk && existsSync(`${generatedFile}.new`)) {
+                await fsPromises.unlink(`${generatedFile}.new`) // nosemgrep: eslint.detect-non-literal-fs-filename
             }
         }
     }
 
     try {
-        await fsPromises.rename(generatedFile + '.new', generatedFile) // nosemgrep: eslint.detect-non-literal-fs-filename
+        await fsPromises.rename(`${generatedFile}.new`, generatedFile) // nosemgrep: eslint.detect-non-literal-fs-filename
         logger.log('Update successful!')
     } catch (err) {
         // nosemgrep: eslint.detect-non-literal-fs-filename
-        if (existsSync(generatedFile + '.new')) {
-            await fsPromises.unlink(generatedFile + '.new') // nosemgrep: eslint.detect-non-literal-fs-filename
+        if (existsSync(`${generatedFile}.new`)) {
+            await fsPromises.unlink(`${generatedFile}.new`) // nosemgrep: eslint.detect-non-literal-fs-filename
         }
 
-        logger.log(`Final swap failed: ${err}`)
+        logger.log(`Final swap failed: ${err instanceof Error ? err.message : String(err)}`)
         throw err
     }
 }

package/src/command/tsCommandBuilder.ts

@@ -4,58 +4,58 @@ import path from 'node:path'
 
 import { glob } from 'glob'
 
-import Logger from '../logger'
-import { CommandBuilder, Platform } from './index'
-
-const reservedWords = new Set([
-    'break',
-    'case',
-    'catch',
-    'class',
-    'const',
-    'continue',
-    'debugger',
-    'default',
-    'delete',
-    'do',
-    'else',
-    'enum',
-    'export',
-    'extends',
-    'false',
-    'finally',
-    'for',
-    'function',
-    'if',
-    'import',
-    'in',
-    'instanceof',
-    'new',
-    'null',
-    'return',
-    'super',
-    'switch',
-    'this',
-    'throw',
-    'true',
-    'try',
-    'typeof',
-    'var',
-    'void',
-    'while',
-    'with',
-    'yield',
-    'let',
-    'static',
-    'implements',
-    'interface',
-    'package',
-    'private',
-    'protected',
-    'public',
-])
+import Logger from '../logger.js'
+import { CommandBuilder, Platform } from './index.js'
 
 export default class TsCommandBuilder extends CommandBuilder {
+    private static readonly reservedWords = new Set([
+        'break',
+        'case',
+        'catch',
+        'class',
+        'const',
+        'continue',
+        'debugger',
+        'default',
+        'delete',
+        'do',
+        'else',
+        'enum',
+        'export',
+        'extends',
+        'false',
+        'finally',
+        'for',
+        'function',
+        'if',
+        'import',
+        'in',
+        'instanceof',
+        'new',
+        'null',
+        'return',
+        'super',
+        'switch',
+        'this',
+        'throw',
+        'true',
+        'try',
+        'typeof',
+        'var',
+        'void',
+        'while',
+        'with',
+        'yield',
+        'let',
+        'static',
+        'implements',
+        'interface',
+        'package',
+        'private',
+        'protected',
+        'public',
+    ])
+
     // By default ts plugin should be linked to .bin dir but in case if it doesn't
     // try to look it up in "standard" locations
     private tsPluginLocations = [
@@ -80,7 +80,6 @@ export default class TsCommandBuilder extends CommandBuilder {
 
         for (const location of this.tsPluginLocations) {
             try {
-                // eslint-disable-next-line security/detect-non-literal-fs-filename
                 await fs.realpath(location) // nosemgrep: eslint.detect-non-literal-fs-filename
             } catch {
                 continue
@@ -115,7 +114,7 @@ export default class TsCommandBuilder extends CommandBuilder {
         switch (projectPlatform) {
             case Platform.java: {
                 typesProtoPath = `./${this.javaModule ?? '.'}/build/extracted-protos/main/`
-                typesSubPaths = [`${this.javaModule ?? '.'}`, 'build', 'extracted-protos', 'main']
+                typesSubPaths = [this.javaModule ?? '.', 'build', 'extracted-protos', 'main']
                 dependenciesPattern = `${this.javaModule ?? '.'}/build/extracted-protos/main/**/*.proto`
                 execSync(`./gradlew ${this.javaModule ?? ''}:extractProto`, { stdio: 'pipe' })
                 break
@@ -187,7 +186,6 @@ export default class TsCommandBuilder extends CommandBuilder {
         const files = await glob(path.join(this.outputDir, '**/*.ts'))
 
         for (const file of files) {
-            // eslint-disable-next-line security/detect-non-literal-fs-filename
             const content = await fs.readFile(file, 'utf8') // nosemgrep: eslint.detect-non-literal-fs-filename
 
             if (!content.includes('export namespace ')) {
@@ -197,7 +195,6 @@ export default class TsCommandBuilder extends CommandBuilder {
             const result = this.stripReservedWordTypeAliases(content)
 
             if (result !== content) {
-                // eslint-disable-next-line security/detect-non-literal-fs-filename
                 await fs.writeFile(file, result) // nosemgrep: eslint.detect-non-literal-fs-filename
             }
         }
@@ -235,7 +232,7 @@ export default class TsCommandBuilder extends CommandBuilder {
             if (insideNamespace) {
                 const match = line.match(/^\s*export type (\w+) = typeof /)
 
-                if (match && reservedWords.has(match[1])) {
+                if (match && TsCommandBuilder.reservedWords.has(match[1])) {
                     continue
                 }
 

package/src/genproto.ts

@@ -5,13 +5,14 @@ import path from 'node:path'
 
 import { lookpath } from 'lookpath'
 import yargs from 'yargs'
+import { hideBin } from 'yargs/helpers'
 
-import { CommandBuilder, Platform } from './command'
-import JavaCommandBuilder from './command/javaCommandBuilder'
-import PythonCommandBuilder from './command/pythonCommandBuilder'
-import TsCommandBuilder from './command/tsCommandBuilder'
-import Logger from './logger'
-import Utils from './utils'
+import { CommandBuilder, Platform } from './command/index.js'
+import JavaCommandBuilder from './command/javaCommandBuilder.js'
+import PythonCommandBuilder from './command/pythonCommandBuilder.js'
+import TsCommandBuilder from './command/tsCommandBuilder.js'
+import Logger from './logger.js'
+import Utils from './utils/index.js'
 
 async function main(): Promise<void> {
     const protocExists = await lookpath('protoc')
@@ -20,7 +21,7 @@ async function main(): Promise<void> {
         throw new Error("Couldn't find protoc in PATH")
     }
 
-    const options = await yargs
+    const options = await yargs(hideBin(process.argv))
         .usage('$0 --rootDir dirname --outputDir dirname')
         .option('v', { type: 'boolean', default: false })
         .option('platform', { type: 'string', default: Platform.ts })
@@ -51,12 +52,11 @@ async function main(): Promise<void> {
 
     logger.log(`Creating directory ${outputAbsoluteDir}...`)
 
-    // eslint-disable-next-line security/detect-non-literal-fs-filename
     await fs.promises.mkdir(outputDir, { recursive: true }) // nosemgrep: eslint.detect-non-literal-fs-filename
 
     let commandBuilder: CommandBuilder
 
-    switch (platform) {
+    switch (platform as Platform) {
         case Platform.java: {
             commandBuilder = new JavaCommandBuilder(logger, generateClient, rootDir, outputDir, protoPaths)
             break
@@ -91,7 +91,7 @@ async function main(): Promise<void> {
                     logger.log(`Generating index.ts for directory: ${indexDir}`)
                     await Utils.generateIndexForDirectory(indexDir, rootDir)
                 } catch (err) {
-                    logger.log(`Error processing directory ${dir}: ${err}`)
+                    logger.log(`Error processing directory ${dir}: ${err instanceof Error ? err.message : String(err)}`)
                 }
             }
         }

package/src/logger.ts

@@ -6,7 +6,7 @@ export default class Logger {
     }
 
     log(...message: string[]): void {
-        // eslint-disable-next-line no-console
+        // oxlint-disable-next-line eslint/no-console
         console.log(...message)
     }
 
@@ -15,7 +15,7 @@ export default class Logger {
             return
         }
 
-        // eslint-disable-next-line no-console
+        // oxlint-disable-next-line eslint/no-console
         console.log(...message)
     }
 }

package/src/utils/index.ts

@@ -3,25 +3,28 @@ import syncFs, { promises as fs } from 'node:fs'
 import path from 'node:path'
 import { createInterface } from 'node:readline'
 
+interface ExportedNames {
+    valueNames: string[]
+    typeNames: string[]
+}
+
 /**
  * Extract exported symbol names from a ts-proto generated TypeScript file.
  * Returns arrays of value exports and type-only exports separately.
  * Names that exist as both value and type (e.g. interface + const with same name)
  * are only included in valueNames to avoid duplicate identifier errors.
  */
-function extractExportedNames(content: string): { valueNames: string[]; typeNames: string[] } {
+function extractExportedNames(content: string): ExportedNames {
     const valueSet = new Set<string>()
     const typeSet = new Set<string>()
 
-    // eslint-disable-next-line regexp/no-unused-capturing-group
-    const exportRegex = /^export\s+(?:(const|let|var|function|enum|class)\s+(\w+)|(interface|type)\s+(\w+))/gm
-    let match
-    // eslint-disable-next-line no-cond-assign
-    while ((match = exportRegex.exec(content)) !== null) {
-        if (match[2]) {
-            valueSet.add(match[2])
-        } else if (match[4]) {
-            typeSet.add(match[4])
+    const exportRegex = /^export\s+(?:(?:const|let|var|function|enum|class)\s+(\w+)|(?:interface|type)\s+(\w+))/gm
+
+    for (const match of content.matchAll(exportRegex)) {
+        if (match[1]) {
+            valueSet.add(match[1])
+        } else if (match[2]) {
+            typeSet.add(match[2])
         }
     }
 
@@ -36,7 +39,6 @@ export default {
         const exportedNames = new Set<string>()
 
         const recursivePaths = async (realpath: string): Promise<string[]> => {
-            // eslint-disable-next-line security/detect-non-literal-fs-filename
             const items = await fs.readdir(realpath, { withFileTypes: true }) // nosemgrep: eslint.detect-non-literal-fs-filename
             let paths: string[] = []
 
@@ -54,7 +56,6 @@ export default {
         }
 
         for (const recPaths of await recursivePaths(dir)) {
-            // eslint-disable-next-line security/detect-non-literal-fs-filename
             const stream = syncFs.createReadStream(recPaths) // nosemgrep: eslint.detect-non-literal-fs-filename
             const rl = createInterface({
                 input: stream,
@@ -69,10 +70,8 @@ export default {
                     const protoFile = matchArr[1]
 
                     const protofilepath = path.resolve(protoRoot, protoFile)
-                    // prettier-ignore
-                    // eslint-disable-next-line security/detect-non-literal-fs-filename
-                    if (syncFs.existsSync(protofilepath)) { // nosemgrep: eslint.detect-non-literal-fs-filename
-                        // eslint-disable-next-line security/detect-non-literal-fs-filename
+                    const exists = syncFs.existsSync(protofilepath) // nosemgrep: eslint.detect-non-literal-fs-filename
+                    if (exists) {
                         const contents = syncFs.readFileSync(protofilepath) // nosemgrep: eslint.detect-non-literal-fs-filename
 
                         ownPackage = contents.includes('package ua.gov.diia')
@@ -94,7 +93,6 @@ export default {
 
             if (ownPackage) {
                 // Read file and extract exported names to avoid re-export conflicts (TS2308)
-                // eslint-disable-next-line security/detect-non-literal-fs-filename
                 const content = await fs.readFile(recPaths, 'utf8') // nosemgrep: eslint.detect-non-literal-fs-filename
                 const { valueNames, typeNames } = extractExportedNames(content)
 
@@ -118,7 +116,6 @@ export default {
                     exportLines.push(parts.join('\n'))
                 }
             } else {
-                // eslint-disable-next-line unicorn/prefer-string-replace-all
                 const namespace = fileNameWithPrefix.replace(/[/\\]/g, '_').replace(/[^\w$]/g, '_')
 
                 exportLines.push(`export * as ${namespace} from '${importPath}';`)
@@ -128,8 +125,7 @@ export default {
         if (exportLines.length > 0) {
             const indexFilePath = path.join(dir, 'index.ts')
 
-            // eslint-disable-next-line security/detect-non-literal-fs-filename
-            await fs.writeFile(indexFilePath, exportLines.join('\n\n') + '\n') // nosemgrep: eslint.detect-non-literal-fs-filename
+            await fs.writeFile(indexFilePath, `${exportLines.join('\n\n')}\n`) // nosemgrep: eslint.detect-non-literal-fs-filename
         }
     },
 }