Merge pull request #61 from relay-tools/fix-typings-when-not-using-single-artefact-dir

[plugin] Type fragment refs as any when not using a single artifact dir.

Author: alloy

src/TypeScriptGenerator.ts

@@ -353,26 +353,37 @@ function createVisitor(options: TypeGeneratorOptions) {
         });
         state.generatedFragments.add(node.name);
         const refTypeName = getRefTypeName(node.name);
-        const _refTypeName = `_${refTypeName}`;
-        const _refType = ts.createVariableStatement(
-          [ts.createToken(ts.SyntaxKind.DeclareKeyword)],
-          ts.createVariableDeclarationList(
-            [
-              ts.createVariableDeclaration(
-                _refTypeName,
-                ts.createTypeOperatorNode(
-                  ts.SyntaxKind.UniqueKeyword,
-                  ts.createKeywordTypeNode(ts.SyntaxKind.SymbolKeyword)
+        const refTypeNodes: ts.Node[] = []
+        if (options.useSingleArtifactDirectory) {
+          const _refTypeName = `_${refTypeName}`;
+          const _refType = ts.createVariableStatement(
+            [ts.createToken(ts.SyntaxKind.DeclareKeyword)],
+            ts.createVariableDeclarationList(
+              [
+                ts.createVariableDeclaration(
+                  _refTypeName,
+                  ts.createTypeOperatorNode(
+                    ts.SyntaxKind.UniqueKeyword,
+                    ts.createKeywordTypeNode(ts.SyntaxKind.SymbolKeyword)
+                  )
                 )
-              )
-            ],
-            ts.NodeFlags.Const
+              ],
+              ts.NodeFlags.Const
+            )
+          );
+          const refType = exportType(
+            refTypeName,
+            ts.createTypeQueryNode(ts.createIdentifier(_refTypeName))
+          );
+          refTypeNodes.push(_refType)
+          refTypeNodes.push(refType)
+        } else {
+          const refType = exportType(
+            refTypeName,
+            ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)
           )
-        );
-        const refType = exportType(
-          refTypeName,
-          ts.createTypeQueryNode(ts.createIdentifier(_refTypeName))
-        );
+          refTypeNodes.push(refType)
+        }
         const baseType = selectionsToAST(selections, state, refTypeName);
         const type = isPlural(node)
           ? ts.createTypeReferenceNode(ts.createIdentifier("ReadonlyArray"), [
@@ -382,8 +393,7 @@ function createVisitor(options: TypeGeneratorOptions) {
         return [
           ...getFragmentImports(state),
           ...getEnumDefinitions(state),
-          _refType,
-          refType,
+          ...refTypeNodes,
           exportType(node.name, type)
         ];
       },

test/TypeScriptGenerator-test.ts

@@ -6,7 +6,32 @@ import {GraphQLCompilerContext, IRTransforms, transformASTSchema} from 'relay-co
 
 import * as TypeScriptGenerator from '../src/TypeScriptGenerator'
 
-describe('TypeScriptGenerator', () => {
+describe('TypeScriptGenerator with a single artifact directory', () => {
+  generateTestsFromFixtures(`${__dirname}/fixtures/type-generator`, text => {
+    const schema = transformASTSchema(RelayTestSchema, [
+      IRTransforms.schemaExtensions[1], // RelayRelayDirectiveTransform.SCHEMA_EXTENSION,
+    ]);
+    const {definitions} = parseGraphQLText(schema, text);
+    return new GraphQLCompilerContext(RelayTestSchema, schema)
+      .addAll(definitions)
+      .applyTransforms(TypeScriptGenerator.transforms)
+      .documents()
+      .map(doc =>
+        TypeScriptGenerator.generate(doc, {
+          customScalars: {},
+          enumsHasteModule: null,
+          existingFragmentNames: new Set(['PhotoFragment']),
+          inputFieldWhiteList: [],
+          relayRuntimeModule: 'relay-runtime',
+          useHaste: false,
+          useSingleArtifactDirectory: true,
+        }),
+      )
+      .join('\n\n');
+  });
+});
+
+describe('TypeScriptGenerator without a single artifact directory', () => {
   generateTestsFromFixtures(`${__dirname}/fixtures/type-generator`, text => {
     const schema = transformASTSchema(RelayTestSchema, [
       IRTransforms.schemaExtensions[1], // RelayRelayDirectiveTransform.SCHEMA_EXTENSION,