Improve implements generation

Author: drwpow

README.md

@@ -1,3 +1,5 @@
+[![version (scoped)](https://img.shields.io/npm/v/@manifoldco/graphql-gen.svg)](https://www.npmjs.com/package/@manifoldco/graphql-gen)
+
 # ⚛️ graphql-gen
 
 Node client for generating crude GraphQL specs from Swagger OpenAPI.
@@ -10,8 +12,7 @@ Node client for generating crude GraphQL specs from Swagger OpenAPI.
 | :----------------------------------- | :-: |
 | Enum                                 | ✅  |
 | ID                                   | ✅  |
-| Implements (`allOf`)                 | ✅  |
-| Polymorphism (`oneOf`)               | ✅  |
+| Union (`oneOf`)                      | ✅  |
 | Non-nullable                         | ✅  |
 | Primitives (string, boolean, number) | ✅  |
 | Query                                | 🚫  |

example/output.graphql

@@ -296,7 +296,21 @@ enum ExpandedProductType {
 enum ExpandedProductVersion {
   Version1
 }
-type ExpandedPlanBody implements PlanBody {
+type ExpandedPlanBody {
+  providerId: ID
+  productId: ID
+  name: String
+  label: String
+  state: String
+  resizableTo: [ID]
+  "Array of Region IDs"
+  regions: [ID]
+  "Array of Feature Values"
+  features: [FeatureValue]
+  "The number of days a user gets as a free trial when subscribing to this plan. Trials are valid only once per product; changing plans or adding an additional subscription will not start a new trial."
+  trialDays: Int
+  "Dollar value in cents."
+  cost: Int
   "An array of feature definitions for the plan, as defined on the Product."
   expandedFeatures: [ExpandedFeature]
   "A boolean flag that indicates if a plan is free or not based on it's cost and features."
@@ -318,11 +332,28 @@ enum ExpandedPlanType {
 enum ExpandedPlanVersion {
   Version1
 }
-type ExpandedFeature implements FeatureType {
+type ExpandedFeature {
+  label: String
+  name: String
+  type: ExpandedFeatureType
+  "This sets whether or not the feature can be customized by a consumer."
+  customizable: Boolean
+  "This sets whether or not the feature can be upgraded by the consumer after the resource has provisioned. Upgrading means setting a higher value or selecting a higher element in the list."
+  upgradable: Boolean
+  "This sets whether or not the feature can be downgraded by the consumer after the resource has provisioned. Downgrading means setting a lower value or selecting a lower element in the list."
+  downgradable: Boolean
+  "Sets if this feature’s value is trackable from the provider, this only really affects numeric constraints."
+  measurable: Boolean
+  values: [FeatureValueDetails]
   "The string value set for the feature on the plan, this should only be used if the value property is null."
   valueString: String
   value: FeatureValueDetails
 }
+enum ExpandedFeatureType {
+  BOOLEAN
+  STRING
+  NUMBER
+}
 type Error {
   "The error type"
   type: String!

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manifoldco/graphql-gen",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Generate GraphQL schemas from Swagger OpenAPI specs ",
   "main": "dist/index.js",
   "bin": {

src/swagger-2.ts

@@ -133,35 +133,38 @@ function parse(spec: Swagger2) {
     }
     const [ID, { allOf, properties, required }] = nextObject;
 
-    let allProperties = properties || {};
-    const implementations: string[] = [];
+    let allProperties = {};
 
     // Include allOf, if specified
     if (Array.isArray(allOf)) {
       allOf.forEach(item => {
         // Add “implements“ if this references other items
         if (item.$ref) {
-          const [refName] = getRef(item.$ref);
-          implementations.push(refName);
+          const refProperties = getRef(item.$ref)[1];
+          if (refProperties && refProperties.properties) {
+            allProperties = { ...allProperties, ...refProperties.properties };
+          }
         } else if (item.properties) {
           allProperties = { ...allProperties, ...item.properties };
         }
       });
     }
 
+    // Then add new properties
+    if (properties && Object.keys(properties).length) {
+      allProperties = { ...allProperties, ...properties };
+    }
+
     // If nothing’s here, let’s skip this one.
     if (!Object.keys(allProperties).length) {
       return;
     }
-    // Open type
-    const isImplementing = implementations.length
-      ? ` implements ${implementations.join(', ')}`
-      : '';
 
-    output.push(`type ${camelCase(ID)}${isImplementing} {`);
+    // Open type
+    output.push(`type ${camelCase(ID)} {`);
 
     // Populate type
-    Object.entries(allProperties).forEach(([key, value]) => {
+    Object.entries(allProperties).forEach(([key, value]: [string, Swagger2Definition]) => {
       const optional = !Array.isArray(required) || required.indexOf(key) === -1;
       const nonNullable = optional ? '' : '!';
       const name = camelCase(key);

tests/swagger-2.test.ts

@@ -284,7 +284,8 @@ describe('Swagger 2 spec', () => {
       type User {
         email: String
       }
-      type Admin implements User {
+      type Admin {
+        email: String
         rbac: String
       }`);