npm - @diia-inhouse/genproto - Versions diffs - 3.2.1 → 3.2.2 - Mend

@diia-inhouse/genproto 3.2.1 → 3.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/dist/command/tsCommandBuilder.js +99 -1
package/dist/command/tsCommandBuilder.js.map +1 -1
package/dist/types/command/tsCommandBuilder.d.ts +1 -0
package/package.json +9 -6
package/src/command/tsCommandBuilder.ts +115 -1
package/.github/workflows/accept-contribution.yml +0 -13
package/.gitlab-ci.yml +0 -10
package/.prettierignore +0 -1
package/CONTRIBUTING.md +0 -34
package/eslint.config.mjs +0 -18
package/migrations/tsconfig.json +0 -12
package/tests/tsconfig.json +0 -12
package/tsconfig.json +0 -14

package/dist/command/tsCommandBuilder.js CHANGED Viewed

@@ -5,7 +5,56 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_child_process_1 = require("node:child_process");
 const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
+const glob_1 = require("glob");
 const index_1 = require("./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',
+]);
 class TsCommandBuilder extends index_1.CommandBuilder {
     // 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
@@ -106,7 +155,56 @@ class TsCommandBuilder extends index_1.CommandBuilder {
         command.push(await this.iPath());
         return command;
     }
-    async postProcess() { }
+    async postProcess() {
+        const files = await (0, glob_1.glob)(node_path_1.default.join(this.outputDir, '**/*.ts'));
+        for (const file of files) {
+            // eslint-disable-next-line security/detect-non-literal-fs-filename
+            const content = await promises_1.default.readFile(file, 'utf8'); // nosemgrep: eslint.detect-non-literal-fs-filename
+            if (!content.includes('export namespace ')) {
+                continue;
+            }
+            const result = this.stripReservedWordTypeAliases(content);
+            if (result !== content) {
+                // eslint-disable-next-line security/detect-non-literal-fs-filename
+                await promises_1.default.writeFile(file, result); // nosemgrep: eslint.detect-non-literal-fs-filename
+            }
+        }
+    }
+    stripReservedWordTypeAliases(content) {
+        const lines = content.split('\n');
+        const output = [];
+        let insideNamespace = false;
+        let namespaceStartIndex = -1;
+        let hasNonReservedMember = false;
+        for (const line of lines) {
+            if (line.startsWith('export namespace ')) {
+                insideNamespace = true;
+                namespaceStartIndex = output.length;
+                hasNonReservedMember = false;
+                output.push(line);
+                continue;
+            }
+            if (insideNamespace && line === '}') {
+                insideNamespace = false;
+                if (hasNonReservedMember) {
+                    output.push(line);
+                }
+                else {
+                    output.splice(namespaceStartIndex);
+                }
+                continue;
+            }
+            if (insideNamespace) {
+                const match = line.match(/^\s*export type (\w+) = typeof /);
+                if (match && reservedWords.has(match[1])) {
+                    continue;
+                }
+                hasNonReservedMember = true;
+            }
+            output.push(line);
+        }
+        return output.join('\n');
+    }
     async isFileExists(file) {
         try {
             await promises_1.default.access(file, promises_1.default.constants.F_OK);

package/dist/command/tsCommandBuilder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tsCommandBuilder.js","sourceRoot":"","sources":["../../src/command/tsCommandBuilder.ts"],"names":[],"mappings":";;;;;AAAA,2DAA6C;AAC7C,gEAAiC;~~AAEjC~~,mCAAkD;AAElD,MAAqB,gBAAiB,SAAQ,sBAAc;IACxD,8EAA8E;IAC9E,4CAA4C;IACpC,iBAAiB,GAAG;QACxB,yCAAyC;QACzC,6CAA6C;QAC7C,iFAAiF;KACpF,CAAA;IAED,KAAK,CAAC,wBAAwB;QAC1B,MAAM,eAAe,GAAG,EAAE,CAAA;QAE1B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC5C,IAAI,CAAC;gBACD,mEAAmE;gBACnE,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA,CAAC,mDAAmD;YACnF,CAAC;YAAC,MAAM,CAAC;gBACL,SAAQ;YACZ,CAAC;YAED,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAClC,CAAC;QAED,OAAO,eAAe,CAAC,GAAG,EAAE,CAAA;IAChC,CAAC;IAED,KAAK,CAAC,aAAa;QACf,IAAI,eAAyB,CAAA;QAE7B,IACI,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;YACzC,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;YAC1C,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,EAChD,CAAC;YACC,eAAe,GAAG,gBAAQ,CAAC,EAAE,CAAA;QACjC,CAAC;aAAM,IAAI,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC;YACpG,eAAe,GAAG,gBAAQ,CAAC,IAAI,CAAA;QACnC,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAA;QAC7F,CAAC;QAED,IAAI,cAAsB,CAAA;QAC1B,IAAI,aAAuB,CAAA;QAC3B,IAAI,mBAA2B,CAAA;QAC/B,IAAI,qBAAqB,GAAG,EAAE,CAAA;QAE9B,QAAQ,eAAe,EAAE,CAAC;YACtB,KAAK,gBAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;gBACjB,cAAc,GAAG,gCAAgC,CAAA;gBACjD,aAAa,GAAG,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAA;gBACrD,mBAAmB,GAAG,wCAAwC,CAAA;gBAC9D,IAAA,6BAAQ,EAAC,yBAAyB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;gBACtD,MAAK;YACT,CAAC;YACD,KAAK,gBAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;gBACf,cAAc,GAAG,gDAAgD,CAAA;gBACjE,aAAa,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,eAAe,CAAC,CAAA;gBAC5E,qBAAqB,GAAG,uDAAuD,CAAA;gBAC/E,mBAAmB,GAAG,gDAAgD,CAAA;gBACtE,MAAK;YACT,CAAC;QACL,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAA;QAE5D,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,kFAAkF,CAAC,CAAA;QACvG,CAAC;QAED,MAAM,OAAO,GAAG;YACZ,QAAQ;YACR,sCAAsC;YACtC,YAAY,cAAc,EAAE;YAC5B,uCAAuC;YACvC,uCAAuC;YACvC,iCAAiC;YACjC,qCAAqC;YACrC,yCAAyC;YACzC,yBAAyB;YACzB,qCAAqC;YACrC,iCAAiC;YACjC,mCAAmC;YACnC,sCAAsC;YACtC,6BAA6B;YAC7B,oCAAoC;YACpC,kBAAkB,IAAI,CAAC,SAAS,EAAE;YAClC,kBAAkB,IAAI,CAAC,OAAO,EAAE;YAChC,gBAAgB,cAAc,EAAE;SACnC,CAAA;QAED,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,gBAAgB,qBAAqB,EAAE,CAAC,CAAA;QACzD,CAAC;QAED,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACtC,OAAO,CAAC,IAAI,CAAC,gBAAgB,SAAS,EAAE,CAAC,CAAA;QAC7C,CAAC;QAED,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,OAAO,CAAC,IAAI,CAAC,4EAA4E,CAAC,CAAA;QAC9F,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,IAAI,CAAC,qCAAqC,EAAE,uCAAuC,CAAC,CAAA;QAChG,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,EAAE,aAAa,EAAE,eAAe,CAAC,CAAA;QACjG,KAAK,MAAM,WAAW,IAAI,SAAS,EAAE,CAAC;YAClC,MAAM,UAAU,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,mBAAmB,KAAK,IAAI,WAAW,EAAE,CAAC,CAAA;YAEnG,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAA;QAC/B,CAAC;QAED,gHAAgH;QAChH,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;QAEhC,OAAO,OAAO,CAAA;IAClB,CAAC;IAED,KAAK,CAAC,WAAW,~~KAAmB~~,CAAC;~~IAE7B~~,KAAK,CAAC,YAAY,CAAC,IAAY;QACnC,IAAI,CAAC;YACD,MAAM,kBAAE,CAAC,MAAM,CAAC,IAAI,EAAE,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAC5C,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,KAAK,CAAA;QAChB,CAAC;QAED,OAAO,IAAI,CAAA;IACf,CAAC;CACJ;~~AAhID~~,~~mCAgIC~~"}
1	+ {"version":3,"file":"tsCommandBuilder.js","sourceRoot":"","sources":["../../src/command/tsCommandBuilder.ts"],"names":[],"mappings":"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"}

package/dist/types/command/tsCommandBuilder.d.ts CHANGED Viewed

@@ -4,5 +4,6 @@ export default class TsCommandBuilder extends CommandBuilder {
     getProtoTsPluginLocation(): Promise<string | undefined>;
     protocCommand(): Promise<string[]>;
     postProcess(): Promise<void>;
+    private stripReservedWordTypeAliases;
     private isFileExists;
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@diia-inhouse/genproto",
-    "version": "3.2.1",
+    "version": "3.2.2",
     "description": "JS codegen from proto with imports from @diia-inhouse/types",
     "bin": {
         "genproto": "./dist/genproto.js"
@@ -15,6 +15,7 @@
         "lint-fix": "eslint --fix . && prettier --write .",
         "lint:lockfile": "lockfile-lint --path package-lock.json --allowed-hosts registry.npmjs.org --validate-https",
         "prepare": "npm run build",
+        "test": "vitest run",
         "find-circulars": "madge --circular --extensions ts ./"
     },
     "engines": {
@@ -22,6 +23,10 @@
     },
     "author": "Diia",
     "license": "SEE LICENSE IN LICENSE.md",
+    "files": [
+        "dist",
+        "src"
+    ],
     "dependencies": {
         "glob": "11.1.0",
         "lookpath": "1.2.2",
@@ -40,13 +45,11 @@
         "madge": "7.0.0",
         "prettier": "3.3.3",
         "rimraf": "6.0.1",
-        "semantic-release": "24.0.0"
+        "semantic-release": "24.0.0",
+        "vitest": "4.1.1"
     },
     "release": {
-        "extends": "@diia-inhouse/configs/dist/semantic-release/package",
-        "branches": [
-            "main"
-        ]
+        "extends": "@diia-inhouse/configs/dist/semantic-release/package"
     },
     "commitlint": {
         "extends": "@diia-inhouse/configs/dist/commitlint"

package/src/command/tsCommandBuilder.ts CHANGED Viewed

@@ -1,8 +1,59 @@
 import { execSync } from 'node:child_process'
 import fs from 'node:fs/promises'
+import path from 'node:path'
+import { glob } from 'glob'
 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',
+])
 export default class TsCommandBuilder extends CommandBuilder {
     // 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
@@ -120,7 +171,70 @@ export default class TsCommandBuilder extends CommandBuilder {
         return command
     }
-    async postProcess(): Promise<void> {}
+    async postProcess(): Promise<void> {
+        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 ')) {
+                continue
+            }
+            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
+            }
+        }
+    }
+    private stripReservedWordTypeAliases(content: string): string {
+        const lines = content.split('\n')
+        const output: string[] = []
+        let insideNamespace = false
+        let namespaceStartIndex = -1
+        let hasNonReservedMember = false
+        for (const line of lines) {
+            if (line.startsWith('export namespace ')) {
+                insideNamespace = true
+                namespaceStartIndex = output.length
+                hasNonReservedMember = false
+                output.push(line)
+                continue
+            }
+            if (insideNamespace && line === '}') {
+                insideNamespace = false
+                if (hasNonReservedMember) {
+                    output.push(line)
+                } else {
+                    output.splice(namespaceStartIndex)
+                }
+                continue
+            }
+            if (insideNamespace) {
+                const match = line.match(/^\s*export type (\w+) = typeof /)
+                if (match && reservedWords.has(match[1])) {
+                    continue
+                }
+                hasNonReservedMember = true
+            }
+            output.push(line)
+        }
+        return output.join('\n')
+    }
     private async isFileExists(file: string): Promise<boolean> {
         try {

package/.github/workflows/accept-contribution.yml DELETED Viewed

@@ -1,13 +0,0 @@
-on:
-    workflow_dispatch:
-        inputs:
-            pr_number:
-                description: Number of accepted PR
-                required: true
-jobs:
-    accept-contribution:
-        with:
-            pr_number: ${{ inputs.pr_number }}
-        uses: diia-open-source/reusable-workflows/.github/workflows/accept-contribution-be.yml@main
-        secrets: inherit

package/.gitlab-ci.yml DELETED Viewed

@@ -1,10 +0,0 @@
-include:
-    project: diia-inhouse/ci
-    ref: main
-    file: main/package.gitlab-ci.yaml
-variables:
-    LINT_COMMIT: 'true'
-    NODE_PACKAGE_MANAGER: 'npm'
-    CHART_NAME: genproto
-    OSS_PUBLISH_ENABLED: 'true'

package/.prettierignore DELETED Viewed

	@@ -1 +0,0 @@
1	- dist

package/CONTRIBUTING.md DELETED Viewed

@@ -1,34 +0,0 @@
-# Contributing to the Diia project
-We're pleased that you're interested in contributing to the Diia project. At the moment we're welcoming contributions in various forms and we want to make contributing as easy and transparent as possible. You're welcome to contribute in any of the following ways:
--   Reporting a bug
--   Discussing the current state of the code
--   Proposing new features or ideas
-In the future we'll be considering welcoming code contributions and expanding our contributor community.
-## Report using Issues
-We use GitHub issues to track public bugs. Report a bug, feature, idea or open a discussion point by [opening a new issue](../../issues/new); it's that easy!
-For bugs related to vulnerabilities or security concerns please feel free to contact us directly at [modt.opensource@thedigital.gov.ua](mailto:modt.opensource@thedigital.gov.ua).
-We'd also request that you detail bug reports with detail, background and sample code. Typically a great bug report includes:
--   A quick summary and/or background
--   Steps to reproduce
--   Be specific and provide sample code if you can.
--   What you expected would happen
--   What actually happens
--   Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)
-For ideas, suggestions and discussion you're free to use any format that you find suitable.
-## Licensing
-By contributing, you agree that your contributions will be licensed under the EUPL.
-You may obtain a copy of the License at [https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12).
-Questions regarding the Diia project, the License and any re-use should be directed to [modt.opensource@thedigital.gov.ua](mailto:modt.opensource@thedigital.gov.ua).

package/eslint.config.mjs DELETED Viewed

@@ -1,18 +0,0 @@
-import diiaConfig from '@diia-inhouse/eslint-config'
-/**  @type {import('eslint').Linter.Config}  */
-export default [
-    ...diiaConfig,
-    {
-        ignores: ['*.js', '*.mjs', 'node_modules', 'dist', 'coverage', 'migrate-mongo-config.ts', 'src/generated/**'],
-    },
-    {
-        languageOptions: {
-            parserOptions: {
-                project: ['./tsconfig.json', './tests/tsconfig.json'],
-                ecmaVersion: 2022,
-                sourceType: 'module',
-            },
-        },
-    },
-]

package/migrations/tsconfig.json DELETED Viewed

@@ -1,12 +0,0 @@
-{
-    "extends": "@diia-inhouse/configs/tsconfig",
-    "compilerOptions": {
-        "outDir": "dist",
-        "declaration": true,
-        "declarationDir": "dist/types",
-        "baseUrl": ".",
-        "strict": true
-    },
-    "include": ["src/genproto.ts"],
-    "exclude": ["node_modules"]
-}

package/tests/tsconfig.json DELETED Viewed

@@ -1,12 +0,0 @@
-{
-    "extends": "@diia-inhouse/configs/tsconfig",
-    "compilerOptions": {
-        "outDir": "dist",
-        "declaration": true,
-        "declarationDir": "dist/types",
-        "baseUrl": ".",
-        "strict": true
-    },
-    "include": ["src/genproto.ts"],
-    "exclude": ["node_modules"]
-}

package/tsconfig.json DELETED Viewed

@@ -1,14 +0,0 @@
-{
-    "extends": "@diia-inhouse/configs/tsconfig",
-    "compilerOptions": {
-        "outDir": "dist",
-        "declaration": true,
-        "declarationDir": "dist/types",
-        "baseUrl": ".",
-        "noUnusedLocals": false,
-        "noUnusedParameters": false,
-        "strict": true
-    },
-    "include": ["src/genproto.ts"],
-    "exclude": ["node_modules"]
-}