@aws-amplify/graphql-api-construct 1.15.1 → 1.16.0-ai-streaming.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-api-construct",
-  "version": "1.15.1",
+  "version": "1.16.0-ai-streaming.0",
   "description": "AppSync GraphQL Api Construct using Amplify GraphQL Transformer.",
   "repository": {
     "type": "git",
@@ -158,25 +158,25 @@
     "semver"
   ],
   "dependencies": {
-    "@aws-amplify/ai-constructs": "^0.2.0",
+    "@aws-amplify/ai-constructs": "0.6.1",
     "@aws-amplify/backend-output-schemas": "^1.0.0",
     "@aws-amplify/backend-output-storage": "^1.0.0",
-    "@aws-amplify/graphql-auth-transformer": "4.1.4",
-    "@aws-amplify/graphql-conversation-transformer": "0.4.0",
-    "@aws-amplify/graphql-default-value-transformer": "3.1.1",
-    "@aws-amplify/graphql-directives": "2.4.0",
-    "@aws-amplify/graphql-function-transformer": "3.1.3",
-    "@aws-amplify/graphql-generation-transformer": "0.2.4",
-    "@aws-amplify/graphql-http-transformer": "3.0.6",
-    "@aws-amplify/graphql-index-transformer": "3.0.6",
-    "@aws-amplify/graphql-maps-to-transformer": "4.0.6",
-    "@aws-amplify/graphql-model-transformer": "3.0.6",
-    "@aws-amplify/graphql-predictions-transformer": "3.0.6",
-    "@aws-amplify/graphql-relational-transformer": "3.0.6",
-    "@aws-amplify/graphql-searchable-transformer": "3.0.6",
-    "@aws-amplify/graphql-sql-transformer": "0.4.6",
-    "@aws-amplify/graphql-transformer": "2.1.4",
-    "@aws-amplify/graphql-transformer-core": "3.2.1",
+    "@aws-amplify/graphql-auth-transformer": "4.1.5-ai-streaming.0",
+    "@aws-amplify/graphql-conversation-transformer": "0.5.0-ai-streaming.0",
+    "@aws-amplify/graphql-default-value-transformer": "3.1.2-ai-streaming.0",
+    "@aws-amplify/graphql-directives": "2.4.1-ai-streaming.0",
+    "@aws-amplify/graphql-function-transformer": "3.1.4-ai-streaming.0",
+    "@aws-amplify/graphql-generation-transformer": "0.2.5-ai-streaming.0",
+    "@aws-amplify/graphql-http-transformer": "3.0.7-ai-streaming.0",
+    "@aws-amplify/graphql-index-transformer": "3.0.7-ai-streaming.0",
+    "@aws-amplify/graphql-maps-to-transformer": "4.0.7-ai-streaming.0",
+    "@aws-amplify/graphql-model-transformer": "3.0.7-ai-streaming.0",
+    "@aws-amplify/graphql-predictions-transformer": "3.0.7-ai-streaming.0",
+    "@aws-amplify/graphql-relational-transformer": "3.0.7-ai-streaming.0",
+    "@aws-amplify/graphql-searchable-transformer": "3.0.7-ai-streaming.0",
+    "@aws-amplify/graphql-sql-transformer": "0.4.7-ai-streaming.0",
+    "@aws-amplify/graphql-transformer": "2.1.5-ai-streaming.0",
+    "@aws-amplify/graphql-transformer-core": "3.2.2-ai-streaming.0",
     "@aws-amplify/graphql-transformer-interfaces": "4.1.2",
     "@aws-amplify/platform-core": "^1.0.0",
     "@aws-amplify/plugin-types": "^1.0.0",
@@ -261,7 +261,7 @@
     "graceful-fs": "^4.2.0",
     "graphql": "^15.5.0",
     "graphql-mapping-template": "5.0.1",
-    "graphql-transformer-common": "5.0.1",
+    "graphql-transformer-common": "5.0.2-ai-streaming.0",
     "hjson": "^3.2.2",
     "immer": "^9.0.12",
     "is-buffer": "~1.1.6",
@@ -282,7 +282,7 @@
     "zod": "^3.22.2"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-transformer-test-utils": "1.0.5",
+    "@aws-amplify/graphql-transformer-test-utils": "1.0.6-ai-streaming.0",
     "@types/fs-extra": "^8.0.1",
     "@types/node": "^18.0.0",
     "aws-cdk-lib": "2.158.0",
@@ -353,5 +353,5 @@
       "printBasicPrototype": true
     }
   },
-  "gitHead": "701c6763d9679033043d84f9fa4091884dc3697e"
+  "gitHead": "8701d087e41015a83c74bf9fd0723f16ac23313f"
 }

