@diia-inhouse/genproto 2.0.2 → 2.0.8
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/.github/workflows/accept-contribution.yml +13 -0
- package/dist/command/index.js +10 -1
- package/dist/command/index.js.map +1 -1
- package/dist/command/tsCommandBuilder.js +1 -1
- package/dist/command/tsCommandBuilder.js.map +1 -1
- package/package.json +4 -4
- package/src/command/index.ts +13 -1
- package/src/command/tsCommandBuilder.ts +1 -1
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
on:
|
|
2
|
+
workflow_dispatch:
|
|
3
|
+
inputs:
|
|
4
|
+
pr_number:
|
|
5
|
+
description: Number of accepted PR
|
|
6
|
+
required: true
|
|
7
|
+
|
|
8
|
+
jobs:
|
|
9
|
+
accept-contribution:
|
|
10
|
+
with:
|
|
11
|
+
pr_number: ${{ inputs.pr_number }}
|
|
12
|
+
uses: diia-open-source/reusable-workflows/.github/workflows/accept-contribution-be.yml@main
|
|
13
|
+
secrets: inherit
|
package/dist/command/index.js
CHANGED
|
@@ -31,10 +31,19 @@ class CommandBuilder {
|
|
|
31
31
|
return iPath.trim();
|
|
32
32
|
}
|
|
33
33
|
async externalImports(dependenciesPattern, subpaths, platform) {
|
|
34
|
-
|
|
34
|
+
let files = await (0, glob_1.glob)(dependenciesPattern);
|
|
35
35
|
if (!files) {
|
|
36
36
|
return {};
|
|
37
37
|
}
|
|
38
|
+
if (dependenciesPattern.includes('node_modules')) {
|
|
39
|
+
files = files.filter((file) => {
|
|
40
|
+
const pathParts = file.split('/');
|
|
41
|
+
if (pathParts.filter((part) => part === 'node_modules').length > 1) {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
return true;
|
|
45
|
+
});
|
|
46
|
+
}
|
|
38
47
|
return files.reduce?.((acc, value) => {
|
|
39
48
|
const ext = node_path_1.default.extname(value);
|
|
40
49
|
if (ext !== '.proto') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/command/index.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,+BAA2B;AAI3B,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,qBAAS,CAAA;IACT,yBAAa,CAAA;AACjB,CAAC,EAHW,QAAQ,wBAAR,QAAQ,QAGnB;AAED,MAAsB,cAAc;IAET;IACA;IACA;IACA;IAJvB,YACuB,MAAc,EACd,cAAuB,EACvB,OAAe,EACf,SAAiB;QAHjB,WAAM,GAAN,MAAM,CAAQ;QACd,mBAAc,GAAd,cAAc,CAAS;QACvB,YAAO,GAAP,OAAO,CAAQ;QACf,cAAS,GAAT,SAAS,CAAQ;IACrC,CAAC;IAIM,KAAK,CAAC,KAAK;QACjB,IAAI,KAAK,GAAG,EAAE,CAAA;QACd,MAAM,UAAU,GAAG,MAAM,IAAA,WAAI,EAAC,GAAG,IAAI,CAAC,OAAO,aAAa,CAAC,CAAA;QAE3D,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,KAAK,IAAI,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACvC,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,EAAE,CAAA;IACvB,CAAC;IAES,KAAK,CAAC,eAAe,CAC3B,mBAA2B,EAC3B,QAAkB,EAClB,QAAkB;QAElB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/command/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,7 +65,7 @@ class TsCommandBuilder extends index_1.CommandBuilder {
|
|
|
65
65
|
break;
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
|
-
const pluginLocation = this.getProtoTsPluginLocation();
|
|
68
|
+
const pluginLocation = await this.getProtoTsPluginLocation();
|
|
69
69
|
if (!pluginLocation) {
|
|
70
70
|
throw new Error("Couldn't locate plugin in node modules. Are you sure that ts-proto is installed?");
|
|
71
71
|
}
|
|
@@ -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;IAEO,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;IAED,KAAK,CAAC,wBAAwB;QAC1B,MAAM,eAAe,GAAG,EAAE,CAAA;QAE1B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC5C,IAAI,CAAC;gBACD,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;YAC/B,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,IAAI,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;YAC1F,eAAe,GAAG,gBAAQ,CAAC,EAAE,CAAA;QACjC,CAAC;aAAM,IAAI,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;YACjD,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;QAE/B,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,CAAC,CAAA;gBAC3D,mBAAmB,GAAG,gDAAgD,CAAA;gBACtE,MAAK;YACT,CAAC;QACL,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"tsCommandBuilder.js","sourceRoot":"","sources":["../../src/command/tsCommandBuilder.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": "2.0.
|
|
3
|
+
"version": "2.0.8",
|
|
4
4
|
"description": "JS codegen from proto with imports from @diia-inhouse/types",
|
|
5
5
|
"bin": {
|
|
6
6
|
"genproto": "./dist/genproto.js"
|
|
@@ -32,11 +32,11 @@
|
|
|
32
32
|
"devDependencies": {
|
|
33
33
|
"@diia-inhouse/configs": "2.2.0",
|
|
34
34
|
"@diia-inhouse/eslint-config": "5.1.0",
|
|
35
|
-
"@types/node": "20.
|
|
36
|
-
"eslint": "8.57.
|
|
35
|
+
"@types/node": "20.17.1",
|
|
36
|
+
"eslint": "8.57.1",
|
|
37
37
|
"lockfile-lint": "4.14.0",
|
|
38
38
|
"madge": "7.0.0",
|
|
39
|
-
"prettier": "3.3.
|
|
39
|
+
"prettier": "3.3.3",
|
|
40
40
|
"rimraf": "6.0.1",
|
|
41
41
|
"semantic-release": "24.0.0"
|
|
42
42
|
},
|
package/src/command/index.ts
CHANGED
|
@@ -35,12 +35,24 @@ export abstract class CommandBuilder {
|
|
|
35
35
|
subpaths: string[],
|
|
36
36
|
platform: Platform,
|
|
37
37
|
): Promise<{ [key: string]: string[] }> {
|
|
38
|
-
|
|
38
|
+
let files: string[] = await glob(dependenciesPattern)
|
|
39
39
|
|
|
40
40
|
if (!files) {
|
|
41
41
|
return {}
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
+
if (dependenciesPattern.includes('node_modules')) {
|
|
45
|
+
files = files.filter((file) => {
|
|
46
|
+
const pathParts = file.split('/')
|
|
47
|
+
|
|
48
|
+
if (pathParts.filter((part) => part === 'node_modules').length > 1) {
|
|
49
|
+
return false
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
return true
|
|
53
|
+
})
|
|
54
|
+
}
|
|
55
|
+
|
|
44
56
|
return files.reduce?.<{ [key: string]: string[] }>((acc, value) => {
|
|
45
57
|
const ext = path.extname(value)
|
|
46
58
|
|
|
@@ -69,7 +69,7 @@ export default class TsCommandBuilder extends CommandBuilder {
|
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
71
|
|
|
72
|
-
const pluginLocation = this.getProtoTsPluginLocation()
|
|
72
|
+
const pluginLocation = await this.getProtoTsPluginLocation()
|
|
73
73
|
|
|
74
74
|
if (!pluginLocation) {
|
|
75
75
|
throw new Error("Couldn't locate plugin in node modules. Are you sure that ts-proto is installed?")
|