Merge pull request #83 from timjacobi/master

support --noImplicitAny

src/addAnyTypeCast.ts

@@ -0,0 +1,33 @@
+import * as ts from "typescript";
+
+export default function addAsAnyToObjectLiterals(oldSource: string): string {
+  function transformer<T extends ts.Node>(context: ts.TransformationContext) {
+    return function transform(rootNode: T) {
+      function visit(node: ts.Node): ts.Node {
+        if (node.kind === ts.SyntaxKind.ObjectLiteralExpression) {
+          return ts.createAsExpression(
+            node as ts.Expression,
+            ts.createTypeReferenceNode("any", [])
+          );
+        }
+        return ts.visitEachChild(node, visit, context);
+      }
+      return ts.visitNode(rootNode, visit);
+    };
+  }
+
+  const source = ts.createSourceFile(
+    "",
+    oldSource,
+    ts.ScriptTarget.ES2015,
+    true,
+    ts.ScriptKind.TS
+  );
+
+  const result = ts.transform(source, [transformer]);
+
+  const printer: ts.Printer = ts.createPrinter({
+    newLine: ts.NewLineKind.LineFeed
+  });
+  return printer.printFile(result.transformed[0] as ts.SourceFile);
+}

src/formatGeneratedModule.ts

@@ -1,6 +1,10 @@
 import { FormatModule } from "relay-compiler";
+import * as ts from "typescript";
+import addAnyTypeCast from "./addAnyTypeCast";
 
-export const formatGeneratedModule: FormatModule = ({
+export const formatterFactory = (
+  compilerOptions: ts.CompilerOptions = {}
+): FormatModule => ({
   moduleName,
   documentType,
   docText,
@@ -14,13 +18,18 @@ export const formatGeneratedModule: FormatModule = ({
     ? `import { ${documentType} } from "${relayRuntimeModule}";`
     : "";
   const docTextComment = docText ? "\n/*\n" + docText.trim() + "\n*/\n" : "";
+  let nodeStatement = `const node: ${documentType ||
+    "never"} = ${concreteText};`;
+  if (compilerOptions.noImplicitAny) {
+    nodeStatement = addAnyTypeCast(nodeStatement).trim();
+  }
   return `/* tslint:disable */
 
 ${documentTypeImport}
 ${typeText || ""}
 
 ${docTextComment}
-const node: ${documentType || "never"} = ${concreteText};
+${nodeStatement}
 (node as any).hash = '${sourceHash}';
 export default node;
 `;

src/index.ts

@@ -1,15 +1,16 @@
 import { PluginInterface } from "relay-compiler";
 
 import { find } from "./FindGraphQLTags";
-import { formatGeneratedModule } from "./formatGeneratedModule";
+import { formatterFactory } from "./formatGeneratedModule";
+import { loadCompilerOptions } from "./loadCompilerOptions";
 import * as TypeScriptGenerator from "./TypeScriptGenerator";
 
 export default function plugin(): PluginInterface {
   return {
     inputExtensions: ["ts", "tsx"],
     outputExtension: "ts",
     findGraphQLTags: find,
-    formatModule: formatGeneratedModule,
+    formatModule: formatterFactory(loadCompilerOptions()),
     typeGenerator: TypeScriptGenerator
   };
 }

src/loadCompilerOptions.ts

@@ -0,0 +1,13 @@
+import * as ts from "typescript";
+
+export const loadCompilerOptions = (): ts.CompilerOptions => {
+  const configFileName = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
+  if (!configFileName) {
+    return {};
+  }
+  const result = ts.readConfigFile(configFileName, ts.sys.readFile);
+  if (result.error) {
+    return {};
+  }
+  return result.config.compilerOptions;
+};

test/fixtures/generated-module/complete-example-no-cast.ts

@@ -0,0 +1,9 @@
+/* tslint:disable */
+
+import { ConcreteFragment } from "relay-runtime";
+export type CompleteExample = { readonly id: string }
+
+
+const node: ConcreteFragment = {"the":{"fragment":{"data":42}}};
+(node as any).hash = 'edcba';
+export default node;

test/fixtures/generated-module/complete-example.ts

@@ -4,6 +4,6 @@ import { ConcreteFragment } from "relay-runtime";
 export type CompleteExample = { readonly id: string }
 
 
-const node: ConcreteFragment = {"the":{"fragment":{"data":42}}};
+const node: ConcreteFragment = ({ "the": { "fragment": { "data": 42 } } } as any);
 (node as any).hash = 'edcba';
 export default node;

test/formatGeneratedModule-test.ts

@@ -3,7 +3,7 @@ import { join } from 'path'
 
 import * as diff from 'jest-diff'
 
-import { formatGeneratedModule } from '../src/formatGeneratedModule'
+import { formatterFactory } from '../src/formatGeneratedModule'
 
 expect.extend({
   toMatchFile(received, fixturePath) {
@@ -37,6 +37,7 @@ expect.extend({
 
 describe('formatGeneratedModule', () => {
   it('works', () => {
+    const formatGeneratedModule = formatterFactory({noImplicitAny: true});
     expect(formatGeneratedModule({
       moduleName: 'complete-example',
       documentType: 'ConcreteFragment',
@@ -50,6 +51,7 @@ describe('formatGeneratedModule', () => {
   })
 
   it('works without passing relay runtime module explicitly', () => {
+    const formatGeneratedModule = formatterFactory({noImplicitAny: true});
     expect(formatGeneratedModule({
       moduleName: 'complete-example',
       documentType: 'ConcreteFragment',
@@ -60,4 +62,17 @@ describe('formatGeneratedModule', () => {
       sourceHash: 'edcba',
     })).toMatchFile(join(__dirname, 'fixtures/generated-module/complete-example.ts'))
   })
+
+  it('doesn\'t add a typecast if noImplicitAny is not set', () => {
+    const formatGeneratedModule = formatterFactory();
+    expect(formatGeneratedModule({
+      moduleName: 'complete-example',
+      documentType: 'ConcreteFragment',
+      docText: null,
+      concreteText: JSON.stringify({ the: { fragment: { data: 42 } }}),
+      typeText: 'export type CompleteExample = { readonly id: string }',
+      hash: 'abcde',
+      sourceHash: 'edcba',
+    })).toMatchFile(join(__dirname, 'fixtures/generated-module/complete-example-no-cast.ts'))
+  })
 })