@aws-amplify/data-schema 1.0.1 → 1.1.1

package/src/ModelType.ts

@@ -259,7 +259,7 @@ export type ModelType<
   Brand<typeof brandName>;
 
 /**
- * External representation of Model Type that exposes the `addRelationships` modifier.
+ * External representation of Model Type that exposes the `relationships` modifier.
  * Used on the complete schema object.
  */
 export type SchemaModelType<
@@ -271,7 +271,7 @@ export type SchemaModelType<
   IsRDS extends boolean = false,
 > = IsRDS extends true
   ? T & {
-      addRelationships<
+    relationships<
         Param extends Record<
           string,
           ModelRelationalField<any, string, any, any>
@@ -329,7 +329,7 @@ function _model<T extends ModelTypeParamShape>(fields: T['fields']) {
   return {
     ...builder,
     data,
-    addRelationships(relationships) {
+    relationships(relationships) {
       data.fields = { ...data.fields, ...relationships };
     },
     fields: data.fields,
@@ -352,7 +352,7 @@ export const isSchemaModelType = (
     internalType.data.authorization !== undefined &&
     internalType.data.identifier !== undefined &&
     internalType.data.secondaryIndexes !== undefined &&
-    typeof internalType.addRelationships === 'function'
+    typeof internalType.relationships === 'function'
   );
 };
 

package/src/runtime/internals/APIClient.ts

@@ -678,6 +678,11 @@ export function generateGraphQLDocument(
     },
   } = modelDefinition;
 
+  // Use pascal case of the model name to generate the operations and the arguments.
+  // This is required to be in sync with the resources generated by the GraphQL transformers.
+  const namePascalCase = name.charAt(0).toUpperCase() + name.slice(1);
+  const pluralNamePascalCase = pluralName.charAt(0).toUpperCase() + pluralName.slice(1);
+
   const { operationPrefix, usePlural } = graphQLOperationsInfo[modelOperation];
 
   const { selectionSet } = listArgs || {};
@@ -686,7 +691,7 @@ export function generateGraphQLDocument(
   let indexQueryArgs: Record<string, string>;
 
   if (operationPrefix) {
-    graphQLFieldName = `${operationPrefix}${usePlural ? pluralName : name}`;
+    graphQLFieldName = `${operationPrefix}${usePlural ? pluralNamePascalCase : namePascalCase}`;
   } else if (indexMeta) {
     const { queryField, pk, sk = [] } = indexMeta;
     graphQLFieldName = queryField;
@@ -775,7 +780,7 @@ export function generateGraphQLDocument(
           input: `${
             operationPrefix.charAt(0).toLocaleUpperCase() +
             operationPrefix.slice(1)
-          }${name}Input!`,
+          }${namePascalCase}Input!`,
         });
       graphQLOperationType ?? (graphQLOperationType = 'mutation');
     // TODO(Eslint): this this case clause correct without the break statement?
@@ -795,7 +800,7 @@ export function generateGraphQLDocument(
           // ignore the eslint error on the ts-ignore.
           // eslint-disable-next-line
           // @ts-ignore
-          filter: `Model${name}FilterInput`,
+          filter: `Model${namePascalCase}FilterInput`,
           limit: 'Int',
           nextToken: 'String',
         });
@@ -808,7 +813,7 @@ export function generateGraphQLDocument(
       graphQLArguments ??
         (graphQLArguments = {
           ...indexQueryArgs!,
-          filter: `Model${name}FilterInput`,
+          filter: `Model${namePascalCase}FilterInput`,
           sortDirection: 'ModelSortDirection',
           limit: 'Int',
           nextToken: 'String',
@@ -823,7 +828,7 @@ export function generateGraphQLDocument(
     case 'ONDELETE':
       graphQLArguments ??
         (graphQLArguments = {
-          filter: `ModelSubscription${name}FilterInput`,
+          filter: `ModelSubscription${namePascalCase}FilterInput`,
         });
       graphQLOperationType ?? (graphQLOperationType = 'subscription');
       graphQLSelectionSet ?? (graphQLSelectionSet = selectionSetFields);