@aws-amplify/data-schema 1.20.4 → 1.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/data-schema",
-  "version": "1.20.4",
+  "version": "1.21.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -18,7 +18,7 @@
     "docs:temp": "api-extractor run && api-documenter markdown --input-folder temp --output-folder temp/docs",
     "check:api": "rimraf temp && npm run docs:temp && tsx ../../scripts/shallow-dir-diff.ts docs temp/docs",
     "lint": "eslint .",
-    "test": "jest"
+    "test": "jest --coverage"
   },
   "exports": {
     ".": {

package/src/ModelIndex.ts

@@ -6,7 +6,7 @@ export type ModelIndexData = {
   partitionKey: string;
   sortKeys: readonly unknown[];
   indexName: string;
-  queryField: string;
+  queryField: string | null;
 };
 
 export type InternalModelIndexType = ModelIndexType<any, any, any, any> & {
@@ -31,7 +31,7 @@ export type ModelIndexType<
       name: string,
     ): ModelIndexType<ModelFieldKeys, PK, SK, QueryField, K | 'name'>;
     queryField<
-      QF extends string = never,
+      QF extends string | null = never,
       MF extends ModelFieldKeys = ModelFieldKeys,
     >(
       field: QF,

package/src/SchemaProcessor.ts

@@ -217,7 +217,7 @@ function scalarFieldToGql(
   for (const index of secondaryIndexes) {
     field += ` ${index}`;
   }
-  
+
   // Add validation directives for each validation rule
   for (const validationRule of validation) {
     const valueStr = typeof validationRule.value === 'number' ? validationRule.value.toString() : validationRule.value;
@@ -227,7 +227,7 @@ function scalarFieldToGql(
       field += ` @validate(type: ${validationRule.type}, value: "${valueStr}")`;
     }
   }
-  
+
   return field;
 }
 
@@ -897,6 +897,7 @@ function mapToNativeAppSyncAuthDirectives(
   const rules = new Set<string>();
 
   const groupProvider: Map<string, Set<string>> = new Map();
+  const generalProviderUsed = new Set<string>();
 
   for (const entry of authorization) {
     const rule = accessData(entry);
@@ -911,17 +912,20 @@ function mapToNativeAppSyncAuthDirectives(
       };
       rule.groups.forEach((group) => groupProvider.get(provider)?.add(group));
     } else {
+      generalProviderUsed.add(provider);
       rules.add(provider);
     }
   }
 
   groupProvider.forEach((groups, provider) => {
-    rules.add(
-      `${provider}(cognito_groups: [${Array.from(groups)
-        .map((group) => `"${group}"`)
-        .join(', ')}])`,
-    );
-    // example: (cognito_groups: ["Bloggers", "Readers"])
+    if(!generalProviderUsed.has(provider)) {
+      rules.add(
+        `${provider}(cognito_groups: [${Array.from(groups).reduce((acc, group) => 
+          acc == "" ? `"${group}"` : `${acc}, "${group}"`
+        , "")}])`
+      );
+      // example: (cognito_groups: ["Bloggers", "Readers"])
+    }
   })
 
   const authString = [...rules].join(' ');
@@ -1112,7 +1116,7 @@ const transformedSecondaryIndexesForModel = (
     partitionKey: string,
     sortKeys: readonly string[],
     indexName: string,
-    queryField: string,
+    queryField: string | null,
   ): string => {
     for (const keyName of [partitionKey, ...sortKeys]) {
       const field = modelFields[keyName];
@@ -1127,7 +1131,7 @@ const transformedSecondaryIndexesForModel = (
       }
     }
 
-    if (!sortKeys.length && !indexName && !queryField) {
+    if (!sortKeys.length && !indexName && !queryField && queryField !== null) {
       return `@index(queryField: "${secondaryIndexDefaultQueryField(
         modelName,
         partitionKey,
@@ -1146,7 +1150,10 @@ const transformedSecondaryIndexesForModel = (
       );
     }
 
-    if (queryField) {
+    if(queryField === null) {
+      attributes.push(`queryField: null`);
+    }
+    else if (queryField) {
       attributes.push(`queryField: "${queryField}"`);
     } else {
       attributes.push(