@aws-amplify/data-schema 0.16.1 → 0.16.2

package/package.json

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

package/src/MappedTypes/CustomOperations.ts

@@ -7,7 +7,7 @@ import type {
 import type { ModelField } from '../ModelField';
 import type { RefType, RefTypeParamShape } from '../RefType';
 import type {
-  ResolveCustomTypeFieldsRequirements,
+  ResolveFieldRequirements,
   ResolveRefsOfCustomType,
   ResolveRefValueArrayTraits,
 } from './ResolveFieldProperties';
@@ -66,7 +66,7 @@ export type CustomOpShapes<Schema extends GenericModelSchema<any>> = {
 export type CustomOpArguments<Shape extends CustomOperationParamShape> =
   Shape['arguments'] extends null
     ? never
-    : {
+    : ResolveFieldRequirements<{
         [FieldName in keyof Shape['arguments']]: Shape['arguments'][FieldName] extends ModelField<
           infer R,
           any,
@@ -74,7 +74,7 @@ export type CustomOpArguments<Shape extends CustomOperationParamShape> =
         >
           ? R
           : never;
-      };
+      }>;
 
 /**
  * Computes the return type from the `returnType` of a custom operation shape.
@@ -106,12 +106,12 @@ export type CustomOpReturnType<
       ? R
       : Shape['returnType'] extends CustomType<infer R>
         ?
-            | ResolveCustomTypeFieldsRequirements<
+            | ResolveFieldRequirements<
                 FieldTypesOfCustomType<{
                   thisCustomType: R['fields'];
                 }>['thisCustomType']
               > // The inline `.customType()` with a custom operation doesn't have
-              // `.required()` modifier, hence it's nullable
+            // `.required()` modifier, hence it's nullable
             | null
         : never;
 
@@ -237,20 +237,21 @@ export type CustomOperationHandlerTypes<
  *
  * (Custom handlers should not return lazy loaded fields -- they're *lazy loaded*.)
  */
-type LambdaReturnType<T> = T extends Record<string, any>
-  ? {
-      // Return type can include `null | undefined`, which we can't meaningfully
-      // map over.
-      [K in keyof Exclude<T, null | undefined> as Exclude<
-        T,
-        null | undefined
-      >[K] extends (...args: any) => any
-        ? never
-        : K]: Exclude<T, null | undefined>[K];
-    }
-  :
-      | T
-      // If the original return type allowed null | undefined, mix them back into
-      // the final return type
-      | (null extends T ? null : never)
-      | (undefined extends T ? undefined : never);
+type LambdaReturnType<T> =
+  T extends Record<string, any>
+    ? {
+        // Return type can include `null | undefined`, which we can't meaningfully
+        // map over.
+        [K in keyof Exclude<T, null | undefined> as Exclude<
+          T,
+          null | undefined
+        >[K] extends (...args: any) => any
+          ? never
+          : K]: Exclude<T, null | undefined>[K];
+      }
+    :
+        | T
+        // If the original return type allowed null | undefined, mix them back into
+        // the final return type
+        | (null extends T ? null : never)
+        | (undefined extends T ? undefined : never);

package/src/MappedTypes/ResolveFieldProperties.ts

@@ -138,10 +138,10 @@ export type ResolveRefsOfCustomType<
     ? ResolveRef<NonModelTypes, R>
     : T[Prop];
 } extends infer Resolved
-  ? ResolveCustomTypeFieldsRequirements<Resolved>
+  ? ResolveFieldRequirements<Resolved>
   : never;
 
-export type ResolveCustomTypeFieldsRequirements<Resolved> = Intersection<
+export type ResolveFieldRequirements<Resolved> = Intersection<
   ExtractNullableFieldsToOptionalFields<Resolved>,
   ExtractNonNullableFieldsToRequiredFields<Resolved>
 >;