package/src/amplify-graphql-api.ts

@@ -35,7 +35,6 @@ import type {
   IBackendOutputStorageStrategy,
   AddFunctionProps,
   DataStoreConfiguration,
-  IAmplifyGraphqlDefinition,
 } from './types';
 import {
   convertAuthorizationModesToTransformerAuthConfig,
@@ -50,6 +49,7 @@ import {
 } from './internal';
 import { getStackForScope, walkAndProcessNodes } from './internal/construct-tree';
 import { getDataSourceStrategiesProvider } from './internal/data-source-config';
+import { getMetadataDataSources, getMetadataAuthorizationModes, getMetadataCustomOperations } from './internal/metadata';
 
 /**
  * L3 Construct which invokes the Amplify Transformer Pattern over an input Graphql Schema.
@@ -168,11 +168,18 @@ export class AmplifyGraphqlApi extends Construct {
 
     this.dataStoreConfiguration = dataStoreConfiguration || conflictResolution;
 
-    const dataSources = getMetadataDataSources(definition);
+    const attributionMetadata = {
+      dataSources: getMetadataDataSources(definition),
+      authorizationModes: getMetadataAuthorizationModes(authorizationModes),
+      customOperations: getMetadataCustomOperations(definition),
+    };
 
-    new AttributionMetadataStorage().storeAttributionMetadata(Stack.of(scope), this.stackType, path.join(__dirname, '..', 'package.json'), {
-      dataSources,
-    });
+    new AttributionMetadataStorage().storeAttributionMetadata(
+      Stack.of(scope),
+      this.stackType,
+      path.join(__dirname, '..', 'package.json'),
+      attributionMetadata,
+    );
 
     validateAuthorizationModes(authorizationModes);
     const { authConfig, authSynthParameters } = convertAuthorizationModesToTransformerAuthConfig(authorizationModes);
@@ -420,10 +427,3 @@ const validateNoOtherAmplifyGraphqlApiInStack = (scope: Construct): void => {
     throw new Error('Only one AmplifyGraphqlApi is expected in a stack. Place the AmplifyGraphqlApis in separate nested stacks.');
   }
 };
-
-const getMetadataDataSources = (definition: IAmplifyGraphqlDefinition): string => {
-  const dataSourceDbTypes = Object.values(definition.dataSourceStrategies).map((strategy) => strategy.dbType.toLocaleLowerCase());
-  const customSqlDbTypes = (definition.customSqlDataSourceStrategies ?? []).map((strategy) => strategy.strategy.dbType.toLocaleLowerCase());
-  const dataSources = [...new Set([...dataSourceDbTypes, ...customSqlDbTypes])].sort();
-  return dataSources.join(',');
-};

package/src/internal/metadata.ts

@@ -0,0 +1,40 @@
+import { AuthorizationModes, IAmplifyGraphqlDefinition } from '../types';
+
+export const getMetadataDataSources = (definition: IAmplifyGraphqlDefinition): string => {
+  const dataSourceDbTypes = Object.values(definition.dataSourceStrategies).map((strategy) => strategy.dbType.toLocaleLowerCase());
+  const customSqlDbTypes = (definition.customSqlDataSourceStrategies ?? []).map((strategy) => strategy.strategy.dbType.toLocaleLowerCase());
+  const dataSources = [...new Set([...dataSourceDbTypes, ...customSqlDbTypes])].sort();
+  return dataSources.join(',');
+};
+
+export const getMetadataAuthorizationModes = (authorizationModes: AuthorizationModes): string => {
+  const configKeyToAuthMode: Record<string, string> = {
+    iamConfig: 'aws_iam',
+    oidcConfig: 'openid_connect',
+    identityPoolConfig: 'amazon_cognito_identity_pools',
+    userPoolConfig: 'amazon_cognito_user_pools',
+    apiKeyConfig: 'api_key',
+    lambdaConfig: 'aws_lambda',
+  };
+  const authModes = Object.keys(authorizationModes)
+    .map((mode) => configKeyToAuthMode[mode])
+    // remove values not found in mapping
+    .filter((mode) => !!mode)
+    .sort();
+  return authModes.join(',');
+};
+
+export const getMetadataCustomOperations = (definition: IAmplifyGraphqlDefinition): string => {
+  const customOperations: string[] = [];
+  if (definition.schema.includes('type Query')) {
+    customOperations.push('queries');
+  }
+  if (definition.schema.includes('type Mutation')) {
+    customOperations.push('mutations');
+  }
+  if (definition.schema.includes('type Subscription')) {
+    customOperations.push('subscriptions');
+  }
+
+  return customOperations.join(',');
+};