@diia-inhouse/genproto 3.2.5 → 3.2.6
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.
- package/dist/utils/index.js +7 -4
- package/dist/utils/index.js.map +1 -1
- package/package.json +4 -3
- package/src/utils/index.ts +10 -5
package/dist/utils/index.js
CHANGED
|
@@ -36,6 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
const node_events_1 = require("node:events");
|
|
39
40
|
const node_fs_1 = __importStar(require("node:fs"));
|
|
40
41
|
const node_path_1 = __importDefault(require("node:path"));
|
|
41
42
|
const node_readline_1 = require("node:readline");
|
|
@@ -85,12 +86,12 @@ exports.default = {
|
|
|
85
86
|
for (const recPaths of await recursivePaths(dir)) {
|
|
86
87
|
// eslint-disable-next-line security/detect-non-literal-fs-filename
|
|
87
88
|
const stream = node_fs_1.default.createReadStream(recPaths); // nosemgrep: eslint.detect-non-literal-fs-filename
|
|
88
|
-
const rl = node_readline_1.
|
|
89
|
+
const rl = (0, node_readline_1.createInterface)({
|
|
89
90
|
input: stream,
|
|
90
91
|
crlfDelay: Infinity,
|
|
91
92
|
});
|
|
92
93
|
let ownPackage = false;
|
|
93
|
-
|
|
94
|
+
rl.on('line', (line) => {
|
|
94
95
|
const matchArr = line.match(/^\/\/ source: (.+)$/);
|
|
95
96
|
if (matchArr) {
|
|
96
97
|
const protoFile = matchArr[1];
|
|
@@ -99,11 +100,13 @@ exports.default = {
|
|
|
99
100
|
// eslint-disable-next-line security/detect-non-literal-fs-filename
|
|
100
101
|
if (node_fs_1.default.existsSync(protofilepath)) { // nosemgrep: eslint.detect-non-literal-fs-filename
|
|
101
102
|
// eslint-disable-next-line security/detect-non-literal-fs-filename
|
|
102
|
-
const contents =
|
|
103
|
+
const contents = node_fs_1.default.readFileSync(protofilepath); // nosemgrep: eslint.detect-non-literal-fs-filename
|
|
103
104
|
ownPackage = contents.includes('package ua.gov.diia');
|
|
104
105
|
}
|
|
105
106
|
}
|
|
106
|
-
}
|
|
107
|
+
});
|
|
108
|
+
await (0, node_events_1.once)(rl, 'close');
|
|
109
|
+
stream.destroy();
|
|
107
110
|
const fileName = node_path_1.default.basename(recPaths, node_path_1.default.extname(recPaths));
|
|
108
111
|
const parentDirName = node_path_1.default.basename(node_path_1.default.dirname(recPaths));
|
|
109
112
|
const fileNameWithPrefix = node_path_1.default.join(parentDirName, fileName);
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAgD;AAChD,0DAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@diia-inhouse/genproto",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.6",
|
|
4
4
|
"description": "JS codegen from proto with imports from @diia-inhouse/types",
|
|
5
5
|
"bin": {
|
|
6
6
|
"genproto": "./dist/genproto.js"
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"lint-fix": "eslint --fix . && prettier --write .",
|
|
16
16
|
"lint:lockfile": "lockfile-lint --path package-lock.json --allowed-hosts registry.npmjs.org --validate-https",
|
|
17
17
|
"prepare": "npm run build",
|
|
18
|
-
"test": "vitest run",
|
|
18
|
+
"test": "tsc --project tests/tsconfig.json && vitest run",
|
|
19
19
|
"find-circulars": "madge --circular --extensions ts ./"
|
|
20
20
|
},
|
|
21
21
|
"engines": {
|
|
@@ -40,13 +40,14 @@
|
|
|
40
40
|
"@diia-inhouse/eslint-config": "8.6.0",
|
|
41
41
|
"@types/node": "20.17.1",
|
|
42
42
|
"@types/yargs": "17.0.33",
|
|
43
|
+
"@vitest/coverage-v8": "4.1.2",
|
|
43
44
|
"eslint": "9.33.0",
|
|
44
45
|
"lockfile-lint": "4.14.0",
|
|
45
46
|
"madge": "7.0.0",
|
|
46
47
|
"prettier": "3.3.3",
|
|
47
48
|
"rimraf": "6.0.1",
|
|
48
49
|
"semantic-release": "24.0.0",
|
|
49
|
-
"vitest": "4.1.
|
|
50
|
+
"vitest": "4.1.2"
|
|
50
51
|
},
|
|
51
52
|
"release": {
|
|
52
53
|
"extends": "@diia-inhouse/configs/dist/semantic-release/package"
|
package/src/utils/index.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { once } from 'node:events'
|
|
1
2
|
import syncFs, { promises as fs } from 'node:fs'
|
|
2
3
|
import path from 'node:path'
|
|
3
|
-
import {
|
|
4
|
+
import { createInterface } from 'node:readline'
|
|
4
5
|
|
|
5
6
|
/**
|
|
6
7
|
* Extract exported symbol names from a ts-proto generated TypeScript file.
|
|
@@ -55,13 +56,14 @@ export default {
|
|
|
55
56
|
for (const recPaths of await recursivePaths(dir)) {
|
|
56
57
|
// eslint-disable-next-line security/detect-non-literal-fs-filename
|
|
57
58
|
const stream = syncFs.createReadStream(recPaths) // nosemgrep: eslint.detect-non-literal-fs-filename
|
|
58
|
-
const rl =
|
|
59
|
+
const rl = createInterface({
|
|
59
60
|
input: stream,
|
|
60
61
|
crlfDelay: Infinity,
|
|
61
62
|
})
|
|
62
63
|
|
|
63
64
|
let ownPackage = false
|
|
64
|
-
|
|
65
|
+
|
|
66
|
+
rl.on('line', (line) => {
|
|
65
67
|
const matchArr = line.match(/^\/\/ source: (.+)$/)
|
|
66
68
|
if (matchArr) {
|
|
67
69
|
const protoFile = matchArr[1]
|
|
@@ -71,12 +73,15 @@ export default {
|
|
|
71
73
|
// eslint-disable-next-line security/detect-non-literal-fs-filename
|
|
72
74
|
if (syncFs.existsSync(protofilepath)) { // nosemgrep: eslint.detect-non-literal-fs-filename
|
|
73
75
|
// eslint-disable-next-line security/detect-non-literal-fs-filename
|
|
74
|
-
const contents =
|
|
76
|
+
const contents = syncFs.readFileSync(protofilepath) // nosemgrep: eslint.detect-non-literal-fs-filename
|
|
75
77
|
|
|
76
78
|
ownPackage = contents.includes('package ua.gov.diia')
|
|
77
79
|
}
|
|
78
80
|
}
|
|
79
|
-
}
|
|
81
|
+
})
|
|
82
|
+
|
|
83
|
+
await once(rl, 'close')
|
|
84
|
+
stream.destroy()
|
|
80
85
|
|
|
81
86
|
const fileName = path.basename(recPaths, path.extname(recPaths))
|
|
82
87
|
const parentDirName = path.basename(path.dirname(recPaths))
|