@aws-amplify/data-schema 0.17.1 → 0.18.1

package/package.json

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

package/src/ClientSchema.ts

@@ -74,14 +74,17 @@ type InternalClientSchema<
     ResolvedFields,
     NonModelTypes
   >['customOperations']
-> &
-  ResolvedFields & {
-    [__modelMeta__]: IdentifierMeta &
-      SecondaryIndexes &
-      RelationalMetadata<ResolvedSchema, ResolvedFields, IdentifierMeta> &
-      NonModelTypes &
-      ResolveCustomOperations<Schema, ResolvedFields, NonModelTypes>;
+> & {
+  [K in keyof ResolvedFields]: {
+    type: ResolvedFields[K];
   };
+} & {
+  [__modelMeta__]: IdentifierMeta &
+    SecondaryIndexes &
+    RelationalMetadata<ResolvedSchema, ResolvedFields, IdentifierMeta> &
+    NonModelTypes &
+    ResolveCustomOperations<Schema, ResolvedFields, NonModelTypes>;
+};
 
 type GetInternalClientSchema<Schema> =
   Schema extends GenericModelSchema<any> ? InternalClientSchema<Schema> : never;

package/src/CustomOperation.ts

@@ -237,7 +237,7 @@ export function query(): CustomOperation<
     typeName: 'Query';
     handlers: null;
   },
-  never,
+  'for',
   typeof queryBrand
 > {
   return _custom('Query', queryBrand);
@@ -258,7 +258,7 @@ export function mutation(): CustomOperation<
     typeName: 'Mutation';
     handlers: null;
   },
-  never,
+  'for',
   typeof mutationBrand
 > {
   return _custom('Mutation', mutationBrand);

package/src/MappedTypes/CustomOperations.ts

@@ -200,7 +200,7 @@ type IndividualCustomHandlerTypes<Op extends CustomOperationMinimalDef> = {
    * }
    * ```
    */
-  functionHandlerArguments: Op['arguments'];
+  args: Op['arguments'];
 
   /**
    * The return type expected by a lambda function handler.
@@ -217,7 +217,7 @@ type IndividualCustomHandlerTypes<Op extends CustomOperationMinimalDef> = {
    * }
    * ```
    */
-  functionHandlerResult: LambdaReturnType<Op['returnType']>;
+  returnType: LambdaReturnType<Op['returnType']>;
 };
 
 /**

package/src/SchemaProcessor.ts

@@ -1270,6 +1270,12 @@ function validateCustomOperations(
     }
   }
 
+  if (opType !== 'Subscription' && subscriptionSource.length > 0) {
+    throw new Error(
+      `The .for() modifier function can only be used with a custom subscription. ${typeName} is not a custom subscription.`,
+    );
+  }
+
   if (opType === 'Subscription') {
     if (subscriptionSource.length < 1) {
       throw new Error(

package/src/runtime/client/index.ts

@@ -720,17 +720,21 @@ export type ModelTypes<
   >]: ModelName extends string
     ? Schema[ModelName] extends Record<string, unknown>
       ? Context extends 'CLIENT'
-        ? ModelTypesClient<ModelName, Schema[ModelName], ModelMeta[ModelName]>
+        ? ModelTypesClient<
+            ModelName,
+            Schema[ModelName]['type'],
+            ModelMeta[ModelName]
+          >
         : Context extends 'COOKIES'
           ? ModelTypesSSRCookies<
               ModelName,
-              Schema[ModelName],
+              Schema[ModelName]['type'],
               ModelMeta[ModelName]
             >
           : Context extends 'REQUEST'
             ? ModelTypesSSRRequest<
                 ModelName,
-                Schema[ModelName],
+                Schema[ModelName]['type'],
                 ModelMeta[ModelName]
               >
             : never