@aws-amplify/data-schema 0.17.1 → 0.18.0

package/dist/esm/ClientSchema.d.ts

@@ -22,7 +22,11 @@ export type ClientSchema<Schema extends GenericModelSchema<any> | CombinedModelS
  * @internal @typeParam IdentifierMeta - Resolve the identifier fields for all models
  * @internal @typeParam SecondaryIndexes - Map of model secondary index metadata
  */
-type InternalClientSchema<Schema extends GenericModelSchema<any>, NonModelTypes extends NonModelTypesShape = ExtractNonModelTypes<Schema>, ResolvedSchema = ResolveSchema<Schema>, ResolvedFields extends Record<string, unknown> = Schema extends RDSModelSchema<any, any> ? ResolveStaticFieldProperties<Schema, NonModelTypes, object> : ResolveFieldProperties<Schema, NonModelTypes>, IdentifierMeta extends Record<string, any> = ModelIdentifier<SchemaTypes<Schema>>, SecondaryIndexes extends Record<string, any> = Schema extends RDSModelSchema<any, any> ? object : ModelSecondaryIndexes<SchemaTypes<Schema>>> = CustomOperationHandlerTypes<ResolveCustomOperations<Schema, ResolvedFields, NonModelTypes>['customOperations']> & ResolvedFields & {
+type InternalClientSchema<Schema extends GenericModelSchema<any>, NonModelTypes extends NonModelTypesShape = ExtractNonModelTypes<Schema>, ResolvedSchema = ResolveSchema<Schema>, ResolvedFields extends Record<string, unknown> = Schema extends RDSModelSchema<any, any> ? ResolveStaticFieldProperties<Schema, NonModelTypes, object> : ResolveFieldProperties<Schema, NonModelTypes>, IdentifierMeta extends Record<string, any> = ModelIdentifier<SchemaTypes<Schema>>, SecondaryIndexes extends Record<string, any> = Schema extends RDSModelSchema<any, any> ? object : ModelSecondaryIndexes<SchemaTypes<Schema>>> = CustomOperationHandlerTypes<ResolveCustomOperations<Schema, ResolvedFields, NonModelTypes>['customOperations']> & {
+    [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/dist/esm/MappedTypes/CustomOperations.d.ts

@@ -90,7 +90,7 @@ type IndividualCustomHandlerTypes<Op extends CustomOperationMinimalDef> = {
      * }
      * ```
      */
-    functionHandlerArguments: Op['arguments'];
+    args: Op['arguments'];
     /**
      * The return type expected by a lambda function handler.
      *
@@ -106,7 +106,7 @@ type IndividualCustomHandlerTypes<Op extends CustomOperationMinimalDef> = {
      * }
      * ```
      */
-    functionHandlerResult: LambdaReturnType<Op['returnType']>;
+    returnType: LambdaReturnType<Op['returnType']>;
 };
 /**
  * Derives the function signatures for a lambda handlers for all the provided

package/dist/esm/runtime/client/index.d.ts

@@ -453,7 +453,7 @@ type ModelTypesSSRRequest<ModelName extends string, Model extends Record<string,
 };
 type ContextType = 'CLIENT' | 'COOKIES' | 'REQUEST';
 export type ModelTypes<Schema extends Record<any, any>, Context extends ContextType = 'CLIENT', ModelMeta extends Record<any, any> = ExtractModelMeta<Schema>> = {
-    [ModelName in Exclude<keyof Schema, keyof CustomOperations<Schema, 'Mutation' | 'Query' | 'Subscription', Context, ModelMeta>>]: ModelName extends string ? Schema[ModelName] extends Record<string, unknown> ? Context extends 'CLIENT' ? ModelTypesClient<ModelName, Schema[ModelName], ModelMeta[ModelName]> : Context extends 'COOKIES' ? ModelTypesSSRCookies<ModelName, Schema[ModelName], ModelMeta[ModelName]> : Context extends 'REQUEST' ? ModelTypesSSRRequest<ModelName, Schema[ModelName], ModelMeta[ModelName]> : never : never : never;
+    [ModelName in Exclude<keyof Schema, keyof CustomOperations<Schema, 'Mutation' | 'Query' | 'Subscription', Context, ModelMeta>>]: ModelName extends string ? Schema[ModelName] extends Record<string, unknown> ? Context extends 'CLIENT' ? ModelTypesClient<ModelName, Schema[ModelName]['type'], ModelMeta[ModelName]> : Context extends 'COOKIES' ? ModelTypesSSRCookies<ModelName, Schema[ModelName]['type'], ModelMeta[ModelName]> : Context extends 'REQUEST' ? ModelTypesSSRRequest<ModelName, Schema[ModelName]['type'], ModelMeta[ModelName]> : never : never : never;
 };
 export type CustomQueries<Schema extends Record<any, any>, Context extends ContextType = 'CLIENT', ModelMeta extends Record<any, any> = ExtractModelMeta<Schema>> = CustomOperations<Schema, 'Query', Context, ModelMeta>;
 export type CustomMutations<Schema extends Record<any, any>, Context extends ContextType = 'CLIENT', ModelMeta extends Record<any, any> = ExtractModelMeta<Schema>> = CustomOperations<Schema, 'Mutation', Context, ModelMeta>;