@hodfords/nestjs-grpc-helper 12.3.1 → 12.5.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/README.md +218 -1
- package/commands/generate-sdk.command.js +8 -2
- package/commands/generate-sdk.command.js.map +1 -1
- package/constants/sdk-toolchain.const.d.ts +25 -0
- package/constants/sdk-toolchain.const.js +38 -0
- package/constants/sdk-toolchain.const.js.map +1 -0
- package/decorators/grpc-param.decorator.js +5 -4
- package/decorators/grpc-param.decorator.js.map +1 -1
- package/decorators/property.decorator.js +6 -3
- package/decorators/property.decorator.js.map +1 -1
- package/documents/microservice-document.controller.d.ts +1 -1
- package/dto/sort.dto.d.ts +1 -1
- package/dto/sort.dto.js +1 -1
- package/dto/sort.dto.js.map +1 -1
- package/helpers/generate.helper.d.ts +4 -3
- package/helpers/generate.helper.js +41 -3
- package/helpers/generate.helper.js.map +1 -1
- package/helpers/grpc-method.helper.js +1 -3
- package/helpers/grpc-method.helper.js.map +1 -1
- package/helpers/sdk-naming.helper.d.ts +7 -0
- package/helpers/sdk-naming.helper.js +197 -0
- package/helpers/sdk-naming.helper.js.map +1 -0
- package/helpers/sdk-output.helper.d.ts +6 -0
- package/helpers/sdk-output.helper.js +84 -0
- package/helpers/sdk-output.helper.js.map +1 -0
- package/helpers/shell.helper.d.ts +4 -0
- package/helpers/shell.helper.js +36 -0
- package/helpers/shell.helper.js.map +1 -1
- package/helpers/wire-response.helper.d.ts +8 -0
- package/helpers/wire-response.helper.js +23 -0
- package/helpers/wire-response.helper.js.map +1 -0
- package/index.d.ts +3 -0
- package/index.js +3 -0
- package/index.js.map +1 -1
- package/package.json +3 -1
- package/sdk-stub/helpers/grpc.helper.d.ts +1 -0
- package/sdk-stub/helpers/grpc.helper.js +11 -13
- package/sdk-stub/helpers/grpc.helper.js.map +1 -1
- package/sdk-stub/helpers/grpc.helper.spec.ts +46 -0
- package/sdk-stub/helpers/grpc.helper.ts +19 -12
- package/services/generate-proto.service.d.ts +1 -1
- package/services/generate-proto.service.js +11 -19
- package/services/generate-proto.service.js.map +1 -1
- package/services/go-sdk-generator.service.d.ts +26 -0
- package/services/go-sdk-generator.service.js +227 -0
- package/services/go-sdk-generator.service.js.map +1 -0
- package/services/protoc.service.d.ts +5 -0
- package/services/protoc.service.js +26 -0
- package/services/protoc.service.js.map +1 -0
- package/services/rust-sdk-generator.service.d.ts +24 -0
- package/services/rust-sdk-generator.service.js +201 -0
- package/services/rust-sdk-generator.service.js.map +1 -0
- package/services/sdk-descriptor.service.d.ts +13 -0
- package/services/sdk-descriptor.service.js +142 -0
- package/services/sdk-descriptor.service.js.map +1 -0
- package/templates/go/client.hbs +171 -0
- package/templates/go/enums.hbs +14 -0
- package/templates/go/errors.hbs +55 -0
- package/templates/go/go-mod.hbs +8 -0
- package/templates/rust/cargo-toml.hbs +13 -0
- package/templates/rust/client.hbs +100 -0
- package/templates/rust/enums.hbs +61 -0
- package/templates/rust/error.hbs +52 -0
- package/templates/rust/lib.hbs +17 -0
- package/types/sdk-build-config.type.d.ts +15 -0
- package/types/sdk-build-config.type.js +1 -1
- package/types/sdk-build-config.type.js.map +1 -1
- package/types/sdk-descriptor.type.d.ts +29 -0
- package/types/sdk-descriptor.type.js +2 -0
- package/types/sdk-descriptor.type.js.map +1 -0
|
@@ -0,0 +1,197 @@
|
|
|
1
|
+
const rustRawKeywords = new Set([
|
|
2
|
+
'as',
|
|
3
|
+
'break',
|
|
4
|
+
'const',
|
|
5
|
+
'continue',
|
|
6
|
+
'else',
|
|
7
|
+
'enum',
|
|
8
|
+
'false',
|
|
9
|
+
'fn',
|
|
10
|
+
'for',
|
|
11
|
+
'if',
|
|
12
|
+
'impl',
|
|
13
|
+
'in',
|
|
14
|
+
'let',
|
|
15
|
+
'loop',
|
|
16
|
+
'match',
|
|
17
|
+
'mod',
|
|
18
|
+
'move',
|
|
19
|
+
'mut',
|
|
20
|
+
'pub',
|
|
21
|
+
'ref',
|
|
22
|
+
'return',
|
|
23
|
+
'static',
|
|
24
|
+
'struct',
|
|
25
|
+
'trait',
|
|
26
|
+
'true',
|
|
27
|
+
'type',
|
|
28
|
+
'unsafe',
|
|
29
|
+
'use',
|
|
30
|
+
'where',
|
|
31
|
+
'while',
|
|
32
|
+
'dyn',
|
|
33
|
+
'abstract',
|
|
34
|
+
'become',
|
|
35
|
+
'box',
|
|
36
|
+
'do',
|
|
37
|
+
'final',
|
|
38
|
+
'macro',
|
|
39
|
+
'override',
|
|
40
|
+
'priv',
|
|
41
|
+
'typeof',
|
|
42
|
+
'unsized',
|
|
43
|
+
'virtual',
|
|
44
|
+
'yield',
|
|
45
|
+
'async',
|
|
46
|
+
'await',
|
|
47
|
+
'try'
|
|
48
|
+
]);
|
|
49
|
+
const rustSuffixedKeywords = new Set(['_', 'super', 'self', 'Self', 'extern', 'crate']);
|
|
50
|
+
const goKeywords = new Set([
|
|
51
|
+
'break',
|
|
52
|
+
'case',
|
|
53
|
+
'chan',
|
|
54
|
+
'const',
|
|
55
|
+
'continue',
|
|
56
|
+
'default',
|
|
57
|
+
'defer',
|
|
58
|
+
'else',
|
|
59
|
+
'fallthrough',
|
|
60
|
+
'for',
|
|
61
|
+
'func',
|
|
62
|
+
'go',
|
|
63
|
+
'goto',
|
|
64
|
+
'if',
|
|
65
|
+
'import',
|
|
66
|
+
'interface',
|
|
67
|
+
'map',
|
|
68
|
+
'package',
|
|
69
|
+
'range',
|
|
70
|
+
'return',
|
|
71
|
+
'select',
|
|
72
|
+
'struct',
|
|
73
|
+
'switch',
|
|
74
|
+
'type',
|
|
75
|
+
'var'
|
|
76
|
+
]);
|
|
77
|
+
function isUpper(char) {
|
|
78
|
+
return char !== char.toLowerCase();
|
|
79
|
+
}
|
|
80
|
+
function isLower(char) {
|
|
81
|
+
return char !== char.toUpperCase();
|
|
82
|
+
}
|
|
83
|
+
export function splitWords(name) {
|
|
84
|
+
const words = [];
|
|
85
|
+
const chars = [...name];
|
|
86
|
+
let current = '';
|
|
87
|
+
let mode = 'none';
|
|
88
|
+
chars.forEach((char, index) => {
|
|
89
|
+
if (!/[\p{L}\p{N}]/u.test(char)) {
|
|
90
|
+
if (current) {
|
|
91
|
+
words.push(current);
|
|
92
|
+
}
|
|
93
|
+
current = '';
|
|
94
|
+
mode = 'none';
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
const next = chars[index + 1];
|
|
98
|
+
const nextIsLower = next !== undefined && isLower(next);
|
|
99
|
+
const startsWord = isUpper(char) && (mode === 'lower' || (mode === 'upper' && nextIsLower));
|
|
100
|
+
if (current && startsWord) {
|
|
101
|
+
words.push(current);
|
|
102
|
+
current = '';
|
|
103
|
+
}
|
|
104
|
+
current += char;
|
|
105
|
+
if (isLower(char)) {
|
|
106
|
+
mode = 'lower';
|
|
107
|
+
}
|
|
108
|
+
else if (isUpper(char)) {
|
|
109
|
+
mode = 'upper';
|
|
110
|
+
}
|
|
111
|
+
});
|
|
112
|
+
if (current) {
|
|
113
|
+
words.push(current);
|
|
114
|
+
}
|
|
115
|
+
return words;
|
|
116
|
+
}
|
|
117
|
+
export function toSnakeCase(name) {
|
|
118
|
+
return splitWords(name)
|
|
119
|
+
.map((word) => word.toLowerCase())
|
|
120
|
+
.join('_');
|
|
121
|
+
}
|
|
122
|
+
export function toUpperCamelCase(name) {
|
|
123
|
+
return splitWords(name)
|
|
124
|
+
.map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
|
|
125
|
+
.join('');
|
|
126
|
+
}
|
|
127
|
+
export function toRustIdentifier(name) {
|
|
128
|
+
if (rustRawKeywords.has(name)) {
|
|
129
|
+
return `r#${name}`;
|
|
130
|
+
}
|
|
131
|
+
if (rustSuffixedKeywords.has(name)) {
|
|
132
|
+
return `${name}_`;
|
|
133
|
+
}
|
|
134
|
+
if (/^\p{N}/u.test(name)) {
|
|
135
|
+
return `_${name}`;
|
|
136
|
+
}
|
|
137
|
+
return name;
|
|
138
|
+
}
|
|
139
|
+
export function enumMemberName(key) {
|
|
140
|
+
const name = toUpperCamelCase(key);
|
|
141
|
+
if (!name) {
|
|
142
|
+
return '';
|
|
143
|
+
}
|
|
144
|
+
return /^\p{L}/u.test(name) ? name : `V${name}`;
|
|
145
|
+
}
|
|
146
|
+
function isAsciiLower(char) {
|
|
147
|
+
return char !== undefined && char >= 'a' && char <= 'z';
|
|
148
|
+
}
|
|
149
|
+
function isAsciiDigit(char) {
|
|
150
|
+
return char >= '0' && char <= '9';
|
|
151
|
+
}
|
|
152
|
+
export function toGoCamelCase(name) {
|
|
153
|
+
let result = '';
|
|
154
|
+
for (let index = 0; index < name.length; index++) {
|
|
155
|
+
let char = name[index];
|
|
156
|
+
const next = name[index + 1];
|
|
157
|
+
if (char === '.' && isAsciiLower(next)) {
|
|
158
|
+
continue;
|
|
159
|
+
}
|
|
160
|
+
if (char === '.') {
|
|
161
|
+
result += '_';
|
|
162
|
+
}
|
|
163
|
+
else if (char === '_' && (index === 0 || name[index - 1] === '.')) {
|
|
164
|
+
result += 'X';
|
|
165
|
+
}
|
|
166
|
+
else if (char === '_' && isAsciiLower(next)) {
|
|
167
|
+
continue;
|
|
168
|
+
}
|
|
169
|
+
else if (isAsciiDigit(char)) {
|
|
170
|
+
result += char;
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
if (isAsciiLower(char)) {
|
|
174
|
+
char = char.toUpperCase();
|
|
175
|
+
}
|
|
176
|
+
result += char;
|
|
177
|
+
while (isAsciiLower(name[index + 1])) {
|
|
178
|
+
result += name[index + 1];
|
|
179
|
+
index++;
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
return result;
|
|
184
|
+
}
|
|
185
|
+
export function toGoPackageName(module) {
|
|
186
|
+
const segments = module.split('/');
|
|
187
|
+
let lastSegment = segments.pop() ?? '';
|
|
188
|
+
if (/^v[0-9]+$/.test(lastSegment) && segments.length) {
|
|
189
|
+
lastSegment = segments.pop();
|
|
190
|
+
}
|
|
191
|
+
const packageName = lastSegment.replace(/[^A-Za-z0-9_]/g, '').toLowerCase();
|
|
192
|
+
if (!packageName || /^\d/.test(packageName)) {
|
|
193
|
+
throw new Error(`Cannot derive a Go package name from module "${module}".`);
|
|
194
|
+
}
|
|
195
|
+
return goKeywords.has(packageName) ? `${packageName}sdk` : packageName;
|
|
196
|
+
}
|
|
197
|
+
//# sourceMappingURL=sdk-naming.helper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sdk-naming.helper.js","sourceRoot":"","sources":["../../../lib/helpers/sdk-naming.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { SdkBuildConfigType, SdkLanguage } from '../types/sdk-build-config.type.js';
|
|
2
|
+
export declare const RUST_OWNED_PATHS: string[];
|
|
3
|
+
export declare const GO_OWNED_PATHS: string[];
|
|
4
|
+
export declare function assertSdkOutputs(config: SdkBuildConfigType, languages: SdkLanguage[], cwd?: string): void;
|
|
5
|
+
export declare function cleanOwnedPaths(outputDir: string, ownedPaths: string[]): void;
|
|
6
|
+
export declare function stageOwnedPaths(outputDir: string, ownedPaths: string[], generate: (stagingDir: string) => void): void;
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
import fs from 'fs-extra';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
export const RUST_OWNED_PATHS = ['Cargo.toml', 'microservice.proto', 'src'];
|
|
4
|
+
export const GO_OWNED_PATHS = ['go.mod', 'microservice.proto', 'pb', 'client.go', 'errors.go', 'enums.go'];
|
|
5
|
+
function isSameOrInside(child, parent) {
|
|
6
|
+
const relative = path.relative(parent, child);
|
|
7
|
+
return relative === '' || (!relative.startsWith('..') && !path.isAbsolute(relative));
|
|
8
|
+
}
|
|
9
|
+
export function assertSdkOutputs(config, languages, cwd = process.cwd()) {
|
|
10
|
+
const claimed = new Map();
|
|
11
|
+
for (const key of ['output', 'outputBuild']) {
|
|
12
|
+
if (config[key]) {
|
|
13
|
+
claimed.set(path.resolve(cwd, config[key]), key);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
for (const language of ['rust', 'go']) {
|
|
17
|
+
if (!languages.includes(language)) {
|
|
18
|
+
continue;
|
|
19
|
+
}
|
|
20
|
+
const block = config[language];
|
|
21
|
+
if (!block) {
|
|
22
|
+
throw new Error(`Language "${language}" was requested but the SDK config has no "${language}" block.`);
|
|
23
|
+
}
|
|
24
|
+
assertRequiredName(language, block);
|
|
25
|
+
const label = `${language}.output`;
|
|
26
|
+
if (!block.output) {
|
|
27
|
+
throw new Error(`"${label}" is required in the SDK config.`);
|
|
28
|
+
}
|
|
29
|
+
const resolved = path.resolve(cwd, block.output);
|
|
30
|
+
if (isSameOrInside(path.resolve(cwd), resolved)) {
|
|
31
|
+
throw new Error(`"${label}" must not be the working directory or one of its parent directories.`);
|
|
32
|
+
}
|
|
33
|
+
assertSeparateFrom(label, resolved, claimed);
|
|
34
|
+
claimed.set(resolved, label);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
function assertRequiredName(language, block) {
|
|
38
|
+
const requiredKey = language === 'go' ? 'module' : 'crateName';
|
|
39
|
+
const requiredValue = block[requiredKey];
|
|
40
|
+
if (typeof requiredValue !== 'string' || requiredValue.trim() === '') {
|
|
41
|
+
throw new Error(`"${language}.${requiredKey}" is required in the SDK config.`);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
function assertSeparateFrom(label, resolved, claimed) {
|
|
45
|
+
for (const [claimedPath, owner] of claimed) {
|
|
46
|
+
if (claimedPath === resolved) {
|
|
47
|
+
throw new Error(`"${label}" is also used by "${owner}". Each SDK needs its own directory.`);
|
|
48
|
+
}
|
|
49
|
+
if (isSameOrInside(resolved, claimedPath) || isSameOrInside(claimedPath, resolved)) {
|
|
50
|
+
throw new Error(`"${label}" and "${owner}" must not be nested inside one another. Each SDK needs its own directory.`);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
export function cleanOwnedPaths(outputDir, ownedPaths) {
|
|
55
|
+
fs.ensureDirSync(outputDir);
|
|
56
|
+
for (const ownedPath of ownedPaths) {
|
|
57
|
+
fs.removeSync(path.join(outputDir, ownedPath));
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
function createStagingDir(outputDir) {
|
|
61
|
+
const parentDir = path.dirname(outputDir);
|
|
62
|
+
fs.ensureDirSync(parentDir);
|
|
63
|
+
return fs.mkdtempSync(path.join(parentDir, `.${path.basename(outputDir)}-staging-`));
|
|
64
|
+
}
|
|
65
|
+
function replaceOwnedPaths(stagingDir, outputDir, ownedPaths) {
|
|
66
|
+
cleanOwnedPaths(outputDir, ownedPaths);
|
|
67
|
+
for (const ownedPath of ownedPaths) {
|
|
68
|
+
const stagedPath = path.join(stagingDir, ownedPath);
|
|
69
|
+
if (fs.existsSync(stagedPath)) {
|
|
70
|
+
fs.moveSync(stagedPath, path.join(outputDir, ownedPath));
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
export function stageOwnedPaths(outputDir, ownedPaths, generate) {
|
|
75
|
+
const stagingDir = createStagingDir(outputDir);
|
|
76
|
+
try {
|
|
77
|
+
generate(stagingDir);
|
|
78
|
+
replaceOwnedPaths(stagingDir, outputDir, ownedPaths);
|
|
79
|
+
}
|
|
80
|
+
finally {
|
|
81
|
+
fs.removeSync(stagingDir);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
//# sourceMappingURL=sdk-output.helper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sdk-output.helper.js","sourceRoot":"","sources":["../../../lib/helpers/sdk-output.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1,5 @@
|
|
|
1
1
|
export declare function runCommand(command: string, cwd?: string): any;
|
|
2
|
+
export declare function findBinary(binary: string): string | null;
|
|
3
|
+
export declare function runBinary(binary: string, args: string[], cwd?: string): string;
|
|
4
|
+
export declare function readBinaryVersion(binary: string): string | null;
|
|
5
|
+
export declare function isVersionAtLeast(actual: string, minimum: string): boolean;
|
package/helpers/shell.helper.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { spawnSync } from 'node:child_process';
|
|
1
2
|
import shelljs from 'shelljs';
|
|
2
3
|
const { exec } = shelljs;
|
|
4
|
+
const maxOutputBytes = 64 * 1024 * 1024;
|
|
3
5
|
export function runCommand(command, cwd = process.cwd()) {
|
|
4
6
|
const result = exec(command, { silent: true, cwd: cwd });
|
|
5
7
|
if (result.code !== 0) {
|
|
@@ -7,4 +9,38 @@ export function runCommand(command, cwd = process.cwd()) {
|
|
|
7
9
|
}
|
|
8
10
|
return result;
|
|
9
11
|
}
|
|
12
|
+
export function findBinary(binary) {
|
|
13
|
+
const found = shelljs.which(binary);
|
|
14
|
+
return found ? found.toString() : null;
|
|
15
|
+
}
|
|
16
|
+
export function runBinary(binary, args, cwd = process.cwd()) {
|
|
17
|
+
const result = spawnSync(binary, args, { cwd, encoding: 'utf8', input: '', maxBuffer: maxOutputBytes });
|
|
18
|
+
if (result.error) {
|
|
19
|
+
throw new Error(`Unable to run ${binary}: ${result.error.message}`);
|
|
20
|
+
}
|
|
21
|
+
if (result.status !== 0) {
|
|
22
|
+
throw new Error(`${binary} ${args.join(' ')} failed:\n${result.stderr || result.stdout}`);
|
|
23
|
+
}
|
|
24
|
+
return result.stdout;
|
|
25
|
+
}
|
|
26
|
+
export function readBinaryVersion(binary) {
|
|
27
|
+
const result = spawnSync(binary, ['--version'], { encoding: 'utf8', input: '', timeout: 5000 });
|
|
28
|
+
if (result.error) {
|
|
29
|
+
return null;
|
|
30
|
+
}
|
|
31
|
+
const match = /\d+\.\d+(?:\.\d+)?/.exec(`${result.stdout ?? ''}${result.stderr ?? ''}`);
|
|
32
|
+
return match ? match[0] : null;
|
|
33
|
+
}
|
|
34
|
+
export function isVersionAtLeast(actual, minimum) {
|
|
35
|
+
const actualParts = actual.split('.').map(Number);
|
|
36
|
+
const minimumParts = minimum.split('.').map(Number);
|
|
37
|
+
const length = Math.max(actualParts.length, minimumParts.length);
|
|
38
|
+
for (let index = 0; index < length; index++) {
|
|
39
|
+
const difference = (actualParts[index] ?? 0) - (minimumParts[index] ?? 0);
|
|
40
|
+
if (difference !== 0) {
|
|
41
|
+
return difference > 0;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
10
46
|
//# sourceMappingURL=shell.helper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.helper.js","sourceRoot":"","sources":["../../../lib/helpers/shell.helper.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;AAEzB,MAAM,UAAU,UAAU,CAAC,OAAe,EAAE,MAAc,OAAO,CAAC,GAAG,EAAE;IACnE,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IACzD,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
|
1
|
+
{"version":3,"file":"shell.helper.js","sourceRoot":"","sources":["../../../lib/helpers/shell.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { ResponseMetadata } from '@hodfords/nestjs-response';
|
|
2
|
+
import { SdkResponseKind } from '../types/sdk-descriptor.type.js';
|
|
3
|
+
export type WireResponse = {
|
|
4
|
+
responseKind: SdkResponseKind;
|
|
5
|
+
wireResponseType: string;
|
|
6
|
+
nullableInner?: string;
|
|
7
|
+
};
|
|
8
|
+
export declare function resolveWireResponse(response: ResponseMetadata | undefined): WireResponse;
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { NullableGrpcClassResponseNamePrefix } from '@hodfords/nestjs-response';
|
|
2
|
+
import { isPrimitiveType } from './type.helper.js';
|
|
3
|
+
const emptyMessage = 'google.protobuf.Empty';
|
|
4
|
+
export function resolveWireResponse(response) {
|
|
5
|
+
if (!response) {
|
|
6
|
+
return { responseKind: 'empty', wireResponseType: emptyMessage };
|
|
7
|
+
}
|
|
8
|
+
const className = response.responseClass.name;
|
|
9
|
+
const isPrimitive = isPrimitiveType(response.responseClass);
|
|
10
|
+
if (response.isArray) {
|
|
11
|
+
return { responseKind: isPrimitive ? 'nativeList' : 'list', wireResponseType: `Proto${className}List` };
|
|
12
|
+
}
|
|
13
|
+
const message = isPrimitive ? `Native${className}Value` : className;
|
|
14
|
+
if (response.isAllowEmpty) {
|
|
15
|
+
return {
|
|
16
|
+
responseKind: isPrimitive ? 'nullableNative' : 'nullable',
|
|
17
|
+
wireResponseType: `${NullableGrpcClassResponseNamePrefix}${message}`,
|
|
18
|
+
nullableInner: message
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
return { responseKind: isPrimitive ? 'native' : 'single', wireResponseType: message };
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=wire-response.helper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wire-response.helper.js","sourceRoot":"","sources":["../../../lib/helpers/wire-response.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mCAAmC,EAAoB,MAAM,2BAA2B,CAAC;AAElG,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAUnD,MAAM,YAAY,GAAG,uBAAuB,CAAC;AAO7C,MAAM,UAAU,mBAAmB,CAAC,QAAsC;IACtE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,CAAC;IACrE,CAAC;IAED,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC;IAC9C,MAAM,WAAW,GAAG,eAAe,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAE5D,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,SAAS,MAAM,EAAE,CAAC;IAC5G,CAAC;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,SAAS,SAAS,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACpE,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC;QAExB,OAAO;YACH,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU;YACzD,gBAAgB,EAAE,GAAG,mCAAmC,GAAG,OAAO,EAAE;YACpE,aAAa,EAAE,OAAO;SACzB,CAAC;IACN,CAAC;IAED,OAAO,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC;AAC1F,CAAC"}
|
package/index.d.ts
CHANGED
|
@@ -7,6 +7,8 @@ export * from './decorators/grpc-metadata.decorator.js';
|
|
|
7
7
|
export * from './decorators/extend-type.decorator.js';
|
|
8
8
|
export * from './decorators/sdk-expose.decorator.js';
|
|
9
9
|
export * from './decorators/any-type.decorator.js';
|
|
10
|
+
export * from './dto/pagination.dto.js';
|
|
11
|
+
export * from './dto/sort.dto.js';
|
|
10
12
|
export * from './helpers/generate.helper.js';
|
|
11
13
|
export * from './helpers/mock.helper.js';
|
|
12
14
|
export * from './type-helpers/pick-type.helper.js';
|
|
@@ -14,6 +16,7 @@ export * from './type-helpers/omit-type.helper.js';
|
|
|
14
16
|
export * from './type-helpers/partial-type.helper.js';
|
|
15
17
|
export * from './type-helpers/intersection-type.helper.js';
|
|
16
18
|
export * from './types/property-option.type.js';
|
|
19
|
+
export * from './types/document.type.js';
|
|
17
20
|
export * from './types/sdk-build-config.type.js';
|
|
18
21
|
export * from './sdk-stub/helpers/grpc.helper.js';
|
|
19
22
|
export * from './documents/microservice-document.module.js';
|
package/index.js
CHANGED
|
@@ -7,6 +7,8 @@ export * from './decorators/grpc-metadata.decorator.js';
|
|
|
7
7
|
export * from './decorators/extend-type.decorator.js';
|
|
8
8
|
export * from './decorators/sdk-expose.decorator.js';
|
|
9
9
|
export * from './decorators/any-type.decorator.js';
|
|
10
|
+
export * from './dto/pagination.dto.js';
|
|
11
|
+
export * from './dto/sort.dto.js';
|
|
10
12
|
export * from './helpers/generate.helper.js';
|
|
11
13
|
export * from './helpers/mock.helper.js';
|
|
12
14
|
export * from './type-helpers/pick-type.helper.js';
|
|
@@ -14,6 +16,7 @@ export * from './type-helpers/omit-type.helper.js';
|
|
|
14
16
|
export * from './type-helpers/partial-type.helper.js';
|
|
15
17
|
export * from './type-helpers/intersection-type.helper.js';
|
|
16
18
|
export * from './types/property-option.type.js';
|
|
19
|
+
export * from './types/document.type.js';
|
|
17
20
|
export * from './types/sdk-build-config.type.js';
|
|
18
21
|
export * from './sdk-stub/helpers/grpc.helper.js';
|
|
19
22
|
export * from './documents/microservice-document.module.js';
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,wCAAwC,CAAC;AACvD,cAAc,oCAAoC,CAAC;AACnD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sCAAsC,CAAC;AACrD,cAAc,sCAAsC,CAAC;AACrD,cAAc,yCAAyC,CAAC;AACxD,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AACrD,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC;AACzC,cAAc,oCAAoC,CAAC;AACnD,cAAc,oCAAoC,CAAC;AACnD,cAAc,uCAAuC,CAAC;AACtD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gDAAgD,CAAC;AAC/D,OAAO,gCAAgC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,wCAAwC,CAAC;AACvD,cAAc,oCAAoC,CAAC;AACnD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sCAAsC,CAAC;AACrD,cAAc,sCAAsC,CAAC;AACrD,cAAc,yCAAyC,CAAC;AACxD,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AACrD,cAAc,oCAAoC,CAAC;AACnD,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC;AACzC,cAAc,oCAAoC,CAAC;AACnD,cAAc,oCAAoC,CAAC;AACnD,cAAc,uCAAuC,CAAC;AACtD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,iCAAiC,CAAC;AAChD,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gDAAgD,CAAC;AAC/D,OAAO,gCAAgC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hodfords/nestjs-grpc-helper",
|
|
3
|
-
"version": "12.
|
|
3
|
+
"version": "12.5.0",
|
|
4
4
|
"description": "A utility for simplifying gRPC integration and communication in NestJS applications",
|
|
5
5
|
"author": "",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -80,6 +80,7 @@
|
|
|
80
80
|
"husky": "9.1.7",
|
|
81
81
|
"is-ci": "4.1.0",
|
|
82
82
|
"lint-staged": "17.4.1",
|
|
83
|
+
"prettier": "3.9.6",
|
|
83
84
|
"reflect-metadata": "0.2.2",
|
|
84
85
|
"rimraf": "6.1.3",
|
|
85
86
|
"rxjs": "7.8.2",
|
|
@@ -112,6 +113,7 @@
|
|
|
112
113
|
"lint-staged": "lint-staged",
|
|
113
114
|
"start:consumer": "ts-node --transpile-only -r tsconfig-paths/register sample/consumer/main.ts",
|
|
114
115
|
"build:sample-sdk": "pnpm run prebuild && nest start -p tsconfig.sample.json -- --exit",
|
|
116
|
+
"build:sample-sdk:native": "pnpm run prebuild && nest build -p tsconfig.sample.json && CLI_PATH=dist/sample/cli.js wz-command make-sdk sample/sdk-config.native.json",
|
|
115
117
|
"build-sdk": "nestjs-grpc-helper"
|
|
116
118
|
}
|
|
117
119
|
}
|
|
@@ -48,7 +48,7 @@ export class GrpcHelper {
|
|
|
48
48
|
return data[0];
|
|
49
49
|
}
|
|
50
50
|
stream() {
|
|
51
|
-
return this.serviceGrpc[this.methodName](this.payload, this.metadata).pipe(map((chunk) => applyTransforms(chunk, this.model, { groups: ['__getData'] })));
|
|
51
|
+
return this.serviceGrpc[this.methodName](this.payload, this.metadata).pipe(map((chunk) => applyTransforms(this.unwrapEnvelope(chunk), this.model, { groups: ['__getData'] })));
|
|
52
52
|
}
|
|
53
53
|
async getMany() {
|
|
54
54
|
try {
|
|
@@ -56,24 +56,22 @@ export class GrpcHelper {
|
|
|
56
56
|
if (data.grpcArray) {
|
|
57
57
|
data = data.items || [];
|
|
58
58
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
}
|
|
62
|
-
else if (data.grpcNullable) {
|
|
63
|
-
return [applyTransforms(data.value || null, this.model, { groups: ['__getData'] })];
|
|
64
|
-
}
|
|
65
|
-
if (Array.isArray(data)) {
|
|
66
|
-
return data.map((item) => applyTransforms(item, this.model, { groups: ['__getData'] }));
|
|
67
|
-
}
|
|
68
|
-
else {
|
|
69
|
-
return [applyTransforms(data, this.model, { groups: ['__getData'] })];
|
|
70
|
-
}
|
|
59
|
+
data = this.unwrapEnvelope(data);
|
|
60
|
+
const items = Array.isArray(data) ? data : [data];
|
|
61
|
+
return items.map((item) => applyTransforms(item, this.model, { groups: ['__getData'] }));
|
|
71
62
|
}
|
|
72
63
|
catch (exception) {
|
|
73
64
|
this.logger.error(exception);
|
|
74
65
|
throw exception;
|
|
75
66
|
}
|
|
76
67
|
}
|
|
68
|
+
unwrapEnvelope(data) {
|
|
69
|
+
if (data?.grpcNullable) {
|
|
70
|
+
const value = data.value?.grpcNative ? data.value.value : data.value;
|
|
71
|
+
return value ?? null;
|
|
72
|
+
}
|
|
73
|
+
return data?.grpcNative ? data.value : data;
|
|
74
|
+
}
|
|
77
75
|
async execute() {
|
|
78
76
|
const handler = () => this.toPromise(this.serviceGrpc[this.methodName](this.payload, this.metadata).pipe(timeout(this.options.timeout)));
|
|
79
77
|
return handler();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grpc.helper.js","sourceRoot":"","sources":["../../../../lib/sdk-stub/helpers/grpc.helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,GAAG,EAAc,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,MAAM,OAAO,UAAU;IAiBP;IACA;IACA;IAlBJ,WAAW,CAAM;IACjB,WAAW,CAAS;IACpB,UAAU,CAAS;IACnB,OAAO,CAAM;IACb,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC1B,MAAM,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;IAE1C,MAAM,CAAC,IAAI,CACP,MAAkB,EAClB,KAAwB,EACxB,OAAqC;QAErC,OAAO,IAAI,UAAU,CAAQ,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,YACY,MAAkB,EAClB,KAAwB,EACxB,OAAqC;QAFrC,WAAM,GAAN,MAAM,CAAY;QAClB,UAAK,GAAL,KAAK,CAAmB;QACxB,YAAO,GAAP,OAAO,CAA8B;QAE7C,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAClC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnD,CAAC;IACL,CAAC;IAED,OAAO,CAAC,IAAY;QAChB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAM,IAAI,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,IAAY;QACf,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,IAAS,EAAE,cAAoB;QAChC,IAAI,cAAc,EAAE,CAAC;YAEjB,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,EAAE,MAAM,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACtG,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACxB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;IAOD,MAAM;QACF,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CACtE,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"grpc.helper.js","sourceRoot":"","sources":["../../../../lib/sdk-stub/helpers/grpc.helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,GAAG,EAAc,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,MAAM,OAAO,UAAU;IAiBP;IACA;IACA;IAlBJ,WAAW,CAAM;IACjB,WAAW,CAAS;IACpB,UAAU,CAAS;IACnB,OAAO,CAAM;IACb,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC1B,MAAM,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;IAE1C,MAAM,CAAC,IAAI,CACP,MAAkB,EAClB,KAAwB,EACxB,OAAqC;QAErC,OAAO,IAAI,UAAU,CAAQ,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,YACY,MAAkB,EAClB,KAAwB,EACxB,OAAqC;QAFrC,WAAM,GAAN,MAAM,CAAY;QAClB,UAAK,GAAL,KAAK,CAAmB;QACxB,YAAO,GAAP,OAAO,CAA8B;QAE7C,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAClC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnD,CAAC;IACL,CAAC;IAED,OAAO,CAAC,IAAY;QAChB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAM,IAAI,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,IAAY;QACf,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,IAAS,EAAE,cAAoB;QAChC,IAAI,cAAc,EAAE,CAAC;YAEjB,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,EAAE,MAAM,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACtG,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACxB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;IAOD,MAAM;QACF,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CACtE,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CACf,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,KAAY,EAAE,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAC5F,CACJ,CAAC;IACN,CAAC;IAED,KAAK,CAAC,OAAO;QACT,IAAI,CAAC;YACD,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAO,CAAC;YACrC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACjB,IAAI,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAC5B,CAAC;YACD,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAEjC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAClD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,KAAY,EAAE,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;QACpG,CAAC;QAAC,OAAO,SAAS,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC7B,MAAM,SAAS,CAAC;QACpB,CAAC;IACL,CAAC;IAMO,cAAc,CAAC,IAAS;QAC5B,IAAI,IAAI,EAAE,YAAY,EAAE,CAAC;YACrB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;YACrE,OAAO,KAAK,IAAI,IAAI,CAAC;QACzB,CAAC;QACD,OAAO,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAChD,CAAC;IAEO,KAAK,CAAC,OAAO;QACjB,MAAM,OAAO,GAAG,GAAe,EAAE,CAC7B,IAAI,CAAC,SAAS,CACV,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CACrG,CAAC;QAEN,OAAO,OAAO,EAAE,CAAC;IACrB,CAAC;IAIO,KAAK,CAAC,SAAS,CAAI,OAAsB;QAC7C,IAAI,CAAC;YACD,OAAO,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACL,CAAC;IAED,IAAY,WAAW;QACnB,OAAO,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;IACpD,CAAC;IAEO,WAAW,CAAC,KAAU;QAC1B,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;YAChC,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,sBAAsB,IAAI,CAAC,OAAO,CAAC,OAAO,cAAc,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YAC3G,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;YAC5D,MAAM,IAAI,aAAa,CAAC,KAAK,CAAC,yBAAyB,CAAC,EAAE,UAAU,CAAC,qBAAqB,CAAC,CAAC;QAChG,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YACb,IAAI,KAAK,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBAC/B,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAChD,MAAM,SAAS,GAAQ,IAAI,aAAa,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;gBACpF,SAAS,CAAC,UAAU,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC;gBAC7C,SAAS,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC;gBAC1C,MAAM,SAAS,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACzB,MAAM,IAAI,aAAa,CAAC,KAAK,CAAC,yBAAyB,CAAC,EAAE,UAAU,CAAC,qBAAqB,CAAC,CAAC;YAChG,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;CACJ"}
|
|
@@ -152,6 +152,29 @@ describe('GrpcHelper', () => {
|
|
|
152
152
|
expect(result).toEqual([null]);
|
|
153
153
|
});
|
|
154
154
|
|
|
155
|
+
it('unwraps a nullable primitive, which wraps a Native*Value', async () => {
|
|
156
|
+
serviceGrpc.findNameOrNull = vi.fn(() =>
|
|
157
|
+
of({ grpcNullable: true, value: { value: 'john', grpcNative: true } })
|
|
158
|
+
);
|
|
159
|
+
serviceGrpc.isActiveOrNull = vi.fn(() =>
|
|
160
|
+
of({ grpcNullable: true, value: { value: false, grpcNative: true } })
|
|
161
|
+
);
|
|
162
|
+
|
|
163
|
+
const name = await createHelper().service('UserService').method('findNameOrNull').data({}).getMany();
|
|
164
|
+
const isActive = await createHelper().service('UserService').method('isActiveOrNull').data({}).getMany();
|
|
165
|
+
|
|
166
|
+
expect(name).toEqual(['john']);
|
|
167
|
+
expect(isActive).toEqual([false]);
|
|
168
|
+
});
|
|
169
|
+
|
|
170
|
+
it('returns [null] for a nullable primitive without a value', async () => {
|
|
171
|
+
serviceGrpc.findNameOrNull = vi.fn(() => of({ grpcNullable: true, value: null }));
|
|
172
|
+
|
|
173
|
+
const result = await createHelper().service('UserService').method('findNameOrNull').data({}).getMany();
|
|
174
|
+
|
|
175
|
+
expect(result).toEqual([null]);
|
|
176
|
+
});
|
|
177
|
+
|
|
155
178
|
it('getOne returns the first element of getMany', async () => {
|
|
156
179
|
serviceGrpc.findMany = vi.fn(() => of([{ name: 'john' }, { name: 'jane' }]));
|
|
157
180
|
|
|
@@ -172,6 +195,29 @@ describe('GrpcHelper', () => {
|
|
|
172
195
|
expect(result).toEqual([{ name: 'JOHN' }, { name: 'JANE' }]);
|
|
173
196
|
});
|
|
174
197
|
|
|
198
|
+
it('unwraps primitive and nullable chunks like the unary calls do', async () => {
|
|
199
|
+
serviceGrpc.streamNames = vi.fn(() =>
|
|
200
|
+
of({ value: 'john', grpcNative: true }, { value: '', grpcNative: true })
|
|
201
|
+
);
|
|
202
|
+
serviceGrpc.streamMaybe = vi.fn(() =>
|
|
203
|
+
of(
|
|
204
|
+
{ grpcNullable: true, value: { name: 'john' } },
|
|
205
|
+
{ grpcNullable: true, value: null },
|
|
206
|
+
{ grpcNullable: true, value: { value: false, grpcNative: true } }
|
|
207
|
+
)
|
|
208
|
+
);
|
|
209
|
+
|
|
210
|
+
const names = await firstValueFrom(
|
|
211
|
+
createHelper().service('UserService').method('streamNames').data({}).stream().pipe(toArray())
|
|
212
|
+
);
|
|
213
|
+
const maybe = await firstValueFrom(
|
|
214
|
+
createHelper().service('UserService').method('streamMaybe').data({}).stream().pipe(toArray())
|
|
215
|
+
);
|
|
216
|
+
|
|
217
|
+
expect(names).toEqual(['john', '']);
|
|
218
|
+
expect(maybe).toEqual([{ name: 'JOHN' }, null, false]);
|
|
219
|
+
});
|
|
220
|
+
|
|
175
221
|
it('passes the payload and metadata to the grpc stream method', () => {
|
|
176
222
|
serviceGrpc.streamIt = vi.fn(() => of({ name: 'john' }));
|
|
177
223
|
|