@aws-amplify/graphql-api-construct 1.14.0 → 1.15.0

package/node_modules/@aws-amplify/graphql-default-value-transformer/lib/graphql-default-value-transformer.js

@@ -8,16 +8,25 @@ const graphql_mapping_template_1 = require("graphql-mapping-template");
 const graphql_transformer_common_1 = require("graphql-transformer-common");
 const validators_1 = require("./validators");
 const nonStringTypes = ['Int', 'Float', 'Boolean', 'AWSTimestamp', 'AWSJSON'];
-const validateFieldType = (ctx, type) => {
+const validateFieldType = (ctx, config) => {
+    var _a, _b;
+    const type = config.field.type;
+    const argc = (_b = (_a = config.directive.arguments) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
     const enums = ctx.output.getTypeDefinitionsOfKind(graphql_1.Kind.ENUM_TYPE_DEFINITION);
     if ((0, graphql_transformer_common_1.isListType)(type) || !(0, graphql_transformer_common_1.isScalarOrEnum)(type, enums)) {
         throw new graphql_transformer_core_1.InvalidDirectiveError('The @default directive may only be added to scalar or enum field types.');
     }
+    if ((0, graphql_transformer_core_1.isPostgresModel)(ctx, config.object.name.value) && argc === 0 && (0, graphql_transformer_common_1.getBaseType)(type) !== 'Int') {
+        throw new graphql_transformer_core_1.InvalidDirectiveError('The @default directive requires a value property on non-Int types.');
+    }
 };
-const validateDirectiveArguments = (directive) => {
-    if (directive.arguments.length === 0)
-        throw new graphql_transformer_core_1.InvalidDirectiveError('The @default directive must have a value property');
-    if (directive.arguments.length > 1)
+const validateDirectiveArguments = (ctx, config) => {
+    var _a, _b;
+    const argc = (_b = (_a = config.directive.arguments) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
+    const isPostgres = (0, graphql_transformer_core_1.isPostgresModel)(ctx, config.object.name.value);
+    if (!isPostgres && argc === 0)
+        throw new graphql_transformer_core_1.InvalidDirectiveError('The @default directive requires a value property on non-Postgres datasources.');
+    if (argc > 1)
         throw new graphql_transformer_core_1.InvalidDirectiveError('The @default directive only takes a value property');
 };
 const validateModelDirective = (config) => {
@@ -43,8 +52,8 @@ const validateDefaultValueType = (ctx, config) => {
 };
 const validate = (ctx, config) => {
     validateModelDirective(config);
-    validateFieldType(ctx, config.field.type);
-    validateDirectiveArguments(config.directive);
+    validateFieldType(ctx, config);
+    validateDirectiveArguments(ctx, config);
     const isDynamoDB = (0, graphql_transformer_core_1.isDynamoDbModel)(ctx, config.object.name.value);
     if (isDynamoDB) {
         validateDefaultValueType(ctx, config);
@@ -74,6 +83,9 @@ class DefaultValueTransformer extends graphql_transformer_core_1.TransformerPlug
                     const input = graphql_transformer_core_1.InputObjectDefinitionWrapper.fromObject(name, config.object, ctx.inputDocument);
                     const fieldWrapper = input.fields.find((f) => f.name === config.field.name.value);
                     fieldWrapper === null || fieldWrapper === void 0 ? void 0 : fieldWrapper.makeNullable();
+                    if ((0, graphql_transformer_core_1.isPostgresModel)(ctx, typeName)) {
+                        ctx.output.updateInput(input.serialize());
+                    }
                 }
             }
         };

package/node_modules/@aws-amplify/graphql-default-value-transformer/lib/graphql-default-value-transformer.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-default-value-transformer.js","sourceRoot":"","sources":["../src/graphql-default-value-transformer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graphql-default-value-transformer.js","sourceRoot":"","sources":["../src/graphql-default-value-transformer.ts"],"names":[],"mappings":"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"}

package/node_modules/@aws-amplify/graphql-default-value-transformer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-default-value-transformer",
-  "version": "3.0.4",
+  "version": "3.1.0",
   "description": "Amplify GraphQL default value transformer",
   "repository": {
     "type": "git",
@@ -30,17 +30,17 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/graphql-directives": "2.2.0",
-    "@aws-amplify/graphql-transformer-core": "3.1.2",
-    "@aws-amplify/graphql-transformer-interfaces": "4.1.1",
+    "@aws-amplify/graphql-directives": "2.3.0",
+    "@aws-amplify/graphql-transformer-core": "3.2.0",
+    "@aws-amplify/graphql-transformer-interfaces": "4.1.2",
     "graphql": "^15.5.0",
     "graphql-mapping-template": "5.0.1",
     "graphql-transformer-common": "5.0.1",
     "libphonenumber-js": "1.9.47"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-model-transformer": "3.0.4",
-    "@aws-amplify/graphql-transformer-test-utils": "1.0.3"
+    "@aws-amplify/graphql-model-transformer": "3.0.5",
+    "@aws-amplify/graphql-transformer-test-utils": "1.0.4"
   },
   "jest": {
     "transform": {
@@ -75,12 +75,13 @@
       "src/**/*.ts"
     ],
     "coveragePathIgnorePatterns": [
-      "/__tests__/"
+      "/__tests__/",
+      "types.ts"
     ],
     "snapshotFormat": {
       "escapeString": true,
       "printBasicPrototype": true
     }
   },
-  "gitHead": "1506c6b08974a6b4f517c144cf41dd866da90951"
+  "gitHead": "d11c76ced9ad33acfded8863f144ae6f402d2bd1"
 }

package/node_modules/@aws-amplify/graphql-directives/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.3.0](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-directives@2.2.0...@aws-amplify/graphql-directives@2.3.0) (2024-10-10)
+
+### Features
+
+- auto increment support ([#2883](https://github.com/aws-amplify/amplify-category-api/issues/2883)) ([4e66ac3](https://github.com/aws-amplify/amplify-category-api/commit/4e66ac3a9d276ca063c76a97aee791618b3c71ab))
+
 # [2.2.0](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-directives@2.1.0...@aws-amplify/graphql-directives@2.2.0) (2024-09-16)
 
 ### Features

package/node_modules/@aws-amplify/graphql-directives/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1.  Definitions.
+
+    "License" shall mean the terms and conditions for use, reproduction,
+    and distribution as defined by Sections 1 through 9 of this document.
+
+    "Licensor" shall mean the copyright owner or entity authorized by
+    the copyright owner that is granting the License.
+
+    "Legal Entity" shall mean the union of the acting entity and all
+    other entities that control, are controlled by, or are under common
+    control with that entity. For the purposes of this definition,
+    "control" means (i) the power, direct or indirect, to cause the
+    direction or management of such entity, whether by contract or
+    otherwise, or (ii) ownership of fifty percent (50%) or more of the
+    outstanding shares, or (iii) beneficial ownership of such entity.
+
+    "You" (or "Your") shall mean an individual or Legal Entity
+    exercising permissions granted by this License.
+
+    "Source" form shall mean the preferred form for making modifications,
+    including but not limited to software source code, documentation
+    source, and configuration files.
+
+    "Object" form shall mean any form resulting from mechanical
+    transformation or translation of a Source form, including but
+    not limited to compiled object code, generated documentation,
+    and conversions to other media types.
+
+    "Work" shall mean the work of authorship, whether in Source or
+    Object form, made available under the License, as indicated by a
+    copyright notice that is included in or attached to the work
+    (an example is provided in the Appendix below).
+
+    "Derivative Works" shall mean any work, whether in Source or Object
+    form, that is based on (or derived from) the Work and for which the
+    editorial revisions, annotations, elaborations, or other modifications
+    represent, as a whole, an original work of authorship. For the purposes
+    of this License, Derivative Works shall not include works that remain
+    separable from, or merely link (or bind by name) to the interfaces of,
+    the Work and Derivative Works thereof.
+
+    "Contribution" shall mean any work of authorship, including
+    the original version of the Work and any modifications or additions
+    to that Work or Derivative Works thereof, that is intentionally
+    submitted to Licensor for inclusion in the Work by the copyright owner
+    or by an individual or Legal Entity authorized to submit on behalf of
+    the copyright owner. For the purposes of this definition, "submitted"
+    means any form of electronic, verbal, or written communication sent
+    to the Licensor or its representatives, including but not limited to
+    communication on electronic mailing lists, source code control systems,
+    and issue tracking systems that are managed by, or on behalf of, the
+    Licensor for the purpose of discussing and improving the Work, but
+    excluding communication that is conspicuously marked or otherwise
+    designated in writing by the copyright owner as "Not a Contribution."
+
+    "Contributor" shall mean Licensor and any individual or Legal Entity
+    on behalf of whom a Contribution has been received by Licensor and
+    subsequently incorporated within the Work.
+
+2.  Grant of Copyright License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    copyright license to reproduce, prepare Derivative Works of,
+    publicly display, publicly perform, sublicense, and distribute the
+    Work and such Derivative Works in Source or Object form.
+
+3.  Grant of Patent License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    (except as stated in this section) patent license to make, have made,
+    use, offer to sell, sell, import, and otherwise transfer the Work,
+    where such license applies only to those patent claims licensable
+    by such Contributor that are necessarily infringed by their
+    Contribution(s) alone or by combination of their Contribution(s)
+    with the Work to which such Contribution(s) was submitted. If You
+    institute patent litigation against any entity (including a
+    cross-claim or counterclaim in a lawsuit) alleging that the Work
+    or a Contribution incorporated within the Work constitutes direct
+    or contributory patent infringement, then any patent licenses
+    granted to You under this License for that Work shall terminate
+    as of the date such litigation is filed.
+
+4.  Redistribution. You may reproduce and distribute copies of the
+    Work or Derivative Works thereof in any medium, with or without
+    modifications, and in Source or Object form, provided that You
+    meet the following conditions:
+
+    (a) You must give any other recipients of the Work or
+    Derivative Works a copy of this License; and
+
+    (b) You must cause any modified files to carry prominent notices
+    stating that You changed the files; and
+
+    (c) You must retain, in the Source form of any Derivative Works
+    that You distribute, all copyright, patent, trademark, and
+    attribution notices from the Source form of the Work,
+    excluding those notices that do not pertain to any part of
+    the Derivative Works; and
+
+    (d) If the Work includes a "NOTICE" text file as part of its
+    distribution, then any Derivative Works that You distribute must
+    include a readable copy of the attribution notices contained
+    within such NOTICE file, excluding those notices that do not
+    pertain to any part of the Derivative Works, in at least one
+    of the following places: within a NOTICE text file distributed
+    as part of the Derivative Works; within the Source form or
+    documentation, if provided along with the Derivative Works; or,
+    within a display generated by the Derivative Works, if and
+    wherever such third-party notices normally appear. The contents
+    of the NOTICE file are for informational purposes only and
+    do not modify the License. You may add Your own attribution
+    notices within Derivative Works that You distribute, alongside
+    or as an addendum to the NOTICE text from the Work, provided
+    that such additional attribution notices cannot be construed
+    as modifying the License.
+
+    You may add Your own copyright statement to Your modifications and
+    may provide additional or different license terms and conditions
+    for use, reproduction, or distribution of Your modifications, or
+    for any such Derivative Works as a whole, provided Your use,
+    reproduction, and distribution of the Work otherwise complies with
+    the conditions stated in this License.
+
+5.  Submission of Contributions. Unless You explicitly state otherwise,
+    any Contribution intentionally submitted for inclusion in the Work
+    by You to the Licensor shall be under the terms and conditions of
+    this License, without any additional terms or conditions.
+    Notwithstanding the above, nothing herein shall supersede or modify
+    the terms of any separate license agreement you may have executed
+    with Licensor regarding such Contributions.
+
+6.  Trademarks. This License does not grant permission to use the trade
+    names, trademarks, service marks, or product names of the Licensor,
+    except as required for reasonable and customary use in describing the
+    origin of the Work and reproducing the content of the NOTICE file.
+
+7.  Disclaimer of Warranty. Unless required by applicable law or
+    agreed to in writing, Licensor provides the Work (and each
+    Contributor provides its Contributions) on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+    implied, including, without limitation, any warranties or conditions
+    of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+    PARTICULAR PURPOSE. You are solely responsible for determining the
+    appropriateness of using or redistributing the Work and assume any
+    risks associated with Your exercise of permissions under this License.
+
+8.  Limitation of Liability. In no event and under no legal theory,
+    whether in tort (including negligence), contract, or otherwise,
+    unless required by applicable law (such as deliberate and grossly
+    negligent acts) or agreed to in writing, shall any Contributor be
+    liable to You for damages, including any direct, indirect, special,
+    incidental, or consequential damages of any character arising as a
+    result of this License or out of the use or inability to use the
+    Work (including but not limited to damages for loss of goodwill,
+    work stoppage, computer failure or malfunction, or any and all
+    other commercial damages or losses), even if such Contributor
+    has been advised of the possibility of such damages.
+
+9.  Accepting Warranty or Additional Liability. While redistributing
+    the Work or Derivative Works thereof, You may choose to offer,
+    and charge a fee for, acceptance of support, warranty, indemnity,
+    or other liability obligations and/or rights consistent with this
+    License. However, in accepting such obligations, You may act only
+    on Your own behalf and on Your sole responsibility, not on behalf
+    of any other Contributor, and only if You agree to indemnify,
+    defend, and hold each Contributor harmless for any liability
+    incurred by, or claims asserted against, such Contributor by reason
+    of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+Copyright 2017 - 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

package/node_modules/@aws-amplify/graphql-directives/lib/directives/default.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultDirective = void 0;
 const name = 'default';
 const definition = `
-  directive @${name}(value: String!) on FIELD_DEFINITION
+  directive @${name}(value: String) on FIELD_DEFINITION
 `;
 const defaults = {};
 exports.DefaultDirective = {

package/node_modules/@aws-amplify/graphql-directives/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-directives",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Directive definitions for Amplify GraphQL transformers.",
   "repository": {
     "type": "git",
@@ -67,5 +67,6 @@
       "escapeString": true,
       "printBasicPrototype": true
     }
-  }
+  },
+  "gitHead": "d11c76ced9ad33acfded8863f144ae6f402d2bd1"
 }

package/node_modules/@aws-amplify/graphql-function-transformer/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.2](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-function-transformer@3.1.1...@aws-amplify/graphql-function-transformer@3.1.2) (2024-10-10)
+
+**Note:** Version bump only for package @aws-amplify/graphql-function-transformer
+
 ## [3.1.1](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-function-transformer@3.1.0...@aws-amplify/graphql-function-transformer@3.1.1) (2024-10-01)
 
 **Note:** Version bump only for package @aws-amplify/graphql-function-transformer

package/node_modules/@aws-amplify/graphql-function-transformer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-function-transformer",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Amplify GraphQL @function transformer",
   "repository": {
     "type": "git",
@@ -29,18 +29,18 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/graphql-directives": "2.2.0",
-    "@aws-amplify/graphql-transformer-core": "3.1.2",
-    "@aws-amplify/graphql-transformer-interfaces": "4.1.1",
+    "@aws-amplify/graphql-directives": "2.3.0",
+    "@aws-amplify/graphql-transformer-core": "3.2.0",
+    "@aws-amplify/graphql-transformer-interfaces": "4.1.2",
     "graphql": "^15.5.0",
     "graphql-mapping-template": "5.0.1",
     "graphql-transformer-common": "5.0.1"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-transformer-test-utils": "1.0.3"
+    "@aws-amplify/graphql-transformer-test-utils": "1.0.4"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.152.0",
+    "aws-cdk-lib": "^2.158.0",
     "constructs": "^10.3.0"
   },
   "jest": {
@@ -83,5 +83,5 @@
       "printBasicPrototype": true
     }
   },
