@grpc/proto-loader
Advanced tools
Comparing version 0.6.5 to 0.7.0
@@ -371,6 +371,7 @@ #!/usr/bin/env node | ||
function generateMessageInterfaces(formatter, messageType, options) { | ||
var _a, _b; | ||
let usesLong = false; | ||
let seenDeps = new Set(); | ||
const childTypes = getChildMessagesAndEnums(messageType); | ||
formatter.writeLine(`// Original file: ${messageType.filename}`); | ||
formatter.writeLine(`// Original file: ${(_b = ((_a = messageType.filename) !== null && _a !== void 0 ? _a : 'null')) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, '/')}`); | ||
formatter.writeLine(''); | ||
@@ -432,3 +433,4 @@ messageType.fieldsArray.sort((fieldA, fieldB) => fieldA.id - fieldB.id); | ||
function generateEnumInterface(formatter, enumType, options, nameOverride) { | ||
formatter.writeLine(`// Original file: ${enumType.filename}`); | ||
var _a, _b; | ||
formatter.writeLine(`// Original file: ${(_b = ((_a = enumType.filename) !== null && _a !== void 0 ? _a : 'null')) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, '/')}`); | ||
formatter.writeLine(''); | ||
@@ -497,3 +499,3 @@ if (options.includeComments) { | ||
const responseType = getTypeInterfaceName(method.resolvedResponseType) + '__Output'; | ||
const callbackType = `(error?: grpc.ServiceError, result?: ${responseType}) => void`; | ||
const callbackType = `grpc.requestCallback<${responseType}>`; | ||
if (method.requestStream) { | ||
@@ -588,3 +590,4 @@ if (method.responseStream) { | ||
function generateServiceInterfaces(formatter, serviceType, options) { | ||
formatter.writeLine(`// Original file: ${serviceType.filename}`); | ||
var _a, _b; | ||
formatter.writeLine(`// Original file: ${(_b = ((_a = serviceType.filename) !== null && _a !== void 0 ? _a : 'null')) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, '/')}`); | ||
formatter.writeLine(''); | ||
@@ -751,3 +754,3 @@ const grpcImportPath = options.grpcLib.startsWith('.') ? getPathToRoot(serviceType) + options.grpcLib : options.grpcLib; | ||
} | ||
function runScript() { | ||
async function runScript() { | ||
const argv = yargs | ||
@@ -754,0 +757,0 @@ .parserConfiguration({ |
@@ -22,4 +22,4 @@ /** | ||
import { Options } from './util'; | ||
export { Long } from 'long'; | ||
export { Options }; | ||
import Long = require('long'); | ||
export { Options, Long }; | ||
/** | ||
@@ -26,0 +26,0 @@ * This type exists for use with code generated by the proto-loader-gen-types |
@@ -24,2 +24,4 @@ "use strict"; | ||
const util_1 = require("./util"); | ||
const Long = require("long"); | ||
exports.Long = Long; | ||
function isAnyExtension(obj) { | ||
@@ -76,2 +78,5 @@ return ('@type' in obj) && (typeof obj['@type'] === 'string'); | ||
return function serialize(arg) { | ||
if (Array.isArray(arg)) { | ||
throw new Error(`Failed to serialize message: expected object with ${cls.name} structure, got array instead`); | ||
} | ||
const message = cls.fromObject(arg); | ||
@@ -78,0 +83,0 @@ return cls.encode(message).finish(); |
{ | ||
"name": "@grpc/proto-loader", | ||
"version": "0.6.5", | ||
"version": "0.7.0", | ||
"author": "Google Inc.", | ||
@@ -17,3 +17,3 @@ "contributors": [ | ||
"build": "npm run compile", | ||
"clean": "node -e 'require(\"rimraf\")(\"./build\", () => {})'", | ||
"clean": "rimraf ./build", | ||
"compile": "tsc -p .", | ||
@@ -29,3 +29,3 @@ "format": "clang-format -i -style=\"{Language: JavaScript, BasedOnStyle: Google, ColumnLimit: 80}\" src/*.ts test/*.ts", | ||
"generate-golden": "node ./build/bin/proto-loader-gen-types.js --keepCase --longs=String --enums=String --defaults --oneofs --json --includeComments -I deps/gapic-showcase/schema/ deps/googleapis/ -O ./golden-generated --grpcLib @grpc/grpc-js google/showcase/v1beta1/echo.proto", | ||
"validate-golden": "rm -rf ./golden-generated-old && mv ./golden-generated/ ./golden-generated-old && npm run generate-golden && diff -r ./golden-generated ./golden-generated-old" | ||
"validate-golden": "rm -rf ./golden-generated-old && mv ./golden-generated/ ./golden-generated-old && npm run generate-golden && diff -rb ./golden-generated ./golden-generated-old" | ||
}, | ||
@@ -53,4 +53,4 @@ "repository": { | ||
"long": "^4.0.0", | ||
"protobufjs": "^6.10.0", | ||
"yargs": "^16.1.1" | ||
"protobufjs": "^7.0.0", | ||
"yargs": "^16.2.0" | ||
}, | ||
@@ -62,3 +62,3 @@ "devDependencies": { | ||
"@types/node": "^10.17.26", | ||
"@types/yargs": "^15.0.5", | ||
"@types/yargs": "^16.0.4", | ||
"clang-format": "^1.2.2", | ||
@@ -65,0 +65,0 @@ "gts": "^1.1.0", |
73305
1293
+ Addedlong@5.2.3(transitive)
+ Addedprotobufjs@7.3.2(transitive)
- Removedprotobufjs@6.11.4(transitive)
Updatedprotobufjs@^7.0.0
Updatedyargs@^16.2.0