@diia-inhouse/genproto 2.0.3 → 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/dist/command/index.js +10 -1
- package/dist/command/index.js.map +1 -1
- package/package.json +4 -4
- package/src/command/index.ts +13 -1
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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"}
|
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
|
|