-  "gitHead": "1506c6b08974a6b4f517c144cf41dd866da90951"
+  "gitHead": "d11c76ced9ad33acfded8863f144ae6f402d2bd1"
 }

package/node_modules/@aws-amplify/graphql-generation-transformer/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.3](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-generation-transformer@0.2.2...@aws-amplify/graphql-generation-transformer@0.2.3) (2024-10-10)
+
+### Bug Fixes
+
+- **generation:** gracefully handle stringified tool_use responses ([#2919](https://github.com/aws-amplify/amplify-category-api/issues/2919)) ([db34e42](https://github.com/aws-amplify/amplify-category-api/commit/db34e424069b9d2ebf2a51b3474d2f83644e3174))
+- **generation:** remove trailing comma in inferenceConfig resolver code ([#2933](https://github.com/aws-amplify/amplify-category-api/issues/2933)) ([9dde73c](https://github.com/aws-amplify/amplify-category-api/commit/9dde73c09dd4f42c666c256c8543a6b94dc4a084))
+
 ## [0.2.2](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-generation-transformer@0.2.1...@aws-amplify/graphql-generation-transformer@0.2.2) (2024-10-01)
 
 **Note:** Version bump only for package @aws-amplify/graphql-generation-transformer

package/node_modules/@aws-amplify/graphql-generation-transformer/lib/resolvers/invoke-bedrock-resolver-fn.template.js

@@ -1,3 +1,5 @@
+import { util } from '@aws-appsync/utils';
+
 export function request(ctx) {
   const toolConfig = [[TOOL_CONFIG]];
   const prompt = [[SYSTEM_PROMPT]];
@@ -28,18 +30,31 @@ export function response(ctx) {
   if (ctx.error) {
     util.error(ctx.error.message, ctx.error.type);
   }
-  const body = JSON.parse(ctx.result.body);
-  const { content } = body.output.message;
 
-  if (content.length < 1) {
-    util.error('No content block in assistant response.', 'error');
+  // Check for AccessDeniedException.
+  // This can happen if:
+  //   1. The Bedrock model isn't enabled in this region.
+  //   2. The IAM policy statement for the role assumed by the data source for this resolver doesn't include them model.
+  //    This shouldn't happen because we're managing the policy statements.
+  // We're using a generic error description here (as opposed to using the response body)
+  // to prevent information about the system from leaking.
+  const errorType = ctx.result.headers['x-amzn-ErrorType'];
+  if (errorType) {
+    if (errorType.startsWith('AccessDeniedException')) {
+      const errorMessage = 'The model is disabled or this generation route is missing a necessary identity-based policy.';
+      util.error(errorMessage, 'AccessDeniedException');
+    }
+
+    util.error('', errorType);
   }
 
-  const toolUse = content[0].toolUse;
-  if (!toolUse) {
-    util.error('Missing tool use block in assistant response.', 'error');
+  const body = JSON.parse(ctx.result.body);
+  const value = body?.output?.message?.content?.[0]?.toolUse?.input?.value;
+
+  if (!value) {
+    util.error('Invalid Bedrock response', 'InvalidResponseException');
   }
 
-  const response = toolUse.input.value;
-  return response;
+  [[NON_STRING_RESPONSE_HANDLING]]
+  return value;
 }

package/node_modules/@aws-amplify/graphql-generation-transformer/lib/resolvers/invoke-bedrock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invoke-bedrock.d.ts","sourceRoot":"","sources":["../../src/resolvers/invoke-bedrock.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AACtF,OAAO,EAAE,qCAAqC,EAA0B,MAAM,mCAAmC,CAAC;AAUlH,eAAO,MAAM,mCAAmC,WAAY,qCAAqC,KAAG,uBAgBnG,CAAC"}
+{"version":3,"file":"invoke-bedrock.d.ts","sourceRoot":"","sources":["../../src/resolvers/invoke-bedrock.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AACtF,OAAO,EAAE,qCAAqC,EAA0B,MAAM,mCAAmC,CAAC;AAWlH,eAAO,MAAM,mCAAmC,WAAY,qCAAqC,KAAG,uBAyBnG,CAAC"}

package/node_modules/@aws-amplify/graphql-generation-transformer/lib/resolvers/invoke-bedrock.js

@@ -7,17 +7,26 @@ exports.createInvokeBedrockResolverFunction = void 0;
 const graphql_transformer_core_1 = require("@aws-amplify/graphql-transformer-core");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const graphql_transformer_common_1 = require("graphql-transformer-common");
 const createInvokeBedrockResolverFunction = (config) => {
     const { aiModel, toolConfig, inferenceConfiguration, field } = config;
     const AI_MODEL = aiModel;
     const TOOL_CONFIG = JSON.stringify(toolConfig);
     const SYSTEM_PROMPT = JSON.stringify(config.systemPrompt);
     const INFERENCE_CONFIG = getInferenceConfigResolverDefinition(inferenceConfiguration);
+    const NON_STRING_RESPONSE_HANDLING = stringTypedScalarTypes.includes((0, graphql_transformer_common_1.getBaseType)(config.field.type))
+        ? ''
+        : `// Added for non-string scalar response types
+  // This catches the occasional stringified JSON response.
+  if (typeof value === 'string') {
+    return JSON.parse(value);
+  }`;
     const resolver = generateResolver('invoke-bedrock-resolver-fn.template.js', {
         AI_MODEL,
         TOOL_CONFIG,
         SYSTEM_PROMPT,
         INFERENCE_CONFIG,
+        NON_STRING_RESPONSE_HANDLING,
     });
     const templateName = `${field.name.value}-invoke-bedrock-fn`;
     return graphql_transformer_core_1.MappingTemplate.s3MappingFunctionCodeFromString(resolver, templateName);
@@ -33,7 +42,8 @@ const generateResolver = (fileName, values) => {
 };
 const getInferenceConfigResolverDefinition = (inferenceConfiguration) => {
     return inferenceConfiguration && Object.keys(inferenceConfiguration).length > 0
-        ? `{ inferenceConfig: ${JSON.stringify(inferenceConfiguration)} },`
+        ? `{ inferenceConfig: ${JSON.stringify(inferenceConfiguration)} }`
         : 'undefined';
 };
+const stringTypedScalarTypes = ['String', 'ID', 'AWSJSON'];
 //# sourceMappingURL=invoke-bedrock.js.map

package/node_modules/@aws-amplify/graphql-generation-transformer/lib/resolvers/invoke-bedrock.js.map

@@ -1 +1 @@
-{"version":3,"file":"invoke-bedrock.js","sourceRoot":"","sources":["../../src/resolvers/invoke-bedrock.ts"],"names":[],"mappings":";;;;;;AAAA,oFAAwE;AAGxE,4CAAoB;AACpB,gDAAwB;AAQjB,MAAM,mCAAmC,GAAG,CAAC,MAA6C,EAA2B,EAAE;IAC5H,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IACtE,MAAM,QAAQ,GAAG,OAAO,CAAC;IACzB,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC1D,MAAM,gBAAgB,GAAG,oCAAoC,CAAC,sBAAsB,CAAC,CAAC;IAEtF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,wCAAwC,EAAE;QAC1E,QAAQ;QACR,WAAW;QACX,aAAa;QACb,gBAAgB;KACjB,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,oBAAoB,CAAC;IAC7D,OAAO,0CAAe,CAAC,+BAA+B,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;AACjF,CAAC,CAAC;AAhBW,QAAA,mCAAmC,uCAgB9C;AAEF,MAAM,gBAAgB,GAAG,CAAC,QAAgB,EAAE,MAA8B,EAAU,EAAE;IACpF,IAAI,QAAQ,GAAG,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IACvE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9C,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,SAAS,GAAG,QAAQ,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;QAChF,QAAQ,GAAG,QAAQ,CAAC;IACtB,CAAC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAQF,MAAM,oCAAoC,GAAG,CAAC,sBAA+C,EAAU,EAAE;IACvG,OAAO,sBAAsB,IAAI,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,MAAM,GAAG,CAAC;QAC7E,CAAC,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,KAAK;QACnE,CAAC,CAAC,WAAW,CAAC;AAClB,CAAC,CAAC"}
+{"version":3,"file":"invoke-bedrock.js","sourceRoot":"","sources":["../../src/resolvers/invoke-bedrock.ts"],"names":[],"mappings":";;;;;;AAAA,oFAAwE;AAGxE,4CAAoB;AACpB,gDAAwB;AACxB,2EAAyD;AAQlD,MAAM,mCAAmC,GAAG,CAAC,MAA6C,EAA2B,EAAE;IAC5H,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IACtE,MAAM,QAAQ,GAAG,OAAO,CAAC;IACzB,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC1D,MAAM,gBAAgB,GAAG,oCAAoC,CAAC,sBAAsB,CAAC,CAAC;IAEtF,MAAM,4BAA4B,GAAG,sBAAsB,CAAC,QAAQ,CAAC,IAAA,wCAAW,EAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClG,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;;;;IAIF,CAAC;IAEH,MAAM,QAAQ,GAAG,gBAAgB,CAAC,wCAAwC,EAAE;QAC1E,QAAQ;QACR,WAAW;QACX,aAAa;QACb,gBAAgB;QAChB,4BAA4B;KAC7B,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,oBAAoB,CAAC;IAC7D,OAAO,0CAAe,CAAC,+BAA+B,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;AACjF,CAAC,CAAC;AAzBW,QAAA,mCAAmC,uCAyB9C;AAEF,MAAM,gBAAgB,GAAG,CAAC,QAAgB,EAAE,MAA8B,EAAU,EAAE;IACpF,IAAI,QAAQ,GAAG,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IACvE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9C,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,SAAS,GAAG,QAAQ,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;QAChF,QAAQ,GAAG,QAAQ,CAAC;IACtB,CAAC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAQF,MAAM,oCAAoC,GAAG,CAAC,sBAA+C,EAAU,EAAE;IACvG,OAAO,sBAAsB,IAAI,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,MAAM,GAAG,CAAC;QAC7E,CAAC,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,IAAI;QAClE,CAAC,CAAC,WAAW,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC"}

package/node_modules/@aws-amplify/graphql-generation-transformer/lib/utils/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/utils/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC;AACzF,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAEnE,MAAM,MAAM,IAAI,GAAG;IACjB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,KAAK,EAAE,IAAI,EAAE,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,UAAU,EAAE;QACV,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;KACH,CAAC;CACH,CAAC;AAEF,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE;QACX,IAAI,EAAE,UAAU,CAAC;KAClB,CAAC;CACH,CAAC;AAiBF,eAAO,MAAM,sBAAsB,UAAW,mBAAmB,OAAO,0BAA0B,KAAG,UA4BpG,CAAC"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/utils/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC;AACzF,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAEnE,MAAM,MAAM,IAAI,GAAG;IACjB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,KAAK,EAAE,IAAI,EAAE,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,UAAU,EAAE;QACV,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;KACH,CAAC;CACH,CAAC;AAEF,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE;QACX,IAAI,EAAE,UAAU,CAAC;KAClB,CAAC;CACH,CAAC;AAiBF,eAAO,MAAM,sBAAsB,UAAW,mBAAmB,OAAO,0BAA0B,KAAG,UA8BpG,CAAC"}

package/node_modules/@aws-amplify/graphql-generation-transformer/lib/utils/tools.js

@@ -12,11 +12,12 @@ const createResponseTypeTool = (field, ctx) => {
         },
         required: ['value'],
     };
+    const description = 'Generate a response type for the given field.';
     const tools = [
         {
             toolSpec: {
                 name: 'responseType',
-                description: 'Generate a response type for the given field',
+                description,
                 inputSchema: {
                     json: boxedSchema,
                 },

package/node_modules/@aws-amplify/graphql-generation-transformer/lib/utils/tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/utils/tools.ts"],"names":[],"mappings":";;;AAEA,yEAA4E;AA2CrE,MAAM,sBAAsB,GAAG,CAAC,KAA0B,EAAE,GAA+B,EAAc,EAAE;IAChH,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACvB,MAAM,MAAM,GAAG,IAAA,yDAA8B,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAIzD,MAAM,WAAW,GAAG;QAClB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,KAAK,EAAE,MAAM;SACd;QACD,QAAQ,EAAE,CAAC,OAAO,CAAC;KACpB,CAAC;IACF,MAAM,KAAK,GAAW;QACpB;YACE,QAAQ,EAAE;gBACR,IAAI,EAAE,cAAc;gBACpB,WAAW,EAAE,8CAA8C;gBAC3D,WAAW,EAAE;oBACX,IAAI,EAAE,WAAW;iBAClB;aACF;SACF;KACF,CAAC;IACF,MAAM,UAAU,GAAG,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,CAAC;IACtD,MAAM,UAAU,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IAEzC,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AA5BW,QAAA,sBAAsB,0BA4BjC"}
+{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/utils/tools.ts"],"names":[],"mappings":";;;AAEA,yEAA4E;AA2CrE,MAAM,sBAAsB,GAAG,CAAC,KAA0B,EAAE,GAA+B,EAAc,EAAE;IAChH,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACvB,MAAM,MAAM,GAAG,IAAA,yDAA8B,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAIzD,MAAM,WAAW,GAAG;QAClB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,KAAK,EAAE,MAAM;SACd;QACD,QAAQ,EAAE,CAAC,OAAO,CAAC;KACpB,CAAC;IAEF,MAAM,WAAW,GAAG,+CAA+C,CAAC;IACpE,MAAM,KAAK,GAAW;QACpB;YACE,QAAQ,EAAE;gBACR,IAAI,EAAE,cAAc;gBACpB,WAAW;gBACX,WAAW,EAAE;oBACX,IAAI,EAAE,WAAW;iBAClB;aACF;SACF;KACF,CAAC;IACF,MAAM,UAAU,GAAG,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,CAAC;IACtD,MAAM,UAAU,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IAEzC,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AA9BW,QAAA,sBAAsB,0BA8BjC"}

package/node_modules/@aws-amplify/graphql-generation-transformer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-generation-transformer",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Amplify GraphQL @generation transformer",
   "repository": {
     "type": "git",
@@ -24,19 +24,19 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/graphql-directives": "2.2.0",
-    "@aws-amplify/graphql-transformer-core": "3.1.2",
-    "@aws-amplify/graphql-transformer-interfaces": "4.1.1",
+    "@aws-amplify/graphql-directives": "2.3.0",
+    "@aws-amplify/graphql-transformer-core": "3.2.0",
+    "@aws-amplify/graphql-transformer-interfaces": "4.1.2",
     "graphql": "^15.5.0",
     "graphql-mapping-template": "5.0.1",
     "graphql-transformer-common": "5.0.1",
     "immer": "^9.0.12"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-transformer-test-utils": "1.0.3"
+    "@aws-amplify/graphql-transformer-test-utils": "1.0.4"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.152.0",
+    "aws-cdk-lib": "^2.158.0",
     "constructs": "^10.3.0"
   },
   "jest": {
@@ -75,5 +75,5 @@
       "/__tests__/"
     ]
   },
-  "gitHead": "1506c6b08974a6b4f517c144cf41dd866da90951"
+  "gitHead": "d11c76ced9ad33acfded8863f144ae6f402d2bd1"
 }

package/node_modules/@aws-amplify/graphql-http-transformer/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.5](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-http-transformer@3.0.4...@aws-amplify/graphql-http-transformer@3.0.5) (2024-10-10)
+
+**Note:** Version bump only for package @aws-amplify/graphql-http-transformer
+
 ## [3.0.4](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-http-transformer@3.0.3...@aws-amplify/graphql-http-transformer@3.0.4) (2024-10-01)
 
 **Note:** Version bump only for package @aws-amplify/graphql-http-transformer