Fix add codegen from a non-amplify application (#607)

* fix: check without init case

* test: fix unit test

* fix: add codegen test setup

* test: refactor test helper

* test: fix prompts

* test: minor cleanup

Author: phani-srikar

packages/amplify-codegen-e2e-core/src/categories/codegen.ts

@@ -147,3 +147,31 @@ export function generateModelIntrospection(cwd: string, settings: { outputDir?:
   });
 }
 
+// CLI workflow to add codegen to non-Amplify JS project
+export function addCodegenNonAmplifyJS(cwd: string): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const cmdOptions = ['codegen', 'add', '--apiId', 'mockapiid'];
+    const chain = spawn(getCLIPath(), cmdOptions, { cwd, stripColors: true });
+    chain
+      .wait("Choose the type of app that you're building")
+      .sendCarriageReturn()
+      .wait('What javascript framework are you using')
+      .sendCarriageReturn()
+      .wait('Choose the code generation language target').sendCarriageReturn()
+      .wait('Enter the file name pattern of graphql queries, mutations and subscriptions')
+      .sendCarriageReturn()
+      .wait('Do you want to generate/update all possible GraphQL operations')
+      .sendLine('y')
+      .wait('Enter maximum statement depth [increase from default if your schema is deeply')
+      .sendCarriageReturn();
+
+    chain.run((err: Error) => {
+      if (!err) {
+        resolve();
+      } else {
+        reject(err);
+      }
+    });
+  });
+}
+

packages/amplify-codegen-e2e-tests/src/__tests__/add-codegen-js.test.ts

@@ -5,9 +5,10 @@ import {
     DEFAULT_JS_CONFIG,
     createRandomName,
     addApiWithoutSchema,
-    updateApiSchema
+    updateApiSchema,
+    addCodegenNonAmplifyJS
 } from "@aws-amplify/amplify-codegen-e2e-core";
-import { existsSync } from "fs";
+import { existsSync, writeFileSync } from "fs";
 import path from 'path';
 import { isNotEmptyDir } from '../utils';
 import { deleteAmplifyProject, testAddCodegen, testSetupBeforeAddCodegen, 
@@ -72,4 +73,36 @@ describe('codegen add tests - JS', () => {
     it(`Adding codegen works as expected`, async () => {
         await testAddCodegen(config, projectRoot, schema);
     });
+
+    it(`Adding codegen outside of Amplify project`, async () => {
+        // init project and add API category
+        const testSchema = `
+        type Query {
+            echo: String
+        }
+
+        type Mutation {
+            mymutation: String
+        }
+
+        type Subscription {
+            mysub: String
+        }          
+        `;
+
+        // Setup the non-amplify project with schema and pre-existing files
+        const userSourceCodePath = testSetupBeforeAddCodegen(projectRoot, config);
+        const schemaPath = path.join(projectRoot, 'schema.graphql');
+        writeFileSync(schemaPath, testSchema);
+
+        // add codegen without init
+        await expect(addCodegenNonAmplifyJS(projectRoot)).resolves.not.toThrow();
+
+        // pre-existing file should still exist
+        expect(existsSync(userSourceCodePath)).toBe(true);
+        // GraphQL statements are generated
+        expect(isNotEmptyDir(path.join(projectRoot, config.graphqlCodegenDir))).toBe(true);
+        // graphql configuration should be added
+        expect(existsSync(getGraphQLConfigFilePath(projectRoot))).toBe(true);
+    });
 });

packages/amplify-codegen/src/codegen-config/AmplifyCodeGenConfig.js

@@ -7,18 +7,13 @@ const fs =  require('fs-extra');
 class AmplifyCodeGenConfig {
   static configFileName = '.graphqlconfig.yml';
 
-  constructor(projectPath, withoutInit = false) {
+  constructor(projectPath) {
     try {
       this.gqlConfig = graphQLConfig.getGraphQLConfig();
       this.fixOldConfig();
     } catch (e) {
       if (e instanceof graphQLConfig.ConfigNotFoundError) {
-        let projectRoot;
-        if (!withoutInit) {
-          projectRoot = projectPath || process.cwd();
-        } else {
-          projectRoot = process.cwd();
-        }
+        const projectRoot = projectPath || process.cwd();
         const configPath = join(projectRoot, '.graphqlconfig.yml');
         if(fs.existsSync(configPath)) {
           this.gqlConfig = graphQLConfig.getGraphQLConfig(projectRoot);

packages/amplify-codegen/src/codegen-config/index.js

@@ -6,8 +6,8 @@ let config = null;
 
 function loadConfig(context, withoutInit = false) {
   if (!config) {
-    const projectPath = context.amplify.getEnvInfo().projectPath;
-    config = new AmplifyCodeGenConfig(projectPath, withoutInit);
+    const projectPath = withoutInit ? undefined : context.amplify.getEnvInfo().projectPath;
+    config = new AmplifyCodeGenConfig(projectPath);
   }
   return config;
 }

packages/amplify-codegen/tests/codegen-config/index.test.js

@@ -13,7 +13,7 @@ const MOCK_CONTEXT = {
 describe('codegen-config', () => {
   it('is singleton', () => {
     loadConfig(MOCK_CONTEXT);
-    expect(AmplifyCodeGenConfig).toHaveBeenCalledWith(MOCK_PROJECT_ROOT, false);
+    expect(AmplifyCodeGenConfig).toHaveBeenCalledWith(MOCK_PROJECT_ROOT);
     loadConfig(MOCK_CONTEXT);
     expect(AmplifyCodeGenConfig).toHaveBeenCalledTimes(1);
   });