Merge pull request #493 from aws-amplify/main

Release Amplify Codegen 2022-10-12

Author: AaronZyLee

package.json

@@ -95,8 +95,8 @@
     "rimraf": "^3.0.0",
     "ts-jest": "^28.0.7",
     "ts-node": "^8.10.1",
-    "typescript": "^4.7.4",
-    "amplify-cli-core":  "^2.3.0",
+    "typescript": "4.7.4",
+    "amplify-cli-core":  "^3.0.0",
     "graphql-transformer-core": "^7.2.1",
     "amplify-headless-interface": "^1.13.1"
   },
@@ -105,7 +105,8 @@
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.7",
     "cross-fetch": "^2.2.6",
-    "glob-parent": "^6.0.2"
+    "glob-parent": "^6.0.2",
+    "parse-url": "^8.1.0"
   },
   "config": {
     "commitizen": {

packages/amplify-codegen-e2e-core/package.json

@@ -35,7 +35,7 @@
     "uuid": "7.0.1"
   },
   "peerDependencies": {
-    "amplify-cli-core": "^2.3.0",
+    "amplify-cli-core": "^3.0.0",
     "amplify-headless-interface": "^1.13.1",
     "graphql-transformer-core": "^7.2.1"
   }

packages/amplify-codegen-e2e-tests/package.json

@@ -40,7 +40,7 @@
     "ts-node": "^8.9.0"
   },
   "peerDependencies": {
-    "amplify-cli-core": "^2.3.0",
+    "amplify-cli-core": "^3.0.0",
     "graphql-transformer-core": "^7.2.1"
   },
   "jest": {

packages/amplify-codegen/package.json

@@ -37,7 +37,7 @@
     "slash": "^3.0.0"
   },
   "peerDependencies": {
-    "amplify-cli-core": "^2.3.0",
+    "amplify-cli-core": "^3.0.0",
     "graphql-transformer-core": "^7.2.1"
   },
   "jest": {

packages/amplify-codegen/src/commands/models.js

@@ -5,6 +5,7 @@ const glob = require('glob-all');
 const { FeatureFlags, pathManager } = require('amplify-cli-core');
 const gqlCodeGen = require('@graphql-codegen/core');
 const appSyncDataStoreCodeGen = require('@aws-amplify/appsync-modelgen-plugin');
+const { version: packageVersion } = require('../../package.json');
 const { validateDartSDK } = require('../utils/validateDartSDK');
 const { validateAmplifyFlutterCapableZeroThreeFeatures } = require('../utils/validateAmplifyFlutterCapableZeroThreeFeatures');
 const { validateAmplifyFlutterCoreLibraryDependency } = require('../utils/validateAmplifyFlutterCoreLibraryDependency');
@@ -77,13 +78,13 @@ async function generateModels(context, overrideOutputDir = null, isIntrospection
 
   const schemaContent = loadSchema(apiResourcePath);
 
-  const baseOutputDir = path.join(projectRoot, getModelOutputPath(context))
+  const baseOutputDir = path.join(projectRoot, getModelOutputPath(context));
   const schema = parse(schemaContent);
   const projectConfig = context.amplify.getProjectConfig();
 
   const generateIndexRules = readFeatureFlag('codegen.generateIndexRules');
   const emitAuthProvider = readFeatureFlag('codegen.emitAuthProvider');
-  const usePipelinedTransformer = readFeatureFlag('graphQLTransformer.useExperimentalPipelinedTransformer')
+  const usePipelinedTransformer = readFeatureFlag('graphQLTransformer.useExperimentalPipelinedTransformer');
   const transformerVersion = readNumericFeatureFlag('graphQLTransformer.transformerVersion');
   const respectPrimaryKeyAttributesOnConnectionField = readFeatureFlag('graphQLTransformer.respectPrimaryKeyAttributesOnConnectionField');
 
@@ -117,7 +118,7 @@ async function generateModels(context, overrideOutputDir = null, isIntrospection
     baseOutputDir,
     schema,
     config: {
-      target: isIntrospection ? 'introspection' : (platformToLanguageMap[projectConfig.frontend] || projectConfig.frontend),
+      target: isIntrospection ? 'introspection' : platformToLanguageMap[projectConfig.frontend] || projectConfig.frontend,
       directives: directiveDefinitions,
       isTimestampFieldsAdded,
       emitAuthProvider,
@@ -129,6 +130,7 @@ async function generateModels(context, overrideOutputDir = null, isIntrospection
       transformerVersion,
       dartUpdateAmplifyCoreDependency,
       respectPrimaryKeyAttributesOnConnectionField,
+      codegenVersion: packageVersion,
       overrideOutputDir, // This needs to live under `config` in order for the GraphQL types to work out.
     },
   });