@aws-amplify/data-schema 1.20.0 → 1.20.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/data-schema",
-  "version": "1.20.0",
+  "version": "1.20.2",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

package/src/SchemaProcessor.ts

@@ -896,6 +896,8 @@ function mapToNativeAppSyncAuthDirectives(
 ) {
   const rules = new Set<string>();
 
+  const groupProvider: Map<string, Set<string>> = new Map();
+
   for (const entry of authorization) {
     const rule = accessData(entry);
 
@@ -904,17 +906,25 @@ function mapToNativeAppSyncAuthDirectives(
     const provider = getAppSyncAuthDirectiveFromRule(rule);
 
     if (rule.groups) {
-      // example: (cognito_groups: ["Bloggers", "Readers"])
+      if(!groupProvider.has(provider)) {
+        groupProvider.set(provider, new Set());
+      };
+      rule.groups.forEach((group) => groupProvider.get(provider)?.add(group));
+    } else {
+      rules.add(provider);
+    }
+
+    groupProvider.forEach((groups, provider) => {
       rules.add(
-        `${provider}(cognito_groups: [${rule.groups
+        `${provider}(cognito_groups: [${Array.from(groups)
           .map((group) => `"${group}"`)
           .join(', ')}])`,
       );
-    } else {
-      rules.add(provider);
-    }
+      // example: (cognito_groups: ["Bloggers", "Readers"])
+    })
   }
 
+
   const authString = [...rules].join(' ');
 
   return { authString };
@@ -1444,8 +1454,24 @@ function generateInputTypes(
     if (isRefField(argDef)) {
       const refType = getRefType(argDef.data.link, operationName);
       if (refType.type === 'CustomType') {
+        const { valueRequired, array, arrayRequired } = argDef.data;
+
         const inputTypeName = `${argDef.data.link}Input`;
-        argDefinitions.push(`${argName}: ${inputTypeName}`);
+        let field = inputTypeName;
+
+        if (valueRequired === true) {
+          field += '!';
+        }
+
+        if (array) {
+          field = `[${field}]`;
+
+          if (arrayRequired === true) {
+            field += '!';
+          }
+        }
+
+        argDefinitions.push(`${argName}: ${field}`);
 
         // Process the input type if it hasn't been processed yet
         if (!processedTypes.has(inputTypeName)) {
@@ -1462,7 +1488,23 @@ function generateInputTypes(
           });
         }
       } else if (refType.type === 'Enum') {
-        argDefinitions.push(`${argName}: ${argDef.data.link}`);
+        const { valueRequired, array, arrayRequired } = argDef.data;
+
+        let field = argDef.data.link;
+
+        if (valueRequired === true) {
+          field += '!';
+        }
+
+        if (array) {
+          field = `[${field}]`;
+
+          if (arrayRequired === true) {
+            field += '!';
+          }
+        }
+
+        argDefinitions.push(`${argName}: ${field}`);
       } else {
         throw new Error(
           `Unsupported reference type '${refType.type}' for argument '${argName}' in '${operationName}'. ` +