@aws-amplify/data-schema 1.20.4 → 1.21.0

package/dist/esm/ModelIndex.d.ts

@@ -4,7 +4,7 @@ export type ModelIndexData = {
     partitionKey: string;
     sortKeys: readonly unknown[];
     indexName: string;
-    queryField: string;
+    queryField: string | null;
 };
 export type InternalModelIndexType = ModelIndexType<any, any, any, any> & {
     data: ModelIndexData;
@@ -12,7 +12,7 @@ export type InternalModelIndexType = ModelIndexType<any, any, any, any> & {
 export type ModelIndexType<ModelFieldKeys extends string, PK, SK = readonly [], QueryField = never, K extends keyof ModelIndexType<any, any, any, any> = never> = Omit<{
     sortKeys<FieldKeys extends ModelFieldKeys = ModelFieldKeys, const SK extends ReadonlyArray<Exclude<FieldKeys, PK>> = readonly []>(sortKeys: SK): ModelIndexType<FieldKeys, PK, SK, QueryField, K | 'sortKeys'>;
     name(name: string): ModelIndexType<ModelFieldKeys, PK, SK, QueryField, K | 'name'>;
-    queryField<QF extends string = never, MF extends ModelFieldKeys = ModelFieldKeys>(field: QF): ModelIndexType<MF, PK, SK, QF, K | 'queryField'>;
+    queryField<QF extends string | null = never, MF extends ModelFieldKeys = ModelFieldKeys>(field: QF): ModelIndexType<MF, PK, SK, QF, K | 'queryField'>;
 }, K> & Brand<typeof brandName>;
 export declare function modelIndex<ModelFieldKeys extends string, PK extends ModelFieldKeys, SK = readonly [], QueryField = never>(partitionKeyFieldName: PK): ModelIndexType<ModelFieldKeys, PK, SK, QueryField, never>;
 export {};

package/dist/esm/SchemaProcessor.mjs

@@ -601,6 +601,7 @@ function getAppSyncAuthDirectiveFromRule(rule) {
 function mapToNativeAppSyncAuthDirectives(authorization, isCustomHandler) {
     const rules = new Set();
     const groupProvider = new Map();
+    const generalProviderUsed = new Set();
     for (const entry of authorization) {
         const rule = accessData(entry);
         isCustomHandler && validateCustomHandlerAuthRule(rule);
@@ -612,14 +613,15 @@ function mapToNativeAppSyncAuthDirectives(authorization, isCustomHandler) {
             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(' ');
     return { authString };
@@ -738,7 +740,7 @@ const transformedSecondaryIndexesForModel = (modelName, secondaryIndexes, modelF
                 }
             }
         }
-        if (!sortKeys.length && !indexName && !queryField) {
+        if (!sortKeys.length && !indexName && !queryField && queryField !== null) {
             return `@index(queryField: "${secondaryIndexDefaultQueryField(modelName, partitionKey)}")`;
         }
         const attributes = [];
@@ -748,7 +750,10 @@ const transformedSecondaryIndexesForModel = (modelName, secondaryIndexes, modelF
         if (sortKeys.length) {
             attributes.push(`sortKeyFields: [${sortKeys.map((sk) => `"${sk}"`).join(', ')}]`);
         }
-        if (queryField) {
+        if (queryField === null) {
+            attributes.push(`queryField: null`);
+        }
+        else if (queryField) {
             attributes.push(`queryField: "${queryField}"`);
         }
         else {