Merge pull request #68 from izumin5210/izumin5210/protogen

extract protogen package
proto-graphql · Jan 4, 2021 · f788121 · f788121
2 parents 4676b35 + 64f2e24
commit f788121
Show file tree

Hide file tree

Showing 29 changed files with 1,017 additions and 570 deletions.
diff --git a/...s/protoc-gen-nexus/src/__tests__/__integration__/__snapshots__/customOptions.test.ts.snap b/...s/protoc-gen-nexus/src/__tests__/__integration__/__snapshots__/customOptions.test.ts.snap
@@ -11,7 +11,10 @@ type Query {
 
 \\"\\"\\"\\"\\"\\"
 enum TestPrefixPrefixedEnum {
+  \\"\\"\\"\\"\\"\\"
   PREFIXED_BAR
+
+  \\"\\"\\"\\"\\"\\"
   PREFIXED_FOO
 }
 
@@ -109,7 +112,10 @@ type Query {
 
 \\"\\"\\"\\"\\"\\"
 enum TestPrefixPrefixedEnum {
+  \\"\\"\\"\\"\\"\\"
   PREFIXED_BAR
+
+  \\"\\"\\"\\"\\"\\"
   PREFIXED_FOO
 }
 

diff --git a/...ges/protoc-gen-nexus/src/__tests__/__integration__/__snapshots__/deprecation.test.ts.snap b/...ges/protoc-gen-nexus/src/__tests__/__integration__/__snapshots__/deprecation.test.ts.snap
@@ -7,13 +7,19 @@ exports[`schema generation with protobufjs can make GraphQL schema from generate
 
 \\"\\"\\"\\"\\"\\"
 enum DeprecatedEnum {
+  \\"\\"\\"\\"\\"\\"
   DEPRECATED_BAZ @deprecated(reason: \\"testapis.deprecation.DeprecatedEnum is mark as deprecated in a *.proto file.\\")
+
+  \\"\\"\\"\\"\\"\\"
   DEPRECATED_QUX @deprecated(reason: \\"testapis.deprecation.DeprecatedEnum is mark as deprecated in a *.proto file.\\")
 }
 
 \\"\\"\\"\\"\\"\\"
 enum DeprecatedFileEnum {
+  \\"\\"\\"\\"\\"\\"
   DEPRECATED_FILE_BAR @deprecated(reason: \\"testapis/deprecation/file_deprecation.proto is mark as deprecated.\\")
+
+  \\"\\"\\"\\"\\"\\"
   DEPRECATED_FILE_FOO @deprecated(reason: \\"testapis/deprecation/file_deprecation.proto is mark as deprecated.\\")
 }
 
@@ -79,7 +85,10 @@ input DeprecatedMessageInput {
 
 \\"\\"\\"\\"\\"\\"
 enum NotDeprecatedEnum {
+  \\"\\"\\"\\"\\"\\"
   DEPRECATED_BAR @deprecated(reason: \\"testapis.deprecation.NotDeprecatedEnum.DEPRECATED_BAR is mark as deprecated in a *.proto file.\\")
+
+  \\"\\"\\"\\"\\"\\"
   NOT_DEPRECATED_FOO
 }
 

diff --git a/packages/protoc-gen-nexus/src/__tests__/__integration__/__snapshots__/enums.test.ts.snap b/packages/protoc-gen-nexus/src/__tests__/__integration__/__snapshots__/enums.test.ts.snap
@@ -39,14 +39,23 @@ input MessageWithEnumsInput {
 enum MyEnum {
   \\"\\"\\"This is Bar.\\"\\"\\"
   MY_ENUM_BAR
+
+  \\"\\"\\"\\"\\"\\"
   MY_ENUM_BAZ
+
+  \\"\\"\\"\\"\\"\\"
   MY_ENUM_FOO
 }
 
 \\"\\"\\"\\"\\"\\"
 enum MyEnumWithoutUnspecified {
+  \\"\\"\\"\\"\\"\\"
   MY_ENUM_WITHOUT_UNSPECIFIED_BAR
+
+  \\"\\"\\"\\"\\"\\"
   MY_ENUM_WITHOUT_UNSPECIFIED_BAZ
+
+  \\"\\"\\"\\"\\"\\"
   MY_ENUM_WITHOUT_UNSPECIFIED_FOO
 }
 
@@ -95,14 +104,23 @@ input MessageWithEnumsInput {
 enum MyEnum {
   \\"\\"\\"This is Bar.\\"\\"\\"
   MY_ENUM_BAR
+
+  \\"\\"\\"\\"\\"\\"
   MY_ENUM_BAZ
+
+  \\"\\"\\"\\"\\"\\"
   MY_ENUM_FOO
 }
 
 \\"\\"\\"\\"\\"\\"
 enum MyEnumWithoutUnspecified {
+  \\"\\"\\"\\"\\"\\"
   MY_ENUM_WITHOUT_UNSPECIFIED_BAR
+
+  \\"\\"\\"\\"\\"\\"
   MY_ENUM_WITHOUT_UNSPECIFIED_BAZ
+
+  \\"\\"\\"\\"\\"\\"
   MY_ENUM_WITHOUT_UNSPECIFIED_FOO
 }
 

diff --git a/packages/protoc-gen-nexus/src/__tests__/__integration__/__snapshots__/multipkgs.test.ts.snap b/packages/protoc-gen-nexus/src/__tests__/__integration__/__snapshots__/multipkgs.test.ts.snap
@@ -29,7 +29,10 @@ type Query {
 
 \\"\\"\\"\\"\\"\\"
 enum SubpkgEnum {
+  \\"\\"\\"\\"\\"\\"
   BAR
+
+  \\"\\"\\"\\"\\"\\"
   FOO
 }
 
@@ -76,7 +79,10 @@ type Query {
 
 \\"\\"\\"\\"\\"\\"
 enum SubpkgEnum {
+  \\"\\"\\"\\"\\"\\"
   BAR
+
+  \\"\\"\\"\\"\\"\\"
   FOO
 }
 

diff --git a/...ges/protoc-gen-nexus/src/__tests__/__integration__/__snapshots__/nestedProto.test.ts.snap b/...ges/protoc-gen-nexus/src/__tests__/__integration__/__snapshots__/nestedProto.test.ts.snap
@@ -31,7 +31,10 @@ input ParentMessageInput {
 
 \\"\\"\\"\\"\\"\\"
 enum ParentMessageNestedEnum {
+  \\"\\"\\"\\"\\"\\"
   BAR
+
+  \\"\\"\\"\\"\\"\\"
   FOO
 }
 

diff --git a/packages/protoc-gen-nexus/src/__tests__/__snapshots__/process.test.ts.snap b/packages/protoc-gen-nexus/src/__tests__/__snapshots__/process.test.ts.snap
@@ -280,10 +280,12 @@ export const NotDeprecatedEnum = enumType({
     members: [
         {
             name: \\"NOT_DEPRECATED_FOO\\",
+            description: \\"\\",
             value: 1
         },
         {
             name: \\"DEPRECATED_BAR\\",
+            description: \\"\\",
             deprecation: \\"testapis.deprecation.NotDeprecatedEnum.DEPRECATED_BAR is mark as deprecated in a *.proto file.\\",
             value: 2
         }
@@ -295,11 +297,13 @@ export const DeprecatedEnum = enumType({
     members: [
         {
             name: \\"DEPRECATED_BAZ\\",
+            description: \\"\\",
             deprecation: \\"testapis.deprecation.DeprecatedEnum is mark as deprecated in a *.proto file.\\",
             value: 1
         },
         {
             name: \\"DEPRECATED_QUX\\",
+            description: \\"\\",
             deprecation: \\"testapis.deprecation.DeprecatedEnum is mark as deprecated in a *.proto file.\\",
             value: 2
         }
@@ -396,11 +400,13 @@ export const DeprecatedFileEnum = enumType({
     members: [
         {
             name: \\"DEPRECATED_FILE_FOO\\",
+            description: \\"\\",
             deprecation: \\"testapis/deprecation/file_deprecation.proto is mark as deprecated.\\",
             value: 1
         },
         {
             name: \\"DEPRECATED_FILE_BAR\\",
+            description: \\"\\",
             deprecation: \\"testapis/deprecation/file_deprecation.proto is mark as deprecated.\\",
             value: 2
         }
@@ -702,10 +708,12 @@ export const NotDeprecatedEnum = enumType({
     members: [
         {
             name: \\"NOT_DEPRECATED_FOO\\",
+            description: \\"\\",
             value: 1
         },
         {
             name: \\"DEPRECATED_BAR\\",
+            description: \\"\\",
             deprecation: \\"testapis.deprecation.NotDeprecatedEnum.DEPRECATED_BAR is mark as deprecated in a *.proto file.\\",
             value: 2
         }
@@ -717,11 +725,13 @@ export const DeprecatedEnum = enumType({
     members: [
         {
             name: \\"DEPRECATED_BAZ\\",
+            description: \\"\\",
             deprecation: \\"testapis.deprecation.DeprecatedEnum is mark as deprecated in a *.proto file.\\",
             value: 1
         },
         {
             name: \\"DEPRECATED_QUX\\",
+            description: \\"\\",
             deprecation: \\"testapis.deprecation.DeprecatedEnum is mark as deprecated in a *.proto file.\\",
             value: 2
         }
@@ -824,11 +834,13 @@ export const DeprecatedFileEnum = enumType({
     members: [
         {
             name: \\"DEPRECATED_FILE_FOO\\",
+            description: \\"\\",
             deprecation: \\"testapis/deprecation/file_deprecation.proto is mark as deprecated.\\",
             value: 1
         },
         {
             name: \\"DEPRECATED_FILE_BAR\\",
+            description: \\"\\",
             deprecation: \\"testapis/deprecation/file_deprecation.proto is mark as deprecated.\\",
             value: 2
         }
@@ -1096,10 +1108,12 @@ export const SubpkgEnum = enumType({
     members: [
         {
             name: \\"FOO\\",
+            description: \\"\\",
             value: 1
         },
         {
             name: \\"BAR\\",
+            description: \\"\\",
             value: 2
         }
     ]
@@ -1205,10 +1219,12 @@ export const SubpkgEnum = enumType({
     members: [
         {
             name: \\"FOO\\",
+            description: \\"\\",
             value: 1
         },
         {
             name: \\"BAR\\",
+            description: \\"\\",
             value: 2
         }
     ]
@@ -1370,10 +1386,12 @@ export const ParentMessageNestedEnum = enumType({
     members: [
         {
             name: \\"FOO\\",
+            description: \\"\\",
             value: 1
         },
         {
             name: \\"BAR\\",
+            description: \\"\\",
             value: 2
         }
     ]
@@ -1484,10 +1502,12 @@ export const ParentMessageNestedEnum = enumType({
     members: [
         {
             name: \\"FOO\\",
+            description: \\"\\",
             value: 1
         },
         {
             name: \\"BAR\\",
+            description: \\"\\",
             value: 2
         }
     ]
@@ -1689,10 +1709,12 @@ export const TestPrefixPrefixedEnum = enumType({
     members: [
         {
             name: \\"PREFIXED_FOO\\",
+            description: \\"\\",
             value: 1
         },
         {
             name: \\"PREFIXED_BAR\\",
+            description: \\"\\",
             value: 2
         }
     ]
@@ -1908,10 +1930,12 @@ export const TestPrefixPrefixedEnum = enumType({
     members: [
         {
             name: \\"PREFIXED_FOO\\",
+            description: \\"\\",
             value: 1
         },
         {
             name: \\"PREFIXED_BAR\\",
+            description: \\"\\",
             value: 2
         }
     ]
@@ -2011,6 +2035,7 @@ export const MyEnum = enumType({
     members: [
         {
             name: \\"MY_ENUM_FOO\\",
+            description: \\"\\",
             value: 1
         },
         {
@@ -2020,6 +2045,7 @@ export const MyEnum = enumType({
         },
         {
             name: \\"MY_ENUM_BAZ\\",
+            description: \\"\\",
             value: 3
         }
     ]
@@ -2030,14 +2056,17 @@ export const MyEnumWithoutUnspecified = enumType({
     members: [
         {
             name: \\"MY_ENUM_WITHOUT_UNSPECIFIED_FOO\\",
+            description: \\"\\",
             value: 0
         },
         {
             name: \\"MY_ENUM_WITHOUT_UNSPECIFIED_BAR\\",
+            description: \\"\\",
             value: 1
         },
         {
             name: \\"MY_ENUM_WITHOUT_UNSPECIFIED_BAZ\\",
+            description: \\"\\",
             value: 2
         }
     ]
@@ -2137,6 +2166,7 @@ export const MyEnum = enumType({
     members: [
         {
             name: \\"MY_ENUM_FOO\\",
+            description: \\"\\",
             value: 1
         },
         {
@@ -2146,6 +2176,7 @@ export const MyEnum = enumType({
         },
         {
             name: \\"MY_ENUM_BAZ\\",
+            description: \\"\\",
             value: 3
         }
     ]
@@ -2156,14 +2187,17 @@ export const MyEnumWithoutUnspecified = enumType({
     members: [
         {
             name: \\"MY_ENUM_WITHOUT_UNSPECIFIED_FOO\\",
+            description: \\"\\",
             value: 0
         },
         {
             name: \\"MY_ENUM_WITHOUT_UNSPECIFIED_BAR\\",
+            description: \\"\\",
             value: 1
         },
         {
             name: \\"MY_ENUM_WITHOUT_UNSPECIFIED_BAZ\\",
+            description: \\"\\",
             value: 2
         }
     ]

diff --git a/packages/protoc-gen-nexus/src/dslgen/enumType.ts b/packages/protoc-gen-nexus/src/dslgen/enumType.ts
@@ -1,7 +1,8 @@
 import ts from "typescript";
-import { ProtoEnum, ProtoEnumValue } from "../protoTypes";
+import { ProtoEnum, ProtoEnumValue } from "../protogen";
 import {
   createDeprecationPropertyAssignment,
+  createDescriptionPropertyAssignment,
   createDslExportConstStmt,
   gqlTypeName,
   isEnumValueForUnspecified,
@@ -40,7 +41,7 @@ function createEnumTypeDslStmt(en: ProtoEnum): ts.Statement {
       ts.factory.createObjectLiteralExpression(
         [
           ts.factory.createPropertyAssignment("name", ts.factory.createStringLiteral(typeName)),
-          ts.factory.createPropertyAssignment("description", ts.factory.createStringLiteral(en.description)),
+          createDescriptionPropertyAssignment(en),
           ts.factory.createPropertyAssignment(
             "members",
             ts.factory.createArrayLiteralExpression(
@@ -62,11 +63,9 @@ function createEnumValueExpr(ev: ProtoEnumValue): ts.Expression {
   return ts.factory.createObjectLiteralExpression(
     [
       ts.factory.createPropertyAssignment("name", ts.factory.createStringLiteral(ev.name)),
-      ev.description
-        ? ts.factory.createPropertyAssignment("description", ts.factory.createStringLiteral(ev.description))
-        : null,
+      createDescriptionPropertyAssignment(ev),
       createDeprecationPropertyAssignment(ev),
-      ts.factory.createPropertyAssignment("value", ts.factory.createNumericLiteral(ev.tagNumber)),
+      ts.factory.createPropertyAssignment("value", ts.factory.createNumericLiteral(ev.number)),
     ].filter(onlyNonNull()),
     true // multiline
   );