Comparing version 1.167.2 to 1.167.3
@@ -101,8 +101,8 @@ "use strict"; | ||
let beforeRequest; | ||
if (options.rpcBeforeRequest) { | ||
beforeRequest = (0, ts_poet_1.code) ` | ||
if (this.rpc.beforeRequest) { | ||
this.rpc.beforeRequest(this.service, "${methodDesc.name}", request); | ||
}`; | ||
if (options.rpcBeforeRequest && !methodDesc.clientStreaming) { | ||
beforeRequest = generateBeforeRequest(methodDesc.name); | ||
} | ||
else if (methodDesc.clientStreaming && options.rpcBeforeRequest) { | ||
encode = (0, ts_poet_1.code) `{const encodedRequest = ${encode}; ${generateBeforeRequest(methodDesc.name, "encodedRequest")}; return encodedRequest}`; | ||
} | ||
let decode = (0, ts_poet_1.code) `${rawOutputType}.decode(${Reader}.create(data))`; | ||
@@ -166,5 +166,12 @@ if (options.rpcAfterResponse) { | ||
} | ||
function generateBeforeRequest(methodName, requestVariableName = "request") { | ||
return (0, ts_poet_1.code) ` | ||
if (this.rpc.beforeRequest) { | ||
this.rpc.beforeRequest(this.service, "${methodName}", ${requestVariableName}); | ||
}`; | ||
} | ||
function createDefaultServiceReturn(ctx, methodDesc, decode, errorHandler) { | ||
const { options } = ctx; | ||
const rawOutputType = (0, types_1.responseType)(ctx, methodDesc, { keepValueType: true }); | ||
const returnStatement = (0, utils_1.arrowFunction)("data", decode, !options.rpcAfterResponse); | ||
if (options.returnObservable || methodDesc.serverStreaming) { | ||
@@ -175,16 +182,16 @@ if (options.useAsyncIterable) { | ||
else { | ||
return (0, ts_poet_1.code) `result.pipe(${(0, ts_poet_1.imp)("map@rxjs/operators")}(data => ${decode}))`; | ||
if (errorHandler) { | ||
const tc = (0, utils_1.arrowFunction)("data", (0, utils_1.tryCatchBlock)(decode, (0, ts_poet_1.code) `throw error`), !options.rpcAfterResponse); | ||
return (0, ts_poet_1.code) `result.pipe(${(0, ts_poet_1.imp)("map@rxjs/operators")}(${tc}))`; | ||
} | ||
return (0, ts_poet_1.code) `result.pipe(${(0, ts_poet_1.imp)("map@rxjs/operators")}(${returnStatement}))`; | ||
} | ||
} | ||
if (errorHandler) { | ||
let tryBlock = decode; | ||
if (!options.rpcAfterResponse) { | ||
tryBlock = (0, ts_poet_1.code) `return ${decode}`; | ||
decode = (0, ts_poet_1.code) `return ${decode}`; | ||
} | ||
return (0, ts_poet_1.code) `promise.then(data => { ${(0, utils_1.tryCatchBlock)(tryBlock, (0, ts_poet_1.code) `return Promise.reject(error);`)}}).catch((error) => { ${errorHandler} })`; | ||
return (0, ts_poet_1.code) `promise.then(${(0, utils_1.arrowFunction)("data", (0, utils_1.tryCatchBlock)(decode, (0, ts_poet_1.code) `return Promise.reject(error);`), false)}).catch(${(0, utils_1.arrowFunction)("error", errorHandler, false)})`; | ||
} | ||
else if (options.rpcAfterResponse) { | ||
return (0, ts_poet_1.code) `promise.then(data => { ${decode} } )`; | ||
} | ||
return (0, ts_poet_1.code) `promise.then(data => ${decode})`; | ||
return (0, ts_poet_1.code) `promise.then(${returnStatement})`; | ||
} | ||
@@ -191,0 +198,0 @@ function generateServiceClientImpl(ctx, fileDesc, serviceDesc) { |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.tryCatchBlock = exports.impProto = exports.impFile = exports.getPropertyAccessor = exports.safeAccessor = exports.getFieldName = exports.getFieldJsonName = exports.FormattedMethodDescriptor = exports.assertInstanceOf = exports.maybePrefixPackage = exports.prefixDisableLinter = exports.maybeAddComment = exports.upperFirst = exports.lowerFirst = exports.singular = exports.fail = exports.readToBuffer = exports.generateIndexFiles = exports.protoFilesToGenerate = void 0; | ||
exports.arrowFunction = exports.tryCatchBlock = exports.impProto = exports.impFile = exports.getPropertyAccessor = exports.safeAccessor = exports.getFieldName = exports.getFieldJsonName = exports.FormattedMethodDescriptor = exports.assertInstanceOf = exports.maybePrefixPackage = exports.prefixDisableLinter = exports.maybeAddComment = exports.upperFirst = exports.lowerFirst = exports.singular = exports.fail = exports.readToBuffer = exports.generateIndexFiles = exports.protoFilesToGenerate = void 0; | ||
const path = require("path"); | ||
@@ -257,1 +257,8 @@ const ts_poet_1 = require("ts-poet"); | ||
exports.tryCatchBlock = tryCatchBlock; | ||
function arrowFunction(params, body, isOneLine = true) { | ||
if (isOneLine) { | ||
return (0, ts_poet_1.code) `(${params}) => ${body}`; | ||
} | ||
return (0, ts_poet_1.code) `(${params}) => { ${body} }`; | ||
} | ||
exports.arrowFunction = arrowFunction; |
{ | ||
"name": "ts-proto", | ||
"version": "1.167.2", | ||
"version": "1.167.3", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "main": "build/plugin.js", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
344926
5990