@diia-inhouse/genproto 3.2.12 → 3.3.0
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/command/tsCommandBuilder.js +16 -1
- package/dist/command/tsCommandBuilder.js.map +1 -1
- package/dist/genproto.js +4 -3
- package/dist/genproto.js.map +1 -1
- package/dist/types/command/tsCommandBuilder.d.ts +8 -0
- package/package.json +2 -2
- package/src/command/tsCommandBuilder.ts +13 -1
- package/src/genproto.ts +4 -3
|
@@ -56,6 +56,12 @@ const reservedWords = new Set([
|
|
|
56
56
|
'public',
|
|
57
57
|
]);
|
|
58
58
|
class TsCommandBuilder extends index_1.CommandBuilder {
|
|
59
|
+
logger;
|
|
60
|
+
generateClient;
|
|
61
|
+
rootDir;
|
|
62
|
+
outputDir;
|
|
63
|
+
protoPaths;
|
|
64
|
+
javaModule;
|
|
59
65
|
// By default ts plugin should be linked to .bin dir but in case if it doesn't
|
|
60
66
|
// try to look it up in "standard" locations
|
|
61
67
|
tsPluginLocations = [
|
|
@@ -63,6 +69,15 @@ class TsCommandBuilder extends index_1.CommandBuilder {
|
|
|
63
69
|
'./node_modules/ts-proto/protoc-gen-ts_proto',
|
|
64
70
|
'./node_modules/@diia-inhouse/genproto/node_modules/ts-proto/protoc-gen-ts_proto',
|
|
65
71
|
];
|
|
72
|
+
constructor(logger, generateClient, rootDir, outputDir, protoPaths, javaModule) {
|
|
73
|
+
super(logger, generateClient, rootDir, outputDir, protoPaths);
|
|
74
|
+
this.logger = logger;
|
|
75
|
+
this.generateClient = generateClient;
|
|
76
|
+
this.rootDir = rootDir;
|
|
77
|
+
this.outputDir = outputDir;
|
|
78
|
+
this.protoPaths = protoPaths;
|
|
79
|
+
this.javaModule = javaModule;
|
|
80
|
+
}
|
|
66
81
|
async getProtoTsPluginLocation() {
|
|
67
82
|
const pluginLocations = [];
|
|
68
83
|
for (const location of this.tsPluginLocations) {
|
|
@@ -99,7 +114,7 @@ class TsCommandBuilder extends index_1.CommandBuilder {
|
|
|
99
114
|
typesProtoPath = './build/extracted-protos/main/';
|
|
100
115
|
typesSubPaths = ['build', 'extracted-protos', 'main'];
|
|
101
116
|
dependenciesPattern = 'build/extracted-protos/main/**/*.proto';
|
|
102
|
-
(0, node_child_process_1.execSync)(
|
|
117
|
+
(0, node_child_process_1.execSync)(`./gradlew ${this.javaModule ?? ''}:extractProto`, { stdio: 'pipe' });
|
|
103
118
|
break;
|
|
104
119
|
}
|
|
105
120
|
case index_1.Platform.ts: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsCommandBuilder.js","sourceRoot":"","sources":["../../src/command/tsCommandBuilder.ts"],"names":[],"mappings":";;;;;AAAA,2DAA6C;AAC7C,gEAAiC;AACjC,0DAA4B;AAE5B,+BAA2B;
|
|
1
|
+
{"version":3,"file":"tsCommandBuilder.js","sourceRoot":"","sources":["../../src/command/tsCommandBuilder.ts"],"names":[],"mappings":"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"}
|
package/dist/genproto.js
CHANGED
|
@@ -35,8 +35,9 @@ async function main() {
|
|
|
35
35
|
type: 'array',
|
|
36
36
|
describe: 'List of directories that should be included as import sources for proto',
|
|
37
37
|
string: true,
|
|
38
|
-
})
|
|
39
|
-
|
|
38
|
+
})
|
|
39
|
+
.option('javaModule', { type: 'string', default: '' }).argv;
|
|
40
|
+
const { v, platform, generateClient, rootDir, outputDir, indexToDirs = [outputDir], protoPaths = [], javaModule } = options;
|
|
40
41
|
const logger = new logger_1.default(v);
|
|
41
42
|
const outputAbsoluteDir = node_path_1.default.resolve(outputDir);
|
|
42
43
|
try {
|
|
@@ -57,7 +58,7 @@ async function main() {
|
|
|
57
58
|
break;
|
|
58
59
|
}
|
|
59
60
|
case command_1.Platform.ts: {
|
|
60
|
-
commandBuilder = new tsCommandBuilder_1.default(logger, generateClient, rootDir, outputDir, protoPaths);
|
|
61
|
+
commandBuilder = new tsCommandBuilder_1.default(logger, generateClient, rootDir, outputDir, protoPaths, javaModule);
|
|
61
62
|
break;
|
|
62
63
|
}
|
|
63
64
|
case command_1.Platform.python: {
|
package/dist/genproto.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genproto.js","sourceRoot":"","sources":["../src/genproto.ts"],"names":[],"mappings":";;;;;;AACA,2DAA6C;AAC7C,sDAAwB;AACxB,0DAA4B;AAE5B,uCAAmC;AACnC,kDAAyB;AAEzB,uCAAoD;AACpD,sFAA6D;AAC7D,0FAAiE;AACjE,kFAAyD;AACzD,sDAA6B;AAC7B,oDAA2B;AAE3B,KAAK,UAAU,IAAI;IACf,MAAM,YAAY,GAAG,MAAM,IAAA,mBAAQ,EAAC,QAAQ,CAAC,CAAA;IAE7C,IAAI,CAAC,YAAY,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;IACnD,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,eAAK;SACtB,KAAK,CAAC,0CAA0C,CAAC;SACjD,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;SAChD,MAAM,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,kBAAQ,CAAC,EAAE,EAAE,CAAC;SAC5D,MAAM,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;SAC7D,MAAM,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;SACvD,MAAM,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;SACjE,MAAM,CAAC,aAAa,EAAE;QACnB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,qGAAqG;KAClH,CAAC;SACD,MAAM,CAAC,YAAY,EAAE;QAClB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,yEAAyE;QACnF,MAAM,EAAE,IAAI;KACf,CAAC,CAAC,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"genproto.js","sourceRoot":"","sources":["../src/genproto.ts"],"names":[],"mappings":";;;;;;AACA,2DAA6C;AAC7C,sDAAwB;AACxB,0DAA4B;AAE5B,uCAAmC;AACnC,kDAAyB;AAEzB,uCAAoD;AACpD,sFAA6D;AAC7D,0FAAiE;AACjE,kFAAyD;AACzD,sDAA6B;AAC7B,oDAA2B;AAE3B,KAAK,UAAU,IAAI;IACf,MAAM,YAAY,GAAG,MAAM,IAAA,mBAAQ,EAAC,QAAQ,CAAC,CAAA;IAE7C,IAAI,CAAC,YAAY,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;IACnD,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,eAAK;SACtB,KAAK,CAAC,0CAA0C,CAAC;SACjD,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;SAChD,MAAM,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,kBAAQ,CAAC,EAAE,EAAE,CAAC;SAC5D,MAAM,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;SAC7D,MAAM,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;SACvD,MAAM,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;SACjE,MAAM,CAAC,aAAa,EAAE;QACnB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,qGAAqG;KAClH,CAAC;SACD,MAAM,CAAC,YAAY,EAAE;QAClB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,yEAAyE;QACnF,MAAM,EAAE,IAAI;KACf,CAAC;SACD,MAAM,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,CAAA;IAC/D,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,GAAG,CAAC,SAAS,CAAC,EAAE,UAAU,GAAG,EAAE,EAAE,UAAU,EAAE,GAAG,OAAO,CAAA;IAC3H,MAAM,MAAM,GAAG,IAAI,gBAAM,CAAC,CAAC,CAAC,CAAA;IAC5B,MAAM,iBAAiB,GAAG,mBAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IAEjD,IAAI,CAAC;QACD,MAAM,iBAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;QAC3C,MAAM,CAAC,GAAG,CAAC,sBAAsB,iBAAiB,KAAK,CAAC,CAAA;QACxD,MAAM,iBAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAChE,CAAC;IAAC,MAAM,CAAC;QACL,MAAM,CAAC,GAAG,CAAC,aAAa,iBAAiB,gBAAgB,CAAC,CAAA;IAC9D,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,sBAAsB,iBAAiB,KAAK,CAAC,CAAA;IAExD,mEAAmE;IACnE,MAAM,iBAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA,CAAC,mDAAmD;IAE3G,IAAI,cAA8B,CAAA;IAElC,QAAQ,QAAQ,EAAE,CAAC;QACf,KAAK,kBAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;YACjB,cAAc,GAAG,IAAI,4BAAkB,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;YAC/F,MAAK;QACT,CAAC;QACD,KAAK,kBAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;YACf,cAAc,GAAG,IAAI,0BAAgB,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,CAAC,CAAA;YACzG,MAAK;QACT,CAAC;QACD,KAAK,kBAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YACnB,cAAc,GAAG,IAAI,8BAAoB,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;YACjG,MAAK;QACT,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,EAAE,CAAC,CAAA;QACvD,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,aAAa,EAAE,CAAA;IAEpD,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IAElC,IAAI,CAAC;QACD,sDAAsD;QACtD,IAAA,6BAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;QAC9C,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAA;YAC9C,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;gBAC5B,IAAI,CAAC;oBACD,MAAM,QAAQ,GAAG,mBAAI,CAAC,OAAO,CAAC,GAAa,CAAC,CAAA;oBAE5C,MAAM,iBAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;oBAClC,MAAM,CAAC,GAAG,CAAC,sCAAsC,QAAQ,EAAE,CAAC,CAAA;oBAC5D,MAAM,eAAK,CAAC,yBAAyB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;gBAC5D,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACX,MAAM,CAAC,GAAG,CAAC,8BAA8B,GAAG,KAAK,GAAG,EAAE,CAAC,CAAA;gBAC3D,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAAC,OAAO,IAAa,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,IAAwC,CAAA;QAEpD,MAAM,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;QACtD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACrB,MAAM,GAAG,CAAA;IACb,CAAC;IAED,IAAI,CAAC;QACD,MAAM,cAAc,CAAC,WAAW,EAAE,CAAA;IACtC,CAAC;IAAC,OAAO,IAAa,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,IAAwC,CAAA;QAEpD,MAAM,CAAC,GAAG,CAAC,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC1D,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACrB,MAAM,GAAG,CAAA;IACb,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAA;AACtD,CAAC;AAED,KAAK,IAAI,EAAE,CAAA"}
|
|
@@ -1,6 +1,14 @@
|
|
|
1
|
+
import Logger from '../logger';
|
|
1
2
|
import { CommandBuilder } from './index';
|
|
2
3
|
export default class TsCommandBuilder extends CommandBuilder {
|
|
4
|
+
protected readonly logger: Logger;
|
|
5
|
+
protected readonly generateClient: boolean;
|
|
6
|
+
protected readonly rootDir: string;
|
|
7
|
+
protected readonly outputDir: string;
|
|
8
|
+
protected readonly protoPaths: string[];
|
|
9
|
+
private javaModule?;
|
|
3
10
|
private tsPluginLocations;
|
|
11
|
+
constructor(logger: Logger, generateClient: boolean, rootDir: string, outputDir: string, protoPaths: string[], javaModule?: string | undefined);
|
|
4
12
|
getProtoTsPluginLocation(): Promise<string | undefined>;
|
|
5
13
|
protocCommand(): Promise<string[]>;
|
|
6
14
|
postProcess(): Promise<void>;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@diia-inhouse/genproto",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.3.0",
|
|
4
4
|
"description": "JS codegen from proto with imports from @diia-inhouse/types",
|
|
5
5
|
"bin": {
|
|
6
6
|
"genproto": "./dist/genproto.js"
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"@diia-inhouse/configs": "6.1.1",
|
|
41
|
-
"@diia-inhouse/eslint-config": "8.8.
|
|
41
|
+
"@diia-inhouse/eslint-config": "8.8.2",
|
|
42
42
|
"@types/lodash": "4.17.24",
|
|
43
43
|
"@types/node": "20.17.1",
|
|
44
44
|
"@types/yargs": "17.0.33",
|
|
@@ -4,6 +4,7 @@ import path from 'node:path'
|
|
|
4
4
|
|
|
5
5
|
import { glob } from 'glob'
|
|
6
6
|
|
|
7
|
+
import Logger from '../logger'
|
|
7
8
|
import { CommandBuilder, Platform } from './index'
|
|
8
9
|
|
|
9
10
|
const reservedWords = new Set([
|
|
@@ -63,6 +64,17 @@ export default class TsCommandBuilder extends CommandBuilder {
|
|
|
63
64
|
'./node_modules/@diia-inhouse/genproto/node_modules/ts-proto/protoc-gen-ts_proto',
|
|
64
65
|
]
|
|
65
66
|
|
|
67
|
+
constructor(
|
|
68
|
+
protected readonly logger: Logger,
|
|
69
|
+
protected readonly generateClient: boolean,
|
|
70
|
+
protected readonly rootDir: string,
|
|
71
|
+
protected readonly outputDir: string,
|
|
72
|
+
protected readonly protoPaths: string[],
|
|
73
|
+
private javaModule?: string,
|
|
74
|
+
) {
|
|
75
|
+
super(logger, generateClient, rootDir, outputDir, protoPaths)
|
|
76
|
+
}
|
|
77
|
+
|
|
66
78
|
async getProtoTsPluginLocation(): Promise<string | undefined> {
|
|
67
79
|
const pluginLocations = []
|
|
68
80
|
|
|
@@ -105,7 +117,7 @@ export default class TsCommandBuilder extends CommandBuilder {
|
|
|
105
117
|
typesProtoPath = './build/extracted-protos/main/'
|
|
106
118
|
typesSubPaths = ['build', 'extracted-protos', 'main']
|
|
107
119
|
dependenciesPattern = 'build/extracted-protos/main/**/*.proto'
|
|
108
|
-
execSync(
|
|
120
|
+
execSync(`./gradlew ${this.javaModule ?? ''}:extractProto`, { stdio: 'pipe' })
|
|
109
121
|
break
|
|
110
122
|
}
|
|
111
123
|
case Platform.ts: {
|
package/src/genproto.ts
CHANGED
|
@@ -35,8 +35,9 @@ async function main(): Promise<void> {
|
|
|
35
35
|
type: 'array',
|
|
36
36
|
describe: 'List of directories that should be included as import sources for proto',
|
|
37
37
|
string: true,
|
|
38
|
-
})
|
|
39
|
-
|
|
38
|
+
})
|
|
39
|
+
.option('javaModule', { type: 'string', default: '' }).argv
|
|
40
|
+
const { v, platform, generateClient, rootDir, outputDir, indexToDirs = [outputDir], protoPaths = [], javaModule } = options
|
|
40
41
|
const logger = new Logger(v)
|
|
41
42
|
const outputAbsoluteDir = path.resolve(outputDir)
|
|
42
43
|
|
|
@@ -61,7 +62,7 @@ async function main(): Promise<void> {
|
|
|
61
62
|
break
|
|
62
63
|
}
|
|
63
64
|
case Platform.ts: {
|
|
64
|
-
commandBuilder = new TsCommandBuilder(logger, generateClient, rootDir, outputDir, protoPaths)
|
|
65
|
+
commandBuilder = new TsCommandBuilder(logger, generateClient, rootDir, outputDir, protoPaths, javaModule)
|
|
65
66
|
break
|
|
66
67
|
}
|
|
67
68
|
case Platform.python: {
|