Merge pull request #601 from aws-amplify/main

Release

Author: alharris-at

package.json

@@ -62,10 +62,11 @@
     "packages/*"
   ],
   "devDependencies": {
-    "@aws-amplify/amplify-cli-core": "^4.0.4",
+    "@aws-amplify/amplify-cli-core": "^4.0.6",
     "@commitlint/cli": "^17.0.3",
     "@commitlint/config-conventional": "^17.0.3",
     "@commitlint/config-lerna-scopes": "^17.0.2",
+    "@microsoft/api-extractor": "^7.33.5",
     "@types/jest": "^27.0.0",
     "@types/js-yaml": "^4.0.0",
     "@typescript-eslint/eslint-plugin": "^4.0.0",
@@ -95,7 +96,6 @@
     "jest-junit": "^12.0.0",
     "js-yaml": "^4.0.0",
     "lnk": "1.1.0",
-    "@microsoft/api-extractor": "^7.33.5",
     "prettier": "^1.19.1",
     "prettier-eslint": "^9.0.1",
     "pretty-quick": "^3.1.0",

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

@@ -1,7 +1,8 @@
 const graphQLConfig = require('graphql-config');
-const { isAbsolute, relative } = require('path');
+const { isAbsolute, relative, join } = require('path');
 const slash = require('slash');
 const { graphQlToAmplifyConfig } = require('./utils');
+const fs =  require('fs-extra');
 
 class AmplifyCodeGenConfig {
   static configFileName = '.graphqlconfig.yml';
@@ -18,7 +19,14 @@ class AmplifyCodeGenConfig {
         } else {
           projectRoot = process.cwd();
         }
-        this.gqlConfig = graphQLConfig.getGraphQLConfig(projectRoot);
+        const configPath = join(projectRoot, '.graphqlconfig.yml');
+        if(fs.existsSync(configPath)) {
+          this.gqlConfig = graphQLConfig.getGraphQLConfig(projectRoot);
+        }
+        else {
+          this.gqlConfig = new graphQLConfig.GraphQLConfig(null, configPath);
+          this.gqlConfig.config = {};
+        }
       } else {
         throw e;
       }

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

@@ -1,4 +1,10 @@
 const AmplifyCodeGenConfig = require('../../src/codegen-config/AmplifyCodeGenConfig');
+const fs = require('fs-extra');
+const graphQLConfig = require('graphql-config');
+
+jest.mock('fs-extra');
+
+const MOCK_PROJECT_ROOT = 'mockprojectpath';
 
 describe('AmplifyCodeGenConfig', () => {
   describe('normalizePath', () => {
@@ -36,4 +42,34 @@ describe('AmplifyCodeGenConfig', () => {
       expect(normalizedConfig.extensions.amplify.docsFilePath).toEqual('src/graphql/');
     });
   });
+
+  describe('graphqlconfig file existence', () => {
+    const err = new graphQLConfig.ConfigNotFoundError('cannot find config file');
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('should return a default with no config file', () => {
+      jest.spyOn(graphQLConfig, 'getGraphQLConfig').mockImplementation((rootDir) => {
+        throw err;
+      });
+      const configObj = new AmplifyCodeGenConfig(MOCK_PROJECT_ROOT);
+      expect(configObj?.gqlConfig?.config).toEqual({});
+      expect(configObj?.getProjects()).toEqual([]);
+    });
+
+    it('should read the config file is one exists instead of defaulting', () => {
+      const MOCK_CONFIG = { config: { key: 'value' } };
+      fs.existsSync = jest.fn().mockReturnValue(true);
+      jest.spyOn(graphQLConfig, 'getGraphQLConfig').mockImplementation((rootDir) => {
+        if (!rootDir) {
+          throw err;
+        }
+        return MOCK_CONFIG;
+      });
+      const configObj = new AmplifyCodeGenConfig(MOCK_PROJECT_ROOT);
+      expect(configObj?.gqlConfig).toEqual(MOCK_CONFIG);
+    });
+  });
 });