@grpc/proto-loader - npm Package Compare versions

Comparing version 0.6.0-pre11 to 0.6.0-pre12

build/bin/proto-loader-gen-types.js

@@ -69,2 +69,7 @@ #!/usr/bin/env node
 function getImportPath(to) {
+    /* If the thing we are importing is defined in a message, it is generated in
+     * the same file as that message. */
+    if (to.parent instanceof Protobuf.Type) {
+        return getImportPath(to.parent);
+    }
     return stripLeadingPeriod(to.fullName).replace(/\./g, '/');
@@ -93,13 +98,31 @@ }
     let importedTypes;
-    if (dependency instanceof Protobuf.Type) {
-        importedTypes = `${dependency.name} as ${typeInterfaceName}, ${dependency.name}__Output as ${typeInterfaceName}__Output`;
+    /* If the dependenc is defined within a message, it will be generated in that
+     * message's file and exported using its typeInterfaceName. */
+    if (dependency.parent instanceof Protobuf.Type) {
+        if (dependency instanceof Protobuf.Type) {
+            importedTypes = `${typeInterfaceName}, ${typeInterfaceName}__Output`;
+        }
+        else if (dependency instanceof Protobuf.Enum) {
+            importedTypes = `${typeInterfaceName}`;
+        }
+        else if (dependency instanceof Protobuf.Service) {
+            importedTypes = `${typeInterfaceName}Client`;
+        }
+        else {
+            throw new Error('Invalid object passed to getImportLine');
+        }
     }
-    else if (dependency instanceof Protobuf.Enum) {
-        importedTypes = `${dependency.name} as ${typeInterfaceName}`;
-    }
-    else if (dependency instanceof Protobuf.Service) {
-        importedTypes = `${dependency.name}Client as ${typeInterfaceName}Client`;
-    }
     else {
-        throw new Error('Invalid object passed to getImportLine');
+        if (dependency instanceof Protobuf.Type) {
+            importedTypes = `${dependency.name} as ${typeInterfaceName}, ${dependency.name}__Output as ${typeInterfaceName}__Output`;
+        }
+        else if (dependency instanceof Protobuf.Enum) {
+            importedTypes = `${dependency.name} as ${typeInterfaceName}`;
+        }
+        else if (dependency instanceof Protobuf.Service) {
+            importedTypes = `${dependency.name}Client as ${typeInterfaceName}Client`;
+        }
+        else {
+            throw new Error('Invalid object passed to getImportLine');
+        }
     }
@@ -576,3 +599,3 @@ return `import { ${importedTypes} } from '${filePath}';`;
     formatter.writeLine('  new(...args: ConstructorArguments<Constructor>): Subtype;');
-    formatter.writeLine('}');
+    formatter.writeLine('};');
     formatter.writeLine('');
@@ -646,3 +669,3 @@ formatter.writeLine('export interface ProtoGrpcType {');
         .array('includeDirs')
-        .boolean(['keepCase', 'defaults', 'arrays', 'objects', 'oneofs', 'json', 'verbose', 'generateComments'])
+        .boolean(['keepCase', 'defaults', 'arrays', 'objects', 'oneofs', 'json', 'verbose', 'includeComments'])
         //    .choices('longs', ['String', 'Number'])
@@ -685,2 +708,3 @@ //    .choices('enums', ['String'])
         json: 'Represent Infinity and NaN as strings in float fields. Also decode google.protobuf.Any automatically',
+        includeComments: 'Generate doc comments from comments in the original files',
         includeDirs: 'Directories to search for included files',
@@ -687,0 +711,0 @@ outDir: 'Directory in which to output files',

package.json

 {
   "name": "@grpc/proto-loader",
-  "version": "0.6.0-pre11",
+  "version": "0.6.0-pre12",
   "author": "Google Inc.",
@@ -26,3 +26,5 @@ "contributors": [
     "pretest": "npm run compile",
-    "posttest": "npm run check"
+    "posttest": "npm run check",
+    "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"
   },
@@ -56,3 +58,3 @@ "repository": {
     "@types/mkdirp": "^1.0.1",
-    "@types/mocha": "^7.0.2",
+    "@types/mocha": "^5.2.7",
     "@types/node": "^10.17.26",
@@ -59,0 +61,0 @@ "@types/yargs": "^15.0.5",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

63669

increased by2.46%

Lines of code

1161

increased by2.11%

No dependency changes