feat(core): added support for schema interfaces, and update typescrip…

…t generator
dotansimha · Dec 14, 2016 · 22d3ad0 · 22d3ad0
1 parent f432ecd
commit 22d3ad0
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 49 deletions.
diff --git a/dev-test/githunt/typings.d.ts b/dev-test/githunt/typings.d.ts
@@ -28,14 +28,18 @@ export interface User {
     html_url: string;
 }
 
-export interface Comment {
+export interface Comment extends TestInterface {
     id: number;
     postedBy: User;
     createdAt: number;
     content: string;
     repoName: string;
 }
 
+export interface TestInterface {
+    content: string;
+}
+
 export interface Vote {
     vote_value: number;
 }

diff --git a/generators/typescript-multiple-files/document.handlebars b/generators/typescript-multiple-files/document.handlebars
@@ -10,38 +10,30 @@
 {{/each ~}}
 
 export namespace {{ name }} {
-  {{#if hasVariables}}
-      export interface Variables {
-      {{#each variables}}
-          {{ name }}: {{#if isArray}}Array<{{/if}}{{ type }}{{#if isArray}}>{{/if}}{{#unless isRequired}} | null{{/unless}};
-      {{/each}}
-      }
+{{#if hasVariables}}
+  export type Variables = {
+  {{#each variables}}
+    {{ name }}: {{#if isArray}}Array<{{/if}}{{ type }}{{#if isArray}}>{{/if}}{{#unless isRequired}} | null{{/unless}};
+  {{/each}}
+  }
 
-  {{/if ~}}
+{{/if ~}}
 
-  {{#each innerTypes}}
-      {{#if usingFragments}}
-      export type {{ name }} = {{#each fragmentsUsed ~}}{{this}}.Fragment & {{/each }}{
-      {{#each fields}}
-        {{ name }}: {{#if isArray}}Array<{{/if}}{{ type }}{{#if isArray}}>{{/if}};
-      {{/each}}
-      }
-      {{else}}
-      export interface {{name}} {
-        {{#each fields}}
-          {{ name }}: {{#if isArray}}Array<{{/if}}{{ type }}{{#if isArray}}>{{/if}};
-        {{/each}}
-      }
-      {{/if}}
+{{#each innerTypes}}
+  export type {{ name }} = {
+  {{#each fields}}
+    {{ name }}: {{#if isArray}}Array<{{/if}}{{ type }}{{#if isArray}}>{{/if}};
+  {{/each}}
+  } {{#each fragmentsUsed}}& {{this}}.Fragment {{/each }}{{#if hasInlineFragments}}& ({{#each inlineFragments}}{{ typeName }}{{/each}} | {}) {{/if}}
 
-    {{/each ~}}
+{{/each ~}}
 
 {{#each resultFields}}
-      export interface {{ name }}Result {
-      {{#each fields}}
-      {{ name }}: {{#if isArray}}Array<{{/if}}{{ type }}{{#if isArray}}>{{/if}};
-      {{/each}}
-      }
+  export type Result = {
+  {{#each fields}}
+    {{ name }}: {{#if isArray}}Array<{{/if}}{{ type }}{{#if isArray}}>{{/if}};
+  {{/each}}
+  }
 
-  {{/each ~}}
-}
+{{/each ~}}
+}
diff --git a/generators/typescript-multiple-files/model.handlebars b/generators/typescript-multiple-files/model.handlebars
@@ -3,10 +3,10 @@
 {{/each ~}}
 
 {{#if isObject ~}}
-export interface {{ name }} {
-    {{#each fields}}
-    {{ name }}: {{#if isArray}}Array<{{/if}}{{ type }}{{#if isArray}}>{{/if}}{{#unless isRequired}} | null{{/unless}};
-    {{/each ~}}
+export interface {{ name }}{{#if hasImplementedInterfaces}} extends {{#each implementedInterfaces}}{{this}}{{/each}}{{/if}} {
+{{#each fields}}
+  {{ name }}: {{#if isArray}}Array<{{/if}}{{ type }}{{#if isArray}}>{{/if}}{{#unless isRequired}} | null{{/unless}};
+{{/each ~}}
 }
 
 {{/if ~}}

diff --git a/generators/typescript-single-file/template.handlebars b/generators/typescript-single-file/template.handlebars
@@ -1,6 +1,6 @@
 {{#each models ~}}
 {{#if isObject ~}}
-export interface {{ name }} {
+export interface {{ name }}{{#if hasImplementedInterfaces}} extends {{#each implementedInterfaces}}{{this}}{{/each}}{{/if}} {
     {{#each fields}}
     {{ name }}: {{#if isArray}}Array<{{/if}}{{ type }}{{#if isArray}}>{{/if}}{{#unless isRequired}} | null{{/unless}};
     {{/each ~}}

diff --git a/src/interfaces.ts b/src/interfaces.ts
@@ -19,17 +19,17 @@ export interface Model {
   name?: string;
   description?: string;
   fields?: Field[];
-  isFragment?: boolean;
   isObject?: boolean;
-  isInterface?: boolean;
+  isFragment?: boolean;
   isEnum?: boolean;
-  isUnion?: boolean;
   usingFragments?: boolean;
   enumValues?: EnumValue[];
   fragmentsUsed?: string[];
   inlineFragments?: InlineFragment[];
   hasInlineFragments?: boolean;
   imports?: string[];
+  implementedInterfaces?: string[];
+  hasImplementedInterfaces?: boolean;
 }
 
 export interface CodegenDocument {

diff --git a/src/model-handler.ts b/src/model-handler.ts
@@ -47,11 +47,8 @@ export const handleType = (primitivesMap: any, typeName: string, type: GraphQLTy
     imports: [],
     name: typeName,
     fields: [],
-    isFragment: false,
     isEnum: false,
-    isObject: false,
-    isInterface: false,
-    isUnion: false
+    isObject: false
   };
 
   if (!shouldSkip(typeName)) {
@@ -65,10 +62,17 @@ export const handleType = (primitivesMap: any, typeName: string, type: GraphQLTy
         };
       });
     }
-    else if (type instanceof GraphQLObjectType || type instanceof GraphQLInputObjectType) {
+    else if (type instanceof GraphQLObjectType || type instanceof GraphQLInputObjectType || type instanceof GraphQLInterfaceType) {
       currentType.isObject = true;
       const fields = type.getFields();
 
+      if (type instanceof GraphQLObjectType) {
+        currentType.implementedInterfaces = type.getInterfaces().map<string>(interf => {
+          return interf.name;
+        });
+        currentType.hasImplementedInterfaces = currentType.implementedInterfaces.length > 0;
+      }
+
       currentType.fields = Object
         .keys(fields)
         .map((fieldName: string) => fields[fieldName])
@@ -87,13 +91,12 @@ export const handleType = (primitivesMap: any, typeName: string, type: GraphQLTy
           };
         });
     }
-    else if (type instanceof GraphQLInterfaceType) {
-      currentType.isInterface = true;
-      // TODO: implemented
-    }
     else if (type instanceof GraphQLUnionType) {
-      currentType.isUnion = true;
-      // TODO: implemented
+      // TODO: Handle union
+      //
+      // type.getTypes().map(type => {
+      //   return type.name
+      // });
     }
     else if (type instanceof GraphQLList || type instanceof GraphQLNonNull) {
       return handleType(primitivesMap, typeName, getNamedType(type));