chore: update logic to return empty list and check for length

Author: phani-srikar

packages/appsync-modelgen-plugin/src/utils/fieldUtils.ts

@@ -32,10 +32,12 @@ export function getOtherSideBelongsToField(type: string, otherSideModel: CodeGen
  */
 export function getModelPrimaryKeyComponentFields(model: CodeGenModel): CodeGenField[] {
   const primaryKeyField = model.fields.find(field => field.primaryKeyInfo);
-  if (primaryKeyField && primaryKeyField?.primaryKeyInfo) {
-    const { sortKeyFields } = primaryKeyField.primaryKeyInfo;
-    return [ primaryKeyField, ...sortKeyFields ];
+  const keyFields: CodeGenField[] = [];
+  if (primaryKeyField) {
+    keyFields.push(primaryKeyField);
+    if ( primaryKeyField?.primaryKeyInfo?.sortKeyFields ) {
+      keyFields.push(...primaryKeyField.primaryKeyInfo.sortKeyFields);
+    };
   }
-
-  throw new Error(`Unable to get the primary key component fields for model ${model?.name}`);
+  return keyFields;
 }

packages/appsync-modelgen-plugin/src/visitors/appsync-visitor.ts

@@ -941,15 +941,17 @@ export class AppSyncModelVisitor<
           } else if (connectionInfo.kind === CodeGenConnectionType.HAS_ONE) {
             if (isCustomPKEnabled) {
               const connectedModelFields = getModelPrimaryKeyComponentFields(connectionInfo.connectedModel);
-              connectionInfo.targetNames.forEach((target, index) => {
-                addFieldToModel(model, {
-                  name: target,
-                  directives: [],
-                  type: connectedModelFields[index].type,
-                  isList: false,
-                  isNullable: field.isNullable,
+              if (connectedModelFields?.length > 0) {
+                connectionInfo.targetNames.forEach((target, index) => {
+                  addFieldToModel(model, {
+                    name: target,
+                    directives: [],
+                    type: connectedModelFields[index].type,
+                    isList: false,
+                    isNullable: field.isNullable,
+                  });
                 });
-              });
+              }
             } else {
               addFieldToModel(model, {
                 name: connectionInfo.targetName,
@@ -962,15 +964,17 @@ export class AppSyncModelVisitor<
           } else if (connectionInfo.kind === CodeGenConnectionType.BELONGS_TO) {
             if (isCustomPKEnabled) {
               const connectedModelFields = getModelPrimaryKeyComponentFields(connectionInfo.connectedModel);
-              connectionInfo.targetNames.forEach((target, index) => {
-                addFieldToModel(model, {
-                  name: target,
-                  directives: [],
-                  type: connectedModelFields[index].type,
-                  isList: false,
-                  isNullable: field.isNullable,
+              if (connectedModelFields?.length > 0) {
+                connectionInfo.targetNames.forEach((target, index) => {
+                  addFieldToModel(model, {
+                    name: target,
+                    directives: [],
+                    type: connectedModelFields[index].type,
+                    isList: false,
+                    isNullable: field.isNullable,
+                  });
                 });
-              });
+              }
             } else {
               addFieldToModel(model, {
                 name: connectionInfo.targetName,